From 09e8740c04fe33003ecd1021669f13a55cbbc1cf Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:11:21 +0100 Subject: [PATCH 01/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/ArrayDevices.page | 2 +- emhttp/plugins/dynamix/ArrayOperation.page | 1 + emhttp/plugins/dynamix/BootDevice.page | 2 +- emhttp/plugins/dynamix/CacheDevices.page | 2 +- emhttp/plugins/dynamix/DeviceAttributes.page | 2 +- .../plugins/dynamix/DeviceCapabilities.page | 2 +- emhttp/plugins/dynamix/DeviceIdentify.page | 2 +- emhttp/plugins/dynamix/DiskList.page | 2 +- .../plugins/dynamix/NotificationsArchive.page | 2 +- emhttp/plugins/dynamix/OpenDevices.page | 2 +- emhttp/plugins/dynamix/RoutingTable.page | 2 +- emhttp/plugins/dynamix/ShareList.page | 2 +- emhttp/plugins/dynamix/SysDrivers.page | 2 +- emhttp/plugins/dynamix/UserEdit.page | 2 +- emhttp/plugins/dynamix/include/SmartInfo.php | 24 ++++---- emhttp/plugins/dynamix/nchan/device_list | 2 +- emhttp/plugins/dynamix/sheets/DiskList.css | 3 +- emhttp/plugins/dynamix/sheets/ShareList.css | 3 - emhttp/plugins/dynamix/sheets/UserEdit.css | 1 + .../plugins/dynamix/styles/default-azure.css | 46 +++++++-------- .../plugins/dynamix/styles/default-black.css | 57 +++++++++---------- .../plugins/dynamix/styles/default-gray.css | 46 +++++++-------- .../plugins/dynamix/styles/default-white.css | 57 +++++++++---------- 23 files changed, 128 insertions(+), 138 deletions(-) diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page index 9931a29d4..a99608ad0 100644 --- a/emhttp/plugins/dynamix/ArrayDevices.page +++ b/emhttp/plugins/dynamix/ArrayDevices.page @@ -70,7 +70,7 @@ $('#tab1').bind({click:function() {$('i.toggle').show('slow');}}); - +
setTimeout(refresh); diff --git a/emhttp/plugins/dynamix/BootDevice.page b/emhttp/plugins/dynamix/BootDevice.page index 2b619ab9e..05d09204e 100644 --- a/emhttp/plugins/dynamix/BootDevice.page +++ b/emhttp/plugins/dynamix/BootDevice.page @@ -20,7 +20,7 @@ $('#tab3').bind({click:function() {$('i.toggle').show('slow');}}); -
_(Device)__(Identification)__(Temp)__(Reads)__(Writes)__(Errors)__(FS)__(Size)__(Used)__(Free)_
+
";?> diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page index 099e0e6b8..6fee480a3 100644 --- a/emhttp/plugins/dynamix/CacheDevices.page +++ b/emhttp/plugins/dynamix/CacheDevices.page @@ -135,7 +135,7 @@ $('#tab2').bind({click:function() {$('i.toggle').show('slow');}}); -
_(Device)__(Identification)__(Temp)__(Reads)__(Writes)__(Errors)__(FS)__(Size)__(Used)__(Free)_
+
-
+
#_(Attribute Name)__(Flag)__(Value)__(Worst)__(Threshold)__(Type)__(Updated)__(Failed)__(Raw Value)_
diff --git a/emhttp/plugins/dynamix/DeviceCapabilities.page b/emhttp/plugins/dynamix/DeviceCapabilities.page index 8fbf06e2c..eb1abf90f 100644 --- a/emhttp/plugins/dynamix/DeviceCapabilities.page +++ b/emhttp/plugins/dynamix/DeviceCapabilities.page @@ -22,7 +22,7 @@ $(function() { }); }); -
+
diff --git a/emhttp/plugins/dynamix/DeviceIdentify.page b/emhttp/plugins/dynamix/DeviceIdentify.page index 3374e6422..7e88cb5c9 100644 --- a/emhttp/plugins/dynamix/DeviceIdentify.page +++ b/emhttp/plugins/dynamix/DeviceIdentify.page @@ -26,7 +26,7 @@ $(function() { }); - +
_(Title)__(Information)_
diff --git a/emhttp/plugins/dynamix/DiskList.page b/emhttp/plugins/dynamix/DiskList.page index a6fdadabc..9c4d6ad32 100644 --- a/emhttp/plugins/dynamix/DiskList.page +++ b/emhttp/plugins/dynamix/DiskList.page @@ -15,7 +15,7 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareDisk')!='no'" * all copies or substantial portions of the Software. */ ?> - + diff --git a/emhttp/plugins/dynamix/NotificationsArchive.page b/emhttp/plugins/dynamix/NotificationsArchive.page index 94575b4d7..06cf7fb56 100644 --- a/emhttp/plugins/dynamix/NotificationsArchive.page +++ b/emhttp/plugins/dynamix/NotificationsArchive.page @@ -101,7 +101,7 @@ $(function(){ // Adjust the width of thead cells when window resizes - +
_(Time)__(Event)__(Subject)__(Description)__(Importance)_
diff --git a/emhttp/plugins/dynamix/OpenDevices.page b/emhttp/plugins/dynamix/OpenDevices.page index 46ce02f41..34a36408e 100644 --- a/emhttp/plugins/dynamix/OpenDevices.page +++ b/emhttp/plugins/dynamix/OpenDevices.page @@ -25,7 +25,7 @@ $('').bind({click:function() {$('i.toggle').show('slow');}}); - +
_(Device)__(Identification)__(Temp)__(Reads)__(Writes)__(Errors)__(FS)__(Size)__(Used)__(Free)_
+
_(Protocol)__(Route)__(Gateway)__(Metric)__(Delete)_
diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page index de4970ce5..949d949a5 100644 --- a/emhttp/plugins/dynamix/ShareList.page +++ b/emhttp/plugins/dynamix/ShareList.page @@ -15,7 +15,7 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'" * all copies or substantial portions of the Software. */ ?> - + diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page index 2419f93d5..4bd84e54b 100644 --- a/emhttp/plugins/dynamix/SysDrivers.page +++ b/emhttp/plugins/dynamix/SysDrivers.page @@ -119,5 +119,5 @@ showDrivers("all",true); :sysdrivers_intro_help:
-

+

diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page index 4a4f937c2..c48570ab5 100644 --- a/emhttp/plugins/dynamix/UserEdit.page +++ b/emhttp/plugins/dynamix/UserEdit.page @@ -296,7 +296,7 @@ function updateAccess(form,data,n,i) {
"; +echo ""; echo ""; echo ""; foreach ($shares as $share => $data) { diff --git a/emhttp/plugins/dynamix/include/SmartInfo.php b/emhttp/plugins/dynamix/include/SmartInfo.php index 684c57cd6..ad19636a8 100644 --- a/emhttp/plugins/dynamix/include/SmartInfo.php +++ b/emhttp/plugins/dynamix/include/SmartInfo.php @@ -109,7 +109,7 @@ case "attributes": if ($empty) echo ""; break; case "capabilities": - echo '
"._('Share').""._('Security').""._('User Access')."
"._('Attributes not available')."
' ; + echo '' ; exec("smartctl -n standby -c $type ".escapeshellarg("/dev/$port")."|awk 'NR>5'",$output); $row = ['','','']; $empty = true; @@ -120,27 +120,25 @@ case "capabilities": $line = preg_replace('/^_/','__',preg_replace(['/__+/','/_ +_/'],'_',str_replace([chr(9),')','('],'_',$line))); $info = array_map('trim', explode('_', preg_replace('/_( +)_ /','__',$line), 3)); if ($nvme && $info[0]=="Supported Power States" ) { $nvme_section="psheading" ;echo "
'._('Feature').''._('Value').''._('Information').'
{$line}
"; $row = ['','',''] ; continue ;} - if ($nvme && $info[0]=="Supported LBA Sizes" ) { + if ($nvme && $info[0]=="Supported LBA Sizes" ) { echo "
{$info[0]} {$info[1]} {$info[2]}
"; $row = ['','','']; - $nvme_section="lbaheading" ; + $nvme_section="lbaheading" ; continue ; - } + } append($row[0],$info[0]); append($row[1],$info[1]); append($row[2],$info[2]); - if (substr($row[2],-1)=='.' || ($nvme && $nvme_section=="info")) { echo "{$row[0]}{$row[1]}{$row[2]}"; $row = ['','','']; $empty = false; } - if ($nvme && $nvme_section == "psheading") { - echo '' ; + echo '' ; $nvme_section = "psdetail"; preg_match('/^(?P.\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)$/',$line, $psheadings); - for ($i = 1; $i <= 11; $i++) { + for ($i = 1; $i <= 11; $i++) { echo "" ; } $row = ['','','']; @@ -150,17 +148,17 @@ case "capabilities": $nvme_section = "psdetail"; echo '' ; preg_match('/^(?P.\S+)\s+(?P\S\s+)\s+(?P\S+)\s+(?P\S\s+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)$/',$line, $psdetails); - for ($i = 1; $i <= 11; $i++) { + for ($i = 1; $i <= 11; $i++) { echo "" ; } $row = ['','','']; echo '' ; } if ($nvme && $nvme_section == "lbaheading") { - echo '
"._var($psheadings,'data'.$i)."
"._var($psdetails,'data'.$i)."
' ; + echo '' ; $nvme_section = "lbadetail"; preg_match('/^(?P.\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)$/',$line, $lbaheadings); - for ($i = 1; $i <= 5; $i++) { + for ($i = 1; $i <= 5; $i++) { echo "" ; } $row = ['','','']; @@ -170,7 +168,7 @@ case "capabilities": $nvme_section = "lbadetail"; preg_match('/^(?P.\S+)\s+(?P\S\s+)\s+(?P\S+)\s+(?P\S\s+)\s+(?P\S+)$/',$line, $lbadetails); echo '' ; - for ($i = 1; $i <= 5; $i++) { + for ($i = 1; $i <= 5; $i++) { echo "" ; } $row = ['','','']; @@ -236,7 +234,7 @@ case "update": if ($progress) { if ($transport == 'nvme') echo " "._('self-test in progress').", ".(substr($progress,0,-1))."% "._('complete').""; else echo " "._('self-test in progress').", ".(100-substr($progress,0,-1))."% "._('complete').""; break; - } + } } else { $progress = exec("smartctl -n standby -c $type ".escapeshellarg("/dev/$port")."|grep -Pom1 '\d+%'"); if ($progress) { diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 624f6018d..861522d51 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -303,7 +303,7 @@ function show_totals($text,$array,$name) { $help2 = _('Spin Up').' '._(ucfirst(substr($name,0,-1))); $echo = []; $echo[] = ""; - $echo[] = ""; + $echo[] = ""; $echo[] = ""; $echo[] = ""; $echo[] = ""; diff --git a/emhttp/plugins/dynamix/sheets/DiskList.css b/emhttp/plugins/dynamix/sheets/DiskList.css index ff1a48f90..23e50dcf4 100644 --- a/emhttp/plugins/dynamix/sheets/DiskList.css +++ b/emhttp/plugins/dynamix/sheets/DiskList.css @@ -1,2 +1 @@ -table.share_status thead tr td:first-child{width:15%} -table.share_status thead tr td:nth-child(n+3){width:10%} +td.empty{text-align:center;padding-top:12px} diff --git a/emhttp/plugins/dynamix/sheets/ShareList.css b/emhttp/plugins/dynamix/sheets/ShareList.css index 2fe2a4b43..4be17411d 100644 --- a/emhttp/plugins/dynamix/sheets/ShareList.css +++ b/emhttp/plugins/dynamix/sheets/ShareList.css @@ -1,5 +1,2 @@ -table.share_status thead tr td:first-child{width:15%} -table.share_status thead tr td:nth-child(n+3){width:9%!important} -table.share_status thead tr td:nth-child(5){width:13%!important} td.empty{text-align:center;padding-top:12px} i.fa-fw{margin-right:2px} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css index 3c82b6cd2..d2be01a90 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit.css @@ -1,3 +1,4 @@ i.top{position:absolute;padding-top:4px;cursor:pointer} i#showPass.checked{opacity:0.5} .usage-disk.sys{display:inline-block;width:10rem;top:rem;margin-left:12px;border-radius:4px} +table.unraid{margin-top:20px} diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index af02963a0..60bd8b5ce 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -114,36 +114,34 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} +table thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#9794a0;border-bottom:1px solid #606e7f} table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} -table.disk_status thead tr:first-child>td{text-transform:uppercase;color:#9794a0;border-bottom:1px solid #606e7f} -table.disk_status tr>td:nth-child(1){min-width:170px;max-width:170px;width:170px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.disk_status tr>td:nth-child(2){min-width:390px;max-width:390px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr.offline>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr>td:nth-child(3){text-align:center} -table.disk_status tr>td:nth-child(n+1):hover{overflow:visible} -table.disk_status tr>td:nth-child(n+3){min-width:7.5%;max-width:7.5%;width:7.5%} -table.disk_status tr>td:nth-child(n+4){text-align:right;padding-right:8px} +table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td:hover{overflow:visible} +table.disk_status{table-layout:fixed} +table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} +table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(2){width:30%} +table.disk_status tr>td:nth-child(3){width:8%;text-align:center} +table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr{border-bottom:1px solid #f3f0f4} -table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} -table.array_status tr>td:nth-child(1){width:30%;padding-left:8px} +table.array_status{table-layout:fixed} +table.array_status tr>td{padding-left:8px} +table.array_status tr>td:nth-child(1){width:30%} table.array_status tr>td:nth-child(2){width:20%} +table.array_status.noshift{margin-top:0} table.array_status td.line{border-top:1px solid #f3f0f4} -table.share_status{margin-top:12px} -table.share_status thead tr:first-child>td{font-size:1.2rem;letter-spacing:1px;text-transform:uppercase;color:#9794a0;border-bottom:1px solid #606e7f} -table.share_status tr>td:nth-child(1){min-width:200px;max-width:200px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.share_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(5){min-width:100px;max-width:100px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(n+1):hover{overflow:visible} -table.share_status tbody tr{border-bottom:1px solid #f3f0f4} -table.share_status tbody tr:hover>td{background-color:rgba(0,0,0,0.05)} -table.share_status tbody tr:last-child>td{border-bottom:1px solid #606e7f} -table.share_status tbody tr.alert{color:#f0000c} -table.share_status tbody tr.warn{color:#e68a00} -table.share_status.fixed tr>td:nth-child(n+2){min-width:39px;font-size:1.1rem;text-align:center;padding:0} -table.share_status.table{margin-top:36px} -table.share_status.table tr>td{width:50%} +table.share_status{table-layout:fixed;margin-top:12px} +table.share_status tr>td{padding-left:8px} +table.share_status tr>td:nth-child(1){width:15%} +table.share_status tr>td:nth-child(2){width:30%} +table.share_status tr>td:nth-child(n+3){width:10%} +table.share_status tr>td:nth-child(5){width:15%} table.dashboard{margin:0;border:none;background-color:#d7dbdd} table.dashboard tbody{border:1px solid #cacfd2} table.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top} diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index 5004b8bf0..a830e1f3a 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -109,40 +109,40 @@ div.title.shift{margin-top:-30px} .redbar{background:-webkit-gradient(linear,left top,right top,from(#941c00),to(#de1100));background:linear-gradient(90deg,#941c00 0,#de1100)} .graybar{background:-webkit-gradient(linear,left top,right top,from(#949494),to(#d9d9d9));background:linear-gradient(90deg,#949494 0,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:-30px 0 0 0;width:100%;background-color:#191818} +table thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#262626} +table thead tr:last-child{border-bottom:1px solid #2b2b2b} table thead td{line-height:2.8rem;height:2.8rem;white-space:nowrap} table tbody td{line-height:2.6rem;height:2.6rem;white-space:nowrap} -table tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#212121;border-top:1px solid #2b2b2b} -table td.cpu-info{border:1px solid #2b2b2b} -table.disk_status thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#262626} -table.disk_status thead tr:last-child{border-bottom:1px solid #2b2b2b} -table.disk_status tr>td:nth-child(1){min-width:180px;max-width:180px;width:180px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.disk_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr.offline>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr>td:nth-child(3){text-align:center} -table.disk_status tr>td:nth-child(n+1):hover{overflow:visible} -table.disk_status tr>td:nth-child(n+3){min-width:7.5%;max-width:7.5%;width:7.5%} -table.disk_status tr>td:nth-child(n+4){text-align:right;padding-right:8px} -table.disk_status tbody tr:nth-child(even){background-color:#212121} -table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.1)} -table.array_status tr>td:nth-child(1){width:30%;padding-left:8px} +table tbody tr.alert{color:#f0000c} +table tbody tr.warn{color:#e68a00} +table.unraid tbody tr:nth-child(even){background-color:#212121} +table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.1)} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td:hover{overflow:visible} +table.disk_status{table-layout:fixed} +table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} +table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(2){width:30%} +table.disk_status tr>td:nth-child(3){width:8%;text-align:center} +table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} +table.disk_status tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#212121;border-top:1px solid #2b2b2b} +table.array_status{table-layout:fixed} +table.array_status tr>td{padding-left:8px} +table.array_status tr>td:nth-child(1){width:30%} table.array_status tr>td:nth-child(2){width:20%} -table.array_status td.line{border-top:1px solid #2b2b2b} table.array_status.noshift{margin-top:0} -table.share_status thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#262626} -table.share_status tr>td:nth-child(1){min-width:200px;max-width:200px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.share_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(5){min-width:100px;max-width:100px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(n+1):hover{overflow:visible} -table.share_status tbody tr:nth-child(even){background-color:#212121} -table.share_status tbody tr:hover>td{background-color:rgba(255,255,255,0.1)} -table.share_status tbody tr.alert{color:#f0000c} -table.share_status tbody tr.warn{color:#e68a00} -table.share_status.fixed tr>td:nth-child(n+2){min-width:39px;font-size:1.1rem;text-align:center;padding:0} -table.share_status.table{margin-top:36px} -table.share_status.table tr>td{width:50%} +table.array_status td.line{border-top:1px solid #2b2b2b} +table.share_status{table-layout:fixed} +table.share_status tr>td{padding-left:8px} +table.share_status tr>td:nth-child(1){width:15%} +table.share_status tr>td:nth-child(2){width:30%} +table.share_status tr>td:nth-child(n+3){width:10%} +table.share_status tr>td:nth-child(5){width:15%} table.dashboard{margin:0;border:none;background-color:#262626} table.dashboard tbody{border:1px solid #333333} -table.dashboard tbody td{line-height:normal;height:auto;padding:5px 10px} +table.dashboard tbody td{line-height:normal;height:auto;padding:3px 10px} table.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top} table.dashboard tr:nth-child(even){background-color:transparent} table.dashboard tr:last-child>td{padding-bottom:20px} @@ -158,7 +158,6 @@ table.dashboard td span.info.title{font-weight:bold} table.dashboard td span.load{display:inline-block;width:38px;text-align:right} table.dashboard td span.finish{float:right;margin-right:24px} table.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.3);padding:2px;border-radius:5px} -.dashboard-sortable{background-color:#1c1b1b} [name=arrayOps]{margin-top:12px} span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%} span.warn{color:#e68a00;background-color:#feefb3;display:block;width:100%} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index 0f9f79796..cb9a7fc9e 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -114,36 +114,34 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} +table thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#82857e;border-bottom:1px solid #606e7f} table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} -table.disk_status thead tr:first-child>td{text-transform:uppercase;color:#82857e;border-bottom:1px solid #606e7f} -table.disk_status tr>td:nth-child(1){min-width:170px;max-width:170px;width:170px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.disk_status tr>td:nth-child(2){min-width:390px;max-width:390px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr.offline>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr>td:nth-child(3){text-align:center} -table.disk_status tr>td:nth-child(n+1):hover{overflow:visible} -table.disk_status tr>td:nth-child(n+3){min-width:7.5%;max-width:7.5%;width:7.5%} -table.disk_status tr>td:nth-child(n+4){text-align:right;padding-right:8px} +table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td:hover{overflow:visible} +table.disk_status{table-layout:fixed} +table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} +table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(2){width:30%} +table.disk_status tr>td:nth-child(3){width:8%;text-align:center} +table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr{border-bottom:1px solid #0c0f0b} -table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)} -table.array_status tr>td:nth-child(1){width:30%;padding-left:8px} +table.array_status{table-layout:fixed} +table.array_status tr>td{padding-left:8px} +table.array_status tr>td:nth-child(1){width:30%} table.array_status tr>td:nth-child(2){width:20%} +table.array_status.noshift{margin-top:0} table.array_status td.line{border-top:1px solid #0c0f0b} -table.share_status{margin-top:12px} -table.share_status thead tr:first-child>td{font-size:1.2rem;letter-spacing:1px;text-transform:uppercase;color:#82857e;border-bottom:1px solid #606e7f} -table.share_status tr>td:nth-child(1){min-width:200px;max-width:200px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.share_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(5){min-width:100px;max-width:100px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(n+1):hover{overflow:visible} -table.share_status tbody tr{border-bottom:1px solid #0c0f0b} -table.share_status tbody tr:hover>td{background-color:rgba(255,255,255,0.05)} -table.share_status tbody tr:last-child>td{border-bottom:1px solid #606e7f} -table.share_status tbody tr.alert{color:#f0000c} -table.share_status tbody tr.warn{color:#e68a00} -table.share_status.fixed tr>td:nth-child(n+2){min-width:39px;font-size:1.1rem;text-align:center;padding:0} -table.share_status.table{margin-top:36px} -table.share_status.table tr>td{width:50%} +table.share_status{table-layout:fixed;margin-top:12px} +table.share_status tr>td{padding-left:8px} +table.share_status tr>td:nth-child(1){width:15%} +table.share_status tr>td:nth-child(2){width:30%} +table.share_status tr>td:nth-child(n+3){width:10%} +table.share_status tr>td:nth-child(5){width:15%} table.dashboard{margin:0;border:none;background-color:#212f3d} table.dashboard tbody{border:1px solid #566573} table.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index f49df0ef1..88a668f34 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -109,40 +109,40 @@ div.title.shift{margin-top:-30px} .redbar{background:-webkit-gradient(linear,left top,right top,from(#941c00),to(#de1100));background:linear-gradient(90deg,#941c00 0,#de1100)} .graybar{background:-webkit-gradient(linear,left top,right top,from(#949494),to(#d9d9d9));background:linear-gradient(90deg,#949494 0,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:-30px 0 0 0;width:100%;background-color:#f5f5f5} +table thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#e8e8e8} +table thead tr:last-child{border-bottom:1px solid #e3e3e3} table thead td{line-height:2.8rem;height:2.8rem;white-space:nowrap} table tbody td{line-height:2.6rem;height:2.6rem;white-space:nowrap} -table tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#ededed;border-top:1px solid #e3e3e3} -table td.cpu-info{border:1px solid #e3e3e3} -table.disk_status thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#e8e8e8} -table.disk_status thead tr:last-child{border-bottom:1px solid #e3e3e3} -table.disk_status tr>td:nth-child(1){min-width:180px;max-width:180px;width:180px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.disk_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr.offline>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis} -table.disk_status tr>td:nth-child(3){text-align:center} -table.disk_status tr>td:nth-child(n+1):hover{overflow:visible} -table.disk_status tr>td:nth-child(n+3){min-width:7.5%;max-width:7.5%;width:7.5%} -table.disk_status tr>td:nth-child(n+4){text-align:right;padding-right:8px} -table.disk_status tbody tr:nth-child(even){background-color:#ededed} -table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} -table.array_status tr>td:nth-child(1){width:30%;padding-left:8px} +table tbody tr.alert{color:#f0000c} +table tbody tr.warn{color:#e68a00} +table.unraid tbody tr:nth-child(even){background-color:#ededed} +table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td:hover{overflow:visible} +table.disk_status{table-layout:fixed} +table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} +table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(2){width:30%} +table.disk_status tr>td:nth-child(3){width:8%;text-align:center} +table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} +table.disk_status tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#ededed;border-top:1px solid #e3e3e3} +table.array_status{table-layout:fixed} +table.array_status tr>td{padding-left:8px} +table.array_status tr>td:nth-child(1){width:30%} table.array_status tr>td:nth-child(2){width:20%} -table.array_status td.line{border-top:1px solid #e3e3e3} table.array_status.noshift{margin-top:0} -table.share_status thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#e8e8e8} -table.share_status tr>td:nth-child(1){min-width:200px;max-width:200px;overflow:hidden;text-overflow:ellipsis;padding-left:8px} -table.share_status tr>td:nth-child(2){min-width:400px;max-width:400px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(5){min-width:100px;max-width:100px;overflow:hidden;text-overflow:ellipsis} -table.share_status tr>td:nth-child(n+1):hover{overflow:visible} -table.share_status tbody tr:nth-child(even){background-color:#ededed} -table.share_status tbody tr:hover>td{background-color:rgba(0,0,0,0.1)} -table.share_status tbody tr.alert{color:#f0000c} -table.share_status tbody tr.warn{color:#e68a00} -table.share_status.fixed tr>td:nth-child(n+2){min-width:39px;font-size:1.1rem;text-align:center;padding:0} -table.share_status.table{margin-top:36px} -table.share_status.table tr>td{width:50%} +table.array_status td.line{border-top:1px solid #e3e3e3} +table.share_status{table-layout:fixed} +table.share_status tr>td{padding-left:8px} +table.share_status tr>td:nth-child(1){width:15%} +table.share_status tr>td:nth-child(2){width:30%} +table.share_status tr>td:nth-child(n+3){width:10%} +table.share_status tr>td:nth-child(5){width:15%} table.dashboard{margin:0;border:none;background-color:#f7f9f9} table.dashboard tbody{border:1px solid #dfdfdf} -table.dashboard tbody td{line-height:normal;height:auto;padding:5px 10px} +table.dashboard tbody td{line-height:normal;height:auto;padding:3px 10px} table.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top} table.dashboard tr:nth-child(even){background-color:transparent} table.dashboard tr:last-child>td{padding-bottom:20px} @@ -158,7 +158,6 @@ table.dashboard td span.info.title{font-weight:bold} table.dashboard td span.load{display:inline-block;width:38px;text-align:right} table.dashboard td span.finish{float:right;margin-right:24px} table.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.3);padding:2px;border-radius:5px} -.dashboard-sortable{background-color:#f2f2f2} [name=arrayOps]{margin-top:12px} span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%} span.warn{color:#e68a00;background-color:#feefb3;display:block;width:100%} From ef3ba845edccdea392ca5535adfc1c9302de4428 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:17:19 +0100 Subject: [PATCH 02/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-azure.css | 4 ++-- emhttp/plugins/dynamix/styles/default-black.css | 4 ++-- emhttp/plugins/dynamix/styles/default-gray.css | 4 ++-- emhttp/plugins/dynamix/styles/default-white.css | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index 60bd8b5ce..3f86788f3 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -119,12 +119,12 @@ table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} -table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} -table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} table.disk_status tr.offline>td:nth-child(2){width:auto} diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index a830e1f3a..4426d9094 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -117,12 +117,12 @@ table tbody tr.alert{color:#f0000c} table tbody tr.warn{color:#e68a00} table.unraid tbody tr:nth-child(even){background-color:#212121} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.1)} -table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} -table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} table.disk_status tr.offline>td:nth-child(2){width:auto} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index cb9a7fc9e..d976ab3c8 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -119,12 +119,12 @@ table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)} -table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} -table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} table.disk_status tr.offline>td:nth-child(2){width:auto} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index 88a668f34..44038f3b1 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -117,12 +117,12 @@ table tbody tr.alert{color:#f0000c} table tbody tr.warn{color:#e68a00} table.unraid tbody tr:nth-child(even){background-color:#ededed} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} -table.unraid tr>td{overflow:hidden;text-overflow:ellipsis} +table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} -table.disk_status tr>td:nth-child(1){width:13%;padding-left:8px} +table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} table.disk_status tr.offline>td:nth-child(2){width:auto} From 7531a48c1feb3f73816605d14402f8054459c35b Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:33:13 +0100 Subject: [PATCH 03/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-azure.css | 2 +- emhttp/plugins/dynamix/styles/default-black.css | 2 +- emhttp/plugins/dynamix/styles/default-gray.css | 2 +- emhttp/plugins/dynamix/styles/default-white.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index 3f86788f3..aa1d3717e 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -127,7 +127,7 @@ table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} -table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(2){width:43%} table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr{border-bottom:1px solid #f3f0f4} table.array_status{table-layout:fixed} diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index 4426d9094..34180e92b 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -125,7 +125,7 @@ table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} -table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(2){width:43%} table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#212121;border-top:1px solid #2b2b2b} table.array_status{table-layout:fixed} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index d976ab3c8..9649001a8 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -127,7 +127,7 @@ table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} -table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(2){width:43%} table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr{border-bottom:1px solid #0c0f0b} table.array_status{table-layout:fixed} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index 44038f3b1..01416385b 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -125,7 +125,7 @@ table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} table.disk_status tr>td:nth-child(3){width:8%;text-align:center} -table.disk_status tr.offline>td:nth-child(2){width:auto} +table.disk_status tr.offline>td:nth-child(2){width:43%} table.disk_status tr.offline>td:nth-child(n+3){width:5.5%} table.disk_status tbody tr.tr_last{line-height:3rem;height:3rem;background-color:#ededed;border-top:1px solid #e3e3e3} table.array_status{table-layout:fixed} From bddc9bb40a59603ee57775dcc2a7a5aaf654de3a Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:42:28 +0100 Subject: [PATCH 04/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-black.css | 1 - emhttp/plugins/dynamix/styles/default-white.css | 1 - 2 files changed, 2 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index 34180e92b..8754c5521 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -120,7 +120,6 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0 table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} -table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index 01416385b..8475b7f28 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -120,7 +120,6 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} -table.disk_status tr>td{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} From d5f5ddcddf6c3db127aade3d7768a3ce1bf93dd5 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:43:49 +0100 Subject: [PATCH 05/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-black.css | 1 + emhttp/plugins/dynamix/styles/default-white.css | 1 + 2 files changed, 2 insertions(+) diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index 8754c5521..cd67b5f02 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -120,6 +120,7 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0 table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} +table.disk_status tr>td:last-child{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index 8475b7f28..aa2375d83 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -120,6 +120,7 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} +table.disk_status tr>td:last-child{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} From e67214a3a2efc635115444cb0743b2f31a106cbb Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 20:45:19 +0100 Subject: [PATCH 06/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-azure.css | 2 +- emhttp/plugins/dynamix/styles/default-gray.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index aa1d3717e..a3d839653 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -122,7 +122,7 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} -table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:last-child{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index 9649001a8..a7d29b4d5 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -122,7 +122,7 @@ table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0 table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} table.disk_status{table-layout:fixed} -table.disk_status tr>td{padding-right:8px} +table.disk_status tr>td:last-child{padding-right:8px} table.disk_status tr>td:nth-child(n+4){width:7%;text-align:right} table.disk_status tr>td:nth-child(1){width:13%} table.disk_status tr>td:nth-child(2){width:30%} From 4d53179ff500cdfaca149a11b29f1a34ee3fd10b Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 21:50:37 +0100 Subject: [PATCH 07/16] Dashboard: fix docker tooltip --- emhttp/plugins/dynamix/DashStats.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index 8f36f9d63..478ca1238 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -287,7 +287,7 @@ foreach ($cpus as $pair) { _(RAM usage)__(Percent of total used memory)_ ()
 _(Flash device)__(Percent usage of flash usb device)_ ()
 _(Log filesystem)__(Percent usage of LOG file system)_ ()
 -_(Percent usage of Docker image)_ ()
 + ()
 From 8908bb3c37e7d23b83becb6e3f1089389afa2a56 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 22:26:49 +0100 Subject: [PATCH 08/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-azure.css | 4 ++-- emhttp/plugins/dynamix/styles/default-black.css | 4 ++-- emhttp/plugins/dynamix/styles/default-gray.css | 4 ++-- emhttp/plugins/dynamix/styles/default-white.css | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index a3d839653..829fcfa9f 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -114,10 +114,10 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} -table thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#9794a0;border-bottom:1px solid #606e7f} -table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} +table.unraid thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#9794a0;border-bottom:1px solid #606e7f} +table.unraid thead td{line-height:3rem;height:3rem;white-space:nowrap} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index cd67b5f02..8124b7956 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -109,12 +109,12 @@ div.title.shift{margin-top:-30px} .redbar{background:-webkit-gradient(linear,left top,right top,from(#941c00),to(#de1100));background:linear-gradient(90deg,#941c00 0,#de1100)} .graybar{background:-webkit-gradient(linear,left top,right top,from(#949494),to(#d9d9d9));background:linear-gradient(90deg,#949494 0,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:-30px 0 0 0;width:100%;background-color:#191818} -table thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#262626} -table thead tr:last-child{border-bottom:1px solid #2b2b2b} table thead td{line-height:2.8rem;height:2.8rem;white-space:nowrap} table tbody td{line-height:2.6rem;height:2.6rem;white-space:nowrap} table tbody tr.alert{color:#f0000c} table tbody tr.warn{color:#e68a00} +table.unraid thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#262626} +table.unraid thead tr:last-child{border-bottom:1px solid #2b2b2b} table.unraid tbody tr:nth-child(even){background-color:#212121} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.1)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index a7d29b4d5..1af87340d 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -114,10 +114,10 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} -table thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#82857e;border-bottom:1px solid #606e7f} -table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} +table.unraid thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#82857e;border-bottom:1px solid #606e7f} +table.unraid thead td{line-height:3rem;height:3rem;white-space:nowrap} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index aa2375d83..95a235347 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -109,12 +109,12 @@ div.title.shift{margin-top:-30px} .redbar{background:-webkit-gradient(linear,left top,right top,from(#941c00),to(#de1100));background:linear-gradient(90deg,#941c00 0,#de1100)} .graybar{background:-webkit-gradient(linear,left top,right top,from(#949494),to(#d9d9d9));background:linear-gradient(90deg,#949494 0,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:-30px 0 0 0;width:100%;background-color:#f5f5f5} -table thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#e8e8e8} -table thead tr:last-child{border-bottom:1px solid #e3e3e3} table thead td{line-height:2.8rem;height:2.8rem;white-space:nowrap} table tbody td{line-height:2.6rem;height:2.6rem;white-space:nowrap} table tbody tr.alert{color:#f0000c} table tbody tr.warn{color:#e68a00} +table.unraid thead tr:first-child>td{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;background-color:#e8e8e8} +table.unraid thead tr:last-child{border-bottom:1px solid #e3e3e3} table.unraid tbody tr:nth-child(even){background-color:#ededed} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.1)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} From 47094219b6e804c1bfd44242e3f5228fbfd74fb9 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 22:32:01 +0100 Subject: [PATCH 09/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix/styles/default-azure.css | 2 +- emhttp/plugins/dynamix/styles/default-gray.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css index 829fcfa9f..a7228840f 100644 --- a/emhttp/plugins/dynamix/styles/default-azure.css +++ b/emhttp/plugins/dynamix/styles/default-azure.css @@ -114,10 +114,10 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} +table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} table.unraid thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#9794a0;border-bottom:1px solid #606e7f} -table.unraid thead td{line-height:3rem;height:3rem;white-space:nowrap} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css index 1af87340d..8ad224e3e 100644 --- a/emhttp/plugins/dynamix/styles/default-gray.css +++ b/emhttp/plugins/dynamix/styles/default-gray.css @@ -114,10 +114,10 @@ div.title.shift{margin-top:-12px} .redbar{background:-webkit-radial-gradient(#941c00,#de1100);background:linear-gradient(#941c00,#de1100)} .graybar{background:-webkit-radial-gradient(#949494,#d9d9d9);background:linear-gradient(#949494,#d9d9d9)} table{border-collapse:collapse;border-spacing:0;border-style:hidden;margin:0;width:100%} +table thead td{line-height:3rem;height:3rem;white-space:nowrap} table tbody td{line-height:3rem;height:3rem;white-space:nowrap} table tbody tr.tr_last{border-bottom:1px solid #606e7f} table.unraid thead tr:first-child>td{font-size:1.2rem;text-transform:uppercase;letter-spacing:1px;color:#82857e;border-bottom:1px solid #606e7f} -table.unraid thead td{line-height:3rem;height:3rem;white-space:nowrap} table.unraid tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)} table.unraid tr>td{overflow:hidden;text-overflow:ellipsis;padding-left:8px} table.unraid tr>td:hover{overflow:visible} From c1440a2964b233b951a13ac44e12ba52915e6014 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 11 Dec 2023 22:47:03 +0100 Subject: [PATCH 10/16] Styling enhancements to improve consistency --- emhttp/plugins/dynamix.plugin.manager/Plugins.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emhttp/plugins/dynamix.plugin.manager/Plugins.page b/emhttp/plugins/dynamix.plugin.manager/Plugins.page index a86f501e9..99c85d2c5 100644 --- a/emhttp/plugins/dynamix.plugin.manager/Plugins.page +++ b/emhttp/plugins/dynamix.plugin.manager/Plugins.page @@ -151,7 +151,7 @@ $(function() { $('.tabs').append(""); }); -
"._var($lbaheadings,'data'.$i)."
"._var($lbadetails,'data'.$i)."
$help1$help2$help1$help2$text".($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'],1)) : '*').my_power($sum['power'])."".my_diskio($sum['ioReads'])."".my_number($sum['numReads'])."
+
_(Plugin)__(Author)__(Version)__(Status)__(Uninstall)_
From eb0c24c9469f07097f1bd68ae372c5107470633c Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 00:43:25 +0100 Subject: [PATCH 11/16] device_list: fix columns --- emhttp/plugins/dynamix/nchan/device_list | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 861522d51..917c978de 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -154,7 +154,7 @@ function fs_info(&$disk) { global $display, $pools; $echo = []; if (empty($disk['fsStatus']) || $disk['fsStatus']=='-') { - return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? ""._('Device is part of a pool')."" : ""; + return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? ""._('Device is part of a pool')."" : ""; } elseif (_var($disk,'fsStatus')=='Mounted') { $echo[] = "".vfs_info(_var($disk,'fsType')).""; $echo[] = "".my_scale(_var($disk,'fsSize',0)*1024,$unit,-1)." $unit"; @@ -201,12 +201,12 @@ function array_offline(&$disk, $pool='') { case 'DISK_NP_DSBL': $echo[] = "".device_info($disk,false).""; $echo[] = "".assignment($disk).""; - $echo[] = ""; + $echo[] = ""; break; case 'DISK_NP_MISSING': $echo[] = "".device_info($disk,false)."
"._('Missing').""; $echo[] = "".assignment($disk)."{$disk['idSb']} - ".my_scale(_var($disk,'sizeSb',0)*1024,$unit)." $unit"; - $echo[] = ""; + $echo[] = ""; break; case 'DISK_OK': case 'DISK_DSBL': From c1f851a0bd15f65f85a61699aedfe5beea692c7d Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 05:16:31 +0100 Subject: [PATCH 12/16] Restore headers in pool devices - headers are needed for proper formatting --- emhttp/plugins/dynamix/CacheDevices.page | 2 -- 1 file changed, 2 deletions(-) diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page index 6fee480a3..0ea1e26a9 100644 --- a/emhttp/plugins/dynamix/CacheDevices.page +++ b/emhttp/plugins/dynamix/CacheDevices.page @@ -141,10 +141,8 @@ $cache = array_filter(cache_filter($disks),function($disk) use ($pool){return pr $power = _var($display,'power') && in_array('nvme',array_column($cache,'transport')) ? ' / '._('Power') : ''; $root = explode($_tilde_,$pool)[0]; ?> - _(Device)__(Identification)__(Temp)__(Reads)__(Writes)__(Errors)__(FS)__(Size)__(Used)__(Free)_ - "?> 1) echo ""?> From c46655ef9fc97b5b21894c05bfd1be3010a5c407 Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 11:01:36 +0100 Subject: [PATCH 13/16] User Edit: fix styling --- emhttp/plugins/dynamix/sheets/UserEdit-azure.css | 1 + emhttp/plugins/dynamix/sheets/UserEdit-black.css | 1 + emhttp/plugins/dynamix/sheets/UserEdit-gray.css | 1 + emhttp/plugins/dynamix/sheets/UserEdit-white.css | 1 + emhttp/plugins/dynamix/sheets/UserEdit.css | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css index 927e648fe..afe313e0c 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css @@ -1 +1,2 @@ span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px} +.usage-disk.sys{top:1.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-black.css b/emhttp/plugins/dynamix/sheets/UserEdit-black.css index 0a94f7329..657c2252b 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-black.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-black.css @@ -1 +1,2 @@ span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px} +.usage-disk.sys{top:.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css index e6795581e..b17ee8a57 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css @@ -1 +1,2 @@ span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px} +.usage-disk.sys{top:1.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-white.css b/emhttp/plugins/dynamix/sheets/UserEdit-white.css index ecc903eb7..918e5350d 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-white.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-white.css @@ -1 +1,2 @@ span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px} +.usage-disk.sys{top:.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css index d2be01a90..dee3c7a5d 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit.css @@ -1,4 +1,4 @@ i.top{position:absolute;padding-top:4px;cursor:pointer} i#showPass.checked{opacity:0.5} -.usage-disk.sys{display:inline-block;width:10rem;top:rem;margin-left:12px;border-radius:4px} +.usage-disk.sys{display:inline-block;width:10rem;margin-left:12px;border-radius:4px} table.unraid{margin-top:20px} From 3385e3e2b7e7023c434e1f974c24c1bb4a133c01 Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 11:04:28 +0100 Subject: [PATCH 14/16] Revert "User Edit: fix styling" This reverts commit c46655ef9fc97b5b21894c05bfd1be3010a5c407. --- emhttp/plugins/dynamix/sheets/UserEdit-azure.css | 1 - emhttp/plugins/dynamix/sheets/UserEdit-black.css | 1 - emhttp/plugins/dynamix/sheets/UserEdit-gray.css | 1 - emhttp/plugins/dynamix/sheets/UserEdit-white.css | 1 - emhttp/plugins/dynamix/sheets/UserEdit.css | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css index afe313e0c..927e648fe 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css @@ -1,2 +1 @@ span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px} -.usage-disk.sys{top:1.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-black.css b/emhttp/plugins/dynamix/sheets/UserEdit-black.css index 657c2252b..0a94f7329 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-black.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-black.css @@ -1,2 +1 @@ span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px} -.usage-disk.sys{top:.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css index b17ee8a57..e6795581e 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css @@ -1,2 +1 @@ span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px} -.usage-disk.sys{top:1.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-white.css b/emhttp/plugins/dynamix/sheets/UserEdit-white.css index 918e5350d..ecc903eb7 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit-white.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit-white.css @@ -1,2 +1 @@ span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px} -.usage-disk.sys{top:.2rem} diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css index dee3c7a5d..d2be01a90 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit.css @@ -1,4 +1,4 @@ i.top{position:absolute;padding-top:4px;cursor:pointer} i#showPass.checked{opacity:0.5} -.usage-disk.sys{display:inline-block;width:10rem;margin-left:12px;border-radius:4px} +.usage-disk.sys{display:inline-block;width:10rem;top:rem;margin-left:12px;border-radius:4px} table.unraid{margin-top:20px} From 8617dc0d921bd6950c053819b189d7186cf935fc Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 11:05:05 +0100 Subject: [PATCH 15/16] User Edit: fix styling --- emhttp/plugins/dynamix/sheets/UserEdit.css | 1 - 1 file changed, 1 deletion(-) diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css index d2be01a90..57aa03daf 100644 --- a/emhttp/plugins/dynamix/sheets/UserEdit.css +++ b/emhttp/plugins/dynamix/sheets/UserEdit.css @@ -1,4 +1,3 @@ i.top{position:absolute;padding-top:4px;cursor:pointer} i#showPass.checked{opacity:0.5} -.usage-disk.sys{display:inline-block;width:10rem;top:rem;margin-left:12px;border-radius:4px} table.unraid{margin-top:20px} From 8b9f99adbfeae614547b155f844fac55903c714f Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 12 Dec 2023 16:04:22 +0100 Subject: [PATCH 16/16] Display pools in a single table --- emhttp/plugins/dynamix/CacheDevices.page | 8 +++++-- emhttp/plugins/dynamix/nchan/device_list | 22 +++++++++---------- .../plugins/dynamix/sheets/CacheDevices.css | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page index 0ea1e26a9..561ce8a95 100644 --- a/emhttp/plugins/dynamix/CacheDevices.page +++ b/emhttp/plugins/dynamix/CacheDevices.page @@ -132,24 +132,28 @@ $('#tab2').bind({click:function() {$('i.toggle').show('slow');}}); + -
+ + + +"?> 1) echo ""?> -
_(Device)__(Identification)__(Temp)__(Reads)__(Writes)__(Errors)__(FS)__(Size)__(Used)__(Free)_
+ :cache_devices_help: diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 917c978de..0f9e14367 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -154,7 +154,7 @@ function fs_info(&$disk) { global $display, $pools; $echo = []; if (empty($disk['fsStatus']) || $disk['fsStatus']=='-') { - return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? ""._('Device is part of a pool')."" : ""; + return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? ""._('Device is part of a pool')."" : ""; } elseif (_var($disk,'fsStatus')=='Mounted') { $echo[] = "".vfs_info(_var($disk,'fsType')).""; $echo[] = "".my_scale(_var($disk,'fsSize',0)*1024,$unit,-1)." $unit"; @@ -201,12 +201,12 @@ function array_offline(&$disk, $pool='') { case 'DISK_NP_DSBL': $echo[] = "".device_info($disk,false).""; $echo[] = "".assignment($disk).""; - $echo[] = ""; + $echo[] = ""; break; case 'DISK_NP_MISSING': $echo[] = "".device_info($disk,false)."
"._('Missing').""; $echo[] = "".assignment($disk)."{$disk['idSb']} - ".my_scale(_var($disk,'sizeSb',0)*1024,$unit)." $unit"; - $echo[] = ""; + $echo[] = ""; break; case 'DISK_OK': case 'DISK_DSBL': @@ -219,9 +219,9 @@ function array_offline(&$disk, $pool='') { if ($warning) { $echo[] = "$warning"; } else { - $echo[] = ""; + $echo[] = ""; $echo[] = "".vfs_type(_var($disk,'fsType')).""; - $echo[] = ""; + $echo[] = ""; } break; case 'DISK_WRONG': @@ -231,9 +231,9 @@ function array_offline(&$disk, $pool='') { if ($warning) { $echo[] = "$warning"; } else { - $echo[] = ""; + $echo[] = ""; $echo[] = "".vfs_type(_var($disk,'fsType')).""; - $echo[] = ""; + $echo[] = ""; } break; } @@ -270,14 +270,14 @@ function array_online(&$disk, $fstype='') { if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') { $echo[] = "".device_info($disk,true).""; $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; - $echo[] = ""; + $echo[] = ""; $echo[] = fs_info($disk); } break; case 'DISK_NP_DSBL': $echo[] = "".device_info($disk,true).""; $echo[] = ""._('Not installed').""; - $echo[] = ""; + $echo[] = ""; $echo[] = fs_info($disk); break; case 'DISK_DSBL': @@ -325,7 +325,7 @@ function show_totals($text,$array,$name) { $echo[] = "
".my_scale($sum['fsFree']*1024,$unit)." $unit
"; } } else { - $echo[] = ""; + $echo[] = ""; } $echo[] = ""; return implode($echo); @@ -493,7 +493,7 @@ while (true) { $sum = initSum(); } } - $n++; + $n++; } $echo[$n] = "open_devices\n"; diff --git a/emhttp/plugins/dynamix/sheets/CacheDevices.css b/emhttp/plugins/dynamix/sheets/CacheDevices.css index f8b6b084d..108cd1537 100644 --- a/emhttp/plugins/dynamix/sheets/CacheDevices.css +++ b/emhttp/plugins/dynamix/sheets/CacheDevices.css @@ -1,2 +1,2 @@ -table.divider{margin-top:20px} +td.divider{line-height:16px;height:16px} div.template{display:none}