Dashboard: include links to settings

This commit is contained in:
bergware
2019-01-29 08:42:36 +01:00
parent 772b50f46d
commit 59d2b6d884
2 changed files with 28 additions and 19 deletions
+20 -16
View File
@@ -310,7 +310,7 @@ foreach ($shares as $name => $share) {
elseif ($share['useCache']=='only') $list = "<span class='orange-text'>$list</span>";
$comment = truncate($share['comment'],40);
$security = export_settings($var['shareSMBEnabled'], $sec[$name]);
echo "<tr><td></td><td><i class='icon-folder'></i>$list</td><td>$comment</td><td>$security</td><td id='share{$i}'>0</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-folder'></i><a href=\"$path/Share?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$comment</td><td>$security</td><td id='share{$i}'>0</td><td></td></tr>";
}
if (!count($shares)) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td><td></td></tr>";
?></tbody>
@@ -323,7 +323,7 @@ foreach ($shares as $name => $share) {
elseif ($share['useCache']=='only') $list = "<span class='orange-text'>$list</span>";
$comment = truncate($share['comment'],40);
$security = export_settings($var['shareAFPEnabled'], $sec_afp[$name]);
echo "<tr><td></td><td><i class='icon-folder'></i>$list</td><td>$comment</td><td>$security</td><td>-</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-folder'></i><a href=\"$path/Share?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$comment</td><td>$security</td><td>-</td><td></td></tr>";
}
if (!count($shares)) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td><td></td></tr>";
?></tbody>
@@ -336,7 +336,7 @@ foreach ($shares as $name => $share) {
elseif ($share['useCache']=='only') $list = "<span class='orange-text'>$list</span>";
$comment = truncate($share['comment'],40);
$security = export_settings($var['shareNFSEnabled'], $sec_nfs[$name]);
echo "<tr><td></td><td><i class='icon-folder'></i>$list</td><td>$comment</td><td>$security</td><td>-</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-folder'></i><a href=\"$path/Share?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$comment</td><td>$security</td><td>-</td><td></td></tr>";
}
if (!count($shares)) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td><td></td></tr>";
?></tbody>
@@ -348,7 +348,7 @@ foreach ($shares as $name => $share) {
if ($share['luksStatus']>0) $list = "<span class='green-text'>$list</span>";
elseif ($share['useCache']=='only') $list = "<span class='orange-text'>$list</span>";
$comment = truncate($share['comment'],40);
echo "<tr><td></td><td><i class='icon-folder'></i>$list</td><td>$comment</td><td>-</td><td>-</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-folder'></i><a href=\"$path/Share?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$comment</td><td>-</td><td>-</td><td></td></tr>";
}
if (!count($shares)) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td><td></td></tr>";
?></tbody>
@@ -359,7 +359,8 @@ if (!count($shares)) echo "<tr><td></td><td colspan='4' style='text-align:center
<?if ($var['shareSMBEnabled']=='yes'):?>
<tbody class='smb user user1' style='display:none'><?
foreach ($users as $user) {
$list = truncate($user['name'],20);
$name = $user['name'];
$list = truncate($name,20);
$desc = truncate($user['desc'],40);
if ($list=='root') {
$write = '-'; $read = '-';
@@ -371,14 +372,15 @@ foreach ($users as $user) {
}
}
if ($user['passwd']=='yes') $list = "<span class='green-text'>$list</span>";
echo "<tr><td></td><td><i class='icon-user'></i>$list</td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-user'></i><a href=\"$path/UserEdit?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
}
?></tbody>
<?endif;?>
<?if ($var['shareAFPEnabled']=='yes'):?>
<tbody class='afp user user2' style='display:none'><?
foreach ($users as $user) {
$list = truncate($user['name'],20);
$name = $user['name'];
$list = truncate($name,20);
$desc = truncate($user['desc'],40);
if ($list=='root') {
$write = '-'; $read = '-';
@@ -390,28 +392,30 @@ foreach ($users as $user) {
}
}
if ($user['passwd']=='yes') $list = "<span class='green-text'>$list</span>";
echo "<tr><td></td><td><i class='icon-user'></i>$list</td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-user'></i><a href=\"$path/UserEdit?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
}
?></tbody>
<?endif;?>
<?if ($var['shareNFSEnabled']=='yes'):?>
<tbody class='nfs user user3' style='display:none'><?
foreach ($users as $user) {
$list = truncate($user['name'],20);
$name = $user['name'];
$list = truncate($name,20);
$desc = truncate($user['desc'],40);
$write = '-'; $read = '-';
if ($user['passwd']=='yes') $list = "<span class='green-text'>$list</span>";
echo "<tr><td></td><td><i class='icon-user'></i>$list</td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-user'></i><a href=\"$path/UserEdit?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$desc</td><td>$write</td><td>$read</td><td></td></tr>";
}
?></tbody>
<?endif;?>
<?if (!$group):?>
<tbody><?
foreach ($users as $user) {
$list = truncate($user['name'],20);
$name = $user['name'];
$list = truncate($name,20);
$desc = truncate($user['desc'],40);
if ($user['passwd']=='yes') $list = "<span class='green-text'>$list</span>";
echo "<tr><td></td><td><i class='icon-user'></i>$list</td><td>$desc</td><td>-</td><td>-</td><td></td></tr>";
echo "<tr><td></td><td><i class='icon-user'></i><a href=\"$path/UserEdit?name=".urlencode($name)."\" style=\"color:inherit\" title=\"$name settings\">$list</a></td><td>$desc</td><td>-</td><td>-</td><td></td></tr>";
}
?></tbody>
<?endif;?>
@@ -591,7 +595,7 @@ function update15() {
$('#ups_bcharge').html(data[1]);
$('#ups_timeleft').html(data[2]);
$('#ups_nompower').html(data[3]);
$('#ups_loadpct').html(data[5].replace('Percent','%')+' ('+data[4].replace('Watts','W')+')');
$('#ups_loadpct').html(data[5].replace('Percent','%')+data[4].replace(/>/,'> (').replace(/Watts|-/,'W)'));
});
<?endif;?>
$.post('<?=$url?>',{cmd:'status',number:'<?=$display['number']?>'},function(data) {$('span.info.title').html(data);});
@@ -607,14 +611,14 @@ function update30() {
$.post('<?=$url?>',{cmd:'port',view:tag,ports:'<?=implode(',',$ports)?>'},function(data) {
$.each(data.split('\0'),function(k,v) {$('#'+tag+k).html(v);});
});
$.post('<?=$url?>',{cmd:'array',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
$.post('<?=$url?>',{cmd:'array',path:'<?=$path?>',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
var data = d.split('\0');
var info = moreInfo(data,'Array');
$('#array_list').html(data[0]);
$('#array_info').parent().css('display',info?'':'none');
$('#array_info').html(info);
smartMenu('#array_list');
$.post('<?=$url?>',{cmd:'cache',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
$.post('<?=$url?>',{cmd:'cache',path:'<?=$path?>',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
var data = d.split('\0');
var info = moreInfo(data,'Cache');
$('#cache_list').html(data[0]);
@@ -622,7 +626,7 @@ function update30() {
$('#cache_info').html(info);
smartMenu('#cache_list');
<?if ($devs):?>
$.post('<?=$url?>',{cmd:'extra',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
$.post('<?=$url?>',{cmd:'extra',path:'<?=$path?>',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
var data = d.split('\0');
var info = moreInfo(data,'Unassigned');
$('#extra_list').html(data[0]);
+8 -3
View File
@@ -114,16 +114,18 @@ function stage($i) {
return $t;
}
function device_name(&$disk, $array) {
global $path;
if ($array) {
switch ($disk['type']) {
case 'Flash' : $type = 'usb'; break;
case 'Parity': $type = $disk['rotational'] ? 'disk' : 'nvme'; break;
case 'Data' :
case 'Cache' : $type = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; break;
}
return "<i class='icon-$type'></i> ".my_disk($disk['name']);
$name = my_disk($disk['name']);
return "<i class='icon-$type'></i> <a href=\"".htmlspecialchars("$path/Device?name={$disk['name']}")."\" title=\"$name settings\">$name</a>";
} else {
return "<i class='icon-disk'></i> {$disk['device']}";
$name = $disk['device'];
return "<i class='icon-disk'></i> <a href=\"".htmlspecialchars("$path/New?name=$name")."\" title=\"$name settings\">$name</a>";
}
}
function device_status(&$disk, $array, &$error, &$warning) {
@@ -239,6 +241,7 @@ function extra_group() {
}
switch ($_POST['cmd']) {
case 'array':
$path = $_POST['path'];
$var = (array)parse_ini_file('state/var.ini');
$disks = (array)array_filter(parse_ini_file('state/disks.ini',true),'active_disks');
$saved = @(array)parse_ini_file('state/monitor.ini',true);
@@ -250,6 +253,7 @@ case 'array':
echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
break;
case 'cache':
$path = $_POST['path'];
$var = (array)parse_ini_file('state/var.ini');
$disks = (array)array_filter(parse_ini_file('state/disks.ini',true),'active_disks');
$saved = @(array)parse_ini_file('state/monitor.ini',true);
@@ -260,6 +264,7 @@ case 'cache':
echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
break;
case 'extra':
$path = $_POST['path'];
$var = (array)parse_ini_file('state/var.ini');
$disks = (array)parse_ini_file('state/devs.ini',true);
$saved = @(array)parse_ini_file('state/monitor.ini',true);