navigation MDL-22173 Fixed XHTML issue with navbar, and removed redun…

…dant ul's from nodes without children
Duck-ComEn · Apr 27, 2010 · 6c721bb · 6c721bb
1 parent 633fedb
commit 6c721bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/blocks/navigation/renderer.php b/blocks/navigation/renderer.php
@@ -96,7 +96,12 @@ protected function navigation_node($items, $attrs=array(), $expansionlimit=null,
             $content = html_writer::tag('li', $content, $liattr);
             $lis[] = $content;
         }
-        return html_writer::tag('ul', implode("\n", $lis), $attrs);
+
+        if (count($lis)) {
+            return html_writer::tag('ul', implode("\n", $lis), $attrs);
+        } else {
+            return '';
+        }
     }
 
 }
diff --git a/blocks/settings/renderer.php b/blocks/settings/renderer.php
@@ -62,7 +62,12 @@ protected function navigation_node(navigation_node $node, $attrs=array()) {
             $content = html_writer::tag('li', $content, $liattr);
             $lis[] = $content;
         }
-        return html_writer::tag('ul', implode("\n", $lis), $attrs);
+
+        if (count($lis)) {
+            return html_writer::tag('ul', implode("\n", $lis), $attrs);
+        } else {
+            return '';
+        }
     }
 
     public function search_form(moodle_url $formtarget, $searchvalue) {

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -2079,7 +2079,7 @@ public function navbar() {
         }
 
         // XHTML
-        return join(get_separator(), $htmlblocks);
+        return html_writer::tag('ul', join(html_writer::tag('li',get_separator()), $htmlblocks));;
     }
 
     protected function render_navigation_node(navigation_node $item) {