Few minor changes from HTML/CSS changes.

- Tidied up JS slightly, using 4 space indentation
- Moved layout_* templates into folders
- Few updates to the base templates
- Put oscar's JS into its own folder within static/js
- Added flatpages to the test env to get tests to pass

oscar/apps/dashboard/catalogue/app.py

@@ -0,0 +1,19 @@
+from django.conf.urls.defaults import patterns, url
+
+from oscar.core.application import Application
+from oscar.apps.dashboard.catalogue.views import ProductListView
+
+
+class CatalogueApplication(Application):
+    name = None
+    product_list_view = ProductListView
+
+    def get_urls(self):
+        urlpatterns = patterns('',
+            url(r'^$', self.product_list_view.as_view(),
+                name='catalogue-product-list'),
+        )
+        return self.post_process_urls(urlpatterns)
+
+
+application = CatalogueApplication()

oscar/apps/dashboard/catalogue/views.py

@@ -0,0 +1,10 @@
+from django.views import generic
+from django.db.models import get_model
+
+Product = get_model('catalogue', 'Product')
+
+
+class ProductListView(generic.ListView):
+    template_name = 'dashboard/catalogue/product_list.html'
+    model = Product
+    context_object_name = 'products'

oscar/static/js/dashboard.js

@@ -1,53 +0,0 @@
-// oscar-dashboard.js
-
-var oscar = oscar || {}
-oscar.dashboard = {
-    promotions: {
-        init: function() {
-            $('.promotion_list').sortable({
-                handle: '.btn-handle',
-                stop: oscar.dashboard.promotions.save_order});
-        },
-        save_order: function(event, ui) {
-            // todo - save order of promotions
-            console.log(event, ui);
-        }
-    }
-}
-
-$(document).ready(function() 
-{   
-  //table font size increase decrease
-  $('.fontsize li').click(function()
-  {
-    var os = $('.bordered-table').css('font-size');// find font size for p
-    var uom = os.slice(-2);// finds the unit of mesure = pixles
-    var num = parseFloat(os, 10);// gets rid of the px
-    $('.bordered-table').css('font-size', num / 1.1 + uom);
-    if(this.id == 'larger') {
-      $('.bordered-table').css('font-size', num * 1.1 + uom);    
-    }  
-  });
-
-  //side navigation accordion
-  $('.primary-nav > li > ul, .orders_search').each(function(index) 
-  {
-    $(this).css('height', $(this).height());
-  });
-  $(".primary-nav > li > ul:gt(0), .orders_search").hide();
-  // $(".primary-nav > li:first-child > a:first-child").addClass("viewed");
-
-  $(".primary-nav > li > a").click(function()
-  {
-    $(this).next("ul").slideToggle("fast")
-    $(this).toggleClass("viewed");
-  });
-
-  //pull out draw
-  $(".pull_out").click(function()
-  {
-    $(this).parent("div").find('.orders_search').slideToggle("fast")
-    $(this).toggleClass("viewed");
-  });
-
-});

oscar/static/js/oscar/dashboard.js

@@ -0,0 +1,49 @@
+var oscar = oscar || {}
+oscar.dashboard = {
+    promotions: {
+        init: function() {
+            $('.promotion_list').sortable({
+                handle: '.btn-handle',
+                stop: oscar.dashboard.promotions.save_order});
+        },
+        save_order: function(event, ui) {
+            // todo - save order of promotions
+            console.log(event, ui);
+        }
+    }
+}
+
+$(document).ready(function() 
+{   
+    //table font size increase decrease
+    $('.fontsize li').click(function()
+    {
+        var os = $('.bordered-table').css('font-size');// find font size for p
+        var uom = os.slice(-2);// finds the unit of mesure = pixles
+        var num = parseFloat(os, 10);// gets rid of the px
+        $('.bordered-table').css('font-size', num / 1.1 + uom);
+        if (this.id == 'larger') {
+            $('.bordered-table').css('font-size', num * 1.1 + uom);    
+        }  
+    });
+
+    //side navigation accordion
+    $('.primary-nav > li > ul, .orders_search').each(function(index) 
+    {
+        $(this).css('height', $(this).height());
+    });
+    $(".primary-nav > li > ul:gt(0), .orders_search").hide();
+
+    $(".primary-nav > li > a").click(function()
+    {
+        $(this).next("ul").slideToggle("fast");
+        $(this).toggleClass("viewed");
+    });
+
+    //pull out draw
+    $(".pull_out").click(function()
+    {
+        $(this).parent("div").find('.orders_search').slideToggle("fast");
+        $(this).toggleClass("viewed");
+    });
+});

oscar/static/js/oscar/ui.js

@@ -0,0 +1,105 @@
+$(document).ready(function()
+{	
+    // Product star rating  -- must improve this in python
+    $('.product_pod, .span6').each(function() 
+    {
+        var sum_total_reviews = $(this).find(".review_count li").length * 5;
+        var sum_rating_count = 0;
+        $(this).find('.review_count li').each(function() 
+        {
+            sum_rating_count += parseFloat($(this).text());
+        });
+        var ave_rating = sum_rating_count / sum_total_reviews *10;
+        if (ave_rating <= 2) {
+            var ave_rating = 'One'
+        } else if (ave_rating <= 4) {
+            var ave_rating = 'Two'
+        } else if (ave_rating <= 6) {
+            var ave_rating = 'Three'
+        } else if (ave_rating <= 8) {
+            var ave_rating = 'Four'
+        } else if (ave_rating <= 10) {
+            var ave_rating = 'Five'
+        }
+        $(this).find('.review_count').after('<p class=\"star ' + ave_rating + '\">' + ave_rating + ' star(s) by user reviews. <a href=\"#\">Add review</a></p>');
+        $(this).find('.review_count').remove();
+    });
+    // Product star rating each review -- must improve this in python
+    $('.review').each(function()
+    {
+        var user_rating = 0;
+        $(this).find('span').each(function() 
+        {
+            user_rating += parseFloat($(this).text());
+        });
+        if (user_rating == 1) {
+            var user_rating = 'One'
+        }
+        else if (user_rating == 2) {
+            var user_rating = 'Two'
+        }
+        else if (user_rating == 3) {
+            var user_rating = 'Three'
+        }
+        else if (user_rating == 4) {
+            var user_rating = 'Four'
+        }
+        else if (user_rating == 5) {
+            var user_rating = 'Five'
+        }
+        $(this).find('h3').addClass(user_rating);
+        $(this).find('span').remove();
+    });
+
+    // For multiple submenus in drop down menus
+    var u = $('ul.nav li ul li ul, ul.tabs li ul li ul,').length;
+    if (u > 0) {
+        $("ul.nav li").hover(function()
+        {
+            $(this).addClass("hover");
+            $('ul:first',this).css('visibility', 'visible');
+        }, function(){
+            $(this).removeClass("hover");
+            $('ul:first',this).css('visibility', 'hidden');
+        });
+        $("ul.nav li ul li:has(ul), ul.tabs li ul li:has(ul)").find("a:first").append(" &raquo; ");
+    }
+
+    // This activates elastislide
+    $('#carousel').elastislide({
+        imageW: 200,
+        minItems: 4
+    });
+
+    // Acordion - remove the first in the list as it is duplication.
+    var n = $('.accordion dt').length;
+    if (n > 1) {
+        $('.accordion dt:first, .accordion dd:first,').hide();
+    }
+    // Acordion
+    $('.accordion dd').each(function(index) 
+    {
+        $(this).css('height', $(this).height());
+    });
+    $(".accordion dt").click(function(){
+        $(this).next("dd").slideToggle("slow").siblings("dd:visible").slideUp("slow");
+        $(this).toggleClass("open");
+        $(this).siblings("dt").removeClass("open");
+    });
+    $(".accordion dd").hide();
+
+    //scrollto function
+    var $scrollpage = $('body');
+    $('.span6 .star, .span6 .star a').click(function(){
+        $scrollpage.stop().scrollTo( $('.review_read'), 1000 );
+        return false;
+    });
+    $('a.read_decription').click(function(){
+        $scrollpage.stop().scrollTo( $('.sub-header'), 1000 );
+        return false;
+    });
+    $('.top_page a').click(function(){
+        $scrollpage.stop().scrollTo( $('body'), 1000 );
+        return false;
+    });
+});

oscar/static/js/script.js

@@ -1,116 +0,0 @@
-/* Author: 
-
-*/
-$(document).ready(function()
-{	
-
-  // Product star rating  -- must improve this in python
-  $('.product_pod, .span6').each(function() 
-  {
-    var sum_total_reviews = $(this).find(".review_count li").length * 5;
-    var sum_rating_count = 0;
-    $(this).find('.review_count li').each(function() 
-    {
-      sum_rating_count += parseFloat($(this).text());
-    });
-    var ave_rating = sum_rating_count / sum_total_reviews *10;
-    if (ave_rating <= 2) {
-      var ave_rating = 'One'
-    }
-    else if (ave_rating <= 4) {
-      var ave_rating = 'Two'
-    }
-    else if (ave_rating <= 6) {
-      var ave_rating = 'Three'
-    }
-    else if (ave_rating <= 8) {
-      var ave_rating = 'Four'
-    }
-    else if (ave_rating <= 10) {
-      var ave_rating = 'Five'
-    }
-    $(this).find('.review_count').after('<p class=\"star ' + ave_rating + '\">' + ave_rating + ' star(s) by user reviews. <a href=\"#\">Add review</a></p>');
-    $(this).find('.review_count').remove();
-  });
-  // Product star rating each review -- must improve this in python
-  $('.review').each(function()
-  {
-    var user_rating = 0;
-    $(this).find('span').each(function() 
-    {
-      user_rating += parseFloat($(this).text());
-    });
-    if (user_rating == 1) {
-      var user_rating = 'One'
-    }
-    else if (user_rating == 2) {
-      var user_rating = 'Two'
-    }
-    else if (user_rating == 3) {
-      var user_rating = 'Three'
-    }
-    else if (user_rating == 4) {
-      var user_rating = 'Four'
-    }
-    else if (user_rating == 5) {
-      var user_rating = 'Five'
-    }
-    $(this).find('h3').addClass(user_rating);
-    $(this).find('span').remove();
-  });
-
-  // For multiple submenus in drop down menus
-  var u = $('ul.nav li ul li ul, ul.tabs li ul li ul,').length;
-  if (u > 0) {
-    $("ul.nav li").hover(function()
-    {
-      $(this).addClass("hover");
-      $('ul:first',this).css('visibility', 'visible');
-    }, function(){
-      $(this).removeClass("hover");
-      $('ul:first',this).css('visibility', 'hidden');
-    });
-    $("ul.nav li ul li:has(ul), ul.tabs li ul li:has(ul)").find("a:first").append(" &raquo; ");
-  }
-  
-  // This activates elastislide
-  $('#carousel').elastislide({
-    imageW 	: 200,
-    minItems	: 4
-  });
-  
-  // Acordion - remove the first in the list as it is duplication.
-  var n = $('.accordion dt').length;
-  if (n > 1) {
-    $('.accordion dt:first, .accordion dd:first,').hide();
-  }
-  // Acordion
-  $('.accordion dd').each(function(index) 
-  {
-    $(this).css('height', $(this).height());
-  });
-  $(".accordion dt").click(function(){
-    $(this).next("dd").slideToggle("slow")
-    .siblings("dd:visible").slideUp("slow");
-    $(this).toggleClass("open");
-    $(this).siblings("dt").removeClass("open");
-  });
-  $(".accordion dd").hide();
-  
-  //scrollto function
-  var $scrollpage = $('body');
-  $('.span6 .star, .span6 .star a').click(function(){
-  	$scrollpage.stop().scrollTo( $('.review_read'), 1000 );
-  	return false;
-  });
-  $('a.read_decription').click(function(){
-  	$scrollpage.stop().scrollTo( $('.sub-header'), 1000 );
-  	return false;
-  });
-  $('.top_page a').click(function(){
-  	$scrollpage.stop().scrollTo( $('body'), 1000 );
-  	return false;
-  });
-  
-  
-});

oscar/templates/500.html

@@ -0,0 +1 @@
+<p>Error occurred</p>

oscar/templates/base.html

@@ -25,7 +25,7 @@
         {% endif %}
         <!-- Responsive - will need to be minified -->
         <link rel="stylesheet" href="{{ STATIC_URL }}css/responsive.css" />
-        {% block extra_head %}{% endblock %}
+        {% block extrahead %}{% endblock %}
     </head>
     <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
         {% block layout %}{% endblock %}
@@ -35,23 +35,29 @@
                 <!-- Tracking to go here. -->
             {% endif %}
         {% endblock %}
+
         <!-- Jquery -->
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/jquery/jquery-1.7.1.min.js"><\/script>')</script>
         <script src="{{ STATIC_URL }}js/jquery/jquery.easing.1.3.js" type="text/javascript" charset="utf-8"></script>
         <script src="{{ STATIC_URL }}js/scrollto/jquery.scrollTo-min.js" type="text/javascript" charset="utf-8"></script>
         <!-- Bootstrap -->
-		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js"></script>
+		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js" charset="utf-8"></script>
 		<!-- Elastislide carousel js -->
         <script src="{{ STATIC_URL }}js/elastislide/jquery.elastislide.js" type="text/javascript" charset="utf-8"></script>    
+
         <!-- Responsive carousel js -->
         {% if product %}
         <script src="{{ STATIC_URL }}js/colorbox/jquery.colorbox-min.js" type="text/javascript" charset="utf-8"></script> 
         <script src="{{ STATIC_URL }}js/responsivegallery/jquery.tmpl.min.js" type="text/javascript" charset="utf-8"></script>
         <script src="{{ STATIC_URL }}js/responsivegallery/gallery.js" type="text/javascript" charset="utf-8"></script>
         {% endif %}
+
+		{# Block for additional scripts #}
+		{% block extrascripts %}{% endblock %}
+
         <!-- Front end js -->
-        <script src="{{ STATIC_URL }}js/script.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ STATIC_URL }}js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
         <script type="text/javascript">
 			$(function(){
 				{% block onbodyload %}

oscar/templates/base_dashboard.html

@@ -20,7 +20,7 @@
         <!-- Main styles - will need to be minified -->
         <link rel="stylesheet" href="{{ STATIC_URL }}css/styles.css" />
         <link rel="stylesheet" href="{{ STATIC_URL }}css/dashboard.css" />
-        {% block extra_head %}{% endblock %}
+        {% block extrahead %}{% endblock %}
     </head>
     <body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}default{% endblock %}">
         {% block layout %}{% endblock %}
@@ -30,6 +30,7 @@
                 <!-- Tracking to go here. -->
             {% endif %}
         {% endblock %}
+
         <!-- Jquery -->
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}js/jquery/jquery-1.7.1.min.js"><\/script>')</script>
@@ -37,7 +38,12 @@
         <!-- Bootstrap -->
 		<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/bootstrap.min.js"></script>    
         <!-- Front end js -->
-        <script src="{{ STATIC_URL }}js/dashboard.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ STATIC_URL }}js/oscar/dashboard.js" type="text/javascript" charset="utf-8"></script>
+
+		{# Block for additional scripts #}
+		{% block extrascripts %}{% endblock %}
+
+		{# Block to allow pages to define which js functions get loaded #}
         <script type="text/javascript">
 			$(function(){
 				{% block onbodyload %}

oscar/templates/basket/basket.html

@@ -1,4 +1,4 @@
-{% extends "layout_checkout.html" %}
+{% extends "checkout/layout.html" %}
 
 {% load currency_filters %}
 

oscar/templates/checkout/checkout.html

@@ -1,4 +1,4 @@
-{% extends "layout_checkout.html" %}
+{% extends "checkout/layout.html" %}
 
 {% load currency_filters %}
 

oscar/templates/checkout/gateway.html

@@ -1,4 +1,4 @@
-{% extends "layout_checkout.html" %}
+{% extends "checkout/layout.html" %}
 
 {% load currency_filters %}
 

oscar/templates/layout_checkout.html → oscar/templates/checkout/layout.html

@@ -14,10 +14,13 @@
     				<li><a href="#about">About</a></li>
     				<li><a href="#contact">Contact</a></li>
     				{% if user.is_authenticated %}
-    				<li><a href="{% url customer:summary %}">Profile</a></li>
-    				<li><a href="{% url customer:logout %}">Logout</a></li>
+						{% if user.is_staff %}
+						<li><a href="{% url dashboard:index %}">Dashboard</a></li>
+						{% endif %}
+						<li><a href="{% url customer:summary %}">Profile</a></li>
+						<li><a href="{% url customer:logout %}">Logout</a></li>
     				{% else %}
-    				<li><a href="{% url customer:login %}">Login</a></li>
+						<li><a href="{% url customer:login %}">Login</a></li>
     				{% endif %}
                 </ul>
             </div>

oscar/templates/checkout/thank_you.html

@@ -1,4 +1,4 @@
-{% extends "layout_checkout.html" %}
+{% extends "checkout/layout.html" %}
 
 {% load currency_filters %}
 

oscar/templates/dashboard/catalogue/product_list.html

@@ -0,0 +1,77 @@
+{% extends 'dashboard/layout.html' %}
+{% load currency_filters %}
+
+{% block header %}
+<h2>Catalogue management</h2>
+{% endblock header %}
+
+{% block dashboard_content %}
+
+<h2>Search products</h2>
+<form action="." method="get">
+	<table>
+		{{ form.as_table }}
+		<tr>
+			<th></th>
+			<td>
+                <button type="submit" class="btn btn-primary">Go!</button>
+			</td>
+	</table>
+</form>
+
+<h2>{{ queryset_description }}</h2>
+
+{% if products %}
+<form action="." method="post">
+    {% csrf_token %}
+<table class="table table-striped">
+    <tr>
+        <th>UPC</th>
+        <th>Title</th>
+        <th>Product class</th>
+		<th>Partner</th>
+        <th>Status</th>
+        <th></th>
+    </tr>
+    {% for product in products %}
+    <tr>
+		<td>{{ product.upc }}</td>
+        <td>{{ product.title }}</td>
+		<td>{{ product.product_class.name }}</td>
+		<td>{{ product.stockrecord.partner.name }}</td>
+		<td>{{ product.status|default:"-" }}</td>
+        <td>
+            <a class="btn btn-info" href="">Edit</a>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+
+{% if page_obj %}
+<div class="pagination">
+    <span class="step-links">
+    
+        {% if page_obj.has_previous %}
+            <a href="?page={{ page_obj.previous_page_number }}{{ search_params }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+            <a href="?page={{ page_obj.next_page_number }}{{ search_params }}">next</a>
+        {% endif %}
+    </span>
+</div>
+{% endif %}
+
+</form>
+
+{% else %}
+
+<p>No products found.</p>
+
+{% endif %}
+
+{% endblock dashboard_content %}

oscar/templates/dashboard/index.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 {% block header %}
 <div class="page-header">

oscar/templates/dashboard/layout.html

@@ -1,29 +1,54 @@
-{% extends 'layout.html' %}
+{% extends "base_dashboard.html" %}
 
-{% block extra_head %}
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}oscar/js/dashboard.js"></script>
-{% endblock %}
+{% load currency_filters %}
+{% load promotion_tags %}
+{% load category_tags %}
 
-{% block header %}
-    <h2>Dashboard</h2>
-{% endblock header %}
+{% block layout %}
+    <div class="navbar accounts">
+        <div class="navbar-inner">
+            <div class="container" style="width: auto;">
+                <a href="{% url promotions:home %}" class="brand">Oscar // Domain-driven e-Commerce for Django</a>
+                <ul class="nav pull-right">
+                    {% if user.is_authenticated %}
+                        <li><a href="{% url customer:summary %}">Profile</a></li>
+                        <li><a href="{% url customer:logout %}">Logout</a></li>
+                    {% else %}
+                        <li><a href="{% url customer:login %}">Login</a></li>
+                    {% endif %}
+                </ul>
+            </div>
+        </div><!-- /navbar-inner -->
+    </div><!-- /navbar -->
 
-{% block breadcrumbs %}
-<li><a href=".">Home</a><span class="divider">/<span></li>
-<li class="active"><a href=".">Dashboard</a></li>
-{% endblock %}
+    <div class="container-fluid dashboard">
+        <div class="row-fluid">
+            {% block container_nav %}
+                    
+                    <ul class="primary-nav">
+                       <li><a class="submenu" href="{% url dashboard:order-summary %}">See statistics</a></li>
+                       <li><a class="submenu" href="{% url dashboard:order-list %}">Manage orders</a></li>
+                       <li><a class="submenu" href="{% url dashboard:reports-index %}">View reports</a></li>
+                       <li><a class="submenu" href="{% url dashboard:users-index %}">User management</a></li>
+                       <li>{% comment %}<a class="submenu" href="{% url dashboard:events-index %}">Events</a>{% endcomment %}</li>       
+                     </ul>
 
-{% block container_nav %}
-    <div>
-        <a href="{% url dashboard:order-summary %}">See statistics</a> |
-        <a href="{% url dashboard:order-list %}">Manage orders</a> |
-        <a href="{% url dashboard:reports-index %}">View reports</a> |
-        <a href="{% url dashboard:users-index %}">User management</a> |
-        {% comment %}<a href="{% url dashboard:events-index %}">Events</a>{% endcomment %}
-    </div>
+            {% endblock %}
+            <div class="offset3 content">
+                {% block header %}
+                {% endblock %}
+                <div class="page-content">
+                    {% for message in messages %}
+                	<div class="alert alert-{{ message.tags }}">
+                		<a class="close">x</a>
+                		{{ message }}
+                	</div>
+                    {% endfor %}
+                    {% block content %}
+                       {% block dashboard_content %}{% endblock dashboard_content %}
+                    {% endblock content %}
+                </div>
+            </div><!-- /span9 --> 
+        </div><!-- /row-fluid -->        
+    </div><!-- /container -->       
 {% endblock %}
-
-{% block content %}
-    {% block dashboard_content %}{% endblock dashboard_content %}
-{% endblock content %}

oscar/templates/dashboard/orders/line_detail.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 {% block title %}

oscar/templates/dashboard/orders/order_detail.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 {% block title %}

oscar/templates/dashboard/orders/order_list.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 {% load currency_filters %}
 

oscar/templates/dashboard/orders/shippingaddress_form.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 {% block title %}

oscar/templates/dashboard/orders/summary.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 {% block header %}

oscar/templates/dashboard/promotions/delete.html

@@ -1,5 +1,4 @@
-{% extends 'layout_dashboard.html' %}
-
+{% extends 'dashboard/layout.html' %}
 
 {% block dashboard_content %}
 <h1>Delete promotion?</h1>

oscar/templates/dashboard/promotions/delete_pagepromotion.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 
 {% block dashboard_content %}

oscar/templates/dashboard/promotions/form.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 <h2>{{ heading }}</h2>
 

oscar/templates/dashboard/promotions/page_detail.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 
 {% block dashboard_content %}

oscar/templates/dashboard/promotions/pagepromotion_list.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 

oscar/templates/dashboard/promotions/promotion_list.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 {% load currency_filters %}
 

oscar/templates/dashboard/reports/index.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 
 {% load currency_filters %}
 

oscar/templates/dashboard/users/detail.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
 
 {% block title %}

oscar/templates/dashboard/users/index.html

@@ -1,4 +1,4 @@
-{% extends 'layout_dashboard.html' %}
+{% extends 'dashboard/layout.html' %}
 {% load dashboard_tags %}
 
 {% block header %}

oscar/templates/layout.html

@@ -14,6 +14,9 @@
     				<li><a href="#about">About</a></li>
     				<li><a href="#contact">Contact</a></li>
     				{% if user.is_authenticated %}
+						{% if user.is_staff %}
+						<li><a href="{% url dashboard:index %}">Dashboard</a></li>
+						{% endif %}
     				<li><a href="{% url customer:summary %}">Profile</a></li>
     				<li><a href="{% url customer:logout %}">Logout</a></li>
     				{% else %}
@@ -31,9 +34,7 @@
                 <li>
                     <div class="btn-group">
                         <a class="btn" href="{% url basket:summary %}">View Basket</a>
-                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                            <span class="caret"></span>
-                        </a>
+                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <span class="caret"></span> </a>
                         <ul class="dropdown-menu">
                             <li>
                                 {% include "basket/partials/basket_quick.html" %}

oscar/templates/layout_dashboard.html

@@ -1,54 +0,0 @@
-{% extends "base_dashboard.html" %}
-
-{% load currency_filters %}
-{% load promotion_tags %}
-{% load category_tags %}
-
-{% block layout %}
-    <div class="navbar accounts">
-        <div class="navbar-inner">
-            <div class="container" style="width: auto;">
-                <a href="{% url promotions:home %}" class="brand">Oscar // Domain-driven e-Commerce for Django</a>
-                <ul class="nav pull-right">
-                    {% if user.is_authenticated %}
-                        <li><a href="{% url customer:summary %}">Profile</a></li>
-                        <li><a href="{% url customer:logout %}">Logout</a></li>
-                    {% else %}
-                        <li><a href="{% url customer:login %}">Login</a></li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div><!-- /navbar-inner -->
-    </div><!-- /navbar -->
-
-    <div class="container-fluid dashboard">
-        <div class="row-fluid">
-            {% block container_nav %}
-                    
-                    <ul class="primary-nav">
-                       <li><a class="submenu" href="{% url dashboard:order-summary %}">See statistics</a></li>
-                       <li><a class="submenu" href="{% url dashboard:order-list %}">Manage orders</a></li>
-                       <li><a class="submenu" href="{% url dashboard:reports-index %}">View reports</a></li>
-                       <li><a class="submenu" href="{% url dashboard:users-index %}">User management</a></li>
-                       <li>{% comment %}<a class="submenu" href="{% url dashboard:events-index %}">Events</a>{% endcomment %}</li>       
-                     </ul>
-
-            {% endblock %}
-            <div class="offset3 content">
-                {% block header %}
-                {% endblock %}
-                <div class="page-content">
-                    {% for message in messages %}
-                	<div class="alert alert-{{ message.tags }}">
-                		<a class="close">x</a>
-                		{{ message }}
-                	</div>
-                    {% endfor %}
-                    {% block content %}
-                       {% block dashboard_content %}{% endblock dashboard_content %}
-                    {% endblock content %}
-                </div>
-            </div><!-- /span9 --> 
-        </div><!-- /row-fluid -->        
-    </div><!-- /container -->       
-{% endblock %}

tests/config.py

@@ -22,6 +22,7 @@ if not settings.configured:
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.sites',
+                'django.contrib.flatpages',
                 # Oscar apps
                 'oscar',
                 'oscar.apps.analytics',