Dashboard: make items moveable between columns

2026-05-03 08:19:27 -05:00 · 2023-01-03 13:11:30 +01:00
parent ab9a2684fe
commit efa8449e80
7 changed files with 89 additions and 101 deletions
@@ -230,7 +230,7 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 <div class='tile' id='tile1'>
 <table id='box1' class='share_status dashboard'>
 <tbody sort='system' class='sortable system'>
-<tr><td></td><td><?=$var['NAME']?>
+<tr><td><?=$var['NAME']?>
 <i class='fa fa-fw fa-wrench control' onclick='contentMgmt()' title="_(Content Management)_"></i><a href='/Dashboard/Settings/Identification' title="_(Go to identification settings)_"><i class='fa fa-fw fa-cog control' title="_(Close Tile)_"></i></a>
 <span class='ctrl'>
 <?if ($parity||$mover||$btrfs):?>
@@ -241,8 +241,8 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 <?if ($sleep):?><span class='fa fa-fw fa-moon-o hand' title="_(Put system to sleep)_" onclick='Sleep()'></span><?endif;?>
 <span class='fa fa-fw fa-refresh hand' title="_(Reboot the system)_" onclick='Reboot()'></span>
 <span class='fa fa-fw fa-power-off hand' title="_(Shutdown the system)_" onclick='Shutdown()'></span></span>
-</td><td></td></tr>
-<tr><td></td><td>
+</td></tr>
+<tr><td>
 <div class='left'>
 <span class='header'>_(Description)_</span><span class='text'><br>
 <?=$var['COMMENT']?><br>
@@ -264,22 +264,22 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 </span>
 <input type='button' value="_(Edit)_" style="margin-right:0" onclick='openChanges("select_case <?=$myfile?>", "_(Select Case Model)_", "selectcase")'>
 </div>
-</td><td></td></tr>
+</td></tr>
 </tbody>

 <tbody sort='motherboard' class='sortable' title="_(Motherboard Information)_">
-<tr><td></td><td><i class='icon-motherboard f32'></i><div class='section'>_(Motherboard)_<br><span id='mb-temp'></span><br><br></div>
+<tr><td><i class='icon-motherboard f32'></i><div class='section'>_(Motherboard)_<br><span id='mb-temp'></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='#' onclick='InfoButton();' title="_(Show Information)_"><i class='fa fa-fw fa-info-circle control'></i></a>
-</td><td></td></tr>
-<tr><td></td><td><?=$board?><br><?=$bios?><br><?=$biosdate?></td><td></td></tr>
+</td></tr>
+<tr><td><?=$board?><br><?=$bios?><br><?=$biosdate?></td></tr>
 </tbody>

 <tbody sort='processor' class='sortable' title="_(Processor Information)_">
-<tr><td></td><td><i class='icon-cpu f32'></i><div class='section'>_(Processor)_<br>
+<tr><td><i class='icon-cpu f32'></i><div class='section'>_(Processor)_<br>
 <span id='load'><i class='ups fa fa-bars'></i>_(Load)_: <span class='cpu'>0%</span></span><span id='cpu-temp'></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/CPUset' title="_(Go to CPU pinning settings)_"><i class='fa fa-fw fa-cog control'></i></a>
-</td><td></td></tr>
-<tr id='cpu_main'><td></td><td><?=$cpumodel?><br>
+</td></tr>
+<tr id='cpu_main'><td><?=$cpumodel?><br>
 <a onclick='toggleCPU()' title="_(Click to toggle details)_" class='cpu_close'>_(Show details)_</a><span id='chart-toggle'>
 <span><select id='cpuline' class='auto' title="_(Select time frame)_" onchange='changeCPUline(this.value)'>
 <?=mk_option("","10", _("10 s"));?>
@@ -287,34 +287,34 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 <?=mk_option("","60", _("1 m"));?>
 <?=mk_option("","120", _("2 m"));?>
 <?=mk_option("","300", _("5 m"));?>
-</select></span><a onclick='toggleChart()' title="_(Click to toggle CPU chart)_"><span class="fa fa-fw fa-bar-chart hand"></span></a></span></td><td></td></tr>
-<tr id='cpu_chart'><td></td><td><div id='cpuchart'></div></td><td></td></tr>
-<tr class='cpu_open'><td></td><td><span class='w26'>_(Overall Load)_:</span><span class='w72'><span class='cpu load'>0%</span><div class='usage-disk sys'><span id='cpu'></span><span></span></div></span></td><td></td></tr>
+</select></span><a onclick='toggleChart()' title="_(Click to toggle CPU chart)_"><span class="fa fa-fw fa-bar-chart hand"></span></a></span></td></tr>
+<tr id='cpu_chart'><td><div id='cpuchart'></div></td></tr>
+<tr class='cpu_open'><td><span class='w26'>_(Overall Load)_:</span><span class='w72'><span class='cpu load'>0%</span><div class='usage-disk sys'><span id='cpu'></span><span></span></div></span></td></tr>
 <?
 foreach ($cpus as $pair) {
  [$cpu1, $cpu2] = my_preg_split('/[,-]/',$pair);
-  echo "<tr class='cpu_open'><td></td>";
+  echo "<tr class='cpu_open'>";
  if ($cpu2)
    echo "<td><span class='w26'>CPU $cpu1 - HT $cpu2</span><span class='dashboard w36'><span class='cpu$cpu1 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span><span class='dashboard w36'><span class='cpu$cpu2 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu2'></span><span></span></div></span></td>";
  else
    echo "<td><span class='w26'>CPU $cpu1</span><span class='w72'><span class='cpu$cpu1 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span></td>";
-  echo "<td></td></tr>";
+  echo "</tr>";
 }
 ?>
 </tbody>

 <tbody sort='memory' class='sortable' title="_(Memory Utilization)_">
-<tr><td></td><td><i class='icon-ram f32'></i><div class='section'>_(Memory)_<br><span><?="$memory_installed $unit $memory_type $ecc"?><span id='util'>_(Utilization)_: <span class='sys0'>0%</span></span><br><br></div>
+<tr><td><i class='icon-ram f32'></i><div class='section'>_(Memory)_<br><span><?="$memory_installed $unit $memory_type $ecc"?><span id='util'>_(Utilization)_: <span class='sys0'>0%</span></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Tools/Processes' title="_(View Running Processes)_"><i class='fa fa-fw fa-info-circle control'></i></a>
-</td><td></td></tr>
-<tr><td></td><td><span class='w26'>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></span><span class='w36'><i class='mm'>_(RAM)_</i><span class='sys0 load'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span>
-<span class='w36'><i class='mm'>_(Flash)_</i><span class='sys1 load'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td><td></td></tr>
-<tr><td></td><td><span class='w26'>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><span class='w36'><i class='mm'>_(Log)_</i><span class='sys2 load'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span>
-<span class='w36'><?if (exec("df /var/lib/docker|grep -om1 '^/'")):?><i class='mm'>_(Docker)_</i><span class='sys3 load'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div><?endif;?></span></td><td></td></tr>
+</td></tr>
+<tr><td><span class='w26'>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></span><span class='w36'><i class='mm'>_(RAM)_</i><span class='sys0 load'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span>
+<span class='w36'><i class='mm'>_(Flash)_</i><span class='sys1 load'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td></tr>
+<tr><td><span class='w26'>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><span class='w36'><i class='mm'>_(Log)_</i><span class='sys2 load'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span>
+<span class='w36'><?if (exec("df /var/lib/docker|grep -om1 '^/'")):?><i class='mm'>_(Docker)_</i><span class='sys3 load'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div><?endif;?></span></td></tr>
 </tbody>

 <tbody sort='interface' class='sortable' title="_(Interface Information)_">
-<tr><td></td><td><i class='icon-ethernet f32'></i><div class='section'>_(Interface)_<br>
+<tr><td><i class='icon-ethernet f32'></i><div class='section'>_(Interface)_<br>
 <select name="port_select" onchange="portSelect(this.value)">
 <?foreach ($ports as $port):?>
 <?=mk_option("",$port,_($port))?>
@@ -322,8 +322,8 @@ foreach ($cpus as $pair) {
 </select>
 <span>_(Inbound)_: <span id='inbound'>---</span>_(Outbound)_: <span id='outbound'>---</span></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/NetworkSettings' title="_(Go to network settings)_"><i class='fa fa-fw fa-cog control'></i></a>
-</td><td></td></tr>
-<tr><td></td><td><span class='w26'><select name="enter_view" onchange="changeView(this.value)">
+</td></tr>
+<tr><td><span class='w26'><select name="enter_view" onchange="changeView(this.value)">
 <?=mk_option("", "0", _("General info"))?>
 <?=mk_option("", "1", _("Counters info"))?>
 <?=mk_option("", "2", _("Errors info"))?>
@@ -337,40 +337,40 @@ foreach ($cpus as $pair) {
 <?=mk_option("","60", _("1 m"))?>
 <?=mk_option("","120", _("2 m"))?>
 <?=mk_option("","300", _("5 m"))?>
-</select></span></span></td><td></td></tr>
+</select></span></span></td></tr>
 <?
 $c = 0;
 foreach ($ports as $port) {
  $last = $port=='lo' ? ' last' : '';
-  echo "<tr class='view1{$last}'><td></td><td><span class='w26'>$port</span><span class='w72' id='main".($c++)."'></span></td><td></td></tr>";
+  echo "<tr class='view1{$last}'><td><span class='w26'>$port</span><span class='w72' id='main".($c++)."'></span></td></tr>";
 }
 $c = 0;
 foreach ($ports as $port) {
  $last = $port=='lo' ? ' last' : '';
-  echo "<tr class='view2{$last}'><td></td><td><span class='w26'>$port</span><span class='w36' id='port{$c}'></span><span class='w36' id='port".($c+1)."'></span></td><td></td></tr>";
+  echo "<tr class='view2{$last}'><td><span class='w26'>$port</span><span class='w36' id='port{$c}'></span><span class='w36' id='port".($c+1)."'></span></td></tr>";
  $c += 2;
 }
 $c = 0;
 foreach ($ports as $port) {
  $last = $port=='lo' ? ' last' : '';
-  echo "<tr class='view3{$last}'><td></td><td><span class='w26'>$port</span><span class='w36' id='link{$c}'></span><span class='w36' id='link".($c+1)."'></span></td><td></td></tr>";
+  echo "<tr class='view3{$last}'><td><span class='w26'>$port</span><span class='w36' id='link{$c}'></span><span class='w36' id='link".($c+1)."'></span></td></tr>";
  $c += 2;
 }
 ?>
-<tr class="view4"><td></td><td><div id="netchart"></div></td><td></td></tr>
+<tr class="view4"><td><div id="netchart"></div></td></tr>
 </tbody>

 <?if ($wireguard):?>
 <tbody sort='wireguard' class='sortable' title="_(VPN Connections)_">
-<tr><td></td><td><i class='icon-vpn f32'></i><div class='section'>_(VPN)_<br><span class='ups'>_(Active tunnels)_: <span id='vpn-active'><?=$up?></span></span><span class='ups'>_(Inactive tunnels)_: <span id='vpn-inactive'><?=$down?></span></span><br><br></div>
+<tr><td><i class='icon-vpn f32'></i><div class='section'>_(VPN)_<br><span class='ups'>_(Active tunnels)_: <span id='vpn-active'><?=$up?></span></span><span class='ups'>_(Inactive tunnels)_: <span id='vpn-inactive'><?=$down?></span></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Settings/VPNmanager' title="_(Go to VPN settings)_"><i class='fa fa-fw fa-cog control'></i></a>
-</td><td></td></tr>
+</td></tr>
 <?foreach ($conf as $wg):?>
 <?$vpn = basename($wg,'.conf'); $peers = vpn_peers($wg);?>
-<tr><td></td><td class='vpn'><span class='w26'><i class='icon-vpn vpn<?=in_array($vpn,$wg_up)?'':' inactive'?>' onclick="toggleVPN($(this),'<?=$vpn?>')" title="Toggle tunnel state"></i><?="Tunnel $vpn"?></span>
-<span class='w36 vpn right'>_(Activity)_</span><span class='w36 vpn right'>_(Handshake)_</span></td><td></td></tr>
+<tr><td class='vpn'><span class='w26'><i class='icon-vpn vpn<?=in_array($vpn,$wg_up)?'':' inactive'?>' onclick="toggleVPN($(this),'<?=$vpn?>')" title="Toggle tunnel state"></i><?="Tunnel $vpn"?></span>
+<span class='w36 vpn right'>_(Activity)_</span><span class='w36 vpn right'>_(Handshake)_</span></td></tr>
 <?foreach ($peers as $i => $peer):?>
-<tr><td></td><td><span class='w26 wg1'><?=$peer?></span><span class='w36 wg2' id='<?="$vpn-rx-".($i-1)?>'>---</span><span class='w36 wg2' id='<?="$vpn-hs-".($i-1)?>'>_(inactive)_</span></td><td></td></tr>
+<tr><td><span class='w26 wg1'><?=$peer?></span><span class='w36 wg2' id='<?="$vpn-rx-".($i-1)?>'>---</span><span class='w36 wg2' id='<?="$vpn-hs-".($i-1)?>'>_(inactive)_</span></td></tr>
 <?endforeach;?>
 <?endforeach;?>
 </tbody>
@@ -378,29 +378,29 @@ foreach ($ports as $port) {

 <?if ($apcupsd):?>
 <tbody sort='power' class='sortable' title="_(Power Status)_">
-<tr><td></td><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<br>
+<tr><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<br>
 <span><i class='ups fa fa-shield'></i>_(UPS Model)_: </span><span id='ups_model'></span>
 <span><i class='ups fa fa-bars'></i>_(UPS Load)_: </span><span id='ups_loadpct'></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/UPSsettings' title="_(Go to UPS settings)_"><i class='fa fa-fw fa-cog control'></i></a>
-</td><td></td></tr>
-<tr><td></td><td>
+</td></tr>
+<tr><td>
 <span class='ups'><i class='ups fa fa-fw fa-plug'></i>_(UPS status)_:</span><span id='ups_status'></span><br>
 <span class='ups'><i class='ups fa fa-fw fa-battery'></i>_(Battery charge)_:</span><span id='ups_bcharge'></span><br>
 <span class='ups'><i class='ups fa fa-fw fa-clock-o'></i>_(Runtime left)_:</span><span id='ups_timeleft'></span><br>
 <span class='ups'><i class='ups fa fa-fw fa-bolt'></i>_(Nominal power)_:</span><span id='ups_nompower'></span><br>
 <span class='ups'><i class='ups fa fa-fw fa-ellipsis-h'></i>_(Output voltage)_:</span><span id='ups_outputv'></span><br>
-</td><td></td></tr>
+</td></tr>
 </tbody>
 <?endif;?>

 <?if ($fans):?>
 <tbody sort='airflow' class='sortable' title="_(Fan Information)_">
-<tr><td></td><td><i class='icon-fan f32'></i><div class='section'>_(Airflow)_<br><span>_(Fan count)_: <?=$fans?></span><br><br></div>
+<tr><td><i class='icon-fan f32'></i><div class='section'>_(Airflow)_<br><span>_(Fan count)_: <?=$fans?></span><br><br></div>
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i>
 <?if ($autofan):?>
 <a href='/Dashboard/Settings/FanSettings' title="_(Go to fan settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <?endif;?>
-</td><td></td></tr>
+</td></tr>
 <?
 $label = $value = [];
 $i = 0;
@@ -413,14 +413,14 @@ for ($fan=0; $fan<$fans; $fan++) {
  if ($fan > 0 && $fan % 3 == 0) $i++;
  $value[$i][] = "<span class='fan' id='fan$fan'></span>";
 }
-echo "<tr><td></td><td>";
+echo "<tr><td>";
 for ($i = 0; $i < count($label); $i++) {
  foreach ($label[$i] as $data) echo $data;
  echo "<br>";
  foreach ($value[$i] as $data) echo $data;
  echo "<br>";
 }
-echo "</td><td></td></tr>";
+echo "</td></tr>";
 ?>
 </tbody>
 <?endif;?>
@@ -432,24 +432,24 @@ echo "</td><td></td></tr>";
 <?if ($display['dashapps']!='none'):?>
 <?if ($dockerd && ($display['dashapps']=='icons' || $display['dashapps']=='docker')):?>
 <tbody sort='docker' class='sortable' id='docker_view' title="_(Docker Containers)_">
-<tr><td></td><td>_(Docker Containers)_
+<tr><td>_(Docker Containers)_
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/DockerSettings' title="_(Go to Docker settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <span class='info apps'><input type='checkbox' id='apps'></span>
-</td><td></td></tr>
+</td></tr>
 </tbody>
 <?endif;?>
 <?if ($libvirtd && ($display['dashapps']=='icons' || $display['dashapps']=='vms')):?>
 <tbody sort='vms' class='sortable' id='vm_view' title="_(Virtual Machines)_">
-<tr><td></td><td>_(Virtual Machines)_
+<tr><td>_(Virtual Machines)_
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/VMSettings' title="_(Go to VM settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <span class='info vms'><input type='checkbox' id='vms'></span>
-</td><td></td></tr>
+</td></tr>
 </tbody>
 <?endif;?>
 <?endif;?>

 <tbody sort='shares' class='sortable' title="_(Shares Information)_">
-<tr><td></td><td>_(Shares)_
+<tr><td>_(Shares)_
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Shares' title="_(Go to Share settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <span class='info'><?=sprintf(_("Share count: %s with %s cache only and %s encrypted"),count($shares),$cache_only,$encrypted)?></span>
 <?if ($group):?>
@@ -462,8 +462,8 @@ echo "</td><td></td></tr>";
 <?endif;?>
 </select>
 <?endif;?>
-</td><td></td></tr>
-<tr class='header'><td></td><td><span class='w26'>_(Name)_</span><span class='w40'>_(Description)_</span><span class='w18'>_(Security)_</span><span class='w14'>_(Streams)_</span></td><td></td></tr>
+</td></tr>
+<tr class='header'><td><span class='w26'>_(Name)_</span><span class='w40'>_(Description)_</span><span class='w18'>_(Security)_</span><span class='w14'>_(Streams)_</span></td></tr>
 <?
 if ($var['shareSMBEnabled']=='yes') {
  $i = 0;
@@ -475,9 +475,9 @@ if ($var['shareSMBEnabled']=='yes') {
    $comment = compress($share['comment'],40) ?: '&nbsp;';
    $security = export_settings($var['shareSMBEnabled'], $sec[$name]);
    $last = $name==array_key_last($shares) ? ' last' : '';
-    echo "<tr class='smb share share1{$last}'><td></td><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>$security</span><span class='w14' id='share{$i}'>0</span></td><td></td></tr>";
+    echo "<tr class='smb share share1{$last}'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>$security</span><span class='w14' id='share{$i}'>0</span></td></tr>";
  }
-  if (!count($shares)) echo "<tr class='smb share share1'><td></td><td class='none'>"._("No shares present")."</td><td></td></tr>";
+  if (!count($shares)) echo "<tr class='smb share share1'><td class='none'>"._("No shares present")."</td></tr>";
 }
 if ($var['shareNFSEnabled']=='yes') {
  foreach ($shares as $name => $share) {
@@ -487,9 +487,9 @@ if ($var['shareNFSEnabled']=='yes') {
    $comment = compress($share['comment'],40) ?: '&nbsp;';
    $security = export_settings($var['shareNFSEnabled'], $sec_nfs[$name]);
    $last = $name==array_key_last($shares) ? ' last' : '';
-    echo "<tr class='nfs share share3{$last}'><td></td><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>$security</span><span class='w14'>-</span></td><td></td></tr>";
+    echo "<tr class='nfs share share3{$last}'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>$security</span><span class='w14'>-</span></td></tr>";
  }
-  if (!count($shares)) echo "<tr class='nfs share share3'><td></td><td class='none'>"._("No shares present")."</td><td></td></tr>";
+  if (!count($shares)) echo "<tr class='nfs share share3'><td class='none'>"._("No shares present")."</td></tr>";
 }
 if (!$group) {
  foreach ($shares as $name => $share) {
@@ -497,19 +497,19 @@ if (!$group) {
    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;';
-    echo "<tr class='share'><td></td><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>-</span><span class='w14'>-</span></td><td></td></tr>";
+    echo "<tr class='share'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w40'>$comment</span><span class='w18'>-</span><span class='w14'>-</span></td></tr>";
  }
-  if (!count($shares)) echo "<tr class='share'><td></td><td class='none'>"._("No shares present")."</td><td></td></tr>";
+  if (!count($shares)) echo "<tr class='share'><td class='none'>"._("No shares present")."</td></tr>";
 }
 ?>
 </tbody>

 <tbody sort='users' class='sortable' title="_(Users Information)_">
-<tr><td></td><td>_(Users)_
+<tr><td>_(Users)_
 <i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Users' title="_(Go to User settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <span class='info'><?=sprintf(_("User count: %s with %s unprotected"),count($users),$nopass)?></span>
-</td><td></td></tr>
-<tr class='header'><td></td><td><span class='w26'>_(Name)_</span><span class='w40'>_(Description)_</span><span class='w18'>_(Write)_</span><span class='w14'>_(Read)_</span></td><td></td></tr>
+</td></tr>
+<tr class='header'><td><span class='w26'>_(Name)_</span><span class='w40'>_(Description)_</span><span class='w18'>_(Write)_</span><span class='w14'>_(Read)_</span></td></tr>
 <?
 if ($var['shareSMBEnabled']=='yes') {
  foreach ($users as $user) {
@@ -539,7 +539,7 @@ if ($var['shareSMBEnabled']=='yes') {
    }
    if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
    $last = $name==array_key_last($users) ? ' last' : '';
-    echo "<tr class='smb user user1{$last}'><td></td><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>$write</span><span class='w14'>$read</span></td><td></td></tr>";
+    echo "<tr class='smb user user1{$last}'><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>$write</span><span class='w14'>$read</span></td></tr>";
  }
 }
 if ($var['shareNFSEnabled']=='yes') {
@@ -550,7 +550,7 @@ if ($var['shareNFSEnabled']=='yes') {
    $write = '-'; $read = '-';
    if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
    $last = $name==array_key_last($users) ? ' last' : '';
-    echo "<tr class='nfs user user3{$last}'><td></td><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>$write</span><span class='w14'>$read</span></td><td></td></tr>";
+    echo "<tr class='nfs user user3{$last}'><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>$write</span><span class='w14'>$read</span></td></tr>";
  }
 }
 if (!$group) {
@@ -559,7 +559,7 @@ if (!$group) {
    $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;';
    if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
-    echo "<tr class='user'><td></td><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>-</span><span class='w14'>-</span></td><td></td></tr>";
+    echo "<tr class='user'><td><span class='w26'><i class='icon-user f14'></i>$list</span><span class='w40'>$desc</span><span class='w18'>-</span><span class='w14'>-</span></td></tr>";
  }
 }
 ?>
@@ -570,36 +570,36 @@ if (!$group) {
 <div class='tile' id='tile3'>
 <table id='box3' class='share_status dashboard'>
 <tbody sort='parity' class='sortable' title="_(Parity Information)_">
-<tr><td></td><td>_(Parity)_<i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/Scheduler' title="_(Go to scheduler settings)_"><i class='fa fa-fw fa-cog control'></i></a>
-<span class='info title'></span></td><td></td></tr>
-<tr><td></td><td id='parity' class="wrap"></td><td></td></tr>
-<tr><td></td><td id='program' class="wrap"></td><td></td></tr>
+<tr><td>_(Parity)_<i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/Scheduler' title="_(Go to scheduler settings)_"><i class='fa fa-fw fa-cog control'></i></a>
+<span class='info title'></span></td></tr>
+<tr><td id='parity' class="wrap"></td></tr>
+<tr><td id='program' class="wrap"></td></tr>
 </tbody>

 <tbody sort='array' class='sortable' id='array_list' title="_(Array Information)_">
-<tr><td></td><td>_(Array)_<?if (!$started):?> (_(stopped)_)<?endif;?><i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/DiskSettings' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
+<tr><td>_(Array)_<?if (!$started):?> (_(stopped)_)<?endif;?><i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/DiskSettings' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <?if ($started):?><span class='info'><?=sprintf(_("%s used of %s (%s %%)"),my_scale($array_used*1024,$unit)." $unit",my_scale($array_size*1024,$unit,-1,-1)." $unit",$array_percent)?></span><?endif;?>
-</td><td></td></tr>
-<tr><td></td><td id='array_info'></td><td></td></tr>
-<tr class='header'><td></td><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td><td></td></tr>
+</td></tr>
+<tr><td id='array_info'></td></tr>
+<tr class='header'><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td></tr>
 </tbody>

 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody sort='_<?=$pool?>_' class='sortable' id='pool_list<?=$i++?>' title="_(<?=$pool?> Information)_">
-<tr><td></td><td><?=ucfirst($pool)?><?if (!$started):?> (_(stopped)_)<?endif;?><i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/DiskSettings' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
+<tr><td><?=ucfirst($pool)?><?if (!$started):?> (_(stopped)_)<?endif;?><i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><a href='/Dashboard/Settings/DiskSettings' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 <?if ($started):?><span class='info'><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?></span><?endif;?>
-</td><td></td></tr>
-<tr><td></td><td id='pool_info<?=$i?>'></td><td></td></tr>
-<tr class='header'><td></td><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td><td></td></tr>
+</td></tr>
+<tr><td id='pool_info<?=$i?>'></td></tr>
+<tr class='header'><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td></tr>
 </tbody>
 <?endforeach;?>

 <?if ($devs):?>
 <tbody sort='devs' class='sortable' id='devs_list' title="_(Unassigned Devices)_">
-<tr><td></td><td>_(Unassigned)_<i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><span class='info'></span></td><td></td></tr>
-<tr><td></td><td id='devs_info'></td><td></td></tr>
-<tr class='header'><td></td><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td><td></td></tr>
+<tr><td>_(Unassigned)_<i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title="_(Close Tile)_"></i><span class='info'></span></td></tr>
+<tr><td id='devs_info'></td></tr>
+<tr class='header'><td><span class='w26'>_(Device)_</span><span class='w18'>_(Status)_</span><span class='w18'>_(Temp)_</span><span class='w18'>_(SMART)_</span><span class='w18'>_(Utilization)_</span></td></tr>
 </tbody>
 <?endif;?>
 </table>
@@ -33,7 +33,7 @@ if ($_POST['docker'] && ($display=='icons' || $display=='docker')) {
    foreach ($containers as $ct) $sort[] = array_search($ct['Name'],$prefs) ?? 999;
    array_multisort($sort,SORT_NUMERIC,$containers);
  }
-  echo "<tr class='updated'><td></td><td>";
+  echo "<tr class='updated'><td>";
  foreach ($containers as $ct) {
    $name = $ct['Name'];
    $id = $ct['Id'];
@@ -61,7 +61,7 @@ if ($_POST['docker'] && ($display=='icons' || $display=='docker')) {
  }
  $none = count($containers) ? _('No running docker containers') : _('No docker containers defined');
  echo "<span id='no_apps' style='display:none'>$none<br><br></span>";
-  echo "</td><td></td></tr>";
+  echo "</td></tr>";
 }
 echo "\0";
 if ($_POST['vms'] && ($display=='icons' || $display=='vms')) {
@@ -74,7 +74,7 @@ if ($_POST['vms'] && ($display=='icons' || $display=='vms')) {
  } else {
    natcasesort($vms);
  }
-  echo "<tr class='updated'><td></td><td>";
+  echo "<tr class='updated'><td>";
  foreach ($vms as $vm) {
    $res = $lv->get_domain_by_name($vm);
    $uuid = libvirt_domain_get_uuid_string($res);
@@ -135,5 +135,5 @@ if ($_POST['vms'] && ($display=='icons' || $display=='vms')) {
  }
  $none = count($vms) ? _('No running virtual machines') : _('No virtual machines defined');
  echo "<span id='no_vms' style='display:none'>$none<br><br></span>";
-  echo "</td><td></td></tr>";
+  echo "</td></tr>";
 }
@@ -135,7 +135,7 @@ function device_name(&$disk) {
  $name = my_disk($disk['name']);
  [$p1,$p2] = explode(' ',$name);
  $name = _($p1).($p2?" $p2":"");
-  return "<i class='icon-$type' style='font-size:1.4rem'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name={$disk['name']}")."\" title=\"$name settings\">$name</a>";
+  return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name={$disk['name']}")."\" title=\"$name settings\">$name</a>";
 }
 function device_status(&$disk, &$error, &$warning) {
  global $var;
@@ -225,13 +225,13 @@ function array_group($type,$pool=false) {
  global $disks,$error,$warning,$red,$orange,$fail,$smart,$full,$high;
  $echo = [];
  foreach ($disks as $disk) if ($disk['type']==$type && strpos($disk['status'],'DISK_NP')===false && (!$pool||$pool==prefix($disk['name']))) {
-    $echo[] = "<tr class='updated'><td></td><td>";
+    $echo[] = "<tr class='updated'><td>";
    $echo[] = "<span class='w26'>".device_name($disk)."</span>";
    $echo[] = "<span class='w18'>".device_status($disk,$error,$warning)."</span>";
    $echo[] = "<span class='w18'>".device_temp($disk,$red,$orange)."</span>";
    $echo[] = "<span class='w18'>".device_smart($disk,$fail,$smart)."</span>";
    $echo[] = "<span class='w18'>".device_usage($disk,$full,$high)."</span>";
-    $echo[] = "</td><td></td></tr>";
+    $echo[] = "</td></tr>";
  }
  return implode('',$echo);
 }
@@ -242,13 +242,13 @@ function extra_group() {
    $name = $disk['name'];
    $disk['type'] = "Extra";
    $disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink';
-    $echo[] = "<tr class='updated'><td></td><td>";
+    $echo[] = "<tr class='updated'><td>";
    $echo[] = "<span class='w26'>".device_name($disk)."</span>";
    $echo[] = "<span class='w18'>".device_status($disk,$error,$warning)."</span>";
    $echo[] = "<span class='w18'>".device_temp($disk,$red,$orange)."</span>";
    $echo[] = "<span class='w18'>".device_smart($disk,$fail,$smart)."</span>";
    $echo[] = "<span class='w18'>".device_usage($disk,$full,$high)."</span>";
-    $echo[] = "</td><td></td></tr>";
+    $echo[] = "</td></tr>";
  }
  return implode('',$echo);
 }
@@ -165,10 +165,7 @@ table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;fo
 table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
 table.share_status.dashboard tr.last>td{padding-bottom:20px}
 table.share_status.dashboard tr{border:none}
-table.share_status.dashboard tr>td{line-height:normal;padding-top:3px;padding-bottom:3px}
-table.share_status.dashboard tr td:first-child{width:2%}
-table.share_status.dashboard tr td:nth-child(2){width:97%}
-table.share_status.dashboard tr td:last-child{width:1%}
+table.share_status.dashboard td{line-height:normal;padding:3px 10px}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -161,10 +161,7 @@ table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;fo
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
 table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
 table.share_status.dashboard tr.last>td{padding-bottom:20px}
-table.share_status.dashboard tr td:first-child{width:2%}
-table.share_status.dashboard tr td:nth-child(2){width:97%}
-table.share_status.dashboard tr td:last-child{width:1%}
-table.share_status.dashboard td{padding:3px 0}
+table.share_status.dashboard td{padding:3px 10px}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -165,10 +165,7 @@ table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;fo
 table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
 table.share_status.dashboard tr.last>td{padding-bottom:20px}
 table.share_status.dashboard tr{border:none}
-table.share_status.dashboard tr>td{line-height:normal;padding-top:3px;padding-bottom:3px}
-table.share_status.dashboard tr td:first-child{width:2%}
-table.share_status.dashboard tr td:nth-child(2){width:97%}
-table.share_status.dashboard tr td:last-child{width:1%}
+table.share_status.dashboard td{line-height:normal;padding:3px 10px}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -161,10 +161,7 @@ table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;fo
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
 table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
 table.share_status.dashboard tr.last>td{padding-bottom:20px}
-table.share_status.dashboard tr td:first-child{width:2%}
-table.share_status.dashboard tr td:nth-child(2){width:97%}
-table.share_status.dashboard tr td:last-child{width:1%}
-table.share_status.dashboard td{padding:3px 0}
+table.share_status.dashboard td{padding:3px 10px}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}