Refactor stock location view

InvenTree/stock/templates/stock/location.html

@@ -7,50 +7,27 @@
 {% include "stock/location_navbar.html" %}
 {% endblock %}
 
-{% block content %}
-
-<div class='panel panel-inventree'>
-
-    <div class='panel-heading'>
+{% block details_left %}
+{% if location %}
 <h4>
-            {% if location %}
-            {{ location.name }}
-            {% if location %}
+    {% trans "Stock Location" %}: {{ location.name }}
     {% if user.is_staff and roles.stock_location.change %}
     <a  href="{% url 'admin:stock_stocklocation_change' location.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
     {% endif %}
-            </h3>
+</h4>
+<p>{{ location.description }}</p>
 {% else %}
-            <h3>{% trans "Stock" %}</h3>
+<h4>
+    {% trans "Stock" %}
+</h4>
 <p>{% trans "All stock items" %}</p>
 {% endif %}
 
-            {% else %}
-            {% trans "Stock" %}
-            {% endif %}
-        </h4>
-    </div>
-
-    <div class='panel-content'>
-
-    {% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
-    {% if owner_control.value == "True" %}
-        {% authorized_owners location.owner as owners %}
-
-        {% if location and not user in owners and not user.is_superuser %}
-        <div class='alert alert-block alert-info'>
-            {% trans "You are not in the list of owners of this location. This stock location cannot be edited." %}<br>
-        </div>
-        {% endif %}
-    {% endif %}
-
-    <div class='row'>
-    <div class='col-sm-6'>
 <div class='btn-group' role='group'>
     {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser or not location %}
     {% if roles.stock_location.add %}
-                    <button class='btn btn-success' id='location-create' title='{% trans "Create new stock location" %}'>
-                    <span class='fas fa-plus-circle'/>
+    <button class='btn btn-success' id='location-create' type='button' title='{% trans "Create new stock location" %}'>
+        <span class='fas fa-plus-circle'></span>
     </button>
     {% endif %}
     {% endif %}
@@ -103,8 +80,21 @@
         {% endif %}
     {% endif %}
 </div>
+
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners location.owner as owners %}
+
+    {% if location and not user in owners and not user.is_superuser %}
+    <div class='alert alert-block alert-info'>
+        {% trans "You are not in the list of owners of this location. This stock location cannot be edited." %}<br>
     </div>
-    <div class='col-sm-6'>
+    {% endif %}
+{% endif %}
+
+{% endblock %}
+
+{% block details_right %}
 {% if location %}
 <table class='table table-striped table-condensed'>
     <col width='25'>
@@ -140,12 +130,9 @@
     </tr>
 </table>
 {% endif %}
-    </div>
-    </div>
-</div>
-</div>
+{% endblock %}
 
-{% block location_content %}
+{% block page_content %}
 
 <div class='panel panel-inventree panel-hidden' id='panel-stock'>
     <div class='panel-heading'>
@@ -184,10 +171,6 @@
 
 {% endblock %}
 
-</div>
-
-{% endblock %}
-
 {% block js_ready %}
 {{ block.super }}
 

InvenTree/stock/templates/stock/stock_app_base.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "page_base.html" %}
 {% load static %}
 {% load i18n %}
 {% load inventree_extras %}