From 681bcff670ff6186bedfe2d12641ecf32a161c3a Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 9 Jul 2022 11:09:14 +0200 Subject: [PATCH] Plugin system update --- .../dynamix.docker.manager/include/CreateDocker.php | 4 ++-- plugins/dynamix.docker.manager/scripts/container_size | 8 ++++---- plugins/dynamix/include/DefaultPageLayout.php | 10 +++++----- plugins/dynamix/scripts/feedback | 2 +- plugins/dynamix/styles/jquery.sweetalert.css | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index e887ebb4a..a0642d781 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -403,7 +403,7 @@ function addConfigPopup() { popup.dialog({ title: title, resizable: false, - width: 900, + width: 800, modal: true, show : {effect: 'fade' , duration: 250}, hide : {effect: 'fade' , duration: 250}, @@ -477,7 +477,7 @@ function editConfigPopup(num,disabled) { popup.dialog({ title: title, resizable: false, - width: 900, + width: 800, modal: true, show: {effect:'fade', duration: 250}, hide: {effect:'fade', duration: 250}, diff --git a/plugins/dynamix.docker.manager/scripts/container_size b/plugins/dynamix.docker.manager/scripts/container_size index 01dab7a13..509bbff1e 100755 --- a/plugins/dynamix.docker.manager/scripts/container_size +++ b/plugins/dynamix.docker.manager/scripts/container_size @@ -50,7 +50,7 @@ function autoscale($value) { $decimals = $base ? ($value>=100 ? 0 : ($value>=10 ? 1 : (round($value*100)%100===0 ? 0 : 2))) : 0; return number_format($value, $decimals, '.', $value>9999 ? ',' : '').' '.$unit[$base]; } -function align($text, $w=21) { +function align($text, $w=30) { return $text.str_repeat(' ',$w-min(strlen($text),$w-1)); } function gap($text) { @@ -71,13 +71,13 @@ foreach ($container as $ct) { $sum = ['total' => 0, 'writable' => 0, 'log' => 0]; array_multisort(array_column($list,'total'),SORT_DESC,$list); // sort on container size $i = 0; -write(align(_('Name'),42).align(_('Container')).align(_('Writable'))._('Log')."\n"); +write(align(_('Name'),50).align(_('Container')).align(_('Writable'))._('Log')."\n"); foreach ($list as $ct) { - write(($i++==0 ? '
':'').align($ct['name'],42).align(autoscale($ct['total'])).align(autoscale($ct['writable'])).autoscale($ct['log'])."\n"); + write(($i++==0 ? '
':'').align($ct['name'],50).align(autoscale($ct['total'])).align(autoscale($ct['writable'])).autoscale($ct['log'])."\n"); $sum['total'] += $ct['total']; $sum['writable'] += $ct['writable']; $sum['log'] += $ct['log']; } -write("
".align(_('Total size'),42).align(autoscale($sum['total'])).align(autoscale($sum['writable'])).autoscale($sum['log'])."\n"); +write("
".align(_('Total size'),50).align(autoscale($sum['total'])).align(autoscale($sum['writable'])).autoscale($sum['log'])."\n"); done(); ?> diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index c5291e634..9d2164bbc 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -59,13 +59,13 @@ html{font-size:%} .inline_help{display:none} -.upgrade_notice{position:fixed;top:24px;left:50%;margin-left:-480px;width:900px;height:38px;line-height:38px;color:#e68a00;background-color:#feefb3;border:#e68a00 1px solid;border-radius:38px;text-align:center;font-size:1.4rem;z-index:999} +.upgrade_notice{position:fixed;top:24px;left:50%;margin-left:-480px;width:1200px;height:38px;line-height:38px;color:#e68a00;background-color:#feefb3;border:#e68a00 1px solid;border-radius:38px;text-align:center;font-size:1.4rem;z-index:999} .upgrade_notice.done{color:#4f8a10;background-color:#dff2bf;border-color:#4f8a10} .upgrade_notice i{float:right;cursor:pointer} .back_to_top{display:none;position:fixed;bottom:30px;right:12px;color:#e22828;font-size:2.5rem;z-index:999} span.big.blue-text{cursor:pointer} -pre#body{font-family:clear-sans;text-align:left;margin:0;padding:0;height:450px;white-space:normal;border:none} -pre#text{text-align:left;margin:0;padding:0;height:450px;white-space:normal;border:none} +pre#body{font-family:clear-sans;text-align:left;margin:0;padding:0;height:650px;white-space:normal;border:none} +pre#text{text-align:left;margin:0;padding:0;height:650px;white-space:normal;border:none} ' : '/logging.htm?cmd='+cmd+'&csrf_token='+csrf_token+'&done='; var options = load ? (func ? {modal:true,onClose:function(){setTimeout(func+'('+'"'+(id||'')+'")');}} : {modal:true,onClose:function(){location.reload();}}) : {modal:false}; - Shadowbox.open({content:run, player:'iframe', title:title, height:600, width:900, options:options}); + Shadowbox.open({content:run, player:'iframe', title:title, height:800, width:1200, options:options}); } function openWindow(cmd,title,height,width) { // open regular window (run in background) @@ -240,7 +240,7 @@ function openTerminal(tag,name,more) { } // open terminal window (run in background) name = name.replace(/[ #]/g,"_"); - tty_window = makeWindow(name+(more=='.log'?more:''),600,900); + tty_window = makeWindow(name+(more=='.log'?more:''),800,1200); var socket = ['ttyd','syslog'].includes(tag) ? '/webterminal/'+tag+'/' : '/logterminal/'+name+(more=='.log'?more:'')+'/'; $.get('/webGui/include/OpenTerminal.php',{tag:tag,name:name,more:more},function(){tty_window.location=socket; tty_window.focus();}); } diff --git a/plugins/dynamix/scripts/feedback b/plugins/dynamix/scripts/feedback index a768d7bb0..035a26ce5 100755 --- a/plugins/dynamix/scripts/feedback +++ b/plugins/dynamix/scripts/feedback @@ -48,7 +48,7 @@ $style[] = "div.four label:first-child{margin-left:0}"; $style[] = "div.four label{margin-left:2%;cursor:pointer}"; $style[] = "div.allpanels{display:none;position:absolute;left:0;right:0;top:40px;bottom:0;overflow:auto}"; $style[] = "div#footer_panel{position:absolute;left:0;right:0;bottom:0;height:30px;line-height:30px;text-align:center}"; -$style[] = "textarea.feedback{width:$width;height:330px;margin:0;resize:none}"; +$style[] = "textarea.feedback{width:$width;height:530px;margin:0;resize:none}"; $style[] = "input.submit[type=button]{margin-right:0;float:right}"; $style[] = "input.submit[type=email]{margin-top:10px;float:left}"; $style[] = "p.note,label.note{font-size:1.1rem!important;display:block}"; diff --git a/plugins/dynamix/styles/jquery.sweetalert.css b/plugins/dynamix/styles/jquery.sweetalert.css index 1fe7ce55c..979ddf562 100644 --- a/plugins/dynamix/styles/jquery.sweetalert.css +++ b/plugins/dynamix/styles/jquery.sweetalert.css @@ -3,7 +3,7 @@ body.stop-scrolling{height:100%;overflow:hidden} -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";/* IE8 */ background-color:rgba(0, 0, 0, 0.4);position:fixed;left:0;right:0;top:0;bottom:0;display:none;z-index:10000} .sweet-alert{font-family:clear-sans;width:480px;padding:17px;border-style:solid;border-width:thin;border-radius:10px;text-align:center;position:fixed;left:50%;top:50%;margin-left:-240px;overflow:hidden;display:none;z-index:99999} -.sweet-alert.nchan{height:600px;width:900px;margin-left:-460px} +.sweet-alert.nchan{height:800px;width:1200px;margin-left:-610px} @media all and (max-width:540px){.sweet-alert{width:auto;margin-left:0;margin-right:0;left:15px;right:15px}} .sweet-alert h2{color:#575757;font-size:3rem;text-align:center;font-weight:600;text-transform:none;position:relative;margin:25px 0;padding:0;line-height:40px;display:block} .sweet-alert p{color:#797979;font-size:1.5rem;text-align:center;font-weight:300;position:relative;text-align:inherit;float:none;margin:0;padding:0;line-height:normal}