Merge pull request #72 from jsavargas/ui

add dependencies column

plugin/NerdTools.plg

@@ -3,8 +3,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "NerdTools">
 <!ENTITY author    "UnRAIDES">
-<!ENTITY version   "2023.05.04">
+<!ENTITY version   "2023.05.07">
-<!ENTITY md5       "a8754758eabb13ebc5a278e606c6549e">
+<!ENTITY md5       "ad9092c4776721583702e501e0735649">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY github    "UnRAIDES/unRAID-&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/plugin/&name;.plg">
@@ -17,6 +17,10 @@
 
 <CHANGES>
 ##&name;
+###2023.05.05
+- Enhanced: add dependencies column
+- Enhanced: rearrange multiple columns
+- Enhanced: delete DOWNLOADED column
 ###2023.05.04
 - Enhanced: improvements in the treatment of dependencies
 - Added: python-packaging-21.3 as dependency of borgbackup
@@ -159,7 +163,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 ""
@@ -190,7 +194,7 @@ echo ""
 echo "-----------------------------------------------------------"
 echo " &name; has been removed."
 echo " Copyright 2023, &author;"
-echo " Credits, based on NerdPack plugin of dmacias72, eschultz"		
+echo " based on NerdPack"		
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""

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>

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;
+}

source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php

@@ -12,7 +12,7 @@ if (!is_dir($pkg_extra_path))
     
 
 $pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-desc';
-$pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/$os_version";
+$pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/pkgs";
 $pkg_depends = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-depends';
 
 $desc_file    = $pkg_path.'packages-desc';

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>");
         }