Merge pull request #153 from bergware/6.4-wip

Set max screen width of 1920 pixels for all themes
This commit is contained in:
tom mortensen
2017-08-08 18:35:47 -05:00
committed by GitHub
8 changed files with 101 additions and 114 deletions
+5 -4
View File
@@ -11,7 +11,7 @@
*/
?>
<?
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Helpers.php";
$path = $_POST['path'];
@@ -138,12 +138,12 @@ function array_offline(&$disk,$w) {
echo "<td colspan='8'>$warning</td>";
break;
case 'DISK_NP_MISSING':
echo "<td>".device_info($disk)."<span class='diskinfo'><em>Missing</em></span></td>";
echo "<td>".device_info($disk)."<br><span class='diskinfo'><em>Missing</em></span></td>";
echo "<td>".assignment($disk)."<em>{$disk['idSb']} - ".my_scale($disk['sizeSb']*1024,$unit)." $unit</em></td>";
echo "<td colspan='9'></td>";
break;
case 'DISK_WRONG':
echo "<td>".device_info($disk)."<span class='diskinfo'><em>Wrong</em></span></td>";
echo "<td>".device_info($disk)."<br><span class='diskinfo'><em>Wrong</em></span></td>";
echo "<td>".assignment($disk)."<em>{$disk['idSb']} - ".my_scale($disk['sizeSb']*1024,$unit)." $unit</em></td>";
echo "<td>".my_temp($disk['temp'])."</td>";
echo "<td colspan='8'>$warning</td>";
@@ -153,7 +153,8 @@ function array_offline(&$disk,$w) {
}
function array_online(&$disk) {
global $sum, $diskio;
$data = $diskio ? explode(' ',$diskio[$disk['device']]) : [];
$dev = $disk['device'];
$data = isset($diskio[$dev]) ? explode(' ',$diskio[$dev]) : [];
if (is_numeric($disk['temp'])) {
$sum['count']++;
$sum['temp'] += $disk['temp'];
+1 -1
View File
@@ -1,7 +1,7 @@
html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar}
body{font-size:14px;color:#606E7F;background-color:#E4E2E4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
::-webkit-scrollbar{display:none}
#template{min-width:1080px;max-width:100%;margin:0}
#template{min-width:1080px;max-width:1920px;margin:0}
img{border:0;text-decoration:none;vertical-align:middle}
p{text-align:left}
p.centered{text-align:left}
+2 -2
View File
@@ -1,6 +1,6 @@
html{font-family:arimo}
body{font-size:12px;color:#808080;background-color:#000000;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
#template{min-width:1080px;margin:0 10px}
#template{min-width:1080px;max-width:1920px;margin:0 10px}
img{border:0;text-decoration:none;vertical-align:middle}
p{text-align:justify}
p.centered{text-align:left}
@@ -109,7 +109,7 @@ input.trim{width:50px}
table{border-collapse:collapse;border-spacing:0;margin:-21px 0 0 0;width:100%;color:#808080;border-bottom-right-radius:5px;border-bottom-left-radius:5px}
table thead td{padding:5px 0}
table tbody td{padding:7px 0}
table.wide tbody td{padding:10px 0}
table.wide tbody td{padding:.9em 0}
table tbody tr.tr_last{background:#181818;border-top:1px solid #202020;border-bottom:1px solid #202020}
table td.cpu-info{border:1px solid #303030}
table.disk_status{white-space:nowrap}
+1 -1
View File
@@ -1,7 +1,7 @@
html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar}
body{font-size:14px;color:#606E7F;background-color:#1B1D1B;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
::-webkit-scrollbar{display:none}
#template{min-width:1080px;max-width:100%;margin:0}
#template{min-width:1080px;max-width:1920px;margin:0}
img{border:0;text-decoration:none;vertical-align:middle}
p{text-align:left}
p.centered{text-align:left}
+2 -2
View File
@@ -1,6 +1,6 @@
html{font-family:arimo}
body{font-size:12px;color:#303030;background-color:#FFFFFF;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
#template{min-width:1080px;margin:0 10px}
#template{min-width:1080px;max-width:1920px;margin:0 10px}
img{border:0;text-decoration:none;vertical-align:middle}
p{text-align:justify}
p.centered{text-align:left}
@@ -109,7 +109,7 @@ input.trim{width:50px}
table{border-collapse:collapse;border-spacing:0;margin:-21px 0 0 0;width:100%;color:#404040;border-bottom-right-radius:5px;border-bottom-left-radius:5px}
table thead td{padding:5px 0}
table tbody td{padding:7px 0}
table.wide tbody td{padding:10px 0}
table.wide tbody td{padding:.9em 0}
table tbody tr.tr_last{background:#F0F0F0;border-top:1px solid #E8E8E8;border-bottom:1px solid #E8E8E8}
table td.cpu-info{border:1px solid #303030}
table.disk_status{white-space:nowrap}