From 44c10c45cd285216d45099a34d8f190f43d9a55b Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Apr 2020 20:50:33 +1000
Subject: [PATCH] visual consolidation

---
 InvenTree/build/templates/build/detail.html   |  1 +
 .../templates/company/company_base.html       |  1 +
 .../company/templates/company/detail.html     | 20 +++++++++++--------
 .../order/templates/order/order_base.html     |  1 +
 InvenTree/part/templates/part/category.html   |  2 ++
 InvenTree/part/templates/part/detail.html     |  1 +
 InvenTree/part/templates/part/part_base.html  |  1 +
 .../stock/templates/stock/item_base.html      |  1 +
 InvenTree/stock/templates/stock/location.html |  2 ++
 InvenTree/templates/InvenTree/index.html      | 12 ++++++++---
 InvenTree/templates/required_part_table.html  | 12 +++++------
 11 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 4011ca7dfb..8b8a53023b 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -10,6 +10,7 @@
 <hr>
 
 <table class='table table-striped'>
+    <col width='25'>
 <tr>
     <td></td>
     <td>{% trans "Title" %}</td>
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 873d6747be..19ef2a0e60 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -43,6 +43,7 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
     </div>
     <div class="col-sm-6">
         <table class="table">
+            <col width='25'>
         {% if company.website %}
         <tr>
             <td><span class='fas fa-link'></span></td>
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 93e9e5bbb9..adb999fb4d 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -9,14 +9,18 @@
 <hr>
 
 <table class='table table-striped'>
-<tr>
-    <td>{% trans "Customer" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
-</tr>
-<tr>
-    <td>{% trans "Supplier" %}</td>
-    <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
-</tr>
+    <col width='25'>
+    <col>
+    <tr>
+        <td><span class='fas fa-user-tag'></span></td>
+        <td>{% trans "Customer" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
+    </tr>
+    <tr>
+        <td><span class='fas fa-industry'></span></td>
+        <td>{% trans "Supplier" %}</td>
+        <td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
+    </tr>
 </table>
 
 {% endblock %}
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index 6452f8ab2c..e5ed77cf4f 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -60,6 +60,7 @@ InvenTree | {{ order }}
     <div class='col-sm-6'>
         <h4>{% trans "Purchase Order Details" %}</h4>
         <table class='table'>
+            <col width='25'>
             <tr>
                 <td><span class='fas fa-industry'></span></td>
                 <td>{% trans "Supplier" %}</td>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index ec8fd8d8e0..2161ff1bd9 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -33,6 +33,7 @@
         {% if category %}
         <h3>{% trans "Category Details" %}</h3>
         <table class='table table-condensed table-striped'>
+            <col width='25'>
             <tr>
                 <td><span class='fas fa-sitemap'></span></td>
                 <td>{% trans "Category Path" %}</td>
@@ -71,6 +72,7 @@
         {% else %}
         <h3>{% trans "Category Details" %}</h3>
         <table class='table table-striped table-condensed'>
+            <col width='25'>
             <tr>
                 <td><span class='fas fa-sitemap'></span></td>
                 <td>{% trans "Part Categories" %}</td>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 64e0bed5bc..2c3e5a2884 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -13,6 +13,7 @@
 <div class='row'>
     <div class='col-sm-6'>
     <table class='table table-striped'>
+        <col width='25'>
         <tr>
             <td></td>
             <td><b>{% trans "Part name" %}</b></td>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index b75b01cb12..abac62f059 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -70,6 +70,7 @@
             </div>
         </p>
         <table class='table table-condensed'>
+            <col width='25'>
             {% if part.IPN %}
             <tr>
                 <td></td>
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 9ef0762a07..949823b83b 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -73,6 +73,7 @@
     <div class='row'>
         <div class='col-sm-6'>
             <table class="table table-striped">
+            <col width='25'>
             <tr>
                 <td><span class='fas fa-shapes'></span></td>
                 <td>Part</td>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index aad5b2b9e8..7117e54c60 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -36,6 +36,7 @@
     {% if location %}
     <h3>{% trans "Location Details" %}</h3>
     <table class='table table-striped table-condensed'>
+        <col width='25'>
         <tr>
             <td><span class='fas fa-sitemap'></span></td>
             <td>{% trans "Location Path" %}</td>
@@ -60,6 +61,7 @@
     {% else %}
     <h3>{% trans "Stock Details" %}</h3>
     <table class='table table-striped table-condensed'>
+        <col width='25'>
         <tr>
             <td><span class='fas fa-map-marker-alt'></span></td>
             <td>{% trans "Stock Locations" %}</td>
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index a4c6b68ef4..c4eb5990cc 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -24,10 +24,16 @@ InvenTree | Index
 {% endblock %}
 
 {% block js_ready %}
+
+console.log("abcde?");
+
 {{ block.super }}
 
-$("#to-build-table").bootstrapTable();
-$("#to-order-table").bootstrapTable();
-$("#starred-parts-table").bootstrapTable();
+//TODO: These calls to bootstrapTable() are failing, for some reason?
+//$("#to-build-table").bootstrapTable();
+//$("#to-order-table").bootstrapTable();
+//$("#starred-parts-table").bootstrapTable();
+
+console.log("Got to here...");
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/required_part_table.html b/InvenTree/templates/required_part_table.html
index 74feb07336..a1e26e2894 100644
--- a/InvenTree/templates/required_part_table.html
+++ b/InvenTree/templates/required_part_table.html
@@ -1,11 +1,11 @@
 <table class='table table-striped table-condensed' id='{{ table_id }}'>
     <tr>
-        <th>Part</th>
-        <th>Description</th>
-        <th>In Stock</th>
-        <th>On Order</th>
-        <th>Allocted</th>
-        <th>Net Stock</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>Part</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>Description</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>In Stock</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>On Order</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>Allocted</th>
+        <th data-field='part' data-sortable='true' data-searchable='true'>Net Stock</th>
     </tr>
     {% for part in parts %}
     <tr>