diff options
-rw-r--r-- | usr/local/www/shortcuts.inc | 6 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/interface_statistics.widget.php | 23 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 12 |
3 files changed, 21 insertions, 20 deletions
diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc index 830b258..c02d18c 100644 --- a/usr/local/www/shortcuts.inc +++ b/usr/local/www/shortcuts.inc @@ -93,7 +93,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = break; } if(!empty($link) && ($_SERVER['REQUEST_URI'] != "/{$link}")) - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" border=\"0\"></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" border=\"0\" alt=\"plus\" /></a>"; } function get_shortcut_status_link($shortcut_section, $addspace = true, $service = array()) { @@ -117,14 +117,14 @@ function get_shortcut_status_link($shortcut_section, $addspace = true, $service break; } if(!empty($link)) - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_service_status.gif\" border=\"0\"></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_service_status.gif\" border=\"0\" alt=\"status\" /></a>"; } function get_shortcut_log_link($shortcut_section, $addspace = true) { global $g, $shortcuts; $space = ($addspace) ? " " : "" ; if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])) { - return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_logs.gif\" border=\"0\"></a>"; + return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_logs.gif\" border=\"0\" alt=\"logs\" /></a>"; } } 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/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> |