Basic image promotions now working

examples/vanilla/settings.py

@@ -63,6 +63,7 @@ MEDIA_URL = '/media/'
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX = '/media/admin/'
 
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '$)a7n&o80u!6y5t-+jrd3)3!%vh&shg$wqpjpxc!ar&p#!)n1a'
 
@@ -180,10 +181,11 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.admin',
     'django.contrib.flatpages',
+    'django.contrib.staticfiles',
     # External apps
     'django_extensions',
     'haystack',
-    'debug_toolbar',
+    #'debug_toolbar',
     # Apps from oscar
     'oscar',
     'oscar.apps.analytics',

examples/vanilla/templates/layout.html

@@ -20,11 +20,6 @@
                 <a href="{% url customer:login %}">Login</a>
             {% endif %}
             
-            Add a:
-            <a href="/admin/promotions/pagepromotion/add/?page_url={{ url_path }}" >promotion</a> /
-            <a href="/admin/promotions/pagemerchandisingblock/add/?page_url={{ url_path }}" >merchandising block</a>
-            to this page.
-            
             Basket total: {{ basket.total_incl_tax|currency }}
             <a href="{% url basket:summary %}">View basket</a>
             
@@ -42,9 +37,9 @@
             {% endif %}
             
             <div id="promotions">
-            {% for promotion in promotions_top %}
-                {% render_promotion promotion %}
-            {% endfor %}
+                {% for promotion in promotions_page %}
+                    {% render_promotion promotion %}
+                {% endfor %}
             </div>
             
             {% block content %}{% endblock %}

examples/vanilla/urls.py

@@ -1,5 +1,7 @@
 from django.conf.urls.defaults import *
 from django.contrib import admin
+from django.conf.urls.static import static
+from django.conf import settings
 
 from oscar.app import shop
 
@@ -9,3 +11,5 @@ urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     (r'', include(shop.urls)),
 )
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

oscar/apps/promotions/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from oscar.apps.promotions.models import Banner, Pod, HandPickedProductList, OrderedProduct, AutomaticProductList, TabbedBlock, \
+from oscar.apps.promotions.models import Image, MultiImage, RawHTML, HandPickedProductList, OrderedProduct, AutomaticProductList, TabbedBlock, \
                                   PagePromotion, KeywordPromotion
 
 
@@ -25,8 +25,9 @@ class KeywordPromotionAdmin(admin.ModelAdmin):
     readonly_fields = ['clicks']
 
 
-admin.site.register(Banner)
-admin.site.register(Pod)
+admin.site.register(Image)
+admin.site.register(MultiImage)
+admin.site.register(RawHTML)
 admin.site.register(HandPickedProductList, HandPickedProductListAdmin)
 admin.site.register(AutomaticProductList)
 admin.site.register(TabbedBlock)

oscar/apps/promotions/context_processors.py

@@ -10,16 +10,18 @@ def promotions(request):
     For adding bindings for banners and pods to the template
     context.
     """
-    context = {
-        'url_path': request.path
-    }
+    
     # @todo need caching here / and order bt
     promotions = PagePromotion._default_manager.select_related().filter(page_url=request.path)
 
-    if 'q' in request.GET:
-        keyword_promotions = KeywordPromotion._default_manager.select_related().filter(keyword=request.GET['q'])
-        if keyword_promotions.count() > 0:
-            promotions = list(chain(promotions, keyword_promotions))
+#    if 'q' in request.GET:
+#        keyword_promotions = KeywordPromotion._default_manager.select_related().filter(keyword=request.GET['q'])
+#        if keyword_promotions.count() > 0:
+#            promotions = list(chain(promotions, keyword_promotions))
+
+    context = {
+        'url_path': request.path
+    }
 
     # Split the promotions into separate lists for each position, and 
     # add them to the template bindings

oscar/apps/promotions/models.py

@@ -9,14 +9,10 @@ from django.contrib.contenttypes.models import ContentType
 
 from oscar.forms.fields import ExtendedURLField
 
-# Settings-controlled stuff
-BANNER_FOLDER = settings.OSCAR_BANNER_FOLDER
-POD_FOLDER = settings.OSCAR_POD_FOLDER
-
 # Different model types for each type of promotion
 
 
-class Promotion(models.Model):
+class AbstractPromotion(models.Model):
     """
     Abstract base promotion that defines the interface
     that subclasses must implement.
@@ -40,36 +36,50 @@ class Promotion(models.Model):
         return {}
 
 
-class Banner(Promotion):
+class RawHTML(AbstractPromotion):
+    """
+    Simple promotion - just raw HTML
+    """
+    name = models.CharField(_("Name"), max_length=128)
+    body = models.TextField(_("HTML"))
+    date_created = models.DateTimeField(auto_now_add=True)
+
+
+class Image(AbstractPromotion):
+    """
+    An image promotion is simply a named image which has an optional 
+    link to another part of the site (or another site).
     
+    This can be used to model both banners and pods.
+    """
     name = models.CharField(_("Name"), max_length=128)
     link_url = ExtendedURLField(blank=True, null=True, help_text="""This is 
         where this promotion links to""")
-    image = models.ImageField(upload_to=BANNER_FOLDER, blank=True, null=True)
+    image = models.ImageField(upload_to=settings.OSCAR_PROMOTION_FOLDER, blank=True, null=True)
     date_created = models.DateTimeField(auto_now_add=True)
     
     def __unicode__(self):
         return self.name
     
-
-class Pod(Promotion):
     
+class MultiImage(AbstractPromotion):
+    """
+    A multi-image promotion is simply a collection of image promotions
+    that are rendered in a specific way.  This models things like 
+    rotating banners.
+    """
     name = models.CharField(_("Name"), max_length=128)
-    link_url = ExtendedURLField(blank=True, null=True, help_text="""This is 
-        where this promotion links to""")
-    image = models.ImageField(upload_to=BANNER_FOLDER, blank=True, null=True)
-    date_created = models.DateTimeField(auto_now_add=True)
+    tabs = models.ManyToManyField('promotions.Image', null=True, blank=True)
     
     def __unicode__(self):
         return self.name
 
 
-class AbstractProductList(Promotion):
+class AbstractProductList(AbstractPromotion):
     """
     Abstract superclass for promotions which are essentially a list
     of products.
     """
-    
     name = models.CharField(_("Title"), max_length=255)
     description = models.TextField(null=True, blank=True)
     link_url = ExtendedURLField(blank=True, null=True)
@@ -83,7 +93,10 @@ class AbstractProductList(Promotion):
         
  
 class HandPickedProductList(AbstractProductList):
-    
+    """
+    A hand-picked product list is a list of manually selected
+    products.
+    """
     products = models.ManyToManyField('product.Item', through='OrderedProduct', blank=True, null=True)
     
 
@@ -118,7 +131,7 @@ class OrderedProductList(models.Model):
         ordering = ('display_order',)
 
 
-class TabbedBlock(Promotion):
+class TabbedBlock(AbstractPromotion):
 
     tabs = models.ManyToManyField('promotions.HandPickedProductList', through='OrderedProductList', null=True, blank=True)
     date_created = models.DateTimeField(auto_now_add=True)
@@ -126,13 +139,6 @@ class TabbedBlock(Promotion):
     
 # Linking models
 
-TOP, LEFT, RIGHT = ('Top', 'Left', 'Right')
-POSITION_CHOICES = (
-    (TOP, _("Top of page")),
-    (LEFT, _("Left-hand sidebar")),
-    (RIGHT, _("Right-hand sidebar")),
-)
-
 
 class LinkedPromotion(models.Model):
     
@@ -141,7 +147,7 @@ class LinkedPromotion(models.Model):
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey('content_type', 'object_id')
     
-    position = models.CharField(_("Position"), max_length=100, help_text="Position on page", choices=POSITION_CHOICES)
+    position = models.CharField(_("Position"), max_length=100, help_text="Position on page")
     display_order = models.PositiveIntegerField(default=0)
     clicks = models.PositiveIntegerField(default=0)
     date_created = models.DateTimeField(auto_now_add=True)

oscar/apps/promotions/templatetags/promotions.py

@@ -6,10 +6,10 @@ register = Library()
      
 class PromotionNode(Node):
     def __init__(self, promotion):
-        self.promotion = Variable(promotion)
+        self.promotion_var = Variable(promotion)
     
     def render(self, context):
-        promotion = self.promotion.resolve(context)
+        promotion = self.promotion_var.resolve(context)
         template = select_template([promotion.template_name(), 'promotions/default.html'])
         args = dict(promotion=promotion, **promotion.template_context(request=context['request']))
         return template.render(Context(args))

oscar/defaults.py

@@ -11,8 +11,7 @@ OSCAR_RECENTLY_VIEWED_PRODUCTS = 4
 
 # Image paths
 OSCAR_IMAGE_FOLDER = 'images/products/%Y/%m/'
-OSCAR_BANNER_FOLDER = 'images/promotions/banners'
-OSCAR_POD_FOLDER = 'images/promotions/pods'
+OSCAR_PROMOTION_FOLDER = 'images/promotions/'
 
 # Search settings
 OSCAR_SEARCH_SUGGEST_LIMIT = 10

oscar/templates/base.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html> 
-<html lang="{% block language %}en-gb{% endblock %}">
-    <head>
-        <title>{% block title %}Oscar :: Flexible ecommerce for Django{% endblock %}</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-        <meta name="created" content='{% now "jS M Y h:i" %}' />
-        <meta name="description" content="{% block description %}{% endblock %}" />
-        <meta name="keywords" content="{% block keywords %}{% endblock %}" />
-        {% block extra_head %}{% endblock %}
-    </head>
-    <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
-        {% block layout %}{% endblock %}
-        {% block tracking %}
-            {% if not debug and not request.user.is_staff %}
-                <!-- Tracking to go here. -->
-            {% endif %}
-        {% endblock %}
-    </body>
-</html>

oscar/templates/layout.html

@@ -1,56 +0,0 @@
-{% extends "base.html" %}
-
-{% load currency_filters %}
-{% load promotions %}
-
-{% block layout %}
-    <div id="container">
-        <div id="header">
-            <p><a href="{% url home %}">Oscar // Flexible e-commerce for Django</a></p>
-            
-            <form method="get" action="{% url search:search %}">
-                {{ search_form.as_p }}
-                <input type="submit" value="Go!" /> 
-            </form>
-            
-            {% if user.is_authenticated %}
-                <a href="{% url customer:summary %}">Profile</a>
-                <a href="{% url customer:logout %}">Logout</a>
-            {% else %}
-                <a href="{% url customer:login %}">Login</a>
-            {% endif %}
-            
-            {% for banner in banners %}
-                {{ banner.get_banner_html|safe }}
-            {% endfor %}
-
-            Add a:
-            <a href="/admin/promotions/pagepromotion/add/?page_url={{ url_path }}" >promotion</a> /
-            <a href="/admin/promotions/pagemerchandisingblock/add/?page_url={{ url_path }}" >merchandising block</a>
-            to this page.
-            
-            Basket total: {{ basket.total_incl_tax|currency }}
-            <a href="{% url basket:summary %}">View basket</a>
-            
-            {% block header %}
-            {% endblock %}
-        </div>
-        <div id="content">
-        
-            {% if messages %}
-            <ul class="messages">
-                {% for message in messages %}
-                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-                {% endfor %}
-            </ul>
-            {% endif %}
-            
-            {% for linked_block in merchandising_blocks %}
-                {% render_merchandising_block linked_block %}
-            {% endfor %}
-            
-            {% block content %}{% endblock %}
-        </div>
-        <div id="footer">{% block footer %}{% endblock %}</div>
-    </div>
-{% endblock %}

oscar/templates/promotions/image.html

@@ -0,0 +1,6 @@
+{% if promotion.link_url %}
+    <a href="{{ promotion.link_url }}"><img src="{{ promotion.image.url }}" title="{{ promotion.name }}" /></a>
+{% else %}
+    <img src="{{ promotion.image.url }}" title="{{ promotion.name }}" />
+{% endif %}
+