From 14b1f37c26785159a977cac57170f82b833580b9 Mon Sep 17 00:00:00 2001
From: jsavargas <jsavargas@gmail.com>
Date: Wed, 3 May 2023 20:09:55 -0400
Subject: [PATCH] add dependencies column

---
 plugin/NerdTools.plg                                 |  5 ++++-
 .../local/emhttp/plugins/NerdTools/NerdTools.page    | 12 ++++++------
 .../local/emhttp/plugins/NerdTools/css/NerdTools.css |  6 ++++++
 .../emhttp/plugins/NerdTools/js/jquery.NerdTools.js  |  9 ++++-----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/plugin/NerdTools.plg b/plugin/NerdTools.plg
index 4bf0fff..b074286 100644
--- a/plugin/NerdTools.plg
+++ b/plugin/NerdTools.plg
@@ -19,6 +19,9 @@
 ##&name;
 ###2023.05.04
 - Enhanced: improvements in the treatment of dependencies
+- Enhanced: add dependencies column
+- Enhanced: rearrange multiple columns
+- Enhanced: delete DOWNLOADED column
 ###2023.05.02
 - Update: borgbackup-1.2.4
 - Update: python3-3.9.16-3
@@ -159,7 +162,7 @@ echo "-----------------------------------------------------------"
 echo " &name; has been installed."
 echo ""
 echo " Copyright 2023, &author;"
-echo " Credits, based on NerdPack plugin of dmacias72, eschultz"
+echo " based on NerdPack"
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/NerdTools.page b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/NerdTools.page
index 4bd6d55..0ffc8d0 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/NerdTools.page
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/NerdTools.page
@@ -23,13 +23,13 @@ table.tablesorter tbody tr:nth-child(even) {
 <table class="tablesorter hover-highlight" id="tblPackages">
     <thead>
         <tr>
-            <th class="filter-name" data-placeholder="Search..."> Name </th>
-            <th class="filter-version" data-placeholder="by status"> Status </th>
-            <th class="sorter-metric filter-false" data-placeholder="by size" data-metric-name-full="byte|Byte|BYTE" data-metric-name-abbr="b|B"> Size </th>
-            <th class="filter-downloaded" data-placeholder="by download"> Downloaded </th>
-            <th class="filter-installed" data-placeholder="by install"> Installed </th>
-            <th class="filter-false" data-placeholder="Search..."> Installed Version </th>
             <th class="parser-false filter-false" nowrap="nowrap"></th>
+            <th class="filter-name" data-placeholder="Search..."> Name </th>
+            <th class="filter-false" data-placeholder="by dependencies"> Dependencies </th>
+            <th class="filter-version" data-placeholder="by status"> Status </th>
+            <th class="filter-installed" data-placeholder="by install"> Installed </th>
+            <th class="sorter-metric filter-false" data-placeholder="by size" data-metric-name-full="byte|Byte|BYTE" data-metric-name-abbr="b|B"> Size </th>
+            <th class="filter-false" data-placeholder="Search..."> Installed Version </th>
         </tr>
     </thead>
     <tbody>
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/css/NerdTools.css b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/css/NerdTools.css
index c552e23..df5f1a4 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/css/NerdTools.css
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/css/NerdTools.css
@@ -19,3 +19,9 @@
     white-space:nowrap;
     cursor: inherit;
 }
+table.tablesorter tbody td.wrapper  {
+    white-space: nowrap;
+}
+table.tablesorter .checked  {
+    width: 90px;
+}
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
index d5044a4..4d61ced 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
@@ -13,7 +13,6 @@ $(function(){
             filter_reset: '.reset',
             filter_functions: {
                 '.filter-version': true,
-                '.filter-downloaded': true,
                 '.filter-installed': true
             }
         }
@@ -66,13 +65,13 @@ function packageQuery(force) {
            }
 
             $('#tblPackages tbody').append("<tr>"+
-            "<td class='package' title='"+data.packages[i].desc+"'>"+data.packages[i].name+"</td>"+ // package name
+            "<td class='checked'><input class='pkgcheckbox' id='"+data.packages[i].pkgname+"' type='checkbox' "+Checked+">"+
+            "<td class='package wrapper' title='"+data.packages[i].desc+"'>"+data.packages[i].name+"</td>"+ // package name
+            "<td>"+data.packages[i].dependencies+"</td>"+ // package status
             "<td>"+Update+"</td>"+ // package status
-            "<td>"+data.packages[i].size+"</td>"+ // package size
             "<td>"+Downloaded+"</td>"+ // package downloaded
-            "<td>"+Installed+"</td>"+ // package installed
+            "<td>"+data.packages[i].size+"</td>"+ // package size
             "<td>"+data.packages[i].actualpkgv+"</td>"+ // package dependents
-            "<td><input class='pkgcheckbox' id='"+data.packages[i].pkgname+"' type='checkbox' "+Checked+">"+
             "<input class='pkgvalue' type='hidden' id='"+data.packages[i].pkgname+"_value' name='"+data.packages[i].pkgnver+"' value='"+data.packages[i].config+"'></td>"+
             "</tr>");
         }