diff options
author | Colin Fleming <cj_fleming@sky.com> | 2014-06-05 22:44:55 +0100 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2014-06-05 22:44:55 +0100 |
commit | 5689813244ea57c6f20457c29f72faa1c1da6ea0 (patch) | |
tree | 6fe5a6375363007de1e662d8be78621048c7cb97 | |
parent | ed10564bfe664e0c4723217cded9e134b9d82a08 (diff) | |
download | pfsense-5689813244ea57c6f20457c29f72faa1c1da6ea0.zip pfsense-5689813244ea57c6f20457c29f72faa1c1da6ea0.tar.gz |
Tidy up misc. widgets XHTML
captive_portal_status.widget.php
Remove NAME from TABLE tag, not valid in XHTML
carp_status.widget.php
Add missing closing TD tag
dyn_dns_status.widget.php and
installed_packages.widgete.php
Update TD class to single line
load_balancer_status.widget.php
Add quotes to missing TD background colour
traffic_graphs.widget.php
Tidy up HTML Boolean operator
Make NAME and ID in INPUT tag unique
wake_on_lan.widget.php
Remove B tag from "widgetsubheader", alread in CSS
Center message across all columns within table
7 files changed, 15 insertions, 15 deletions
diff --git a/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/usr/local/www/widgets/widgets/captive_portal_status.widget.php index d773877..4700a5b 100644 --- a/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -88,7 +88,7 @@ if ($_GET['order']) { usort($cpdb_all, "clientcmp"); } ?> -<table class="sortable" name="sortabletable" id="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="captive portal status"> +<table class="sortable" id="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="captive portal status"> <tr> <td class="listhdrr"><a href="?order=ip&showact=<?=$_GET['showact'];?>">IP address</a></td> <td class="listhdrr"><a href="?order=mac&showact=<?=$_GET['showact'];?>">MAC address</a></td> diff --git a/usr/local/www/widgets/widgets/carp_status.widget.php b/usr/local/www/widgets/widgets/carp_status.widget.php index 3b52fd8..60d02b6 100644 --- a/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/usr/local/www/widgets/widgets/carp_status.widget.php @@ -74,7 +74,7 @@ $carp_enabled = get_carp_status(); if ($ipaddress){ ?> <?=htmlspecialchars($status);?> <?=htmlspecialchars($ipaddress);}?> -</tr><?php } +</td></tr><?php } } else { ?> <tr><td class="listr">No CARP Interfaces Defined. Click <a href="carp_status.php">here</a> to configure CARP.</td></tr> <?php } ?> diff --git a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index 6fc9da7..cde52c6 100644 --- a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -105,7 +105,7 @@ if($_REQUEST['getdyndnsstatus']) { } ?> </td> - <td class="listlr"> + <td class="listr"> <?php $types = explode(",", DYNDNS_PROVIDER_DESCRIPTIONS); $vals = explode(" ", DYNDNS_PROVIDER_VALUES); @@ -127,7 +127,7 @@ if($_REQUEST['getdyndnsstatus']) { echo htmlspecialchars($dyndns['host']); ?> </td> - <td class="listlr"> + <td class="listr"> <div id='dyndnsstatus<?php echo $i; ?>'><?php echo gettext("Checking ..."); ?></div> </td> </tr> diff --git a/usr/local/www/widgets/widgets/installed_packages.widget.php b/usr/local/www/widgets/widgets/installed_packages.widget.php index 0682f92..9c3b237 100644 --- a/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -70,10 +70,10 @@ $updateavailable = false; <td class="listlr"> <?= $pkg['name'] ?> </td> - <td class="listlr"> + <td class="listr"> <?= $pkg['category'] ?> </td> - <td class="listlr"> + <td class="listr"> <?php $latest_package = $currentvers[$pkg['name']]['version']; if($latest_package == false) { diff --git a/usr/local/www/widgets/widgets/load_balancer_status.widget.php b/usr/local/www/widgets/widgets/load_balancer_status.widget.php index 910bba8..2146575 100644 --- a/usr/local/www/widgets/widgets/load_balancer_status.widget.php +++ b/usr/local/www/widgets/widgets/load_balancer_status.widget.php @@ -125,7 +125,7 @@ if (!$nentries) $checked = "checked"; } echo "<tr>"; - echo "<td bgcolor={$bgcolor}> {$server['ip']['addr']}:{$pool['port']} </td><td bgcolor={$bgcolor}> "; + echo "<td bgcolor=\"{$bgcolor}\"> {$server['ip']['addr']}:{$pool['port']} </td><td bgcolor=\"{$bgcolor}\"> "; if($server['ip']['avail']) echo " ({$server['ip']['avail']}) "; echo " </td></tr>"; diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php index 768a0a2..2dedc2d 100644 --- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -111,7 +111,7 @@ if (isset($a_config["scale_type"])) { <?php } ?> Default AutoScale: <?php - $scale_type_up="checked"; + $scale_type_up="checked=\"checked\""; $scale_type_follow=""; if (isset($config["widgets"]["trafficgraphs"]["scale_type"])) { $selected_radio = $config["widgets"]["trafficgraphs"]["scale_type"]; @@ -123,15 +123,15 @@ if (isset($a_config["scale_type"])) { } } ?> - <input name="scale_type" class="radio" type="radio" id="scale_type" value="up" <?php echo $scale_type_up; ?> onchange="updateGraphDisplays();" /> <span>up</span> - <input name="scale_type" class="radio" type="radio" id="scale_type" value="follow" <?php echo $scale_type_follow; ?> onchange="updateGraphDisplays();" /> <span>follow</span><br /><br /> + <input name="scale_type_up" class="radio" type="radio" id="scale_type_up" value="up" <?php echo $scale_type_up; ?> onchange="updateGraphDisplays();" /> <span>up</span> + <input name="scale_type_follow" class="radio" type="radio" id="scale_type_follow" value="follow" <?php echo $scale_type_follow; ?> onchange="updateGraphDisplays();" /> <span>follow</span><br /><br /> Refresh Interval: <select name="refreshinterval" class="formfld" id="refreshinterval" onchange="updateGraphDisplays();"> <?php for ($i = 1; $i <= 10; $i += 1) { ?> <option value="<?= $i ?>" <?php if ($refreshinterval == $i) echo "selected=\"selected\"";?>><?= $i ?></option> <?php } ?> </select> Seconds<br /> <b>Note:</b> changing this setting will increase CPU utilization<br /><br /> - <input id="submit" name="submit" type="submit" onclick="return updatePref();" class="formbtn" value="Save Settings" /> + <input id="submit_settings" name="submit_settings" type="submit" onclick="return updatePref();" class="formbtn" value="Save Settings" /> </form> </div> diff --git a/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/usr/local/www/widgets/widgets/wake_on_lan.widget.php index c5483b1..c354675 100644 --- a/usr/local/www/widgets/widgets/wake_on_lan.widget.php +++ b/usr/local/www/widgets/widgets/wake_on_lan.widget.php @@ -39,9 +39,9 @@ else <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="wol status"> <tr> <?php - echo '<td class="widgetsubheader" align="center"><b>' . gettext("Computer / Device") . '</b></td>'; - echo '<td class="widgetsubheader" align="center"><b>' . gettext("Interface") . '</b></td>'; - echo '<td class="widgetsubheader" align="center"><b>' . gettext("Status") . '</b></td>'; + echo '<td class="widgetsubheader" align="center">' . gettext("Computer / Device") . '</td>'; + echo '<td class="widgetsubheader" align="center">' . gettext("Interface") . '</td>'; + echo '<td class="widgetsubheader" align="center">' . gettext("Status") . '</td>'; ?> <td class="widgetsubheader"> </td> </tr> @@ -70,7 +70,7 @@ if (count($wolcomputers) > 0) { echo "</td></tr>\n"; } } else { - echo "<tr><td colspan=\"3\" align=\"center\">" . gettext("No saved WoL addresses") . ".</td></tr>\n"; + echo "<tr><td colspan=\"4\" align=\"center\">" . gettext("No saved WoL addresses") . ".</td></tr>\n"; } ?> </table> |