Merge pull request #990 from N0YB/RELENG_2_1

XHTML Compliance

4 files changed, 16 insertions, 4 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index bcca750..f8ea173 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -3389,7 +3389,7 @@ EOD;
 		$form .= $mask['bits'];
 		$form .= "\"";
 		if ($mask['type'] == "none")
-			$form .= " disabled";
+			$form .= " disabled=\"disabled\"";
 		$form .= " />";
 		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
@@ -3397,7 +3397,7 @@ EOD;
 		$form .= $mask['bitsv6'];
 		$form .= "\"";
 		if ($mask['type'] == "none")
-			$form .= " disabled";
+			$form .= " disabled=\"disabled\"";
 		$form .= " />";
 		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
@@ -3670,7 +3670,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= $mask['bits'];
 		$form .= "\"";
 		if ($mask['type'] == "none")
-			$form .= " disabled";
+			$form .= " disabled=\"disabled\"";
 		$form .= " />";
 		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
@@ -3678,7 +3678,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= $mask['bitsv6'];
 		$form .= "\"";
 		if ($mask['type'] == "none")
-			$form .= " disabled";
+			$form .= " disabled=\"disabled\"";
 		$form .= " />";
 		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index fe37735..2a1571e 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -213,11 +213,15 @@ else {
 
 // Builds the left tree
 $tree = "<ul class=\"tree\" >";
+$rowIndex = 0;
 if (is_array($layer7_rules_list)) {
         foreach ($layer7_rules_list as $tmpl7) {
+			$rowIndex++;
                 $tree .= $tmpl7->build_tree();
         }
 }
+if ($rowIndex == 0)
+	$tree .= "<li></li>";
 $tree .= "</ul>";
 
 $output = "<table summary=\"output form\">";
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index c21d7e3..24c6274 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -58,13 +58,17 @@ if (!is_array($qlist))
 	$qlist = array();
 
 $tree = "<ul class=\"tree\" >";
+$rowIndex = 0;
 foreach ($qlist as $queue => $qkey) {
+	$rowIndex++;
 	$tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&amp;action=show\" >";
 	if (isset($shaperIFlist[$queue]))
 		$tree .= $shaperIFlist[$queue] . "</a></li>";
 	else	
 		$tree .= $queue . "</a></li>";
 }
+if ($rowIndex == 0)
+	$tree .= "<li></li>";
 $tree .= "</ul>";
 
 if ($_GET) {
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 24f7fff..7e36fc1 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -303,11 +303,15 @@ if ($queue) {
 }
 
 $tree = "<ul class=\"tree\" >";
+$rowIndex = 0;
 if (is_array($dummynet_pipe_list)) {
         foreach ($dummynet_pipe_list as $tmpdn) {
+			$rowIndex++;
                 $tree .= $tmpdn->build_tree();
         }
 }
+if ($rowIndex == 0)
+	$tree .= "<li></li>";
 $tree .= "</ul>";
 
 if (!$dontshow || $newqueue) {