move local tablesorter to cdn, add support link to readme

2017-01-30 22:38:30 -07:00 · 2017-01-30 22:38:30 -07:00 · 961a6dd31e
commit 961a6dd31e
parent 12e01ccee9
8 changed files with 221 additions and 21 deletions
--- a/plugins/NerdPack.plg
+++ b/plugins/NerdPack.plg
@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "NerdPack">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2016.10.20">
+<!ENTITY version   "2017.01.30">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@ -18,6 +18,9 @@
 <CHANGES>
 ##&name;
 ###&version;
+- move local tablesorter to cdn
+- add support link to readme
+###2016.10.20
 - fix: php7 compatibility
 ###2016.10.09
 - fix: not creating package directory
@ -234,7 +237,7 @@ echo ""
 echo "-----------------------------------------------------------"
 echo " &name; has been installed."
 echo " This plugin requires Dynamix webGui to operate"
-echo " Copyright 2016, &author;, eschultz"
+echo " Copyright 2016-2017, &author;, eschultz"
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""
@ -255,7 +258,7 @@ rm -f &plgPATH;/&plgNAME;.md5
 echo ""
 echo "-----------------------------------------------------------"
 echo " &name; has been removed."
-echo " Copyright 2016, &author;, eschultz"
+echo " Copyright 2016-2017, &author;, eschultz"
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""
--- a/plugins/NerdPack.xml
+++ b/plugins/NerdPack.xml
@ -11,8 +11,10 @@ This plugin allows installation of extra packages, mostly CLI, for advanced user
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=37541.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/NerdPack.png</Icon>
-<Date>2016-10-20</Date>
+<Date>2017.01.30</Date>
 <Changes>
+###2017.01.30
+
 ###2016.10.20
 - fix: php7 compatibility
 ###2016.10.09
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page
@ -2,8 +2,8 @@ Icon="NerdPack.png"
 Menu="UserPreferences"
 Title="Nerd Pack"
 ---
-<link type="text/css" rel="stylesheet" href="/plugins/tablesorter/css/tablesorter.css">
-<link type="text/css" rel="stylesheet" href="/plugins/tablesorter/css/tablesorter-<?=$display["theme"];?>.css">
+<link type="text/css" rel="stylesheet" href="/plugins/NerdPack/css/tablesorter.css">
+<link type="text/css" rel="stylesheet" href="/plugins/NerdPack/css/tablesorter-<?=htmlspecialchars($display["theme"]);?>.css">
 <link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
 <link type="text/css" rel="stylesheet" href="/plugins/NerdPack/css/NerdPack.css">

@ -31,7 +31,7 @@ Title="Nerd Pack"
 <input type="hidden" name="#file" value="NerdPack/NerdPack.cfg">
 </form>

-<script type="text/javascript" src="/plugins/tablesorter/js/jquery.tablesorter.combined.min.js"></script>
-<script type="text/javascript" src="/plugins/tablesorter/js/parsers/parser-metric.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.28.4/js/jquery.tablesorter.combined.min.js" integrity="sha256-vrKUVFL6e2WKZ1sZ8oMOt3E7+x48uoubEk9qmBEGVH0=" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.28.5/js/parsers/parser-metric.min.js" integrity="sha256-SIkPAaAZ+8/AmijJwnVoHWW+q+fKil6V0NcK+MCnZvk=" crossorigin="anonymous"></script>
 <script type="text/javascript" src="/webGui/javascript/jquery.switchbutton.js"></script>
 <script type="text/javascript" src="/plugins/NerdPack/js/jquery.NerdPack.js"></script>
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/README.md
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/README.md
@ -1,5 +1,5 @@
 **Nerd Tools**

 Click on the icon or go to /Settings/NerdPack to install extra packages, mostly CLI, for advanced users.  Use at your own risk.  Not officially supported by LimeTech.
-
 Contains: iftop, iotop, screen, lshw, kbd, inotify-tools, cpio, unrar, bwm-ng, strace, git, lftp, subversion, python, sshfs, iperf, p7zip...30+ packages
+[Support.](http://http://lime-technology.com/forum/index.php?topic=37541.0)
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter-black.css
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter-black.css
@ -0,0 +1,26 @@
+/* header */
+.tablesorter .headerSortUp,
+.tablesorter .tablesorter-headerSortUp,
+.tablesorter .tablesorter-headerAsc {
+	background-color:#101010;
+}
+.tablesorter .headerSortDown,
+.tablesorter .tablesorter-headerSortDown,
+.tablesorter .tablesorter-headerDesc {
+	background-color:#101010;
+}
+/* filter widget */
+.tablesorter .tablesorter-filter-row {
+	background-color: #101010;
+}
+.tablesorter .tablesorter-filter-row td {
+	background-color: #101010;
+	border-bottom: #000000 1px solid;
+}
+/* filters */
+.tablesorter input.tablesorter-filter,
+.tablesorter select.tablesorter-filter {
+	background-color: #000000;
+	border: 1px solid #101010;
+	color: #808080;
+}
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter-white.css
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter-white.css
@ -0,0 +1,26 @@
+/* header */
+.tablesorter .headerSortUp,
+.tablesorter .tablesorter-headerSortUp,
+.tablesorter .tablesorter-headerAsc {
+	background-color:#E0E0E0;
+}
+.tablesorter .headerSortDown,
+.tablesorter .tablesorter-headerSortDown,
+.tablesorter .tablesorter-headerDesc {
+	background-color:#E0E0E0;
+}
+/* filter widget */
+.tablesorter .tablesorter-filter-row {
+	background-color: #E0E0E0;
+}
+
+.tablesorter .tablesorter-filter-row td {
+	background-color: #E0E0E0;
+	border-bottom: #FFFFFF 1px solid;
+}
+/* filters */
+.tablesorter input.tablesorter-filter,
+.tablesorter select.tablesorter-filter {
+	background-color: #FFFFFF;
+	border: 1px solid #E0E0E0;
+}
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter.css
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/css/tablesorter.css
@ -0,0 +1,143 @@
+.fa {
+	margin:0 0 2px 2px;
+	width: 15px;
+	cursor: pointer;
+}
+
+/* header */
+.tablesorter {
+	font-family:arimo;
+	margin:0 0 15px 0;
+}
+.tablesorter .header,
+.tablesorter .tablesorter-header {
+	background-position: center right;
+	background-repeat: no-repeat;
+	cursor: pointer;
+	outline: none;
+}
+.tablesorter .headerSortUp,
+.tablesorter .tablesorter-headerSortUp,
+.tablesorter .tablesorter-headerAsc {
+	background-image: url(/webGui/images/sort-asc.png);
+}
+.tablesorter .headerSortDown,
+.tablesorter .tablesorter-headerSortDown,
+.tablesorter .tablesorter-headerDesc {
+	background-image: url(/webGui/images/sort-desc.png);
+}
+
+/* tbody */
+.tablesorter td {
+	padding:4px 20px 4px 6px;
+	vertical-align:middle;
+	text-align:justify;
+}
+tablesorter tbody tr.tr_last td{
+	padding:8px 20px 8px 6px;
+}
+
+/* filter widget */
+.tablesorter .tablesorter-filter-row td {
+	line-height: normal;
+	text-align: center; /* center the input */
+	-webkit-transition: line-height 0.1s ease;
+	-moz-transition: line-height 0.1s ease;
+	-o-transition: line-height 0.1s ease;
+	transition: line-height 0.1s ease;
+}
+/* optional disabled input styling */
+.tablesorter .tablesorter-filter-row .disabled {
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	cursor: not-allowed;
+}
+/* filters */
+.tablesorter input.tablesorter-filter,
+.tablesorter select.tablesorter-filter {
+	width: 95%;
+	height: auto;
+	margin: 2px auto;
+	padding: 2px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: height 0.1s ease;
+	-moz-transition: height 0.1s ease;
+	-o-transition: height 0.1s ease;
+	transition: height 0.1s ease;
+}
+/* rows hidden by filtering (needed for child rows) */
+.tablesorter .filtered {
+	display: none;
+}
+
+/* pager wrapper, div */
+.tablesorter-pager {
+  padding: 5px;
+}
+/* pager wrapper, in thead/tfoot */
+td.tablesorter-pager {
+  background-color: #e6eeee;
+  margin: 0; /* needed for bootstrap .pager gets a 18px bottom margin */
+}
+/* pager navigation arrows */
+.tablesorter-pager img {
+  vertical-align: middle;
+  margin-right: 2px;
+  cursor: pointer;
+}
+
+/* pager output text */
+.tablesorter-pager .pagedisplay {
+  padding: 0 5px 0 5px;
+  width: 50px;
+  text-align: center;
+}
+.tablesorter-pager select {
+    margin: 0;
+    padding: 0;
+    min-width: 40px;
+    max-width: 40px;
+}
+/*** css used when "updateArrows" option is true ***/
+/* the pager itself gets a disabled class when the number of rows is less than the size */
+.tablesorter-pager.disabled {
+  display: none;
+}
+/* hide or fade out pager arrows when the first or last row is visible */
+.tablesorter-pager .disabled {
+  /* visibility: hidden */
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  cursor: default;
+}
+
+/* HOVER ROW highlight colors */
+table.hover-highlight tbody > tr:hover > td, /* override tablesorter theme row hover */
+table.hover-highlight tbody > tr.odd:hover > td,
+table.hover-highlight tbody > tr.even:hover > td {
+  background-color: #9FC2E6;
+  color: #000000;
+}
+
+/* ************************************************* */
+/* **** No need to modify the definitions below **** */
+/* ************************************************* */
+.hover-highlight td:hover::after, .hover-highlight th:hover::after {
+  content: '';
+  position: absolute;
+  width: 100%;
+  height: 999em;
+  left: 0;
+  top: -555em;
+  z-index: -1;
+}
+/* required styles */
+.hover-highlight {
+  overflow: hidden;
+}
+.hover-highlight td, .hover-highlight th {
+  position: relative;
+  outline: 0;
+}
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php
@ -55,18 +55,18 @@ foreach ($pkgs_github_array as $pkg_github) {
        }

        $pkg = [
-            'name' => $pkg_github['name'], // add full package name
-            'pkgname' => $pkg_name, // add package name only
-            'pkgnver' => $pkg_nver, // add package name with underscored version
+            'name'       => $pkg_github['name'], // add full package name
+            'pkgname'    => $pkg_name, // add package name only
+            'pkgnver'    => $pkg_nver, // add package name with underscored version
            'pkgversion' => $pkg_version, // add package name with raw version
-            'size' => format_size($pkg_github['size'], 1, '?'), // add package size
-            'installed' => preg_grep($pkg_pattern, $pkgs_installed) ? 'yes' : 'no', // checks if package name is installed
-            'installeq' => in_array(pathinfo($pkg_github['name'], PATHINFO_FILENAME), $pkgs_installed) ? 'yes' : 'no', // checks if package installed equals github exactly
+            'size'       => format_size($pkg_github['size'], 1, '?'), // add package size
+            'installed'  => preg_grep($pkg_pattern, $pkgs_installed) ? 'yes' : 'no', // checks if package name is installed
+            'installeq'  => in_array(pathinfo($pkg_github['name'], PATHINFO_FILENAME), $pkgs_installed) ? 'yes' : 'no', // checks if package installed equals github exactly
            'downloaded' => preg_grep($pkg_pattern, $pkgs_downloaded) ? 'yes' : 'no', // checks if package name is downloaded
            'downloadeq' => in_array($pkg_github['name'], $pkgs_downloaded) ? 'yes' : 'no', // checks if package downloaded equals github exactly
-            'config' => $pkg_set, // install preference
-            'plugins' => $pkg_plgs, // plugins dependency on package
-            'desc' => $pkgs_desc_array[$pkg_name]
+            'config'     => $pkg_set, // install preference
+            'plugins'    => $pkg_plgs, // plugins dependency on package
+            'desc'       => $pkgs_desc_array[$pkg_name]
        ];

        $pkgs_array[] = $pkg;
@ -75,7 +75,7 @@ foreach ($pkgs_github_array as $pkg_github) {

 $return = [
        'packages' => $pkgs_array,
-        'empty' => empty($pkgs_downloaded)
+        'empty'    => empty($pkgs_downloaded)
    ];

 echo json_encode($return);