Adjust dashboard templates (following pull request #326)

* Add missing i18n tags
* Tidy pagination
* Minify CSS
* Remove dead HTMl
* Remove simple settings file

Closes #326

oscar/templates/oscar/dashboard/catalogue/category_list.html

@@ -14,11 +14,7 @@
 		<a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
-    <li>
-		<a href="{% url dashboard:catalogue-category-list %}">{% trans "Category management" %}</a>
-        <span class="divider">/</span>
-    </li>
-	<li class="active"><a href=".">{{ category.name }}</a></li>
+    <li class="active"><a href=".">{% trans "Categories" %}</a></li>
 </ul>
 {% endblock %}
 

oscar/templates/oscar/dashboard/catalogue/product_list.html

@@ -35,7 +35,7 @@
         <span class="control-group">
             <label for="id_promotion_type">{% trans "Create a new product of type" %}</label>
             <select id="id_promotion_type" name="product_class">
-                <option> -- choose type --</option>
+                <option> -- {% trans "Choose type" %} --</option>
                 {% for product_class in product_classes %}
                 <option value="{{ product_class.id }}">{{ product_class.name }}</option>
                 {% endfor %}
@@ -51,46 +51,42 @@
 {% if products %}
 <form action="." method="post">
     {% csrf_token %}
-<table class="table table-striped table-bordered">
-    <tr>
-		<th>{% trans "UPC" %}</th>
-		<th>{% trans "Title" %}</th>
-		<th>{% trans "Product class" %}</th>
-		<th>{% trans "Status" %}</th>
-		<th>{% trans "Partner" %}</th>
-		<th>{% trans "Partner SKU" %}</th>
-		<th>{% trans "Price excl. tax" %}</th>
-		<th>{% trans "Price incl. tax" %}</th>
-		<th>{% trans "Number in stock" %}</th>
-		<th>{% trans "Number allocated" %}</th>
-        <th></th>
-    </tr>
-    {% for product in products %}
-    <tr>
-		<td>{{ product.upc|default:"-" }}</td>
-        <td>{{ product.get_title }}</td>
-		<td>{{ product.product_class.name }}</td>
-		<td>{{ product.status|default:"-" }}</td>
-		{% with stockrecord=product.stockrecord %}
-			<td>{{ stockrecord.partner.name }}</td>
-			<td>{{ stockrecord.partner_sku }}</td>
-			<td>{{ stockrecord.price_excl_tax|currency }}</td>
-			<td>{{ stockrecord.price_incl_tax|currency }}</td>
-			<td>{{ stockrecord.num_in_stock }}</td>
-			<td>{{ stockrecord.num_allocated }}</td>
-		{% endwith %}
-		<td>
-			<a class="btn btn-info" href="{% url dashboard:catalogue-product product.id %}">{% trans "Edit" %}</a>
-			<a class="btn btn-success" href="{{ product.get_absolute_url }}">{% trans "View on site" %}</a>
-		</td>
-    </tr>
-    {% endfor %}
-</table>
-
-{% if page_obj %}
-    {% include "partials/pagination.html" %}
-{% endif %}
-
+	<table class="table table-striped table-bordered">
+	    <tr>
+			<th>{% trans "UPC" %}</th>
+			<th>{% trans "Title" %}</th>
+			<th>{% trans "Product class" %}</th>
+			<th>{% trans "Status" %}</th>
+			<th>{% trans "Partner" %}</th>
+			<th>{% trans "Partner SKU" %}</th>
+			<th>{% trans "Price excl. tax" %}</th>
+			<th>{% trans "Price incl. tax" %}</th>
+			<th>{% trans "Number in stock" %}</th>
+			<th>{% trans "Number allocated" %}</th>
+	        <th></th>
+	    </tr>
+	    {% for product in products %}
+	    <tr>
+			<td>{{ product.upc|default:"-" }}</td>
+	        <td>{{ product.get_title }}</td>
+			<td>{{ product.product_class.name }}</td>
+			<td>{{ product.status|default:"-" }}</td>
+			{% with stockrecord=product.stockrecord %}
+				<td>{{ stockrecord.partner.name }}</td>
+				<td>{{ stockrecord.partner_sku }}</td>
+				<td>{{ stockrecord.price_excl_tax|currency }}</td>
+				<td>{{ stockrecord.price_incl_tax|currency }}</td>
+				<td>{{ stockrecord.num_in_stock }}</td>
+				<td>{{ stockrecord.num_allocated }}</td>
+			{% endwith %}
+			<td>
+				<a class="btn btn-info" href="{% url dashboard:catalogue-product product.id %}">{% trans "Edit" %}</a>
+				<a class="btn btn-success" href="{{ product.get_absolute_url }}">{% trans "View on site" %}</a>
+			</td>
+	    </tr>
+	    {% endfor %}
+	</table>
+	{% include "partials/pagination.html" %}
 </form>
 
 {% else %}

oscar/templates/oscar/dashboard/catalogue/product_update.html

@@ -5,17 +5,17 @@
 {% block body_class %}catalogue{% endblock %}
 
 {% block title %}
-Update product | {{ block.super }}
+{% trans "Update product" %} | {{ block.super }}
 {% endblock %}
 
 {% block breadcrumbs %}
 <ul class="breadcrumb">
     <li>
-        <a href="{% url dashboard:index %}">Dashboard</a>
+        <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
     <li>
-        <a href="{% url dashboard:catalogue-product-list %}">Catalogue</a>
+        <a href="{% url dashboard:catalogue-product-list %}">{% trans "Catalogue" %}</a>
         <span class="divider">/</span>
     </li>
     <li class="active"><a href=".">{{ title }}</a></li>
@@ -40,31 +40,31 @@ Update product | {{ block.super }}
             {% if field.is_hidden %}
                 {{ field }}
             {% endif %}
-            {% if 'attr' not in field.id_for_label %}
-<div class="control-group {% for error in field.errors %}error{% endfor %}">
-                    {% if field.is_hidden %}
-                        {{ field }}
-                    {% else %}
-                        <label for="{{ field.auto_id }}" class="control-label {% if field.field.required %}required{% endif %}">{{ field.label }}{% if field.field.required %} <span>*</span>{% endif %}</label>
-                        <div class="controls">
-                            {{ field }}
-                            {% for error in field.errors %}
+        {% if 'attr' not in field.id_for_label %}
+        <div class="control-group {% for error in field.errors %}error{% endfor %}">
+            {% if field.is_hidden %}
+                {{ field }}
+            {% else %}
+            <label for="{{ field.auto_id }}" class="control-label {% if field.field.required %}required{% endif %}">{{ field.label }}{% if field.field.required %} <span>*</span>{% endif %}</label>
+            <div class="controls">
+                {{ field }}
+                {% for error in field.errors %}
                 <span class="help-block">
-                {{ error|escape }}
+                    {{ error }}
                 </span>
-                            {% endfor %}
-                            {% if field.help_text %}
-                                <span class='help-block'>
-                                    {{ field.help_text }}
-                                </span>
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                </div>
-{% endif %}
+                {% endfor %}
+                {% if field.help_text %}
+                <span class='help-block'>
+                    {{ field.help_text }}
+                </span>
+                {% endif %}
+            </div>
+            {% endif %}
+        </div>
+        {% endif %}
         {% endfor %}
     </div>
-	<div class="well well-blank">
+    <div class="well well-blank">
         <div class="sub-header">
             <h3>{% trans "Product Attributes" %}</h3>
         </div>
@@ -87,7 +87,7 @@ Update product | {{ block.super }}
                     {{ field }}
                     {% for error in field.errors %}
                     <span class="help-block">
-                        {{ error|escape }}
+                        {{ error }}
                     </span>
                     {% endfor %}
                     {% if field.help_text %}
@@ -100,71 +100,71 @@ Update product | {{ block.super }}
             </div>
             {% endif %}
         {% endfor %}
-	</div>
+    </div>
 
-	<div class="well well-blank form-inline">
-		<div class="sub-header">
-			<h3>{% trans "Category" %}</h3>
-		</div>
-		{{ category_formset.management_form }}
-		{% for category_form in category_formset %}
-		{% include "partials/form_fields_inline.html" with form=category_form %}
-		{% endfor %}
-	</div>
+    <div class="well well-blank form-inline">
+        <div class="sub-header">
+            <h3>{% trans "Category" %}</h3>
+        </div>
+        {{ category_formset.management_form }}
+        {% for category_form in category_formset %}
+            {% include "partials/form_fields_inline.html" with form=category_form %}
+        {% endfor %}
+    </div>
 </div>
 
 <div class="well well-blank">
-	<div class="sub-header">
-		<h3>{% trans "Upload, Change or Remove Images" %}</h3>
-	</div>
-	{{ image_formset.management_form }}
-	{{ image_formset.non_form_errors }}
-	<ol class='upload-image'>
-		{% for image_form in image_formset %}
-			{% include "dashboard/partials/product_images.html" with form=image_form %}
-		{% endfor %}
-	</ol>
+    <div class="sub-header">
+        <h3>{% trans "Upload, change or remove images" %}</h3>
+    </div>
+    {{ image_formset.management_form }}
+    {{ image_formset.non_form_errors }}
+    <ol class='upload-image'>
+        {% for image_form in image_formset %}
+            {% include "dashboard/partials/product_images.html" with form=image_form %}
+        {% endfor %}
+    </ol>
 </div>
 <div class="well well-blank fields-full stock-pricing">
-	<div class="sub-header">
-		<h3>{% trans "Stock and Price Information" %}</h3>
-	</div>
-	{{ stockrecord_form.non_field_errors }}
-	<div class="row-fluid">
-		<div class="span3">
-			<h4>{% trans "Partner" %}</h4>
-			{% for field in stockrecord_form %}
-			   {% if "partner" in field.id_for_label %}
-				{% include "dashboard/partials/stock_info.html" %}
-			   {% endif %}
-			{% endfor %}
-		</div>
-		<div class="span3">
-			<h4>{% trans "Price" %}</h4>
-			{% for field in stockrecord_form %}
-			   {% if "price" in field.id_for_label %}
-			       {% include "dashboard/partials/stock_info.html" %}
-				{% endif %}
-			{% endfor %}
-		</div>
-		<div class="span3">
-			<h4>{% trans "Stock levels" %}</h4>
-			{% for field in stockrecord_form %}
-				{% if "stock" in field.id_for_label %}
-					{% include "dashboard/partials/stock_info.html" %}
-				{% endif %}
-			{% endfor %}
-		</div>
-	</div>
+    <div class="sub-header">
+        <h3>{% trans "Stock and price information" %}</h3>
+    </div>
+    {{ stockrecord_form.non_field_errors }}
+    <div class="row-fluid">
+        <div class="span3">
+            <h4>{% trans "Partner" %}</h4>
+            {% for field in stockrecord_form %}
+                {% if "partner" in field.id_for_label %}
+                    {% include "dashboard/partials/stock_info.html" %}
+                {% endif %}
+            {% endfor %}
+        </div>
+        <div class="span3">
+            <h4>{% trans "Price" %}</h4>
+            {% for field in stockrecord_form %}
+                {% if "price" in field.id_for_label %}
+                    {% include "dashboard/partials/stock_info.html" %}
+                {% endif %}
+            {% endfor %}
+        </div>
+        <div class="span3">
+            <h4>{% trans "Stock levels" %}</h4>
+            {% for field in stockrecord_form %}
+                {% if "stock" in field.id_for_label %}
+                    {% include "dashboard/partials/stock_info.html" %}
+                {% endif %}
+            {% endfor %}
+        </div>
+    </div>
 </div>
 <hr/>
-    <div class="control-group">
-        <div class="pull-right">
-            <a href="{% url dashboard:catalogue-product-list %}">Cancel</a> or <button class="btn btn-primary btn-large" type="submit">{% trans "Save Product" %}</button>
-        </div>
-        {% if product %}
-            <a class="btn btn-success btn-large" href="{{ product.get_absolute_url }}">{% trans "View on site" %}</a>
-        {% endif %}
+<div class="control-group">
+    <div class="pull-right">
+        <a href="{% url dashboard:catalogue-product-list %}">{% trans "Cancel" %}</a> {% trans "or" %} <button class="btn btn-primary btn-large" type="submit">{% trans "Save Product" %}</button>
+    </div>
+    {% if product %}
+        <a class="btn btn-success btn-large" href="{{ product.get_absolute_url }}">{% trans "View on site" %}</a>
+    {% endif %}
 </div>
 </form>
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/catalogue/stockalert_list.html

@@ -14,7 +14,7 @@
 	<a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
-	<li class="active"><a href=".">{% trans "Catalogue" %}</a></li>
+	<li class="active"><a href=".">{% trans "Stock alerts" %}</a></li>
 </ul>
 {% endblock %}
 

oscar/templates/oscar/dashboard/layout.html

@@ -5,7 +5,7 @@
 {% load i18n %}
 
 {% block mainstylesheet %}
-	<link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/dashboard.css" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/dashboard.css" />
 {% endblock %}
 
 {% block extrahead %}
@@ -16,51 +16,51 @@
 {% endblock %}
 
 {% block layout %}
-	{% block navbar %}
+    {% block navbar %}
     <div class="navbar navbar-fixed-top">
         <div class="navbar-inner">
             <div class="container" style="width: auto;">
-				<a href="{% url promotions:home %}" class="brand">{{ shop_name }}</a>
+                <a href="{% url promotions:home %}" class="brand">{{ shop_name }}</a>
                 <ul class="nav pull-right">
                     {% if user.is_authenticated %}
                         <li><span>Welcome <em>{{ request.user.get_full_name|default:'Guest' }}</em></span></li>
-						<li><a href="{% url customer:summary %}" class="app-ico ico_profile">{% trans "Account" %}</a></li>
-						<li><a href="{% url customer:logout %}" class="app-ico ico_logout">{% trans "Logout" %}</a></li>
+                        <li><a href="{% url customer:summary %}" class="app-ico ico_profile">{% trans "Account" %}</a></li>
+                        <li><a href="{% url customer:logout %}" class="app-ico ico_logout">{% trans "Logout" %}</a></li>
                     {% else %}
-					<li><a href="{% url customer:login %}" class="app-ico ico_logout">{% trans "Login" %}</a></li>
+                    <li><a href="{% url customer:login %}" class="app-ico ico_logout">{% trans "Login" %}</a></li>
                     {% endif %}
                 </ul>
             </div>
         </div><!-- /navbar-inner -->
     </div><!-- /navbar -->
-	{% endblock navbar %}
+    {% endblock navbar %}
 
     <div class="container-fluid dashboard">
         {% block dashboard_nav %}
         <div class="row-fluid">
             {% dashboard_navigation request.user %}
-			<div class="subnav subnav-fixed">
+            <div class="subnav subnav-fixed">
                 <ul class="nav nav-pills">
-                    {% for item in nav_items %}	
+                    {% for item in nav_items %}
                         <li class="{{ item.label }} dropdown">
-            			{% if item.is_heading %}
-        			        <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ item.label }} <b class="caret"></b></a>
-            			{% else %}
-            			    <a href="{{ item.url }}">{{ item.label }}</a>
-            			{% endif %}
-            			{% if item.has_children %}
-            			    <ul class="dropdown-menu">
-            				    {% for subitem in item.children %}
-            				    <li><a href="{{ subitem.url }}">{{ subitem.label }}</a></li>
-            				    {% endfor %}
-            			    </ul>
-            			{% endif %}
-            			</li>
-        			{% endfor %}
+                        {% if item.is_heading %}
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ item.label }} <b class="caret"></b></a>
+                        {% else %}
+                            <a href="{{ item.url }}">{{ item.label }}</a>
+                        {% endif %}
+                        {% if item.has_children %}
+                            <ul class="dropdown-menu">
+                                {% for subitem in item.children %}
+                                <li><a href="{{ subitem.url }}">{{ subitem.label }}</a></li>
+                                {% endfor %}
+                            </ul>
+                        {% endif %}
+                        </li>
+                    {% endfor %}
                 </ul>
             </div>
-        </div>
-        {% endblock %}
+		</div>
+		{% endblock %}
 
         {% block breadcrumbs %}
         <ul class="breadcrumb">
@@ -83,9 +83,9 @@
 {# Block for additional scripts #}
 {% block extrascripts %}
     {{ block.super }}
-	<script src="{{ STATIC_URL }}oscar/js/plugins/plugins.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{ STATIC_URL }}oscar/js/plugins/plugins.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{ STATIC_URL }}oscar/js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{ STATIC_URL }}oscar/js/oscar/dashboard.js" type="text/javascript" charset="utf-8"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
-	<script type="text/javascript">$(oscar.dashboard.init);</script>
+    <script type="text/javascript">$(oscar.dashboard.init);</script>
 {% endblock %}

oscar/templates/oscar/dashboard/offers/offer_list.html

@@ -9,10 +9,10 @@
 {% block breadcrumbs %}
 <ul class="breadcrumb">
     <li>
-	<a href="{% url promotions:home %}">{% trans "Dashboard" %}</a>
+    <a href="{% url promotions:home %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
-    <li class="active"><a href=".">Offers &amp; promotions</a></li>
+    <li class="active"><a href=".">{% trans "Offer management" %}</a></li>
 </ul>
 {% endblock %}
 
@@ -22,59 +22,59 @@
 {% block dashboard_content %}
 <div class="well well-info">
     <div class="sub-header">
-		<h3>{% trans "Search" %}</h3>
+        <h3>{% trans "Search" %}</h3>
     </div>
     <form action="." method="get" class="form-inline">
-		{% include 'partials/form_fields_inline.html' with form=form %}
-		<button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
-		<a href="{% url dashboard:offer-list %}" class="btn">{% trans "Reset" %}</a>
+        {% include 'partials/form_fields_inline.html' with form=form %}
+        <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
+        <a href="{% url dashboard:offer-list %}" class="btn">{% trans "Reset" %}</a>
     </form>
 </div>
 
 <div class="well well-success">
     <h3>{% trans "Create Offer" %}</h3>
-   	<a href="{% url dashboard:offer-metadata %}" class="btn btn-primary">Create</a>
+    <a href="{% url dashboard:offer-metadata %}" class="btn btn-primary">{% trans "Create" %}</a>
 </div>
 
-	<div class="sub-header">
-		<h2>{{ queryset_description }}</h2>
-	</div>
-	{% if offers.count %}
-		<form action="." method="post" class="order_table">
-			{% csrf_token %}
-			<table class="table table-striped table-bordered">
-				<tr>
-					<th>{% trans "Offer name" %}</th>
-					<th>{% trans "Status" %}</th>
-					<th>{% trans "Start date" %}</th>
-					<th>{% trans "End date" %}</th>
-					<th>{% trans "Condition" %}</th>
-					<th>{% trans "Benefit" %}</th>
-					<th>{% trans "Date created" %}</th>
-					<th></th>
-				</tr>
-				{% for offer in offers %}
-				<tr>
-					<td><a href="{{ offer.get_absolute_url }}">{{ offer.name }}</a></td>
-					<td>{% if offer.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</td>
-					<td>{{ offer.start_date }}</td>
-					<td>{{ offer.end_date }}</td>
-					<td>{{ offer.condition.description }}</td>
-					<td>{{ offer.benefit.description }}</td>
-					<td>{{ offer.date_created }}</td>
-					<td>
-						<a class="btn btn-info" href="{% url dashboard:offer-detail offer.pk %}">{% trans "Stats" %}</a>
-						<a class="btn btn-primary" href="{% url dashboard:offer-metadata offer.pk %}">{% trans "Edit" %}</a>
-						<a class="btn btn-danger" href="{% url dashboard:offer-delete offer.pk %}">{% trans "Delete" %}</a>
-					</td>
-				</tr>
-				{% endfor %}
-			</table>
-			{% if page_obj %}
-				{% include "partials/pagination.html" %}
-			{% endif %}
-		</form>
-	{% else %}
-	<p>{% trans "No offers found." %}</p>
-	{% endif %}
+    <div class="sub-header">
+        <h2>{{ queryset_description }}</h2>
+    </div>
+    {% if offers.count %}
+        <form action="." method="post" class="order_table">
+            {% csrf_token %}
+            <table class="table table-striped table-bordered">
+                <tr>
+                    <th>{% trans "Offer name" %}</th>
+                    <th>{% trans "Status" %}</th>
+                    <th>{% trans "Start date" %}</th>
+                    <th>{% trans "End date" %}</th>
+                    <th>{% trans "Condition" %}</th>
+                    <th>{% trans "Benefit" %}</th>
+                    <th>{% trans "Date created" %}</th>
+                    <th></th>
+                </tr>
+                {% for offer in offers %}
+                <tr>
+                    <td><a href="{{ offer.get_absolute_url }}">{{ offer.name }}</a></td>
+                    <td>{% if offer.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</td>
+                    <td>{{ offer.start_date }}</td>
+                    <td>{{ offer.end_date }}</td>
+                    <td>{{ offer.condition.description }}</td>
+                    <td>{{ offer.benefit.description }}</td>
+                    <td>{{ offer.date_created }}</td>
+                    <td>
+                        <a class="btn btn-info" href="{% url dashboard:offer-detail offer.pk %}">{% trans "Stats" %}</a>
+                        <a class="btn btn-primary" href="{% url dashboard:offer-metadata offer.pk %}">{% trans "Edit" %}</a>
+                        <a class="btn btn-danger" href="{% url dashboard:offer-delete offer.pk %}">{% trans "Delete" %}</a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </table>
+            {% if page_obj %}
+                {% include "partials/pagination.html" %}
+            {% endif %}
+        </form>
+    {% else %}
+    <p>{% trans "No offers found." %}</p>
+    {% endif %}
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/orders/order_list.html

@@ -36,15 +36,15 @@
                     {{ field }}
                     {% for error in field.errors %}
                         <ul class="help-block">
-                            <li>{{ error|escape }}</li>
+                            <li>{{ error }}</li>
                         </ul>
                     {% endfor %}
                 </span>
                 {% endif %}
             {% endif %}
         {% endfor %}
-        <input type="submit" value="Search" class="btn btn-primary" />
-        <a data-toggle="modal" href="#SearchModal">Advanced Search</a>
+        <input type="submit" value="{% trans "Search" %}" class="btn btn-primary" />
+        <a data-toggle="modal" href="#SearchModal">{% trans "Advanced Search" %}</a>
     </form>
 
     <div class="modal hide fade" id="SearchModal">
@@ -58,7 +58,7 @@
                 {% include "partials/form_fields.html" with form=form %}
             </div>
             <div class="modal-footer">
-                <a href="#" class="btn" data-dismiss="modal">Close</a>
+                <a href="#" class="btn" data-dismiss="modal">{% trans "Close" %}</a>
                 <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
             </div>
         </form>
@@ -74,7 +74,7 @@
 <div class="tabbable dashboard">
     <ul class="nav nav-tabs">
         <li {% if not active_status %}class="active"{% endif %}>
-            <a href="{% url dashboard:order-list %}">All Orders</a>
+            <a href="{% url dashboard:order-list %}">{% trans "All Orders" %}</a>
         </li>
         {% for slug, name in status_lookup.items %}
         <li {% if slug == active_status %}class="active"{% endif %}>
@@ -93,7 +93,7 @@
     <tr>
         <th>
 			<input name="select_all_orders" type="checkbox">
-            Select all
+            {% trans "Select all" %}
 		</th>
         <th>{% anchor 'number' 'Order number' %}</th>
 		<th>{% trans "Total inc tax" %}</th>
@@ -131,10 +131,7 @@
 </div>
 
 {% include "dashboard/orders/partials/bulk_edit_form.html" with status=active_status %}
-
-{% if page_obj %}
-    {% include "partials/pagination.html" %}
-{% endif %}
+{% include "partials/pagination.html" %}
 
 </form>
 

oscar/templates/oscar/dashboard/pages/index.html

@@ -10,10 +10,10 @@
 {% block breadcrumbs %}
 <ul class="breadcrumb">
     <li>
-	<a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+    <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
-	<li class="active"><a href=".">{% trans "Pages" %}</a></li>
+    <li class="active"><a href=".">{% trans "Pages" %}</a></li>
 </ul>
 {% endblock %}
 
@@ -32,7 +32,7 @@
 <div class="well well-success">
     <h3>Create new page</h3>
     <form action="{% url dashboard:page-create %}" method="get" class="form-inline">
-            <input type="submit" value="Create" class="btn-primary" />
+        <input type="submit" value="{% trans "Create" %}" class="btn-primary" />
     </form>
 </div>
 
@@ -42,40 +42,34 @@
 
 
 {% if flatpage_list.count %}
-<form action="." method="post">
-    {% csrf_token %}
-<table class="table table-striped table-bordered">
-	<thead>
-    <tr>
-		<th>{% trans "Title" %}</th>
-		<th>{% trans "URL" %}</th>
-        <th></th>
-    </tr>
-	</thead>
-	<tbody>
-    {% for page in flatpage_list %}
-    <tr>
-        <td>{{ page.title}}</td>
-        <td>{{ page.url}}</td>
-        <td>
-			<a class="btn btn-info" href="{{ page.get_absolute_url }}">{% trans "View" %}</a>
-			<a class="btn btn-success" href="{% url dashboard:page-update page.id %}">{% trans "Edit" %}</a>
-			<a class="btn btn-danger" href="{% url dashboard:page-delete page.id %}">{% trans "Delete" %}</a>
-        </td>
-    </tr>
-</tbody>
-    {% endfor %}
-</table>
-
-{% if page_obj %}
-    {% include "partials/pagination.html" %}
-{% endif %}
-</form>
-
+    <form action="." method="post">
+        {% csrf_token %}
+        <table class="table table-striped table-bordered">
+            <thead>
+                <tr>
+                    <th>{% trans "Title" %}</th>
+                    <th>{% trans "URL" %}</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for page in flatpage_list %}
+            <tr>
+                <td>{{ page.title}}</td>
+                <td>{{ page.url}}</td>
+                <td>
+                    <a class="btn btn-info" href="{{ page.get_absolute_url }}">{% trans "View" %}</a>
+                    <a class="btn btn-success" href="{% url dashboard:page-update page.id %}">{% trans "Edit" %}</a>
+                    <a class="btn btn-danger" href="{% url dashboard:page-delete page.id %}">{% trans "Delete" %}</a>
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        {% include "partials/pagination.html" %}
+    </form>
 {% else %}
-
-<p>{% trans "No pages found." %}</p>
-
+    <p>{% trans "No pages found." %}</p>
 {% endif %}
 
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/pages/update.html

@@ -46,9 +46,9 @@
 	                        <div class="controls">
 	                            {{ field }}
 	                            {% for error in field.errors %}
-							<span class="help-block">
-								{{ error|escape }}
-							</span>
+	                				<span class="help-block">
+								{{ error }}
+	                				</span>
 	                            {% endfor %}
 	                            {% if field.help_text %}
 	                                <span class='help-block'>

oscar/templates/oscar/dashboard/ranges/range_list.html

@@ -22,38 +22,40 @@
 {% block dashboard_content %}
 <div class="well well-success">
 	<div class="sub-header">
-		<h2>Create new range</h2>
+        <h2>{% trans "Create new range" %}</h2>
 	</div>
 	<a href="{% url dashboard:range-create %}" class="btn btn-primary">{% trans "Create new range" %}</a>
 </div>
 
-	{% if ranges.count %}
-		<table class="table table-striped table-bordered">
-			<tr>
-				<th>{% trans "Name" %}</th>
-				<th>{% trans "Num products" %}</th>
-				<th>{% trans "Date created" %}</th>
-				<th></th>
-			</tr>
-			{% for range in ranges %}
-			<tr>
-				<td>{{ range.name }}</td>
-				<td>{{ range.num_products|default:"-" }}</td>
-				<td>{{ range.date_created }}</td>
-				<td>
-					<a class="btn btn-primary" href="{% url dashboard:range-update range.id %}">{% trans "Edit" %}</a>
-					{% if not range.includes_all_products %}
-					<a class="btn btn-info" href="{% url dashboard:range-products range.id %}">{% trans "Edit products" %}</a>
-					{% endif %}
-					<a class="btn btn-danger" href="{% url dashboard:range-delete range.id %}">{% trans "Delete" %}</a>
-				</td>
-			</tr>
-			{% endfor %}
-		</table>
-		{% if page_obj %}
-			{% include "partials/pagination.html" %}
-		{% endif %}
-	{% else %}
-	<p>{% trans "No ranges found." %}</p>
-	{% endif %}
+{% if ranges.count %}
+    <table class="table table-striped table-bordered">
+        <thead>
+            <tr>
+                <th>{% trans "Name" %}</th>
+                <th>{% trans "Num products" %}</th>
+                <th>{% trans "Date created" %}</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for range in ranges %}
+        <tr>
+            <td>{{ range.name }}</td>
+            <td>{{ range.num_products|default:"-" }}</td>
+            <td>{{ range.date_created }}</td>
+            <td>
+                <a class="btn btn-primary" href="{% url dashboard:range-update range.id %}">{% trans "Edit" %}</a>
+                {% if not range.includes_all_products %}
+                <a class="btn btn-info" href="{% url dashboard:range-products range.id %}">{% trans "Edit products" %}</a>
+                {% endif %}
+                <a class="btn btn-danger" href="{% url dashboard:range-delete range.id %}">{% trans "Delete" %}</a>
+            </td>
+        </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+    {% include "partials/pagination.html" %}
+{% else %}
+    <p>{% trans "No ranges found." %}</p>
+{% endif %}
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/users/index.html

@@ -35,58 +35,50 @@
   <strong>{{ queryset_description }}</strong>
 </div>
 {% endif %}
-<div class="well well-danger">
-	<h3 class="app-ico ico-download icon">Export 2 filtered customers to a .csv file.</h3>
-	<input type="submit" value="Export" class="btn btn-primary"/>
-</div>
 
 {% if user_list.count %}
 <form action="." method="post" class="form-inline">
     {% csrf_token %}
-
-<table class="table table-striped table-bordered">
-    <tr>
-        <th></th>
-		<th>{% trans "Email" %}</th>
-		<th>{% trans "Name (First, Last)" %}</th>
-		<th>{% trans "Active" %}</th>
-		<th>{% trans "Staff status" %}</th>
-		<th>{% trans "Date registered" %}</th>
-		<th>{% trans "Num Orders" %}</th>
-        <th></th>
-    </tr>
-    {% for user in user_list %}
-    <tr>
-        <td><input type="checkbox" name="selected_user" class="selected_user" value="{{ user.id }}"/>
-        <td>{{ user.email }}</td>
-		<td>{{ user.first_name }}, {{ user.last_name }}</td>
-        <td>{{ user.is_active }}</td>
-        <td>{{ user.is_staff }}</td>
-        <td>{{ user.date_joined|date:"d/m/y H:s" }}</td>
-        <td>{% num_orders user %}</td>
-        <td>
-			<a href="{% url dashboard:user-detail user.id %}" class="btn btn-info">{% trans "View" %}</a>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-<div class="well">
-    <h3 class="app-ico ico_sync icon">Bulk Actions</h3>
-    <label for="inlineCheckboxes">With selected customers:</label>
-    <label>
-        <input type="radio" name="action" value="make_active" /> Make active
-    </label>
-    <label>
-        <input type="radio" name="action" value="make_inactive" /> Make inactive
-    </label>
-    <input type="submit" value="Go!" class="btn btn-primary" />
-</div>
-{% if page_obj %}
+    <table class="table table-striped table-bordered">
+        <tr>
+            <th></th>
+            <th>{% trans "Email" %}</th>
+            <th>{% trans "First name" %}</th>
+            <th>{% trans "Last name" %}</th>
+            <th>{% trans "Active" %}</th>
+            <th>{% trans "Staff status" %}</th>
+            <th>{% trans "Date registered" %}</th>
+            <th>{% trans "Num Orders" %}</th>
+            <th></th>
+        </tr>
+        {% for user in user_list %}
+        <tr>
+            <td><input type="checkbox" name="selected_user" class="selected_user" value="{{ user.id }}"/>
+            <td>{{ user.email }}</td>
+            <td>{{ user.first_name }}</td>
+            <td>{{ user.last_name }}</td>
+            <td>{{ user.is_active }}</td>
+            <td>{{ user.is_staff }}</td>
+            <td>{{ user.date_joined|date:"d/m/y H:s" }}</td>
+            <td>{% num_orders user %}</td>
+            <td>
+                <a href="{% url dashboard:user-detail user.id %}" class="btn btn-info">{% trans "View" %}</a>
+            </td>
+        </tr>
+        {% endfor %}
+    </table>
+    <div class="well">
+        <h3 class="app-ico ico_sync icon">{% trans "Bulk Actions" %}</h3>
+        <label for="inlineCheckboxes">{% trans "With selected customers:" %}</label>
+        <label>
+            <input type="radio" name="action" value="make_active" /> {% trans "Make active" %}
+        </label>
+        <label>
+            <input type="radio" name="action" value="make_inactive" /> {% trans "Make inactive" %}
+        </label>
+        <input type="submit" value="{% trans "Go!" %}" class="btn btn-primary" />
+    </div>
     {% include "catalogue/partials/pagination.html" %}
-{% endif %}
-
-
-
 </form>
 
 {% else %}

oscar/templates/oscar/dashboard/vouchers/voucher_list.html

@@ -33,7 +33,7 @@
 
 <div class="well well-success">
 	<div class="sub-header">
-		<h3>Create a new voucher</h3>
+        <h3>{% trans "Create a new voucher" %}</h3>
 	</div>
 	<a href="{% url dashboard:voucher-create %} " class="btn btn-primary">{% trans "Create new voucher" %}</a>
 </div>
@@ -71,9 +71,7 @@
 			</tr>
 			{% endfor %}
 		</table>
-		{% if page_obj %}
-			{% include "partials/pagination.html" %}
-		{% endif %}
+        {% include "partials/pagination.html" %}
 	{% else %}
 	<p>{% trans "No vouchers found." %}</p>
 	{% endif %}

sites/sandbox/settings_simple.py

@@ -1,285 +0,0 @@
-import os
-
-# Django settings for oscar project.
-PROJECT_DIR = os.path.dirname(__file__)
-location = lambda x: os.path.join(
-    os.path.dirname(os.path.realpath(__file__)), x)
-
-DEBUG = True
-TEMPLATE_DEBUG = True
-SQL_DEBUG = True
-SEND_BROKEN_LINK_EMAILS = True
-
-ADMINS = (
-    ('David Winterbottom', 'david.winterbottom@tangentlabs.co.uk'),
-)
-EMAIL_SUBJECT_PREFIX = '[Oscar sandbox] '
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(os.path.dirname(__file__), 'db.sqlite'),
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': '',
-    }
-}
-
-CACHES = {
-    'default': {
-        'BACKEND':
-        'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/London'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-LANGUAGES = (
-    ('de', 'German'),
-    ('fr', 'French'),
-)
-ROSETTA_STORAGE_CLASS = 'rosetta.storage.SessionRosettaStorage'
-ROSETTA_ENABLE_TRANSLATION_SUGGESTIONS = True
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = location("assets/media")
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-#ADMIN_MEDIA_PREFIX = '/media/admin/'
-
-STATIC_URL = '/static/'
-STATICFILES_DIRS = ()
-STATIC_ROOT = location('public/static')
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '$)a7n&o80u!6y5t-+jrd3)3!%vh&shg$wqpjpxc!ar&p#!)n1a'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.request",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.static",
-    "django.contrib.messages.context_processors.messages",
-    # Oscar specific
-    'oscar.apps.search.context_processors.search_form',
-    'oscar.apps.promotions.context_processors.promotions',
-    'oscar.apps.checkout.context_processors.checkout',
-    'oscar.core.context_processors.metadata',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
-    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
-    'oscar.apps.basket.middleware.BasketMiddleware',
-)
-
-INTERNAL_IPS = ('127.0.0.1',)
-
-ROOT_URLCONF = 'urls'
-
-from oscar import OSCAR_MAIN_TEMPLATE_DIR
-TEMPLATE_DIRS = (
-    location('templates'),
-    OSCAR_MAIN_TEMPLATE_DIR,
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s %(message)s',
-        },
-        'simple': {
-            'format': '[%(asctime)s] %(message)s'
-        },
-    },
-    'handlers': {
-        'null': {
-            'level': 'DEBUG',
-            'class': 'django.utils.log.NullHandler',
-        },
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose'
-        },
-        'checkout_file': {
-             'level': 'INFO',
-             'class': 'oscar.core.logging.handlers.EnvFileHandler',
-             'filename': 'checkout.log',
-             'formatter': 'verbose'
-        },
-        'gateway_file': {
-             'level': 'INFO',
-             'class': 'oscar.core.logging.handlers.EnvFileHandler',
-             'filename': 'gateway.log',
-             'formatter': 'simple'
-        },
-        'error_file': {
-             'level': 'INFO',
-             'class': 'oscar.core.logging.handlers.EnvFileHandler',
-             'filename': 'errors.log',
-             'formatter': 'verbose'
-        },
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler',
-        },
-    },
-    'loggers': {
-        'django': {
-            'handlers': ['null'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        'django.request': {
-            'handlers': ['mail_admins', 'error_file'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        'oscar.checkout': {
-            'handlers': ['console', 'checkout_file'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        'gateway': {
-            'handlers': ['gateway_file'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        'django.db.backends': {
-            'handlers': ['null'],
-            'propagate': False,
-            'level': 'DEBUG',
-        },
-    }
-}
-
-
-INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.admin',
-    'django.contrib.flatpages',
-    'django.contrib.staticfiles',
-    'django_extensions',
-    'debug_toolbar',
-    'south',
-    'rosetta',  # For i18n testing
-    'apps.user',  # For profile testing
-    'apps.gateway',  # For allowing dashboard access
-]
-from oscar import get_core_apps
-INSTALLED_APPS = INSTALLED_APPS + get_core_apps()
-
-AUTHENTICATION_BACKENDS = (
-    'oscar.apps.customer.auth_backends.Emailbackend',
-    'django.contrib.auth.backends.ModelBackend',
-)
-
-LOGIN_REDIRECT_URL = '/accounts/'
-APPEND_SLASH = True
-
-# Haystack settings
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
-    },
-}
-
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-}
-
-AUTH_PROFILE_MODULE = 'user.Profile'
-
-# Oscar settings
-from oscar.defaults import *
-
-
-OSCAR_RECENTLY_VIEWED_PRODUCTS = 20
-OSCAR_ALLOW_ANON_CHECKOUT = True
-OSCAR_INITIAL_ORDER_STATUS = 'Pending'
-OSCAR_INITIAL_LINE_STATUS = 'Pending'
-OSCAR_ORDER_STATUS_PIPELINE = {
-    'Pending': ('Being processed', 'Cancelled',),
-    'Being processed': ('Processed', 'Cancelled',),
-    'Cancelled': (),
-}
-
-OSCAR_SHOP_NAME = 'Oscar Sandbox'
-OSCAR_SHOP_TAGLINE = 'e-Commerce for Django'
-
-GOOGLE_ANALYTICS_ID = 'UA-XXXXX-Y'
-
-LOG_ROOT = location('logs')
-DISPLAY_VERSION = False
-
-THUMBNAIL_DEBUG = True
-
-# Must be within MEDIA_ROOT for sorl to work
-OSCAR_MISSING_IMAGE_URL = 'image_not_found.jpg'
-
-try:
-    from settings_local import *
-except ImportError:
-    pass