Main page: styling adjustments

This commit is contained in:
bergware
2023-12-11 12:46:20 +01:00
parent 96eb993106
commit ecc6691cc6
5 changed files with 31 additions and 27 deletions

View File

@@ -171,7 +171,7 @@ function fs_info(&$disk) {
$echo[] = "<td><div class='usage-disk'><span style='width:$free%' class='".usage_color($disk,$free,true)."'></span><span>".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit</span></div></td>";
}
} else {
$echo[] = "<td>".vfs_info(_var($disk,'fsType'))."</td><td colspan='3' style='text-align:center'>"._(_var($disk,'fsStatus'))."</td>";
$echo[] = "<td>".vfs_info(_var($disk,'fsType'))."</td><td colspan='3'>"._(_var($disk,'fsStatus'))."</td>";
}
return implode($echo);
}
@@ -195,7 +195,7 @@ function array_offline(&$disk, $pool='') {
}
}
}
$echo[] = "<tr>";
$echo[] = "<tr class='offline'>";
switch (_var($disk,'status')) {
case 'DISK_NP':
case 'DISK_NP_DSBL':
@@ -219,9 +219,9 @@ function array_offline(&$disk, $pool='') {
if ($warning) {
$echo[] = "<td colspan='7'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td></td><td></td><td></td>";
$echo[] = "<td>".vfs_type(_var($disk,'fsType'))."</td>";
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td></td><td></td><td></td>";
}
break;
case 'DISK_WRONG':
@@ -231,9 +231,9 @@ function array_offline(&$disk, $pool='') {
if ($warning) {
$echo[] = "<td colspan='7'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td></td><td></td><td></td>";
$echo[] = "<td>".vfs_type(_var($disk,'fsType'))."</td>";
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td></td><td></td><td></td>";
}
break;
}
@@ -270,14 +270,14 @@ function array_online(&$disk, $fstype='') {
if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') {
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td><a class='static'><i class='icon-disk icon'></i><span></span></a><em>".($fstype=='zfs' ? _('Not present') : _('Not installed'))."</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td></td><td></td><td></td><td></td>";
$echo[] = fs_info($disk);
}
break;
case 'DISK_NP_DSBL':
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td><a class='static'><i class='icon-disk icon'></i><span></span></a><em>"._('Not installed')."</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td></td><td></td><td></td><td></td>";
$echo[] = fs_info($disk);
break;
case 'DISK_DSBL':
@@ -325,7 +325,7 @@ function show_totals($text,$array,$name) {
$echo[] = "<td><div class='usage-disk'><span style='width:$free%' class='".usage_color($display,$free,true)."'></span><span>".my_scale($sum['fsFree']*1024,$unit)." $unit</span></div></td>";
}
} else {
$echo[] = "<td colspan=3></td>";
$echo[] = "<td></td><td></td><td></td>";
}
$echo[] = "</tr>";
return implode($echo);
@@ -425,7 +425,7 @@ while (true) {
foreach ($data as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
if (_var($var,'fsState')=='Stopped') {
foreach ($parity as $disk) $echo[0] .= array_offline($disk);
$echo[0] .= "<tr class='tr_last'><td style='height:12px' colspan='10'></td></tr>";
$echo[0] .= "<tr class='tr_last'><td colspan='10'></td></tr>";
foreach ($data as $disk) $echo[0] .= array_offline($disk);
$echo[0] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'>".array_slots()."</td><td></td></tr>";
} else {
@@ -512,7 +512,7 @@ while (true) {
if (file_exists("/tmp/preclear_stat_$dev")) {
$text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\<br\>:g'");
if (strpos($text,'Total time')===false) $text = _('Preclear in progress').'... '.$text;
$echo[$n] .= "<td colspan='4' style='text-align:right'><em>$text</em></td>";
$echo[$n] .= "<td colspan='4'><em>$text</em></td>";
} else
$echo[$n] .= "<td colspan='4'></td>";
$echo[$n] .= "</tr>";

View File

@@ -118,11 +118,12 @@ table thead td{line-height:3.2rem;white-space:nowrap}
table tbody td{line-height:3.2rem;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:140px;max-width:140px;width:140px;overflow:hidden;text-overflow:ellipsis;padding-left:8px}
table.disk_status tr>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis}
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:6.5%;max-width:6.5%;width:6.5%}
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{border-bottom:1px solid #f3f0f4}
table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(0,0,0,0.05)}
@@ -194,7 +195,7 @@ span.inner{display:inline-block;vertical-align:top}
span.state{font-size:1.1rem;margin-left:7px}
span.slots{display:inline-block;width:44rem;margin:0!important}
span.slots-left{float:left;margin:0!important}
input.subpool{float:right;margin:8px 0 0 0}
input.subpool{float:right;margin:2px 0 0 0}
i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
i.lock{margin-left:8px;cursor:default;vertical-align:middle}

View File

@@ -115,11 +115,12 @@ table tbody tr.tr_last{line-height:2.8rem;height:2.8rem;background-color:#212121
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:150px;max-width:150px;width:150px;overflow:hidden;text-overflow:ellipsis;padding-left:8px}
table.disk_status tr>td:nth-child(2){min-width:490px;max-width:4990px;overflow:hidden;text-overflow:ellipsis}
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:6.5%;max-width:6.5%;width:6.5%}
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)}
@@ -187,7 +188,7 @@ span.inner{display:inline-block;vertical-align:top}
span.state{font-size:1.1rem;margin-left:7px}
span.slots{display:inline-block;width:44rem;margin:0!important}
span.slots-left{float:left;margin:0!important}
input.subpool{float:right;margin:8px 0 0 0}
input.subpool{float:right;margin:2px 0 0 0}
i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
i.lock{margin-left:8px;cursor:default;vertical-align:middle}

View File

@@ -118,11 +118,12 @@ table thead td{line-height:3.2rem;white-space:nowrap}
table tbody td{line-height:3.2rem;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:140px;max-width:140px;width:140px;overflow:hidden;text-overflow:ellipsis;padding-left:8px}
table.disk_status tr>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis}
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:6.5%;max-width:6.5%;width:6.5%}
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{border-bottom:1px solid #0c0f0b}
table.disk_status tbody tr:not(.tr_last):hover>td{background-color:rgba(255,255,255,0.05)}
@@ -194,7 +195,7 @@ span.inner{display:inline-block;vertical-align:top}
span.state{font-size:1.1rem;margin-left:7px}
span.slots{display:inline-block;width:44rem;margin:0!important}
span.slots-left{float:left;margin:0!important}
input.subpool{float:right;margin:8px 0 0 0}
input.subpool{float:right;margin:2px 0 0 0}
i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
i.lock{margin-left:8px;cursor:default;vertical-align:middle}

View File

@@ -115,11 +115,12 @@ table tbody tr.tr_last{line-height:2.8rem;height:2.8rem;background-color:#ededed
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:150px;max-width:150px;width:150px;overflow:hidden;text-overflow:ellipsis;padding-left:8px}
table.disk_status tr>td:nth-child(2){min-width:490px;max-width:490px;overflow:hidden;text-overflow:ellipsis}
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:6.5%;max-width:6.5%;width:6.5%}
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)}
@@ -187,7 +188,7 @@ span.inner{display:inline-block;vertical-align:top}
span.state{font-size:1.1rem;margin-left:7px}
span.slots{display:inline-block;width:44rem;margin:0!important}
span.slots-left{float:left;margin:0!important}
input.subpool{float:right;margin:8px 0 0 0}
input.subpool{float:right;margin:2px 0 0 0}
i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
i.lock{margin-left:8px;cursor:default;vertical-align:middle}