Merge remote branch 'mainline/master' into 2_firewall

Conflicts:
	usr/local/www/diag_nanobsd.php
	usr/local/www/diag_packet_capture.php
	usr/local/www/firewall_shaper.php

1 files changed, 5 insertions, 5 deletions

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 7382c7e..26954c2 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -341,9 +341,9 @@ $tree .= "</ul>";
 
 if (!$dontshow || $newqueue) {
 
-$output_form .= "<tr><td width=\"22%\" valign=\"top\" class=\"vncellreq\">";
-$output_form .= gettext("Queue Actions");
-$output_form .= "</td><td valign=\"top\" class=\"vncellreq\" width=\"78%\">";
+$output_form .= "<tr><td width=\"22%\" valign=\"center\" class=\"vncellreq\">";
+$output_form .= "<br />" . gettext("Queue Actions") . "<br />";
+$output_form .= "</td><td valign=\"center\" class=\"vncellreq\" width=\"78%\"><br />";
 
 $output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"formbtn\" />";
 if ($can_add || $addnewaltq) {
@@ -368,9 +368,9 @@ if ($can_add || $addnewaltq) {
 		$output_form .= " value=\"" . gettext("Disable shaper on interface") . "\">";
 	$output_form .= "</a>";  
 }
-$output_form .= "</td></tr>";
+$output_form .= "<br /></td></tr>";
 $output_form .= "</div>";
-} 
+}
 else 
 	$output_form .= "</div>";