Added basic pods to the marketing app

oscar/marketing/abstract_models.py

@@ -6,7 +6,13 @@ try:
     BANNER_FOLDER = settings.OSCAR_BANNER_FOLDER
 except AttributeError: 
     BANNER_FOLDER = 'images/banners/'
+    
+try:
+    POD_FOLDER = settings.OSCAR_POD_FOLDER
+except AttributeError: 
+    POD_FOLDER = 'images/pods/'
 
+LEFT, RIGHT = ('Left', 'Right')
 
 class AbstractBanner(models.Model):
     u"""
@@ -14,6 +20,7 @@ class AbstractBanner(models.Model):
     """
     name = models.CharField(_("Name"), max_length=128)
     page_url = models.CharField(_('URL'), max_length=128, db_index=True)
+    display_order = models.PositiveIntegerField(default=0)
     link_url = models.URLField(blank=True, null=True, help_text="""This is 
         where the banner links to""")
     image = models.ImageField(upload_to=BANNER_FOLDER)
@@ -21,6 +28,8 @@ class AbstractBanner(models.Model):
     
     class Meta:
         abstract = True
+        ordering = ['page_url', 'display_order']
+        get_latest_by = "date_created"
         
     def __unicode__(self):
         return "%s (%s)" % (self.name, self.page_url)   
@@ -31,6 +40,40 @@ class AbstractBanner(models.Model):
     @property    
     def has_link(self):
         return self.link_url != None    
+    
+    
+class AbstractPod(models.Model):
+    u"""
+    A pod image linked to a particular page.
+    """
+    POSITION_CHOICES = (
+        (LEFT, _("Left of page")),
+        (RIGHT, _("Right of page")),
+    )
+    
+    name = models.CharField(_("Name"), max_length=128)
+    page_url = models.CharField(_('URL'), max_length=128, db_index=True)
+    page_position = models.CharField(_("Position"), max_length=128, choices=POSITION_CHOICES)
+    display_order = models.PositiveIntegerField(default=0)
+    link_url = models.URLField(blank=True, null=True, help_text="""This is 
+        where the pod links to""")
+    image = models.ImageField(upload_to=POD_FOLDER)
+    date_created = models.DateTimeField(auto_now_add=True)
+    
+    class Meta:
+        abstract = True
+        ordering = ["page_url", "page_position", 'display_order']
+        get_latest_by = "date_created"
+        
+    def __unicode__(self):
+        return "%s (%s)" % (self.name, self.page_url)   
+        
+    def save(self, *args, **kwargs):
+        super(AbstractPod, self).save(*args, **kwargs)
+        
+    @property    
+    def has_link(self):
+        return self.link_url != None 
 
         
     

oscar/marketing/admin.py

@@ -1,9 +1,13 @@
 from django.contrib import admin
 
 from oscar.services import import_module
-models = import_module('marketing.models', ['Banner'])
+models = import_module('marketing.models', ['Banner', 'Pod'])
 
 class BannerAdmin(admin.ModelAdmin):
-    pass
+    list_display = ['page_url', 'name']
+
+class PodAdmin(admin.ModelAdmin):
+    list_display = ['page_url', 'page_position', 'name']
 
 admin.site.register(models.Banner, BannerAdmin)
+admin.site.register(models.Pod, PodAdmin)

oscar/marketing/context_processors.py

@@ -2,15 +2,27 @@ from django.core.exceptions import ObjectDoesNotExist
 
 from oscar.services import import_module
 
-marketing_models = import_module('marketing.models', ['Banner'])
+marketing_models = import_module('marketing.models', ['Banner', 'Pod'])
 
 
 def banners(request):
+    bindings = {}
+    
+    
+    # Look for a banner
     try:
         banner = marketing_models.Banner._default_manager.get(page_url=request.path)
-        bindings = {'banner': banner}
+        bindings['banner'] = banner
     except ObjectDoesNotExist:
-        bindings = {}
+        pass
+    
+    # Looks for pods
+    try:
+        pods = marketing_models.Pod._default_manager.filter(page_url=request.path)
+        bindings['pods'] = pods
+    except ObjectDoesNotExist:
+        pass
+
     return bindings
 
         

oscar/marketing/models.py

@@ -1,7 +1,10 @@
 """
-Vanilla product models
+Vanilla marketing models
 """
-from oscar.marketing.abstract_models import AbstractBanner
+from oscar.marketing.abstract_models import AbstractBanner, AbstractPod
 
 class Banner(AbstractBanner):
     pass
+
+class Pod(AbstractPod):
+    pass

oscar/templates/layout.html

@@ -25,6 +25,16 @@
                 {% endif %}
             {% endif %}
             
+            {% if pods %}
+                {% for pod in pods %}
+                    {% if pod.has_link %}
+                        <a href="{{ pod.link_url }}" title="{{ pod.name }}"><img src="{{ pod.image.url }}" alt="{{ pod.name }}" /></a>
+                    {% else %}
+                        <img src="{{ pod.image.url }}" alt="{{ pod.name }}" />
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
+            
             {% block header %}
             {% endblock %}
         </div>

oscar/views.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.template import Context, loader, RequestContext
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render
 from django.core.urlresolvers import reverse
 from django.contrib import messages
 
@@ -64,4 +64,4 @@ class ModelView(object):
 
 def home(request):
     u"""Oscar home page"""
-    return render_to_response('home.html', locals())
+    return render(request, 'home.html', locals())