From 4a644d65b2e563b7f1c1a4ed2a715922825f9644 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 27 Aug 2018 10:16:20 +0200 Subject: [PATCH 1/4] Header style update --- plugins/dynamix/include/DefaultPageLayout.php | 29 ++++++++++++++----- plugins/dynamix/styles/default-azure.css | 11 ++++--- plugins/dynamix/styles/default-black.css | 11 ++++--- plugins/dynamix/styles/default-gray.css | 11 ++++--- plugins/dynamix/styles/default-white.css | 11 ++++--- 5 files changed, 41 insertions(+), 32 deletions(-) diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index cfa949875..7e48204d8 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -85,13 +85,21 @@ function updateTime() { before = now; if (expiretime > 0) { var remainingtime = expiretime - now.getTime()/1000; - if (remainingtime <= 0) { - $('#licenseexpire').html('Trial period: expired (click here for details)'); - } else { + if (remainingtime > 0) { days = parseInt(remainingtime/86400); hour = parseInt(remainingtime/3600%24); mins = parseInt(remainingtime/60%60); - $('#licenseexpire').html('Trial period: '+((days|hour|mins)?(days?plus(days,'day',true):(hour?plus(hour,'hour',true):plus(mins,'minute',true))):'less than a minute')+' remaining (click here for details)'); + if (days) { + $('#licenseexpire').html(plus(days,'day',true)+' remaining'); + } else if (hour) { + $('#licenseexpire').html(plus(hour,'hour',true)+' remaining').addClass('orange-text'); + } else if (mins) { + $('#licenseexpire').html(plus(mins,'minute',true)+' remaining').addClass('red-text'); + } else { + $('#licenseexpire').html('less than a minute remaining').addClass('red-text'); + } + } else { + $('#licenseexpire').html('expired').addClass('red-text'); } } setTimeout(updateTime,1000); @@ -296,13 +304,12 @@ $.ajaxPrefilter(function(s, orig, xhr){ @@ -487,6 +494,12 @@ $('.back_to_top').click(function(event) { return false; }); $(function() { + + + $('#licensetype').addClass('orange-text'); + + $('#licensetype').addClass('red-text'); + if ($("div#nav-right").css('float').toLowerCase() == 'right') { var origNavRightWidth = $('div#nav-right').width(); var adjustMenuSize = function() { diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index f3640a4b7..0bbf3c1dd 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -43,15 +43,14 @@ select.slot{min-width:440px;max-width:440px} input.narrow{width:166px} input.trim{width:50px} form+p{display:none} -#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#edeaef;background-size:100% 90px;border-bottom:#9794a0 1px solid} -#header .logo{float:left;margin-left:75px;color:#e22828;font-size:24px;font-weight:bold;letter-spacing:2px} -#header .logo svg{height:28px;display:block;margin:17px 50px 4px 0} -#header .logo #licensetype{font-style:italic} -#header .logo a{color:#e22828} -#header .logo #licenseexpire{margin-left:40px;letter-spacing:0} +#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#edeaef;background-size:100% 90px;background-repeat:no-repeat;border-bottom:#9794a0 1px solid} +#header .logo{float:left;margin-left:75px;color:#e22828;width:160px;text-align:center} +#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(237,234,239,0.7);padding:7px 12px} #header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #f15a2c} #header .text-right{float:right;text-align:left;padding-left:5px} +#header .text-right a{color:#606e7f} +#header .text-right #licensetype{font-weight:bold;font-style:italic;margin-right:4px} #menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #edeaef} #nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl;letter-spacing:2px} #nav-block::-webkit-scrollbar{display:none} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 5c10f0f73..463503d3d 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -43,15 +43,14 @@ select.auto{min-width:auto} select.slot{min-width:440px;max-width:440px} input.narrow{width:166px} input.trim{width:50px} -#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;color:#1c1b1b;background:#f2f2f2;background-size:100% 90px} -#header .logo{float:left;margin-left:10px;color:#e22828;font-size:24px;font-weight:bold;letter-spacing:2px} -#header .logo svg{height:28px;display:block;margin:17px 50px 4px 0} -#header .logo #licensetype{font-style:italic} -#header .logo a{color:#e22828} -#header .logo #licenseexpire{margin-left:40px;letter-spacing:0} +#header{position:fixed;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#1c1b1b;background:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat} +#header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center} +#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.3);padding:7px 12px} #header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #f15a2c} #header .text-right{float:right;text-align:left;padding-left:5px} +#header .text-right a{color:#1c1b1b} +#header .text-right #licensetype{font-weight:bold;font-style:italic;margin-right:4px} #title{margin:20px 0 32px 0;padding:8px 10px;clear:both;border-bottom:#2b2b2b 1px solid;background:#262626;letter-spacing:2px} #title span.left{font-size:15px} #title span.right{font-size:13px;padding-top:2px;padding-right:10px;float:right} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index f1d3944b7..34b7b16b7 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -43,15 +43,14 @@ select.slot{min-width:440px;max-width:440px} input.narrow{width:166px} input.trim{width:50px} form+p{display:none} -#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#121510;background-size:100% 90px;border-bottom:#42453e 1px solid} -#header .logo{float:left;margin-left:75px;color:#e22828;font-size:24px;font-weight:bold;letter-spacing:2px} -#header .logo svg{height:28px;display:block;margin:17px 50px 4px 0} -#header .logo #licensetype{font-style:italic} -#header .logo a{color:#e22828} -#header .logo #licenseexpire{margin-left:40px;letter-spacing:0} +#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#121510;background-size:100% 90px;background-repeat:no-repeat;border-bottom:#42453e 1px solid} +#header .logo{float:left;margin-left:75px;color:#e22828;width:160px;text-align:center} +#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(18,21,16,0.7);padding:7px 12px} #header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #f15a2c} #header .text-right{float:right;text-align:left;padding-left:5px} +#header .text-right a{color:#606e7f} +#header .text-right #licensetype{font-weight:bold;font-style:italic;margin-right:4px} #menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383a34;z-index:100;box-shadow:inset -1px 0 2px #121510} #nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl;letter-spacing:2px} #nav-block::-webkit-scrollbar{display:none} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index ff651cd1c..e3132d17e 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -43,15 +43,14 @@ select.auto{min-width:auto} select.slot{min-width:440px;max-width:440px} input.narrow{width:166px} input.trim{width:50px} -#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;color:#f2f2f2;background:#1c1b1b;background-size:100% 90px} -#header .logo{float:left;margin-left:10px;color:#e22828;font-size:24px;font-weight:bold;letter-spacing:2px} -#header .logo svg{height:28px;display:block;margin:17px 50px 4px 0} -#header .logo #licensetype{font-style:italic} -#header .logo a{color:#e22828} -#header .logo #licenseexpire{margin-left:40px;letter-spacing:0} +#header{position:fixed;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#f2f2f2;background:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat} +#header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center} +#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(28,27,27,0.3);padding:7px 12px} #header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #f15a2c} #header .text-right{float:right;text-align:left;padding-left:5px} +#header .text-right a{color:#f2f2f2} +#header .text-right #licensetype{font-weight:bold;font-style:italic;margin-right:4px} #title{margin:20px 0 32px 0;padding:8px 10px;clear:both;border-bottom:#e3e3e3 1px solid;background:#e8e8e8;letter-spacing:2px} #title span.left{font-size:15px} #title span.right{font-size:13px;padding-top:2px;padding-right:10px;float:right} From 533d1531b655a43d8f71461717a7bfc8ac58695a Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 27 Aug 2018 10:30:46 +0200 Subject: [PATCH 2/4] css adjustment for themes Azure and Gray --- plugins/dynamix/styles/default-azure.css | 8 ++++---- plugins/dynamix/styles/default-gray.css | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 0bbf3c1dd..07810a59b 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -69,9 +69,9 @@ form+p{display:none} #nav-item a i{display:none} #nav-user{display:block;float:left;text-align:center;border:none} #nav-user.probe{font-size:11px;margin-left:3px;margin-right:8px} -#nav-tub1{position:fixed;top:56px;right:350px} -#nav-tub2{position:fixed;top:56px;right:320px} -#nav-tub3{position:fixed;top:56px;right:290px} +#nav-tub1{position:fixed;top:56px;right:400px} +#nav-tub2{position:fixed;top:56px;right:370px} +#nav-tub3{position:fixed;top:56px;right:340px} span.tub span[id^='txt-tub']{margin-top:7px} #title{color:#39587f;margin:20px 0 10px 0;padding:10px 0;clear:both;background:#e4e2e4;border-bottom:#606e7f 1px solid;letter-spacing:2px} #title span.left{font-size:20px;text-transform:uppercase} @@ -92,7 +92,7 @@ span.tub span[id^='txt-tub']{margin-top:7px} .orange-text,.warning{color:#E68A00} .blue-text{color:#3B5998} .grey-text{color:#606060} -.usage-bar{position:fixed;top:60px;right:400px;height:22px;line-height:22px;width:140px;background-color:rgba(228,226,228,0.4)} +.usage-bar{position:fixed;top:60px;right:450px;height:22px;line-height:22px;width:140px;background-color:rgba(228,226,228,0.4)} .usage-bar>span{display:block;height:3px;background-color:#606e7f;text-align:left} .usage-bar>span>span{padding-left:4px;color:#606e7f} .usage-disk{height:25px;line-height:25px;background-color:rgba(237,234,239,0.4)} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index 34b7b16b7..723572886 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -69,9 +69,9 @@ form+p{display:none} #nav-item a i{display:none} #nav-user{display:block;float:left;text-align:center;border:none} #nav-user.probe{font-size:11px;margin-left:3px;margin-right:8px} -#nav-tub1{position:fixed;top:56px;right:350px} -#nav-tub2{position:fixed;top:56px;right:320px} -#nav-tub3{position:fixed;top:56px;right:290px} +#nav-tub1{position:fixed;top:56px;right:400px} +#nav-tub2{position:fixed;top:56px;right:370px} +#nav-tub3{position:fixed;top:56px;right:340px} span.tub span[id^='txt-tub']{margin-top:7px} #title{color:#39587f;margin:20px 0 10px 0;padding:10px 0;clear:both;background:#1b1d1b;border-bottom:#606e7f 1px solid;letter-spacing:2px} #title span.left{font-size:20px;text-transform:uppercase} @@ -92,7 +92,7 @@ span.tub span[id^='txt-tub']{margin-top:7px} .orange-text,.warning{color:#E68A00} .blue-text{color:#3B5998} .grey-text{color:#606060} -.usage-bar{position:fixed;top:60px;right:400px;height:22px;line-height:22px;width:140px;background-color:rgba(27,29,27,0.2)} +.usage-bar{position:fixed;top:60px;right:450px;height:22px;line-height:22px;width:140px;background-color:rgba(27,29,27,0.2)} .usage-bar>span{display:block;height:3px;background-color:#606e7f;text-align:left} .usage-bar>span>span{padding-left:4px;color:#606e7f} .usage-disk{height:25px;line-height:25px;background-color:rgba(18,21,16,0.3)} From 72839bccf2ea631db2d46f9df42e79586f44ea8a Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 27 Aug 2018 10:45:12 +0200 Subject: [PATCH 3/4] Header style update --- plugins/dynamix/include/DefaultPageLayout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index 7e48204d8..4dd286033 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -309,7 +309,7 @@ $.ajaxPrefilter(function(s, orig, xhr){
Server
Description
Registration
Uptime

-
+
From 54b8d4d822762221f97e160f6af608d8f477c32d Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 27 Aug 2018 17:10:48 +0200 Subject: [PATCH 4/4] Added extra parameter in parse_plugin_cfg This is used when no parsing of the values is required. E.g. when values are folder names with special characters --- plugins/dynamix/include/Wrappers.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix/include/Wrappers.php b/plugins/dynamix/include/Wrappers.php index f2859ef3d..54105c1c1 100644 --- a/plugins/dynamix/include/Wrappers.php +++ b/plugins/dynamix/include/Wrappers.php @@ -14,12 +14,12 @@ $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; // Wrapper functions -function parse_plugin_cfg($plugin, $sections=false) { +function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) { global $docroot; $ram = "$docroot/plugins/$plugin/default.cfg"; $rom = "/boot/config/plugins/$plugin/$plugin.cfg"; - $cfg = file_exists($ram) ? parse_ini_file($ram, $sections) : []; - return file_exists($rom) ? array_replace_recursive($cfg, parse_ini_file($rom, $sections)) : $cfg; + $cfg = file_exists($ram) ? parse_ini_file($ram, $sections, $scanner) : []; + return file_exists($rom) ? array_replace_recursive($cfg, parse_ini_file($rom, $sections, $scanner)) : $cfg; } function parse_cron_cfg($plugin, $job, $text = "") { $cron = "/boot/config/plugins/$plugin/$job.cron";