diff options
author | Colin Fleming <cj_fleming@sky.com> | 2013-03-05 17:08:07 +0000 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2013-03-05 17:08:07 +0000 |
commit | 319f65ec787b16e349992586557a5b6e0fcecd59 (patch) | |
tree | 4a303e50e03f30841086bc1022df8dd2c74bf0fb /usr/local/www | |
parent | bcab1b076d4a73bf2ffdb3aa527fe0157185a6cb (diff) | |
download | pfsense-319f65ec787b16e349992586557a5b6e0fcecd59.zip pfsense-319f65ec787b16e349992586557a5b6e0fcecd59.tar.gz |
Tidy up widget XHTML
Close BR tag
Close INPUT tag
Depcrated ampersand in HREF
Added ALT to img tag
Added close body tag
Added close htm tag
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/status_interfaces.php | 56 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/interfaces.widget.php | 36 |
2 files changed, 47 insertions, 45 deletions
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 3e6d793..0ab83b1 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -65,7 +65,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<table width="100%" border="0" cellspacing="0" cellpadding="0"> +<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="status interfaces"> <?php $i = 0; $ifdescrs = get_configured_interface_with_descr(false, true); @@ -98,11 +98,11 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['dhcplink']);?> <?php if ($ifinfo['dhcplink'] == "up"): ?> - <a href="status_interfaces.php?action=Release&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Release");?>" class="formbtns"> + <a href="status_interfaces.php?action=Release&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Release");?>" class="formbtns" /> <?php else: ?> - <a href="status_interfaces.php?action=Renew&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Renew");?>" class="formbtns"> + <a href="status_interfaces.php?action=Renew&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Renew");?>" class="formbtns" /> <?php endif; ?> </a> </td> @@ -116,11 +116,11 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['dhcp6link']);?> <?php if ($ifinfo['dhcp6link'] == "up"): ?> - <a href="status_interfaces.php?action=Release&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Release");?>" class="formbtns"> + <a href="status_interfaces.php?action=Release&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Release");?>" class="formbtns" /> <?php else: ?> - <a href="status_interfaces.php?action=Renew&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Renew");?>" class="formbtns"> + <a href="status_interfaces.php?action=Renew&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Renew");?>" class="formbtns" /> <?php endif; ?> </a> </td> @@ -131,11 +131,11 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['pppoelink']);?> <?php if ($ifinfo['pppoelink'] == "up"): ?> - <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns" /> <?php else: ?> - <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns" /> <?php endif; ?> </a> </td> @@ -146,11 +146,11 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['pptplink']);?> <?php if ($ifinfo['pptplink'] == "up"): ?> - <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns" /> <?php else: ?> - <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns" /> <?php endif; ?> </a> </td> @@ -161,11 +161,11 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['l2tplink']);?> <?php if ($ifinfo['l2tplink'] == "up"): ?> - <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns" /> <?php else: ?> - <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns" /> <?php endif; ?> </a> </td> @@ -176,12 +176,12 @@ include("head.inc"); <td width="78%" class="listr"> <?=htmlspecialchars($ifinfo['pppinfo']);?> <?php if ($ifinfo['ppplink'] == "up"): ?> - <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Disconnect");?>" class="formbtns" /> <?php else: ?> <?php if (!$ifinfo['nodevice']): ?> - <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> - <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns"> + <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> + <input type="button" name="<?php echo $ifdescr; ?>" value="<?=gettext("Connect");?>" class="formbtns" /> <?php endif; ?> <?php endif; ?> </a> @@ -325,7 +325,7 @@ include("head.inc"); <?php $dns_servers = get_dns_servers(); foreach($dns_servers as $dns) { - echo "{$dns}<br>"; + echo "{$dns}<br/>"; } ?> </td> @@ -473,10 +473,12 @@ include("head.inc"); <br/> -</strong><?php printf(gettext("Using dial-on-demand will bring the connection up again if any packet ". +<?php printf(gettext("Using dial-on-demand will bring the connection up again if any packet ". "triggers it. To substantiate this point: disconnecting manually ". "will %snot%s prevent dial-on-demand from making connections ". "to the outside! Don't use dial-on-demand if you want to make sure that the line ". "is kept disconnected."),'<strong>','</strong>')?> <?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php index e77f9d6..1a9398b 100644 --- a/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/usr/local/www/widgets/widgets/interfaces.widget.php @@ -42,7 +42,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); $ifdescrs = get_configured_interface_with_descr(); ?> - <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0"> + <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0" summary="interfaces"> <?php foreach ($ifdescrs as $ifdescr => $ifname) { $ifinfo = get_interface_info($ifdescr); @@ -52,18 +52,18 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); <td class="vncellt" width="40%"> <?php if($ifinfo['ppplink']) { - echo "<img src='./themes/{$g['theme']}/images/icons/icon_3g.gif' />"; + echo "<img src='./themes/{$g['theme']}/images/icons/icon_3g.gif' alt='3g' />"; } else if($iswireless) { if($ifinfo['status'] == "associated") { ?> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan.gif" /> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan.gif" alt="wlan" /> <?php } else { ?> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan_d.gif" /> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan_d.gif" alt="wlan_d" /> <?php } ?> <?php } else { ?> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif"/> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif" alt="cablenic" /> <?php } ?> <strong><u> - <span onClick="location.href='/interfaces.php?if=<?=$ifdescr; ?>'" style="cursor:pointer"> + <span onclick="location.href='/interfaces.php?if=<?=$ifdescr; ?>'" style="cursor:pointer"> <?=htmlspecialchars($ifname);?></span></u></strong> <?php if ($ifinfo['dhcplink']) @@ -71,37 +71,37 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); ?> </td> <td width="60%" class="listr"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="status"> <tr> <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> <td> - <div id="<?php echo $ifname;?>-up" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div> + <div id="<?php echo $ifname;?>-up" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" alt="up" /></div> </td> <td> - <div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div> + <div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" alt="down" /></div> </td> <td> - <div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div> + <div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" alt="disabled" /></div> </td> <?php } else if ($ifinfo['status'] == "no carrier") { ?> <td> - <div id="<?php echo $ifname;?>-down" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div> + <div id="<?php echo $ifname;?>-down" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" alt="down" /></div> </td> <td> - <div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div> + <div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" alt="disabled" /></div> </td> <td> - <div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div> + <div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" alt="up" /></div> </td> <?php } else if ($ifinfo['status'] == "down") { ?> <td> - <div id="<?php echo $ifname;?>-block" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div> + <div id="<?php echo $ifname;?>-block" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" alt="disabled" /></div> </td> <td> - <div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div> + <div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" alt="up" /></div> </td> <td> - <div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div> + <div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" alt="down" /></div> </td> <?php } else { ?><?=htmlspecialchars($ifinfo['status']); }?> <td> @@ -109,7 +109,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); </td> </tr> </table> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="summary"> <tr> <td class="vncellt" width="100%"> <div id="<?php echo $ifname;?>-ip" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddr']);?> </div> @@ -118,6 +118,6 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); </td> </tr> </table> - <?php }//end for each ?> </td></tr> + <?php }//end for each ?> </table> |