+ {% with offer_discounts=basket.offer_discounts voucher_discounts=basket.grouped_voucher_discounts %}
+ {% if offer_discounts or voucher_discounts %}
+ {# Basket total will be discounted so we show a before and after version #}
+
+{% with all_images=product.images.all %}
+ {# use length rather then count as the images get queried anyways #}
+
+ {% if all_images|length > 1 %}
+
+
+
+ {% for image in all_images %}
+
+ {% thumbnail image.original "600x600" upscale=False as thumb %}
+
+ {% endthumbnail %}
+
+ {% endfor %}
+
+
+
+ {% else %}
+ {# Only one image to show #}
+
+ {% with image=product.primary_image %}
+ {% thumbnail image.original "600x600" upscale=False as thumb %}
+ {% if not image.is_missing %}
+
+ {% else %}
+
+ {% endif %}
+ {% endthumbnail %}
+ {% endwith %}
+
+ {% endif %}
+{% endwith %}
+
\ No newline at end of file
diff --git a/sites/demo/templates/catalogue/partials/product.html b/sites/demo/templates/catalogue/partials/product.html
index ef1d7aca11d..bfa182424ef 100644
--- a/sites/demo/templates/catalogue/partials/product.html
+++ b/sites/demo/templates/catalogue/partials/product.html
@@ -42,7 +42,7 @@
{% block product_price %}
- {% include "catalogue/partials/stock_record.html" %}
+
{% include "catalogue/partials/stock_record.html" %}
{% if product.is_group %}
{% trans "View range" %}
diff --git a/sites/demo/templates/catalogue/partials/review.html b/sites/demo/templates/catalogue/partials/review.html
new file mode 100644
index 00000000000..c748d6a63ba
--- /dev/null
+++ b/sites/demo/templates/catalogue/partials/review.html
@@ -0,0 +1,61 @@
+{% load reviews_tags %}
+{% load i18n %}
+
+
+
+
+{% endblock %}
+
+{% block shipping_address %}
+ {% if request.user.is_authenticated %}
+ {% if addresses %}
+
+
An address from your addressbook?
+
+
+ {% for address in addresses %}
+
+
+
+ {% for field in address.active_address_fields %}
+ {{ field }}
+ {% endfor %}
+
+
+
+
+ {% if forloop.counter|divisibleby:4 %}
+
+ {% if not forloop.last %}
{% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% endif %}
+
+
+
+{% endblock shipping_address %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/shipping_methods.html b/sites/demo/templates/checkout/shipping_methods.html
new file mode 100644
index 00000000000..2c3e2cf4b6d
--- /dev/null
+++ b/sites/demo/templates/checkout/shipping_methods.html
@@ -0,0 +1,47 @@
+{% extends "oscar/checkout/shipping_methods.html" %}
+{% load currency_filters %}
+{% load i18n %}
+
+{% block shipping_method %}
+
+
{% trans "Choose a shipping method" %}
+
+
+
+
{% trans "Method" %}
+
{% trans "Cost" %}
+
+
+{% for method in methods %}
+
+
+
+
{{ method.name }}
+ {% if method.description %}
+
{{ method.description|safe }}
+ {% endif %}
+ {% if method.is_discounted %}
+
+ {% with discount=method.get_discount %}
+ {% blocktrans with amount=discount.discount|currency name=discount.name %}
+ This includes a discount of {{ amount }} as
+ your basket qualifies for the '{{ name }}' offer.
+ {% endblocktrans %}
+ {% endwith %}
+
+ {% endif %}
+
+
+ {{ method.basket_charge_incl_tax|currency }}
+
+
+
+
+
+
+{% endfor %}
+{% endblock shipping_method %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/user_address_delete.html b/sites/demo/templates/checkout/user_address_delete.html
new file mode 100644
index 00000000000..d6027d6ca0e
--- /dev/null
+++ b/sites/demo/templates/checkout/user_address_delete.html
@@ -0,0 +1,16 @@
+{% extends "oscar/checkout/user_address_delete.html" %}
+{% load i18n %}
+
+
+{% block shipping_address %}
+
+ {% if product.is_group %}
+ {% trans "View range" %}
+ {% else %}
+ {% basket_form request.basket product as basket_form single %}
+
+ {% endif %}
+
+
+
+ {% endfor %}
+
+
+
+
+
\ No newline at end of file
diff --git a/sites/demo/templates/promotions/handpickedproductlist.html b/sites/demo/templates/promotions/handpickedproductlist.html
new file mode 100644
index 00000000000..8a6f9e131ca
--- /dev/null
+++ b/sites/demo/templates/promotions/handpickedproductlist.html
@@ -0,0 +1,3 @@
+{% extends 'promotions/baseproductlist.html' %}
+
+{# just exists to allow overriding #}
\ No newline at end of file
diff --git a/sites/demo/templates/promotions/home.html b/sites/demo/templates/promotions/home.html
index 7e1015ee104..7e8eeb0b639 100644
--- a/sites/demo/templates/promotions/home.html
+++ b/sites/demo/templates/promotions/home.html
@@ -1,15 +1,81 @@
{% extends "layout.html" %}
{% load staticfiles %}
+{% load promotion_tags %}
+{% load i18n %}
+
+{% block body_class %}home-page{% endblock body_class %}
+
+{% block header %}
+{% endblock %}
{% block page_promotions %}
-
+
-
+
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block content %}
+
+ {% comment %}
+ Markup on this page is somewhat temporary. Class wrappers with
+ 'widget' are probably to be used as fancypage widgets and will
+ be removed from here.
+ 'homepage-carousel' and structural classes could also be included in that statement.
+ {% endcomment %}
+
+
@@ -21,20 +18,24 @@ 
+