From 4e810dedf0d44b5725281bf81bf38ae9c2495766 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 26 Apr 2018 11:39:39 +0200 Subject: [PATCH 1/5] Adjusted TAB color styling for all themes --- plugins/dynamix/styles/default-azure.css | 6 +++--- plugins/dynamix/styles/default-black.css | 6 +++--- plugins/dynamix/styles/default-gray.css | 6 +++--- plugins/dynamix/styles/default-white.css | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 3ff9ddf2d..2cf3ba993 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -219,11 +219,11 @@ label+.content{margin-top:64px} div.tabs{position:relative;margin:110px 30px 30px 100px;background-color:#E4E2E4} div.tab{float:left;margin-top:23px} div.tab input[id^='tab']{display:none} -div.tab [type=radio]+label:hover{background:#606E7F;color:#B0B0B0;cursor:pointer;border-color:#0072C6} -div.tab [type=radio]:checked+label{cursor:default;background:#606E7F;color:#B0B0B0} +div.tab [type=radio]+label:hover{cursor:pointer;border-color:#004E86;opacity:1} +div.tab [type=radio]:checked+label{cursor:default;background:transparent;color:#606E7F;border-color:#004E86;opacity:1} 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{position:relative;padding:10px 10px;margin-right:2px;border-top-left-radius:12px;border-top-right-radius:12px;background:#606E7F;color:#B0B0B0;border:#8B98A7 1px solid;border-bottom:none;opacity:0.5} div.tab [type=radio]+label img{display:none} 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} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 5e5d8fd1d..5757e5a69 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -211,11 +211,11 @@ div.content.shift{margin-top:-70px} div.tabs{position:relative;margin:24px 0 0 0} div.tab{float:left;margin:0 0 12px 0} div.tab input[id^="tab"]{display:none} -div.tab [type=radio]+label:hover{background:#000000;color:#478406;cursor:pointer} -div.tab [type=radio]:checked+label{cursor:default;background:-webkit-radial-gradient(#303030,#505050);background:linear-gradient(#303030,#505050);color:#808080} +div.tab [type=radio]+label:hover{background:transparent;color:#478406;cursor:pointer;opacity:1} +div.tab [type=radio]:checked+label{cursor:default;background:transparent;color:#808080;opacity:1} div.tab [type=radio]+label~.content{display:none} div.tab [type=radio]:checked+label~.content{display:inline} -div.tab [type=radio]+label{position:relative;font-size:14px;padding:4px 10px;margin-right:2px;border-top-left-radius:5px;border-top-right-radius:5px;border:1px solid #303030;border-bottom:1px solid #606060;background:-webkit-radial-gradient(#101010,#202020);background:linear-gradient(#101010,#202020)} +div.tab [type=radio]+label{position:relative;font-size:14px;padding:4px 10px;margin-right:2px;border-top-left-radius:5px;border-top-right-radius:5px;border:1px solid #303030;border-bottom:none;background:-webkit-radial-gradient(#101010,#202020);background:linear-gradient(#101010,#202020);opacity:0.6} div.tab [type=radio]+label img{padding-right:4px} div.Panel{text-align:center;float:left;margin:0 30px 30px 12px;height:80px} div.Panel .PanelText{padding-top:10px} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index 21bcb6c7d..4c8947c2b 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -219,11 +219,11 @@ label+.content{margin-top:64px} div.tabs{position:relative;margin:110px 30px 30px 100px;background-color:#1B1D1B} div.tab{float:left;margin-top:23px} div.tab input[id^='tab']{display:none} -div.tab [type=radio]+label:hover{background:#606E7F;color:#B0B0B0;cursor:pointer;border-color:#0072C6} -div.tab [type=radio]:checked+label{cursor:default;background:#606E7F;color:#B0B0B0} +div.tab [type=radio]+label:hover{cursor:pointer;border-color:#0072C6;opacity:1} +div.tab [type=radio]:checked+label{cursor:default;background:transparent;color:#606E7F;border-color:#004E86;opacity:1} 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{position:relative;padding:10px 10px;margin-right:2px;border-top-left-radius:12px;border-top-right-radius:12px;background:#606E7F;color:#B0B0B0;border:#8B98A7 1px solid;border-bottom:none;opacity:0.5} div.tab [type=radio]+label img{display:none} 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} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index c4df0144f..5c8b9f7b9 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -211,11 +211,11 @@ div.content.shift{margin-top:-70px} div.tabs{position:relative;margin:24px 0 0 0} div.tab{float:left;margin:0 0 12px 0} div.tab input[id^="tab"]{display:none} -div.tab [type=radio]+label:hover{background:#FFFFFF;color:#478406;cursor:pointer} -div.tab [type=radio]:checked+label{cursor:default;background:-webkit-radial-gradient(#F8F8F8,#E8E8E8);background:linear-gradient(#F8F8F8,#E8E8E8);color:#303030} +div.tab [type=radio]+label:hover{background:transparent;color:#478406;cursor:pointer;opacity:1} +div.tab [type=radio]:checked+label{cursor:default;background:transparent;color:#303030;opacity:1} div.tab [type=radio]+label~.content{display:none} div.tab [type=radio]:checked+label~.content{display:inline} -div.tab [type=radio]+label{position:relative;font-size:14px;padding:4px 10px;margin-right:2px;border-top-left-radius:5px;border-top-right-radius:5px;border:1px solid #E8E8E8;border-bottom-color:#D8D8D8;background:-webkit-radial-gradient(#D8D8D8,#B8B8B8);background:linear-gradient(#D8D8D8,#B8B8B8)} +div.tab [type=radio]+label{position:relative;font-size:14px;padding:4px 10px;margin-right:2px;border-top-left-radius:5px;border-top-right-radius:5px;border:1px solid #E8E8E8;border-bottom:none;background:-webkit-radial-gradient(#D8D8D8,#B8B8B8);background:linear-gradient(#D8D8D8,#B8B8B8);opacity:0.6} div.tab [type=radio]+label img{padding-right:4px} div.Panel{text-align:center;float:left;margin:0 30px 30px 12px;height:80px} div.Panel .PanelText{padding-top:10px} From e1bbfc7f90450c056f8ddb5b1e9761d7e304f1d8 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 26 Apr 2018 11:40:29 +0200 Subject: [PATCH 2/5] Added branch type to previous version --- plugins/dynamix.plugin.manager/Update.page | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page index a88f39c4c..2c4eb3740 100644 --- a/plugins/dynamix.plugin.manager/Update.page +++ b/plugins/dynamix.plugin.manager/Update.page @@ -16,7 +16,7 @@ Tag="thumbs-up" ?> "; -$version = $date = 'unknown'; +$version = $branch = $date = 'unknown'; $bzroot = file_exists('/boot/previous/bzroot'); $check = $notify['unraidos'] ? 0 : 1; @@ -29,6 +29,7 @@ if (file_exists('/boot/previous/changes.txt')) { break; } } + $branch = strpos($version,'rc')===false ? 'Stable' : 'Next'; } ?> @@ -86,6 +87,6 @@ $(function() { ComponentAuthorVersionStatusBranch -unRAID Server OS (previous)LimeTech +unRAID Server OS (previous)LimeTech From 0160c8c01ce8dbfaf7ab5bcee9430b638bb6d735 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 27 Apr 2018 08:11:10 +0200 Subject: [PATCH 3/5] Minor code changes --- plugins/dynamix/include/DashUpdate.php | 14 +++++++------- plugins/dynamix/include/DeviceList.php | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index 2475776eb..fd801c707 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -123,24 +123,24 @@ function stage($i) { } } else { $d = $i ? ($now ? $D : today($i)) : today(last_day()-6); - $x = $i ?: last_day()-6; - $D = mkdate($d, $x); + $s = $i ?: last_day()-6; + $D = mkdate($d, $s); $t = mktime($h,$m,0,$M,$D,$Y)-$time; // first day if ($t < 0) { - $D = mkdate(next_day($d), $x); + $D = mkdate(next_day($d), $s); $t = mktime($h,$m,0,$M,$D,$Y)-$time; // next day } if ($t < 0) { $M = find_month($M+1); - $x = $i ?: last_day()-6; - $D = mkdate(today($x), $x); + $s = $i ?: last_day()-6; + $D = mkdate(today($s), $s); $t = mktime($h,$m,0,$M,$D,$Y)-$time; // next month } if ($t < 0) { $Y++; $M = find_month(1); - $x = $i ?: last_day()-6; - $D = mkdate(today($x), $x); + $s = $i ?: last_day()-6; + $D = mkdate(today($s), $s); $t = mktime($h,$m,0,$M,$D,$Y)-$time; // next year } } diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index c97dcc4c1..3cb8f24d2 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -1,6 +1,6 @@ 0) { $data[] = my_scale($var['mdResync']*1024,$unit,-1)." $unit"; $data[] = my_clock(floor((time()-$var['sbUpdated'])/60)); - $data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,substr($display['number'],0,1),'')." %)"; + $data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,$display['number'][0],'')." %)"; $data[] = my_scale($var['mdResyncDb']*1024/$var['mdResyncDt'],$unit, 1)." $unit/sec"; $data[] = my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)); $data[] = $var['sbSyncErrs']; From be36a08c242710ee7ddd80fe3c1b61ebb43d9cb9 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 27 Apr 2018 08:41:56 +0200 Subject: [PATCH 4/5] Minor code changes --- plugins/dynamix.docker.manager/include/DockerClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index a04323318..b4a896b2e 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -28,7 +28,7 @@ $dockerManPaths = [ ]; // load network variables if needed. -if (!isset($eth0) && is_file("$docroot/state/network.ini")) extract(parse_ini_file("$docroot/state/network.ini",true)); +if (!isset($eth0)) extract(parse_ini_file("$docroot/state/network.ini",true)); $host = $eth0['IPADDR:0'] ?? '0.0.0.0'; // Docker configuration file - guaranteed to exist From 2c8b3a617517d67509f0db4589134c0ac1dba0a7 Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 28 Apr 2018 13:01:59 +0200 Subject: [PATCH 5/5] Suppress auto generated hyperlinks by MS Edge --- plugins/dynamix/include/DefaultPageLayout.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index c73f2457d..043ff25a8 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -16,6 +16,7 @@ <?=$var['NAME']?>/<?=$myPage['name']?> + ">