Move back link into breadcrumb container

oscar/templates/oscar/catalogue/detail.html

@@ -29,6 +29,15 @@
 		</li>
 		{% endfor %}
 		<li class="active">{{ product.title }}</li>
+
+        {% get_back_button as backbutton %}
+        {% if backbutton %}
+            <li class="pull-right">
+                <a href="{{ backbutton.url }}">
+                    <i class="icon-arrow-left"></i> {{ backbutton.title }}
+                </a>
+            </li>
+        {% endif %}
     {% endwith %}
 </ul>
 {% endblock %}
@@ -37,16 +46,8 @@
 {% endblock header %}
 
 {% block content %}
-{% get_back_button as backbutton %}
 
 <article class="product_page"><!-- Start of product page -->
-    {% if backbutton %}
-        <a href="{{ backbutton.url }}" class="pull-right">
-            <i class="icon-arrow-left"></i>
-            {{ backbutton.title }}
-        </a>
-    {% endif %}
-
     {% comment %} 
     This is a but clunky here.  Better to have some kind of JS-driven dashboard menu that 
     pops out when clicked.  A bit like the Django-Debug-Toolbar button

oscar/templatetags/history_tags.py

@@ -37,9 +37,11 @@ def recently_viewed_products(context):
 
 @register.assignment_tag(takes_context=True)
 def get_back_button(context):
-    """Show back button, custom title available for different urls, for
+    """
+    Show back button, custom title available for different urls, for
     example 'Back to search results', no back button if user came from other
-    site"""
+    site
+    """
     request = context.get('request', None)
     if not request:
         raise Exception('Cannot get request from context')
@@ -65,6 +67,7 @@ def get_back_button(context):
     except Resolver404:
         return None
 
+    # This dict can be extended to link back to other browsing pages
     titles = {
         'search:search': _('Back to search results'),
     }