Merge remote-tracking branch 'inventree/master'

InvenTree/stock/templates/stock/loc_link.html

@@ -1,7 +1,7 @@
 <div class="navigation">
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
-    <li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><b><span class='glyphicon glyphicon-small glyphicon-th-list'></span></b></a></li>  
+    <li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><b><span class='fas fa-stream'></span></b></a></li>  
     <li class="breadcrumb-item{% if location is None %} active" aria-current="page{% endif %}"><a href="/stock/">Stock</a></li>
 {% if location %}
 {% for path_item in location.parentpath %}

InvenTree/stock/templates/stock/location.html

@@ -37,18 +37,22 @@
     <h3>{% trans "Location Details" %}</h3>
     <table class='table table-striped table-condensed'>
         <tr>
+            <td><span class='fas fa-sitemap'></span></td>
             <td>{% trans "Location Path" %}</td>
             <td>{{ location.pathstring }}</td>
         </tr>
         <tr>
+            <td><span class='fas fa-info-circle'></span></td>
             <td>{% trans "Location Description" %}</td>
             <td>{{ location.description }}</td>
         </tr>
         <tr>
+            <td><span class='fas fa-map-marker-alt'></span></td>
             <td>{% trans "Sublocations" %}</td>
             <td>{{ location.children.count }}</td>
         </tr>
         <tr>
+            <td><span class='fas fa-boxes'></span></td>
             <td>{% trans "Stock Items" %}</td>
             <td>{{ location.item_count }}</td>
         </tr>
@@ -57,10 +61,12 @@
     <h3>{% trans "Stock Details" %}</h3>
     <table class='table table-striped table-condensed'>
         <tr>
+            <td><span class='fas fa-map-marker-alt'></span></td>
             <td>{% trans "Stock Locations" %}</td>
             <td>{{ loc_count }}</td>
         </tr>
         <tr>
+            <td><span class='fas fa-boxes'></span></td>
             <td>{% trans "Stock Items" %}</td>
             <td>{{ stock_count }}</td>
         </tr>

InvenTree/stock/templates/stock/stock_app_base.html

@@ -1,11 +1,12 @@
 {% extends "base.html" %}
 {% load static %}
+{% load i18n %}
 
 {% block page_title %}
 {% if item %}
-InvenTree | Stock Item - {{ item }}
+InvenTree | {% trans "Stock Item" %} - {{ item }}
 {% elif location %}
-InvenTree | Stock Location - {{ location }}
+InvenTree | {% trans "Stock Location" %} - {{ location }}
 {% else %}
 InvenTree | Stock
 {% endif %}
@@ -29,13 +30,12 @@ InvenTree | Stock
 {% endblock %}
 
 {% block js_ready %}
-    initSideNav();
 {{ block.super }}
     loadTree("{% url 'api-stock-tree' %}",
-            "#stock-tree",
-            {
-                name: 'stock',
-            }
+        "#stock-tree",
+        {
+            name: 'stock',
+        }
     );
 
     $("#toggle-stock-tree").click(function() {
@@ -43,4 +43,5 @@ InvenTree | Stock
         return false;
     })
 
+    initSideNav();
 {% endblock %}