diff options
| author | Jim P <jim@pingle.org> | 2013-03-22 08:08:18 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-03-22 08:08:18 -0700 |
| commit | 4a8dba5e1691b5832151773124d34868d4ab172e (patch) | |
| tree | 00bcf50014bacce3b699514db3fe8120f12d1bb0 /usr/local/www | |
| parent | b2f73235f911c800e7dfb24f78581e0356bbb615 (diff) | |
| parent | df5c0bc036f545e19b4193202179d28720998b0b (diff) | |
| download | pfsense-4a8dba5e1691b5832151773124d34868d4ab172e.zip pfsense-4a8dba5e1691b5832151773124d34868d4ab172e.tar.gz | |
Merge pull request #489 from ExolonDX/branch_01
Tidy up "traffic shaper" XHTML
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/firewall_shaper.php | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 6ac8538..684ecd4 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -163,7 +163,7 @@ if ($_GET) { $q->SetInterface($interface); $output_form .= $q->build_form(); $output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\""; - $output_form .= " value=\"".$qname."\">"; + $output_form .= " value=\"".$qname."\" />"; $newjavascript = $q->build_javascript(); unset($q); $newqueue = true; @@ -352,22 +352,22 @@ if ($can_add || $addnewaltq) { $output_form .= "<a href=\"firewall_shaper.php?interface="; $output_form .= $interface; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } - $output_form .= "&action=add\">"; - $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\">"; + $output_form .= "&action=add\">"; + $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\" />"; $output_form .= "</a>"; $output_form .= "<a href=\"firewall_shaper.php?interface="; - $output_form .= $interface . "&queue="; + $output_form .= $interface . "&queue="; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } - $output_form .= "&action=delete\">"; + $output_form .= "&action=delete\">"; $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\""; if ($queue) - $output_form .= " value=\"" . gettext("Delete this queue") . "\">"; + $output_form .= " value=\"" . gettext("Delete this queue") . "\" />"; else - $output_form .= " value=\"" . gettext("Disable shaper on interface") . "\">"; + $output_form .= " value=\"" . gettext("Disable shaper on interface") . "\" />"; $output_form .= "</a>"; } $output_form .= "<br /></td></tr>"; @@ -380,13 +380,14 @@ $output = "<div id=\"shaperarea\" style=\"position:relative\">"; $output .= $output_form; //$pgtitle = "Firewall: Shaper: By Interface View"; - +$closehead = false; include("head.inc"); ?> - -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> +</head> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <?php if ($queue) echo $queue->build_javascript(); @@ -401,9 +402,9 @@ include("fbegin.inc"); <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper"> <tr><td> <?php $tab_array = array(); @@ -418,23 +419,23 @@ include("fbegin.inc"); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <?php if (count($altq_list_queues) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> <a href="firewall_shaper.php?action=resetall" > - <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn"> + <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn" /> </a> </td><td width="75%"> </td></tr> <?php endif; ?> <tr> - <td width="25%" valign="top" algin="left"> + <td width="25%" valign="top" align="left"> <?php echo $tree; ?> </td> <td width="75%" valign="top" align="center"> - <table> - <? + <table summary="output form"> + <?php echo $output; ?> </table> @@ -446,7 +447,6 @@ include("fbegin.inc"); </tr> </table> </form> -<?php include("fend.inc"); -?> +<?php include("fend.inc"); ?> </body> </html> |
