Enhanced styling

This commit is contained in:
bergware
2023-12-03 14:43:39 +01:00
parent 575160c5e0
commit b16a844639
3 changed files with 18 additions and 18 deletions

View File

@@ -432,10 +432,10 @@ if (_var($var,'shareSMBEnabled')=='yes') {
$i = 0;
foreach ($shares as $name => $share) {
$i++;
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
$comment = compress($share['comment'],40) ?: '&nbsp;';
$comment = $share['comment'] ?: '&nbsp;';
$security = export_settings(_var($var,'shareSMBEnabled'), $sec[$name]);
$last = $name==array_key_last($shares) ? ' last' : '';
echo "<tr class='smb share share1{$last}'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w44'>$comment</span><span class='w18'>$security</span><span id='share{$i}'>0</span></td></tr>";
@@ -444,10 +444,10 @@ if (_var($var,'shareSMBEnabled')=='yes') {
}
if (_var($var,'shareNFSEnabled')=='yes') {
foreach ($shares as $name => $share) {
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
$comment = compress($share['comment'],40) ?: '&nbsp;';
$comment = $share['comment'] ?: '&nbsp;';
$security = export_settings(_var($var,'shareNFSEnabled'), $sec_nfs[$name]);
$last = $name==array_key_last($shares) ? ' last' : '';
echo "<tr class='nfs share share3{$last}'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w44'>$comment</span><span class='w18'>$security</span><span>-</span></td></tr>";
@@ -456,10 +456,10 @@ if (_var($var,'shareNFSEnabled')=='yes') {
}
if (!$group) {
foreach ($shares as $name => $share) {
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
$comment = compress($share['comment'],40) ?: '&nbsp;';
$comment = $share['comment'] ?: '&nbsp;';
echo "<tr class='share'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w44'>$comment</span><span class='w18'>-</span><span>-</span></td></tr>";
}
if (!count($shares)) echo "<tr class='share'><td class='none'>"._("No shares present")."</td></tr>";
@@ -489,8 +489,8 @@ if (!$group) {
if (_var($var,'shareSMBEnabled')=='yes') {
foreach ($users as $user) {
$name = $user['name'];
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$desc = compress($user['desc'],40) ?: '&nbsp;';
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
$desc = $user['desc'] ?: '&nbsp;';
if ($name=='root') {
$write = $read = '-';
} else {
@@ -521,8 +521,8 @@ if (_var($var,'shareSMBEnabled')=='yes') {
if (_var($var,'shareNFSEnabled')=='yes') {
foreach ($users as $user) {
$name = $user['name'];
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$desc = compress($user['desc'],40) ?: '&nbsp;';
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
$desc = $user['desc'] ?: '&nbsp;';
$write = '-'; $read = '-';
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
$last = $name==array_key_last($users) ? ' last' : '';
@@ -532,8 +532,8 @@ if (_var($var,'shareNFSEnabled')=='yes') {
if (!$group) {
foreach ($users as $user) {
$name = $user['name'];
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">".compress($name,20)."</a>";
$desc = compress($user['desc'],40) ?: '&nbsp;';
$list = "<a href=\"/Dashboard/Users/UserEdit?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
$desc = $user['desc'] ?: '&nbsp;';
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
echo "<tr class='user'><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w44'>$desc</span><span class='w18'>-</span><span>-</span></td></tr>";
}

View File

@@ -138,7 +138,7 @@ function device_name(&$disk) {
case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
}
$name = _var($disk,'name');
$fancy = compress(_(my_disk(native($name,1)),3),16,5);
$fancy = _(my_disk(native($name,1)),3);
return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancy settings\">$fancy</a>";
}
function device_status(&$disk, &$error, &$warning) {

View File

@@ -30,11 +30,11 @@ span[id^=cpu],span[id^=sys]{width:0}
span[class^="fa "]{font-size:1.6rem;margin-right:18px}
span.load.resize{font-size:1.1rem}
span.fan{width:36%;display:inline-block}
span.w18{width:18%;display:inline-block;float:left}
span.w26{width:26%;display:inline-block;float:left}
span.w36{width:36%;display:inline-block;float:left}
span.w44{width:44%;display:inline-block;float:left}
span.w72{width:72%;display:inline-block;float:left}
span.w18{min-width:18%;max-width:18%;width:18%;display:inline-block;float:left;overflow:hidden;text-overflow:ellipsis}
span.w26{min-width:26%;max-width:26%;width:26%;display:inline-block;float:left;overflow:hidden;text-overflow:ellipsis}
span.w36{min-width:36%;max-width:36%;width:36%;display:inline-block;float:left;overflow:hidden;text-overflow:ellipsis}
span.w44{min-width:44%;max-width:44%;width:44%;display:inline-block;float:left;overflow:hidden;text-overflow:ellipsis}
span.w72{min-width:72%;max-width:72%;width:72%;display:inline-block;float:left;overflow:hidden;text-overflow:ellipsis}
select#cpuline,select#netline{border:none;padding:0 12px 0 0}
select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}