diff options
Diffstat (limited to 'usr/local/www/widgets/widgets')
5 files changed, 52 insertions, 51 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 2db0a2a..245b65b 100644 --- a/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -88,14 +88,14 @@ if ($_GET['order']) { usort($cpdb_all, "clientcmp"); } ?> -<table class="sortable" name="sortabletable" id="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0"> +<table class="sortable" name="sortabletable" 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> - <td class="listhdrr"><a href="?order=user&showact=<?=$_GET['showact'];?>"><?=gettext("Username");?></a></td> + <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> + <td class="listhdrr"><a href="?order=user&showact=<?=$_GET['showact'];?>"><?=gettext("Username");?></a></td> <?php if ($_GET['showact']): ?> - <td class="listhdrr"><a href="?order=start&showact=<?=$_GET['showact'];?>"><?=gettext("Session start");?></a></td> - <td class="listhdrr"><a href="?order=start&showact=<?=$_GET['showact'];?>"><?=gettext("Last activity");?></a></td> + <td class="listhdrr"><a href="?order=start&showact=<?=$_GET['showact'];?>"><?=gettext("Session start");?></a></td> + <td class="listhdrr"><a href="?order=start&showact=<?=$_GET['showact'];?>"><?=gettext("Last activity");?></a></td> <?php endif; ?> </tr> <?php foreach ($cpdb_all as $cpent): ?> @@ -107,8 +107,8 @@ if ($_GET['order']) { <td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent[0]));?></td> <td class="listr"><?php if ($cpent[11] && ($cpent[11] > 0)) echo htmlspecialchars(date("m/d/Y H:i:s", $cpent[11]));?></td> <?php endif; ?> - <td valign="middle" class="list" nowrap> - <a href="?order=<?=$_GET['order'];?>&showact=<?=$_GET['showact'];?>&act=del&zone=<?=$cpent[10];?>&id=<?=$cpent[5];?>" onclick="return confirm('Do you really want to disconnect this client?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + <td valign="middle" class="list nowrap"> + <a href="?order=<?=$_GET['order'];?>&showact=<?=$_GET['showact'];?>&act=del&zone=<?=$cpent[10];?>&id=<?=$cpent[5];?>" onclick="return confirm('Do you really want to disconnect this client?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="x" /></a></td> </tr> <?php endforeach; ?> -</table> +</table>
\ No newline at end of file diff --git a/usr/local/www/widgets/widgets/carp_status.widget.php b/usr/local/www/widgets/widgets/carp_status.widget.php index bc048ba..1710d1b 100644 --- a/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/usr/local/www/widgets/widgets/carp_status.widget.php @@ -37,7 +37,7 @@ require_once("/usr/local/www/widgets/include/carp_status.inc"); $carp_enabled = get_carp_status(); ?> -<table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0"> +<table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0" summary="carp status"> <?php if(is_array($config['virtualip']['vip'])) { $carpint=0; @@ -54,7 +54,7 @@ $carp_enabled = get_carp_status(); ?> <tr> <td class="vncellt" width="35%"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif"/> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif" alt="cablenic" /> <strong><a href="/system_hasync.php"> <span style="color:#000000"><?=htmlspecialchars($carp_int);?></span></a></strong> </td> @@ -62,14 +62,14 @@ $carp_enabled = get_carp_status(); <?php if($carp_enabled == false) { $status = "DISABLED"; - echo "<img src='/themes/".$g['theme']."/images/icons/icon_block.gif' title=\"$status\">"; + echo "<img src='/themes/".$g['theme']."/images/icons/icon_block.gif' title=\"$status\" alt=\"$status\" />"; } else { if($status == "MASTER") { - echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass.gif' title=\"$status\">"; + echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass.gif' title=\"$status\" alt=\"$status\" />"; } else if($status == "BACKUP") { - echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass_d.gif' title=\"$status\">"; + echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass_d.gif' title=\"$status\" alt=\"$status\" />"; } else if($status == "INIT") { - echo "<img src='/themes/".$g['theme']."/images/icons/icon_log.gif' title=\"$status\">"; + echo "<img src='/themes/".$g['theme']."/images/icons/icon_log.gif' title=\"$status\" alt=\"$status\" />"; } } if ($ipaddress){ ?> @@ -79,4 +79,4 @@ $carp_enabled = get_carp_status(); } else { ?> <tr><td class="listr">No CARP Interfaces Defined. Click <a href="carp_status.php">here</a> to configure CARP.</td></tr> <?php } ?> -</table> +</table>
\ No newline at end of file diff --git a/usr/local/www/widgets/widgets/interface_statistics.widget.php b/usr/local/www/widgets/widgets/interface_statistics.widget.php index 7dca538..ff14a2e 100644 --- a/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -82,7 +82,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); ?> <div style="padding: 5px"> <div id="int_labels" style="float:left;width:32%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="interfaces statistics"> <tr><td class="widgetsubheader" style="height:25px"> </td></tr> <tr> <td class="vncellt" style="height:25px">Packets In</td> @@ -109,15 +109,14 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); </div> <div id="interfacestats" style="float:right;overflow: auto; width:68%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="the stats"> <tr> - <tr> <?php $interface_names = array(); foreach ($ifdescrs as $ifdescr => $ifname): $ifinfo = get_interface_info($ifdescr); if ($ifinfo['status'] != "down"){ ?> - <td class="widgetsubheader" nowrap style="height:25px"> + <td class="widgetsubheader nowrap" style="height:25px"> <?=htmlspecialchars($ifname);?> </td> <?php @@ -131,7 +130,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 1; foreach ($array_in_packets as $data): ?> - <td class="listr" id="stat<?php echo $counter?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -143,7 +142,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 2; foreach ($array_out_packets as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -155,7 +154,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 3; foreach ($array_in_bytes as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -167,7 +166,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 4; foreach ($array_out_bytes as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -179,7 +178,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 5; foreach ($array_in_errors as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -191,7 +190,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 6; foreach ($array_out_errors as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -203,7 +202,7 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <?php $counter = 7; foreach ($array_collisions as $data): ?> - <td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px"> + <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> <?php @@ -212,4 +211,4 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); </tr> </table> </div> - </div> + </div>
\ No newline at end of file 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> diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index 02e1439..403b24c 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -83,8 +83,8 @@ if($_REQUEST['getupdatestatus']) { $curcfg = $config['system']['firmware']; ?> -</script> -<table width="100%" border="0" cellspacing="0" cellpadding="0"> + +<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="system information"> <tbody> <tr> <td width="25%" class="vncellt">Name</td> @@ -98,7 +98,7 @@ $curcfg = $config['system']['firmware']; <br /> built on <?php readfile("/etc/version.buildtime"); ?> <br /> - <div name="uname" id="uname"><a href="#" onClick='swapuname(); return false;'><?php echo php_uname("s") . " " . php_uname("r"); ?></a></div> + <div id="uname"><a href="#" onclick='swapuname(); return false;'><?php echo php_uname("s") . " " . php_uname("r"); ?></a></div> <?php if(!isset($config['system']['firmware']['disablecheck'])): ?> <div id='updatestatus'><br/><?php echo gettext("Obtaining update status"); ?> ...</div> <?php endif; ?> @@ -168,7 +168,7 @@ $curcfg = $config['system']['firmware']; <?php $dns_servers = get_dns_servers(); foreach($dns_servers as $dns) { - echo "{$dns}<br>"; + echo "{$dns}<br/>"; } ?> </td> @@ -202,7 +202,7 @@ $curcfg = $config['system']['firmware']; <td width="25%" class="vncellt">Temperature</td> <td width="75%" class="listr"> <?php $TempMeter = $temp = get_temp(); ?> - <img src="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height="15" width="4" border="0" align="middle" alt="left bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif" height="15" name="tempwidtha" id="tempwidtha" width="<?= $TempMeter; ?>" border="0" align="middle" alt="red bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" height="15" name="tempwidthb" id="tempwidthb" width="<?= (100 - $TempMeter); ?>" border="0" align="middle" alt="gray bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height="15" width="5" border="0" align="middle" alt="right bar" /> + <img src="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height="15" width="4" border="0" align="middle" alt="left bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif" height="15" name="tempwidtha" id="tempwidtha" width="<?= round($TempMeter); ?>" border="0" align="middle" alt="red bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" height="15" name="tempwidthb" id="tempwidthb" width="<?= (100 - $TempMeter); ?>" border="0" align="middle" alt="gray bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height="15" width="5" border="0" align="middle" alt="right bar" /> <span id="tempmeter"><?= $temp."°C"; ?></span> </td> @@ -255,6 +255,7 @@ $curcfg = $config['system']['firmware']; </tbody> </table> <script type="text/javascript"> +//<![CDATA[ function swapuname() { jQuery('#uname').html("<?php echo php_uname("a"); ?>"); } @@ -278,4 +279,5 @@ $curcfg = $config['system']['firmware']; } setTimeout('getstatus()', 4000); <?php endif; ?> +//]]> </script> |
