mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 10:38:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from bergware/6.4-wip

Browse Source 
Tablesorter updates
This commit is contained in:
tom mortensen
2017-10-03 07:38:14 -07:00
committed by GitHub
parent 700edc2d92 6a3c5320bc
commit 44b878c8fb
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.plugin.manager/Plugins.page
+1 -6
View File
@@ -58,12 +58,7 @@ $(function() {
resize();
$(window).bind('resize',function(){resize(true);});
<?endif;?>
$('#plugin_table').tablesorter({
sortList:[[4,0],[1,0]],
sortAppend:[[1,0]],
headers:{0:{sorter:false},5:{sorter:false}},
textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}
});
$('#plugin_table').tablesorter({sortList:[[4,0],[1,0]],sortAppend:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}},textAttribute:'data'});
$('.desc_readmore').readmore({maxHeight:58});
});
$('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);});
plugins/dynamix.plugin.manager/Update.page
+1 -6
View File
@@ -41,12 +41,7 @@ function update_table(branch) {
$(function() {
$.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{system:'true',audit:<?=$audit?>},function(data) {
if (data) $('#os_list').html(data);
$('#os_table').tablesorter({
sortList:[[4,0],[1,0]],
sortAppend:[[1,0]],
headers:{0:{sorter:false},5:{sorter:false}},
textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}
});
$('#os_table').tablesorter({sortList:[[4,0],[1,0]],sortAppend:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}},textAttribute:'data'});
<?if (preg_match("/^\*\*REBOOT REQUIRED\!\*\*/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md"))):?>
$('#change_branch').prop('disabled',true);
<?endif;?>
plugins/dynamix.plugin.manager/include/ShowPlugins.php
+3 -2
View File
@@ -68,6 +68,7 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
$author = plugin('author',$plugin_file) ?: "anonymous";
//version
$version = plugin('version',$plugin_file) ?: "unknown";
$date = str_replace('.','',$version);
//category
$cat = strpos($version,'rc')!==false ? 'next' : 'stable';
//status
@@ -82,7 +83,7 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
} else {
$latest = plugin('version',$filename);
if (strcmp($latest,$version) > 0) {
$version .= "<br><span class='red-text'>{$latest}</span>";
$version .= "<br><span class='red-text'>$latest</span>";
$status = make_link("update",basename($plugin_file));
$changes_file = $filename;
} else {
@@ -109,7 +110,7 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
echo "<td style='vertical-align:top;width:64px'><p style='text-align:center'>$link</p></td>";
echo "<td><span class='desc_readmore' style='display:block'>$desc</span></td>";
echo "<td>$author</td>";
echo "<td>$version</td>";
echo "<td data='$date'>$version</td>";
echo "<td data='$rank'>$status</td>";
echo "<td>";
if ($system) {
plugins/dynamix/Browse.page
+1 -1
View File
@@ -26,7 +26,7 @@ $(function(){
$.cookie('col',sort[0],{path:'/'});
$.cookie('dir',sort[1],{path:'/'});
});
table.tablesorter({sortList:[[col,dir],[1,0]],sortAppend:[[1,0]],textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}});
table.tablesorter({sortList:[[col,dir],[1,0]],sortAppend:[[1,0]],textAttribute:'data'});
});
});
</script>
plugins/dynamix/NotificationsArchive.page
+1 -1
View File
@@ -48,7 +48,7 @@ function archiveList(init) {
<?if ($display['resize']):?>
resize();
<?endif;?>
$('#archive_table').tablesorter({headers:{5:{sorter:false}},textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}});
$('#archive_table').tablesorter({headers:{5:{sorter:false}},textAttribute:'data'});
} else {
$('#archive_table').trigger('update');
}