From 6a7c722efc968557e4ff4d03febf354a8a428f2e Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 18 Jan 2021 21:52:20 +1100
Subject: [PATCH] Stock table button cleanup

---
 .../stock/templates/stock/item_base.html      |  2 +-
 InvenTree/templates/js/label.js               | 11 ++++++++-
 InvenTree/templates/js/stock.js               | 10 ++++++++
 InvenTree/templates/stock_table.html          | 23 +++++++++++++------
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 403f35d5bb..16b34cb3ea 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -120,7 +120,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <!-- Document / label menu -->
         {% if item.has_labels or item.has_test_reports %}
         <div class='btn-group'>
-            <button id='document-options' title='{% trans "Document actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-file-alt'></span> <span class='caret'></span></button>
+            <button id='document-options' title='{% trans "Printing actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-print'></span> <span class='caret'></span></button>
             <ul class='dropdown-menu' role='menu'>
                 {% if item.has_labels %}
                 <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
diff --git a/InvenTree/templates/js/label.js b/InvenTree/templates/js/label.js
index b62cbc9ef0..63f028fa1d 100644
--- a/InvenTree/templates/js/label.js
+++ b/InvenTree/templates/js/label.js
@@ -133,8 +133,17 @@ function selectLabel(labels, items, options={}) {
     );
 
     // Construct form
-    var html = `
+    var html = '';
+    
+    if (items.length > 0) {
 
+        html += `
+        <div class='alert alert-block alert-info'>
+        ${items.length} {% trans "stock items selected" %}
+        </div>`;
+    }
+
+    html += `
     <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
         <div class='form-group'>
             <label class='control-label requiredField' for='id_label'>
diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js
index 4b67d68bb4..6c7bc3d873 100644
--- a/InvenTree/templates/js/stock.js
+++ b/InvenTree/templates/js/stock.js
@@ -625,9 +625,19 @@ function loadStockTable(table, options) {
         ],
     });
 
+    /*
     if (options.buttons) {
         linkButtonsToSelection(table, options.buttons);
     }
+    */
+
+    linkButtonsToSelection(
+        table,
+        [
+            '#stock-print-options',
+            '#stock-options',
+        ]
+    );
 
     function stockAdjustment(action) {
         var items = $("#stock-table").bootstrapTable("getSelections");
diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html
index 9abb30be80..131856e016 100644
--- a/InvenTree/templates/stock_table.html
+++ b/InvenTree/templates/stock_table.html
@@ -4,21 +4,30 @@
     <div class='button-toolbar container-fluid' style='float: right;'>
         <div class='btn-group'>
             <button class='btn btn-default' id='stock-export' title='{% trans "Export Stock Information" %}'>
-                <span class='fas fa-file-download'></span> {% trans "Export" %}
+                <span class='fas fa-download'></span>
             </button>
             {% if read_only %}
             {% else %}
             {% if roles.stock.add %}
-            <button class="btn btn-success" id='item-create'>
-                <span class='fas fa-plus-circle'></span> {% trans "New Stock Item" %}
+            <button class="btn btn-success" id='item-create' title='{% trans "New Stock Item" %}'>
+                <span class='fas fa-plus-circle'></span>
             </button>
             {% endif %}
-            {% if roles.stock.change or roles.stock.delete %}
-            <div class="btn-group">
-                <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{% trans "Options" %}<span class="caret"></span></button>
-                <ul class="dropdown-menu">
+            <div class='btn-group'>
+                <button id='stock-print-options' class='btn btn-primary dropdown-toggle' type='button' data-toggle="dropdown" title='{% trans "Printing Actions" %}'>
+                    <span class='fas fa-print'></span> <span class='caret'></span>
+                </button>
+                <ul class='dropdown-menu'>
                     <li><a href='#' id='multi-item-print-label' title='{% trans "Print labels" %}'><span class='fas fa-tags'></span> {% trans "Print labels" %}</a></li>
                     <li><a href='#' id='multi-item-print-test-report' title='{% trans "Print test reports" %}'><span class='fas fa-file-pdf'></span> {% trans "Print test reports" %}</a></li>
+                </ul>
+            </div>
+            {% if roles.stock.change or roles.stock.delete %}
+            <div class="btn-group">
+                <button id='stock-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" title='{% trans "Stock Options" %}'>
+                    <span class='fas fa-boxes'></span> <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
                     {% if roles.stock.change %}
                     <li><a href="#" id='multi-item-add' title='{% trans "Add to selected stock items" %}'><span class='fas fa-plus-circle'></span> {% trans "Add stock" %}</a></li>
                     <li><a href="#" id='multi-item-remove' title='{% trans "Remove from selected stock items" %}'><span class='fas fa-minus-circle'></span> {% trans "Remove stock" %}</a></li>