From 14c6f5c9cc171bc75f57ec50d45525d62c22ad47 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Mon, 16 Apr 2018 17:16:03 -0600
Subject: [PATCH] Mostly fix item table width issues

---
 lib/getitemtable.php |  4 ++--
 pages/items.php      | 24 ++++++++++++------------
 static/js/items.js   |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/getitemtable.php b/lib/getitemtable.php
index 16d175b..e32ea33 100644
--- a/lib/getitemtable.php
+++ b/lib/getitemtable.php
@@ -117,8 +117,8 @@ $out['recordsFiltered'] = $recordsFiltered;
 
 $usercache = [];
 for ($i = 0; $i < count($items); $i++) {
-    $items[$i]["editbtn"] = '<a class="btn btn-primary btn-sm" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '"><i class="fas fa-edit"></i> ' . lang("edit", false) . '</a>';
-    $items[$i]["clonebtn"] = '<a class="btn btn-success btn-sm" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '&clone=1"><i class="fas fa-clone"></i> ' . lang("clone", false) . '</a>';
+    $items[$i]["editbtn"] = '<a class="btn btn-primary" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '"><i class="fas fa-edit"></i> ' . lang("edit", false) . '</a>';
+    $items[$i]["clonebtn"] = '<a class="btn btn-success" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '&clone=1"><i class="fas fa-clone"></i> ' . lang("clone", false) . '</a>';
     if (is_null($items[$i]['userid'])) {
         $items[$i]["username"] = "";
     } else {
diff --git a/pages/items.php b/pages/items.php
index a82209c..3fa4b5e 100644
--- a/pages/items.php
+++ b/pages/items.php
@@ -27,13 +27,13 @@ redirectifnotloggedin();
             <th data-priority="0"></th>
             <th data-priority="1"><?php lang('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
-            <th data-priority="2"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
-            <th data-priority="3"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
+            <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
+            <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
+            <th data-priority="2"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
+            <th data-priority="5"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
             <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
-            <th data-priority="3"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
+            <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
+            <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -43,13 +43,13 @@ redirectifnotloggedin();
             <th data-priority="0"></th>
             <th data-priority="1"><?php lang('actions'); ?></th>
             <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
-            <th data-priority="2"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
-            <th data-priority="3"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
+            <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
+            <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
+            <th data-priority="2"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
+            <th data-priority="5"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
             <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th>
-            <th data-priority="4"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
-            <th data-priority="3"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
+            <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
+            <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
         </tr>
     </tfoot>
 </table>
diff --git a/static/js/items.js b/static/js/items.js
index d4266e4..5fe0cbd 100644
--- a/static/js/items.js
+++ b/static/js/items.js
@@ -49,7 +49,7 @@ var itemtable = $('#itemtable').DataTable({
             json.items.forEach(function (row) {
                 json.data.push([
                     "",
-                    "<span class='btn-group'>" + row.editbtn + " " + row.clonebtn + "</span>",
+                    "<span class='btn-group-vertical btn-group-sm'>" + row.editbtn + " " + row.clonebtn + "</span>",
                     row.name,
                     row.catname,
                     row.locname + " (" + row.loccode + ")",