diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page index c7461c507..9f0e15c97 100644 --- a/plugins/dynamix.plugin.manager/Plugins.page +++ b/plugins/dynamix.plugin.manager/Plugins.page @@ -58,7 +58,12 @@ $(function() { resize(); $(window).bind('resize',function(){resize(true);}); - $('#plugin_table').tablesorter({sortList:[[4,0],[1,0]],sortAppend:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}}}); + $('#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();} + }); $('.desc_readmore').readmore({maxHeight:58}); }); $('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);}); diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page index e88cac842..69b705e6c 100644 --- a/plugins/dynamix.plugin.manager/Update.page +++ b/plugins/dynamix.plugin.manager/Update.page @@ -41,7 +41,12 @@ function update_table(branch) { $(function() { $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{system:'true',audit:},function(data) { if (data) $('#os_list').html(data); - $('#os_table').tablesorter({sortList:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}}}); + $('#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();} + }); $('#change_branch').prop('disabled',true); diff --git a/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/plugins/dynamix.plugin.manager/include/ShowPlugins.php index 291474ac8..acab07f24 100644 --- a/plugins/dynamix.plugin.manager/include/ShowPlugins.php +++ b/plugins/dynamix.plugin.manager/include/ShowPlugins.php @@ -92,6 +92,11 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) { } } } + if (strpos($status,'update')!==false) $rank = '0'; + elseif (strpos($status,'install')!==false) $rank = '1'; + elseif ($status=='need check') $rank = '2'; + elseif ($status=='up-to-date') $rank = '3'; + else $rank = '4'; $changes = plugin('changes',$changes_file); if ($changes !== false) { $txtfile = "/tmp/plugins/".basename($plugin_file,'.plg').".txt"; @@ -101,11 +106,11 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) { //write plugin information $empty = false; echo ""; - echo "

{$link}

"; - echo "{$desc}"; - echo "{$author}"; - echo "{$version}"; - echo "{$status}"; + echo "

$link

"; + echo "$desc"; + echo "$author"; + echo "$version"; + echo "$status"; echo ""; if ($system) { if ($os) { diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index 3300801c7..e444a1817 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -66,7 +66,7 @@ function parity_warning(form) { $('').attr({type:'hidden',name:'cmdStart',value:'submit'}).appendTo($(form)); if (form.md_invalidslot.checked) { - swal({title:'Proceed to start',text:text,html:true,type:'warning',confirmButtonText:'Proceed',confirmButtonColor:'#FFFFFF',showCancelButton:true},function(){form.submit();}); + swal({title:'Proceed to start',text:text,html:true,type:'warning',confirmButtonText:'Proceed',showCancelButton:true},function(){form.submit();}); } else { form.submit(); } diff --git a/plugins/dynamix/icons/folderup.png b/plugins/dynamix/icons/folderup.png new file mode 100644 index 000000000..61c870466 Binary files /dev/null and b/plugins/dynamix/icons/folderup.png differ diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php index 666ef5048..c08ec93df 100644 --- a/plugins/dynamix/include/Browse.php +++ b/plugins/dynamix/include/Browse.php @@ -38,7 +38,7 @@ if ($user) { } echo "TypeNameSizeLast ModifiedLocation"; -if ($link = parent_link()) echo "
$link"; +if ($link = parent_link()) echo "
$link"; foreach ($file as $row) { $attr = explode('|',$row); diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php index 5ce03c2b8..6cdaedb99 100644 --- a/plugins/dynamix/include/DiskList.php +++ b/plugins/dynamix/include/DiskList.php @@ -112,6 +112,6 @@ foreach ($disks as $name => $disk) { } } if ($row==0) { - echo "There are no exportable disk shares"; + echo "There are no exportable disk shares"; } ?> diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index e39b43830..361475ef3 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -1,7 +1,8 @@ html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar} body{font-size:14px;color:#606E7F;background-color:#E4E2E4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} ::-webkit-scrollbar{display:none} -#template{min-width:1080px;max-width:1920px;margin:0} +@media (max-width:1920px){#template{min-width:1080px;margin:0}} +@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}} img{border:0;text-decoration:none;vertical-align:middle} p{text-align:left} p.centered{text-align:left} @@ -19,7 +20,7 @@ i.title{display:none} pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px} pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px} big{font-size:15px;font-weight:bold;text-transform:uppercase} -hr{border-color:#EDEAEF} +hr{border-color:#F3F0F4} input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:13px;border:1px solid #9F9180;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#9F9180;background:#EDEAEF} input[type=checkbox]{vertical-align:middle;margin-right:6px} @@ -131,7 +132,7 @@ table.disk_status tr>td+td{width:auto} table.disk_status tr>td+td+td{width:6.5%;text-align:center;padding-left:4px;padding-right:8px} table.disk_status tr>td+td+td+td{text-align:right;padding-left:0;padding-right:12px} table.disk_status tr td:last-child{width:4%;padding-right:10px} -table.disk_status tbody tr{border-bottom:#EDEAEF 1px solid;line-height:30px} +table.disk_status tbody tr{border-bottom:#F3F0F4 1px solid;line-height:30px} table.disk_status.stats tr>td+td{text-align:left;padding-left:0;padding-right:12px} table.array_status{line-height:30px} table.array_status td{padding:12px 0} @@ -139,7 +140,7 @@ table.array_status td:first-child{text-transform:uppercase} table.array_status tr>td{text-align:left;white-space:nowrap;padding-left:12px;width:30%} table.array_status tr>td+td{padding-left:2px;width:20%} table.array_status tr>td+td+td{width:auto} -table.array_status td.line{border-top:1px solid #EDEAEF} +table.array_status td.line{border-top:1px solid #F3F0F4} table.settings{padding-top:8px;line-height:42px} table.settings td:first-child{width:35%;padding-left:12px} table.settings tr>td+td{line-height:16px} @@ -151,7 +152,7 @@ table.share_status tr>td{text-align:left;padding-left:12px} table.share_status tr>td+td{padding-left:0} table.share_status tr.share_status_size>td{padding-left:40px} table.share_status tr.share_status_size>td+td{padding-left:15px} -table.share_status tbody tr{border-bottom:#EDEAEF 1px solid;line-height:30px} +table.share_status tbody tr{border-bottom:#F3F0F4 1px solid;line-height:30px} table.share_status tbody tr:last-child td{border-bottom:#606E7F 1px solid} table.share_status tbody tr.alert{color:#F0000C;background-color:#FF9E9E} table.share_status tbody tr.warn{color:#E68A00;background-color:#FEEFB3} @@ -159,7 +160,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed thead tr>td+td{font-size:11px} table.share_status.fixed tr td:first-child{width:100px} table.share_status.fixed tr>td+td{min-width:30px;text-align:center;padding:0} -table.share_status.fixed tbody tr{border-bottom:1px #EDEAEF solid} +table.share_status.fixed tbody tr{border-bottom:1px #F3F0F4 solid} table.share_status.fixed tbody tr td:first-child{padding-right:10px} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} @@ -234,23 +235,23 @@ div.tab [type=radio]+label~.content{display:none} div.tab [type=radio]:checked+label~.content{display:inline} div.tab [type=radio]+label{position:relative;padding:10px 10px;margin-right:2px;border-top-left-radius:12px;border-top-right-radius:12px;border:#004E86 1px solid;border-bottom:none} div.tab [type=radio]+label img{display:none} -div.Panel{width:25%;height:auto;float:left;margin:0;padding:5px;border-right:#EDEAEF 1px solid;border-bottom:#EDEAEF 1px solid;box-sizing:border-box} +div.Panel{width:25%;height:auto;float:left;margin:0;padding:5px;border-right:#F3F0F4 1px solid;border-bottom:#F3F0F4 1px solid;box-sizing:border-box} div.Panel:hover{background-color:#EDEAEF} div.Panel:hover .PanelText{text-decoration:underline} div.Panel br,.vmtemplate br{display:none} div.Panel img.PanelImg{float:left;width:auto;max-width:32px;height:32px;margin:10px} div.Panel i.PanelIcon{float:left;font-size:32px;margin:10px} div.Panel .PanelText{font-size:15px;padding-top:16px;text-align:center} -div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #EDEAEF;border-radius:5px;line-height:20px;height:100px;width:100px} +div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #F3F0F4;border-radius:5px;line-height:20px;height:100px;width:100px} div.user-list img{width:auto;max-width:48px;height:48px;margin-bottom:16px} div.user-list:hover{background-color:#EDEAEF} div.vmheader{display:block;clear:both} div.vmtemplate:hover{background-color:#EDEAEF} -div.vmtemplate{height:120px;width:120px;border:1px solid #EDEAEF} +div.vmtemplate{height:120px;width:120px;border:1px solid #F3F0F4} div.vmtemplate img{margin-top:20px} -div.up{margin-top:-20px;border:1px solid #EDEAEF;padding:4px 6px;overflow:auto} +div.up{margin-top:-20px;border:1px solid #F3F0F4;padding:4px 6px;overflow:auto} pre.up{margin-top:0} -pre{border:1px solid #EDEAEF;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} +pre{border:1px solid #F3F0F4;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} iframe#progressFrame{position:fixed;bottom:32px;left:60px;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:11px;color:#808080;white-space:nowrap;z-index:-2} dl{margin-top:0;padding-left:12px;line-height:26px} dt{clear:left;float:left;width:35%} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index ce4ab2d7b..8abd07e56 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -1,6 +1,7 @@ html{font-family:arimo} body{font-size:12px;color:#808080;background-color:#000000;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -#template{min-width:1080px;max-width:1920px;margin:0 10px} +@media (max-width:1920px){#template{min-width:1080px;margin:0 10px}} +@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}} img{border:0;text-decoration:none;vertical-align:middle} p{text-align:justify} p.centered{text-align:left} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index f619e5721..cb0d2d883 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -1,7 +1,8 @@ html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar} body{font-size:14px;color:#606E7F;background-color:#1B1D1B;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} ::-webkit-scrollbar{display:none} -#template{min-width:1080px;max-width:1920px;margin:0} +@media (max-width:1920px){#template{min-width:1080px;margin:0}} +@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}} img{border:0;text-decoration:none;vertical-align:middle} p{text-align:left} p.centered{text-align:left} @@ -19,7 +20,7 @@ i.title{display:none} pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px} pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px} big{font-size:15px;font-weight:bold;text-transform:uppercase} -hr{border-color:#121510} +hr{border-color:#0C0F0B} input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:13px;border:1px solid #606E7F;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#606E7F;background:#121510} input[type=checkbox]{vertical-align:middle;margin-right:6px} @@ -131,7 +132,7 @@ table.disk_status tr>td+td{width:auto} table.disk_status tr>td+td+td{width:6.5%;text-align:center;padding-left:4px;padding-right:8px} table.disk_status tr>td+td+td+td{text-align:right;padding-left:0;padding-right:12px} table.disk_status tr td:last-child{width:4%;padding-right:10px} -table.disk_status tbody tr{border-bottom:#121510 1px solid;line-height:30px} +table.disk_status tbody tr{border-bottom:#0C0F0B 1px solid;line-height:30px} table.disk_status.stats tr>td+td{text-align:left;padding-left:0;padding-right:12px} table.array_status{line-height:30px} table.array_status td{padding:12px 0} @@ -139,7 +140,7 @@ table.array_status td:first-child{text-transform:uppercase} table.array_status tr>td{text-align:left;white-space:nowrap;padding-left:12px;width:30%} table.array_status tr>td+td{padding-left:2px;width:20%} table.array_status tr>td+td+td{width:auto} -table.array_status td.line{border-top:1px solid #121510} +table.array_status td.line{border-top:1px solid #0C0F0B} table.settings{padding-top:8px;line-height:42px} table.settings td:first-child{width:35%;padding-left:12px} table.settings tr>td+td{line-height:16px} @@ -151,7 +152,7 @@ table.share_status tr>td{text-align:left;padding-left:12px} table.share_status tr>td+td{padding-left:0} table.share_status tr.share_status_size>td{padding-left:40px} table.share_status tr.share_status_size>td+td{padding-left:15px} -table.share_status tbody tr{border-bottom:#121510 1px solid;line-height:30px} +table.share_status tbody tr{border-bottom:#0C0F0B 1px solid;line-height:30px} table.share_status tbody tr:last-child td{border-bottom:#606E7F 1px solid} table.share_status tbody tr.alert{color:#F0000C;background-color:#FF9E9E} table.share_status tbody tr.warn{color:#E68A00;background-color:#FEEFB3} @@ -159,7 +160,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed thead tr>td+td{font-size:11px} table.share_status.fixed tr td:first-child{width:100px} table.share_status.fixed tr>td+td{min-width:30px;text-align:center;padding:0} -table.share_status.fixed tbody tr{border-bottom:1px #121510 solid} +table.share_status.fixed tbody tr{border-bottom:1px #0C0F0B solid} table.share_status.fixed tbody tr td:first-child{padding-right:10px} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} @@ -234,23 +235,23 @@ div.tab [type=radio]+label~.content{display:none} div.tab [type=radio]:checked+label~.content{display:inline} div.tab [type=radio]+label{position:relative;padding:10px 10px;margin-right:2px;border-top-left-radius:12px;border-top-right-radius:12px;border:#004E86 1px solid;border-bottom:none} div.tab [type=radio]+label img{display:none} -div.Panel{width:25%;height:auto;float:left;margin:0;padding:5px;border-right:#121510 1px solid;border-bottom:#121510 1px solid;box-sizing:border-box} +div.Panel{width:25%;height:auto;float:left;margin:0;padding:5px;border-right:#0C0F0B 1px solid;border-bottom:#0C0F0B 1px solid;box-sizing:border-box} div.Panel:hover{background-color:#121510} div.Panel:hover .PanelText{text-decoration:underline} div.Panel br,.vmtemplate br{display:none} div.Panel img.PanelImg{float:left;width:auto;max-width:32px;height:32px;margin:10px} div.Panel i.PanelIcon{float:left;font-size:32px;margin:10px} div.Panel .PanelText{font-size:15px;padding-top:16px;text-align:center} -div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #121510;border-radius:5px;line-height:20px;height:100px;width:100px} +div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #0C0F0B;border-radius:5px;line-height:20px;height:100px;width:100px} div.user-list img{width:auto;max-width:48px;height:48px;margin-bottom:16px} div.user-list:hover{background-color:#121510} div.vmheader{display:block;clear:both} div.vmtemplate:hover{background-color:#121510} -div.vmtemplate{height:120px;width:120px;border:1px solid #121510} +div.vmtemplate{height:120px;width:120px;border:1px solid #0C0F0B} div.vmtemplate img{margin-top:20px} -div.up{margin-top:-20px;border:1px solid #121510;padding:4px 6px;overflow:auto} +div.up{margin-top:-20px;border:1px solid #0C0F0B;padding:4px 6px;overflow:auto} pre.up{margin-top:0} -pre{border:1px solid #121510;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} +pre{border:1px solid #0C0F0B;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} iframe#progressFrame{position:fixed;bottom:32px;left:60px;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:11px;color:#808080;white-space:nowrap;z-index:-2} dl{margin-top:0;padding-left:12px;line-height:26px} dt{clear:left;float:left;width:35%} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index 034b2167a..bead8717d 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -1,6 +1,7 @@ html{font-family:arimo} body{font-size:12px;color:#303030;background-color:#FFFFFF;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -#template{min-width:1080px;max-width:1920px;margin:0 10px} +@media (max-width:1920px){#template{min-width:1080px;margin:0 10px}} +@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}} img{border:0;text-decoration:none;vertical-align:middle} p{text-align:justify} p.centered{text-align:left}