Replace deprecated HTML5 tags <big> <center> <font>

2026-03-06 00:18:57 -06:00 · 2016-10-24 09:26:24 +02:00
parent ed2657a1c3
commit b7aed12d4f
19 changed files with 81 additions and 73 deletions
--- a/plugins/dynamix/CacheSettings.page
+++ b/plugins/dynamix/CacheSettings.page
@@ -60,5 +60,5 @@ Min. free space:
 > **2000000** => 2,048,000,000 bytes

 &nbsp;
-: <input type="submit" name="changeShare" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be **Stopped** to change<?endif;?>
+: <input type="submit" name="changeShare" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be <span class="strong big">Stopped</span> to change<?endif;?>
 </form>
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -112,9 +112,6 @@ function active_disks($disk) {
 $disks = array_filter($disks,'active_disks');
 $slots = count($disks) + count($devs);
 ?>
-<link type="text/css" rel="stylesheet" href="/webGui/styles/context.standalone.css">
-<script src="/webGui/javascript/context.js"></script>
-
 <table class='share_status fixed'>
 <thead><tr>
 <?
@@ -172,7 +169,7 @@ echo "<td>Array Status</td>".implode('',$row0);
 <?=mk_option("", "1", "Counters")?>
 <?=mk_option("", "2", "Errors")?>
 </select>
-</td></tr><tr><td colspan='4'><center>Load Statistics</center></td></tr></thead>
+</td></tr><tr><td colspan='4' style='text-align:center'>Load Statistics</td></tr></thead>
 <tbody>
 <tr class='wide'><td>Avg. CPU load</td><td colspan='3'><div class='usage-disk sys'><span id='cpu' style='width:0'></span></div></td></tr>
 </tbody>
@@ -355,7 +352,7 @@ foreach ($shares as $name => $share):
  $security = export_settings($var['shareSMBEnabled'], $sec[$name]);
  echo "<tr><td>$list</td><td>$comment</td><td>$security</td><td class='blue' id='share{$i}'>0</td></tr>";
 endforeach;
-if (!count($shares)) echo "<tr><td colspan='4'><center>No shares present</center></td></tr>";
+if (!count($shares)) echo "<tr><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td></tr>";
 ?>
 </tbody>
 <?endif;?>
@@ -368,7 +365,7 @@ foreach ($shares as $name => $share):
  $security = export_settings($var['shareAFPEnabled'], $sec_afp[$name]);
  echo "<tr><td>$list</td><td>$comment</td><td>$security</td><td>-</td></tr>";
 endforeach;
-if (!count($shares)) echo "<tr><td colspan='4'><center>No shares present</center></td></tr>";
+if (!count($shares)) echo "<tr><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td></tr>";
 ?>
 </tbody>
 <?endif;?>
@@ -381,7 +378,7 @@ foreach ($shares as $name => $share):
  $security = export_settings($var['shareNFSEnabled'], $sec_nfs[$name]);
  echo "<tr><td>$list</td><td>$comment</td><td>$security</td><td>-</td></tr>";
 endforeach;
-if (!count($shares)) echo "<tr><td colspan='4'><center>No shares present</center></td></tr>";
+if (!count($shares)) echo "<tr><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td></tr>";
 ?>
 </tbody>
 <?endif;?>
@@ -393,7 +390,7 @@ foreach ($shares as $name => $share):
  $comment = truncate($share['comment'],28);
  echo "<tr><td>$list</td><td>$comment</td><td>-</td><td>-</td></tr>";
 endforeach;
-if (!count($shares)) echo "<tr><td colspan='4'><center>No shares present</center></td></tr>";
+if (!count($shares)) echo "<tr><td colspan='4' style='text-align:center;padding-top:12px'>No shares present</td></tr>";
 ?>
 </tbody>
 <?endif;?>
@@ -459,15 +456,20 @@ function update30() {
    clearTimeout(timer2);
    timer2 = setTimeout(heatAlarm,2000);
    $('[id^="smart-"]').each(function() {
-      var opts = [];
+      var opts = [{header:$(this).attr('id'), image:'/webGui/icons/smart.png'}];
      var id = '#'+$(this).attr('id');
      var page = $(this).attr('name');
      var view = $(this).attr('class');
      var disk = id.substr(id.indexOf('-')+1);
      opts.push({text:'Attributes',icon:'fa-sitemap',action:function(e){e.preventDefault();attributes(page,disk);}});
+      opts.push({divider:true});
      opts.push({text:'Capabilities',icon:'fa-user',action:function(e){e.preventDefault();capabilities(page,disk);}});
+      opts.push({divider:true});
      opts.push({text:'Identity',icon:'fa-home',action:function(e){e.preventDefault();identity(page,disk);}});
-      if (view == 'alert') opts.push({text:'Acknowledge',icon:'fa-check-square-o',action:function(e){e.preventDefault();acknowledge(disk);}});
+      if (view == 'alert') {
+        opts.push({divider:true});
+        opts.push({text:'Acknowledge',icon:'fa-check-square-o',action:function(e){e.preventDefault();acknowledge(disk);}});
+      }
      context.attach(id,opts);
    });
    timer30 = setTimeout(update30,30000);
--- a/plugins/dynamix/DeviceAttributes.page
+++ b/plugins/dynamix/DeviceAttributes.page
@@ -23,7 +23,7 @@ $(function() {
 </script>
 <table class='share_status small'>
 <thead><td style="width:30px">#</td><td>Attribute Name</td><td>Flag</td><td>Value</td><td>Worst</td><td>Threshold</td><td>Type</td><td>Updated</td><td>Failed</td><td style="width:145px">Raw Value</td></thead>
-<tbody id="disk_attributes"><tr><td colspan='10'><br><center><i class='fa fa-spinner fa-spin'></i>&nbsp;<em>Please wait... retrieving S.M.A.R.T. information!</em></center></td></tr></tbody>
+<tbody id="disk_attributes"><tr><td colspan='10' style='text-align:center;padding-top:12px'><i class='fa fa-spinner fa-spin'></i>&nbsp;<em>Please wait... retrieving S.M.A.R.T. information!</em></td></tr></tbody>
 </table>
 <input type="button" value="Done" onclick="done()">

--- a/plugins/dynamix/DeviceCapabilities.page
+++ b/plugins/dynamix/DeviceCapabilities.page
@@ -23,7 +23,7 @@ $(function() {
 </script>
 <table class='share_status small'>
 <thead><td style="width:33%">Feature</td><td>Value</td><td>Information</td></thead>
-<tbody id="disk_capabilities"><tr><td colspan='3'><br><center><i class='fa fa-spinner fa-spin'></i>&nbsp;<em>Please wait... retrieving S.M.A.R.T. information!</em></center></td></tr></tbody>
+<tbody id="disk_capabilities"><tr><td colspan='3' style='text-align:center;padding-top:12px'><i class='fa fa-spinner fa-spin'></i>&nbsp;<em>Please wait... retrieving S.M.A.R.T. information!</em></td></tr></tbody>
 </table>
 <input type="button" value="Done" onclick="done()">

--- a/plugins/dynamix/Identification.page
+++ b/plugins/dynamix/Identification.page
@@ -41,7 +41,7 @@ Model:
 > This is the server model number.

 &nbsp;
-: <input type="submit" name="changeNames" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be **Stopped** to change<?endif;?>
+: <input type="submit" name="changeNames" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be <span class="strong big">Stopped</span> to change<?endif;?>
 </form>
 <script>
 $("#NAME").keypress(function(event) {
--- a/plugins/dynamix/NetworkRules.page
+++ b/plugins/dynamix/NetworkRules.page
@@ -81,5 +81,5 @@ Interface <?=$eth?>:
 > Deleting the file *network-rules.cfg* from the flash device will restore automatic interface assignment after a system reboot.

 <?if (file_exists('/tmp/network-rules.tmp')):?>
-<br><span class="error" style="font-size:13px;text-align:center;padding:12px 0">Please <b>REBOOT</b> system to make new rules active</span>
+<br><span class="error" style="font-size:13px;text-align:center;padding:12px 0">Please <span class="strong big">Reboot</span> system to make new rules active</span>
 <?endif;?>
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -79,7 +79,7 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <br>
 <span class="indent"><input type="button" name="apply" value=" Apply " onclick="prepareNewConfig(this.form)" disabled><input type="button" value=" Done " onclick="done()"></span>
 <?if ($disabled):?>
-<?=$newarray ? 'Array has been <b>RESET</b> (please configure)' : 'Array must be <b>STOPPED</b>'?>
+<?=$newarray ? "Array has been <span class='strong big'>Reset</span> (please configure)" : "Array must be <span class='strong big'>Stopped</span>"?>
 <?else:?>
 <input type="checkbox" onClick="apply.disabled=!this.checked"><small>Yes I want to do this</small>
 <?endif;?>
--- a/plugins/dynamix/NewPerms.page
+++ b/plugins/dynamix/NewPerms.page
@@ -72,7 +72,7 @@ Closing the window before completion will terminate the background process - so

 <input type="submit" name="start" value="Start" disabled><input type="button" value=" Done " onclick="done()">
 <?if ($var['fsState']!="Started"):?>
-Array must be <strong>STARTED</strong> to change permissions.
+Array must be <span class="strong big">Started</span> to change permissions.
 <?else:?>
 <input type="checkbox" onClick="start.disabled=!this.checked"><small>Yes I want to do this</small>
 <?endif;?>
--- a/plugins/dynamix/Registration.page
+++ b/plugins/dynamix/Registration.page
@@ -17,11 +17,14 @@ Type="xmenu"
 function my_time2($time) {
  return $time ? my_time($time) : "Anytime";
 }
+$device = my_word($var['deviceCount']);
+$plural = $var['deviceCount']==1 ? '' : 's';
 ?>
 <style>
-.thanks{padding-left:10px;color:#6FA239;font-weight:bold;}
-.thanks.red{color:#CC0000;}
-.remark{padding:0 10px;text-align:justify;}
+span.thanks{padding-left:10px;color:#6FA239;font-weight:bold;}
+span.thanks.red{color:#F0000C;}
+span.device{font-weight:normal;font-style:italic;}
+div.remark{padding:0 10px;text-align:justify;}
 </style>

 <?if (strstr($var['regTy'], "error")):?>
@@ -55,7 +58,7 @@ GUID is not uninque (this is common with USB card readers).
 <?if (strstr($var['regTy'], "invalid key")):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class='thanks red'>The registered GUID does not match the USB Flash boot device GUID</span>

@@ -66,7 +69,7 @@ Registered GUID:
 : <?=$var['regGUID'];?>

 Registered to:
-: <big><?=$var['regTo'];?></big>
+: <span class="big"><?=$var['regTo'];?></span>

 Registered on:
 : <?=my_time($var['regTm']);?>
@@ -76,7 +79,7 @@ Registered on:
 Expiration:
 : <?=my_time($var['regTm2']);?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key">

 <?else:?>
@@ -86,12 +89,12 @@ Replaceable:

 <?if ($var['regTm2']==0 || $var['regTm2']<time()):?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key"> <input type="button" value="Replace Key" onclick="openBox('/webGui/include/ReplaceKey.php','Replace Key',600,900);">

 <?else:?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key"> <input type="button" value="Replace Key" disabled>

 <?endif;?>
@@ -102,7 +105,7 @@ Replaceable:
 <?if (strstr($var['regTy'], "invalid installation")):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class='thanks red'>Invalid <em>Trial</em> Installation</span>

@@ -113,7 +116,7 @@ Registered GUID:
 : <?=$var['regGUID'];?>

 Registered to:
-: <big><?=$var['regTo'];?></big>
+: <span class="big"><?=$var['regTo'];?></span>

 Registered on:
 : <?=my_time($var['regTm']);?>
@@ -121,7 +124,7 @@ Registered on:
 Expiration:
 : <?=my_time($var['regTm2']);?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key">

 </form>
@@ -130,7 +133,7 @@ Expiration:
 <?if (strstr($var['regTy'], "missing")):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class='thanks red'>Wrong or Missing Key file.</span>

@@ -140,7 +143,7 @@ Flash GUID:
 Registered GUID:
 : <?=$var['regGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key">

 </form>
@@ -149,12 +152,12 @@ Registered GUID:
 <?if (strstr($var['regTy'], "unregistered")):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class="thanks">Thank you for trying unRAID Server OS!</span>

 <div markdown="1" class="remark">
-Your server will not be usable until you purchase a registration key or install a <big>**free** 30-day *Trial*</big> key.
+Your server will not be usable until you purchase a registration key or install a <span class="big">**free** 30-day *Trial*</span> key.
 <br>Registration keys are bound to your USB Flash boot device GUID (serial number).  Please use a high-quality device
 between 512MB and 32GB in size.

@@ -167,7 +170,7 @@ between 512MB and 32GB in size.
 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key"> <input type="button" value="Get Trial Key" onclick="openBox('/webGui/include/TrialRequest.php','Get Trial Key',600,900);">

 </form>
@@ -176,7 +179,7 @@ Flash GUID:
 <?if (strstr($var['regTy'], "expired")):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class="thanks">Thank you for trying unRAID Server OS!</span>

@@ -191,7 +194,7 @@ To continue using unRAID Server OS you may purchase a registration key. Alternat
 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key"> <input type="button" value="Request Extension" onclick="openBox('/webGui/include/TrialRequest.php','Request Trial Extension Key',600,900);">

 </form>
@@ -200,7 +203,7 @@ Flash GUID:
 <?if ($var['regTy']=="Trial"):?>
 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="TrialGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 <span class="thanks">Thank you for trying unRAID Server OS!</span>

@@ -210,7 +213,7 @@ Flash GUID:
 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Purchase Key">

 </form>
@@ -221,7 +224,7 @@ Flash GUID:
 <span class="thanks">Thank you for choosing unRAID Server OS!</span>

 Registered to:
-: <big><?=$var['regTo'];?></big>
+: <span class="big"><?=$var['regTo'];?></span>

 Registered on:
 : <?=my_time($var['regTm']);?>
@@ -231,12 +234,12 @@ Replaceable:

 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="BasicGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Upgrade">

 </form>
@@ -247,7 +250,7 @@ Flash GUID:
 <span class="thanks">Thank you for choosing unRAID Server OS!</span>

 Registered to:
-: <big><?=$var['regTo'];?></big>
+: <span class="big"><?=$var['regTo'];?></span>

 Registered on:
 : <?=my_time($var['regTm']);?>&nbsp;
@@ -257,12 +260,12 @@ Replaceable:

 <form markdown="1" method="GET" action="https://lime-technology.com/getkey" target="_blank">
 <input type="hidden" name="PlusGUID" value="<?=$var['flashGUID'];?>">
-<input type="hidden" name="deviceCount" value="<?=$var['deviceCount'];?>">
+<input type="hidden" name="deviceCount" value="<?=$var['deviceCount']?>">

 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="submit" value="Upgrade">

 </form>
@@ -273,7 +276,7 @@ Flash GUID:
 <span class="thanks">Thank you for choosing unRAID Server OS!</span>

 Registered to:
-: <big><?=$var['regTo'];?></big>
+: <span class="big"><?=$var['regTo'];?></span>

 Registered on:
 : <?=my_time($var['regTm']);?>&nbsp;
@@ -284,7 +287,7 @@ Replaceable:
 Flash GUID:
 : <?=$var['flashGUID'];?>

-<?=$var['deviceCount'];?> Attached storage device(s)
+<span class="device">This system has <?=$device?> attached storage device<?=$plural?>.</span>
 : <input type="button" value="Done" onclick="done()">

 <?else:?>
--- a/plugins/dynamix/SMBsettings.page
+++ b/plugins/dynamix/SMBsettings.page
@@ -41,7 +41,7 @@ Hide "dot" files:

 <?if ($var['fsState']=="Started"):?>
 &nbsp;
-: <input type="submit" name="changeShare" value="Apply" disabled><input type="button" value="Done" onclick="done()">Array must be **Stopped** to change
+: <input type="submit" name="changeShare" value="Apply" disabled><input type="button" value="Done" onclick="done()">Array must be <span class="strong big">Stopped</span> to change
 <?else:?>
 &nbsp;
 : <input type="submit" name="changeShare" value="Apply"><input type="button" value="Done" onclick="done()">
--- a/plugins/dynamix/SecurityAFP.page
+++ b/plugins/dynamix/SecurityAFP.page
@@ -29,7 +29,7 @@ $(checkShareSettingsAFP);
 <input type="hidden" name="shareName" value="<?=$name;?>">

 Share name:
-: <big><?=$name?></big>
+: <span class="big"><?=$name?></span>

 Export:
 : <select name="shareExportAFP" size="1" onchange="checkShareSettingsAFP()">
--- a/plugins/dynamix/SecurityNFS.page
+++ b/plugins/dynamix/SecurityNFS.page
@@ -18,7 +18,7 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$
 <input type="hidden" name="shareName" value="<?=$name;?>">

 Share name:
-: <big><?=$name?></big>
+: <span class="big"><?=$name?></span>

 Export:
 : <select name="shareExportNFS" size="1">
--- a/plugins/dynamix/SecuritySMB.page
+++ b/plugins/dynamix/SecuritySMB.page
@@ -47,7 +47,7 @@ if (isset($disks[$name])) {
 <input type="hidden" name="shareName" value="<?=$name?>">

 Share name:
-: <big><?=$name?></big>
+: <span class="big"><?=$name?></span>

 Export:
 : <select name="shareExport" size="1">
--- a/plugins/dynamix/ShareSettings.page
+++ b/plugins/dynamix/ShareSettings.page
@@ -121,6 +121,6 @@ Tunable (enable Direct IO):
 > *Auto* selects No.

 &nbsp;
-: <input type="submit" name="changeShare" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be **Stopped** to change<?endif;?>
+: <input type="submit" name="changeShare" value="Apply" <?=$disabled?>><input type="button" value="Done" onclick="done()"><?if ($disabled):?>Array must be <span class="strong big">Stopped</span> to change<?endif;?>

 </form>
--- a/plugins/dynamix/Shares.page
+++ b/plugins/dynamix/Shares.page
@@ -3,7 +3,7 @@ Type="xmenu"
 ----
 <?PHP
 if ($var['fsState']!="Started") {
-  echo "<p class='notice'>Array must be <strong><big>started</big></strong> to view Shares.</p>";
+  echo "<p class='notice'>Array must be <span class='strong big'>started</span> to view Shares.</p>";
  return;
 }
 if (count($pages)==2) $tabbed = false;
--- a/plugins/dynamix/include/ParityHistory.php
+++ b/plugins/dynamix/include/ParityHistory.php
@@ -49,9 +49,9 @@ if (file_exists($log)) {
 if ($list)
  for ($i=count($list); $i>=0; --$i) echo $list[$i];
 else
-  echo "<tr><td colspan='4' style='text-align:center'>No parity check history present!</td></tr>";
+  echo "<tr><td colspan='4' style='text-align:center;padding-top:12px'>No parity check history present!</td></tr>";
 ?>
 </tbody></table>
-<center><input type="button" value="Done" onclick="top.Shadowbox.close()"></center>
+<div style="text-align:center"><input type="button" value="Done" onclick="top.Shadowbox.close()"></div>
 </body>
 </html>
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -11,7 +11,8 @@
 */
 ?>
 <?
-require_once 'Helpers.php';
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+require_once "$docroot/webGui/include/Helpers.php";

 $shares  = parse_ini_file('state/shares.ini',true);
 $disks   = parse_ini_file('state/disks.ini',true);
@@ -28,7 +29,7 @@ $display['scale']  = $_GET['scale'];
 $display['number'] = $_GET['number'];

 if (!$shares) {
-  echo "<tr><td colspan='8' style='text-align:center'><i class='fa fa-folder-open-o icon'></i>There are no exportable user shares</td></tr>";
+  echo "<tr><td colspan='8' style='text-align:center;padding-top:12px'><i class='fa fa-folder-open-o icon'></i>There are no exportable user shares</td></tr>";
  exit;
 }

@@ -58,7 +59,7 @@ $myDisks = array_filter(array_diff(array_keys($disks), explode(',',$var['shareUs

 // Share size per disk
 $preserve = ($path==$prev || $compute=='yes');
-$ssz1 = array();
+$ssz1 = [];
 foreach (glob("state/*.ssz1", GLOB_NOSORT) as $entry) {
  if ($preserve)
    $ssz1[basename($entry, ".ssz1")] = parse_ini_file($entry);
@@ -110,5 +111,5 @@ foreach ($shares as $name => $share) {
  }
 }
 if ($row==0) {
-  echo "<tr><td colspan='8' style='text-align:center'><i class='fa fa-folder-open-o icon'></i>There are no exportable user shares</td></tr>";
+  echo "<tr><td colspan='8' style='text-align:center;padding-top:12px'><i class='fa fa-folder-open-o icon'></i>There are no exportable user shares</td></tr>";
 }
--- a/plugins/dynamix/include/SmartInfo.php
+++ b/plugins/dynamix/include/SmartInfo.php
@@ -11,6 +11,8 @@
 */
 ?>
 <?
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+
 function normalize($text, $glue='_') {
  $words = explode($glue,$text);
  foreach ($words as &$word) $word = $word==strtoupper($word) ? $word : preg_replace(['/^(ct|cnt)$/','/^blk$/'],['count','block'],strtolower($word));
@@ -30,7 +32,7 @@ function spindownDelay($port) {
  }
 }
 $disks = []; $var = [];
-require_once 'CustomMerge.php';
+require_once "$docroot/webGui/include/CustomMerge.php";
 $name = isset($_POST['name']) ? $_POST['name'] : '';
 $port = isset($_POST['port']) ? $_POST['port'] : '';
 if ($name) {
@@ -50,8 +52,8 @@ if ($name) {
 }
 switch ($_POST['cmd']) {
 case "attributes":
-  require_once 'Wrappers.php';
-  require_once 'Preselect.php';
+  require_once "$docroot/webGui/include/Wrappers.php";
+  require_once "$docroot/webGui/include/Preselect.php";
  $select = isset($disk['smSelect']) ? $disk['smSelect'] : -1; if ($select==-1) $select = isset($var['smSelect']) ? $var['smSelect'] : 0;
  $level  = isset($disk['smLevel']) ? $disk['smLevel'] : -1; if ($level==-1) $level = isset($var['smLevel']) ? $var['smLevel'] : 1;
  $events = isset($disk['smEvents']) ? explode('|',$disk['smEvents']) : (isset($var['smEvents']) ? explode('|',$var['smEvents']) : $numbers);
@@ -75,7 +77,7 @@ case "attributes":
    echo "<tr{$color}>".implode('',array_map('normalize', $info))."</tr>";
    $empty = false;
  }
-  if ($empty) echo "<tr><td colspan='10' style='text-align:center'>Can not read attributes</td></tr>";
+  if ($empty) echo "<tr><td colspan='10' style='text-align:center;padding-top:12px'>Can not read attributes</td></tr>";
  break;
 case "capabilities":
  exec("smartctl -c $type /dev/$port|awk 'NR>5'",$output);
@@ -94,7 +96,7 @@ case "capabilities":
      $empty = false;
    }
  }
-  if ($empty) echo "<tr><td colspan='3' style='text-align:center'>Can not read capabilities</td></tr>";
+  if ($empty) echo "<tr><td colspan='3' style='text-align:center;padding-top:12px'>Can not read capabilities</td></tr>";
  break;
 case "identify":
  $passed = ['PASSED','OK'];
@@ -111,7 +113,7 @@ case "identify":
    echo "<tr>".normalize(preg_replace('/ is:$/',':',"$title:"),' ')."<td>$info</td></tr>";
    $empty = false;
  }
-  if ($empty) echo "<tr><td colspan='2' style='text-align:center'>Can not read identification</td></tr>";
+  if ($empty) echo "<tr><td colspan='2' style='text-align:center;padding-top:12px'>Can not read identification</td></tr>";
  break;
 case "save":
  exec("smartctl -a $type /dev/$port >{$_SERVER['DOCUMENT_ROOT']}/{$_POST['file']}");
@@ -133,28 +135,28 @@ case "stop":
 case "update":
  if (!exec("hdparm -C /dev/$port|grep -Pom1 'active|unknown'")) {
    $cmd = $_POST['type']=='New' ? "cmd=/webGui/scripts/hd_parm&arg1=up&arg2=$name" : "cmdSpinup=$name";
-    echo "<a href='/update.htm?$cmd' class='info' target='progressFrame'><input type='button' value='Spin Up'></a><span class='orange-text'><big>Unavailable - disk must be spun up</big></span>";
+    echo "<a href='/update.htm?$cmd' class='info' target='progressFrame'><input type='button' value='Spin Up'></a><span class='orange-text'><span class='big'>Unavailable - disk must be spun up</span></span>";
    break;
  }
  $progress = exec("smartctl -c $type /dev/$port|grep -Pom1 '\d+%'");
  if ($progress) {
-    echo "<big><i class='fa fa-spinner fa-pulse'></i> self-test in progress, ".(100-substr($progress,0,-1))."% complete</big>";
+    echo "<span class='big'><i class='fa fa-spinner fa-pulse'></i> self-test in progress, ".(100-substr($progress,0,-1))."% complete</span>";
    break;
  }
  $result = trim(exec("smartctl -l selftest $type /dev/$port|grep -m1 '^# 1'|cut -c26-55"));
  if (!$result) {
-    echo "<big>No self-tests logged on this disk</big>";
+    echo "<span class='big'>No self-tests logged on this disk</span>";
    break;
  }
  if (strpos($result, "Completed without error")!==false) {
-    echo "<span class='green-text'><big>$result</big></span>";
+    echo "<span class='green-text'><span class='big'>$result</span></span>";
    break;
  }
  if (strpos($result, "Aborted")!==false or strpos($result, "Interrupted")!==false) {
-    echo "<span class='orange-text'><big>$result</big></span>";
+    echo "<span class='orange-text'><span class='big'>$result</span></span>";
    break;
  }
-  echo "<span class='red-text'><big>Errors occurred - Check SMART report</big></span>";
+  echo "<span class='red-text'><span class='big'>Errors occurred - Check SMART report</span></span>";
  break;
 case "selftest":
  echo shell_exec("smartctl -l selftest $type /dev/$port|awk 'NR>5'");
--- a/plugins/dynamix/include/Watchdog.php
+++ b/plugins/dynamix/include/Watchdog.php
@@ -15,11 +15,11 @@ $var = parse_ini_file("state/var.ini");

 switch ($var['fsState']) {
 case 'Stopped':
-  echo '<span class="red"><strong>Array Stopped</strong></span>'; break;
+  echo '<span class="red strong">Array Stopped</span>'; break;
 case 'Starting':
-  echo '<span class="orange"><strong>Array Starting</strong></span>'; break;
+  echo '<span class="orange strong">Array Starting</span>'; break;
 default:
-  echo '<span class="green"><strong>Array Started</strong></span>'; break;
+  echo '<span class="green strong">Array Started</span>'; break;
 }
 if ($var['mdResync']) {
  $mode = '';
@@ -32,7 +32,7 @@ if ($var['mdResync']) {
  } elseif (strstr($var['mdResyncAction'],"check")) {
    $mode = 'Parity-Check';
  }
-  echo '&bullet;<span class="orange"><strong>'.$mode.' '.number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,$_POST['dot'],'').' %</strong></span>';
+  echo '&bullet;<span class="orange strong">'.$mode.' '.number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,$_POST['dot'],'').' %</span>';
  if ($_POST['mode']<0) echo '#stop';
 }
 ?>