MDL-7861 xhtml strict fixes - removed table from navbar layout

diff --git a/lib/weblib.php b/lib/weblib.php
index 8cae2365aa546c9351128713c01fd86ea8d896ae..5d6d8aa8d767aa618c8fa95c4ef9e7dcf3b1297d 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4222,32 +4222,32 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
 
     if ($selectmod and has_capability('moodle/site:viewreports', $context)) {
         $logstext = get_string('alllogs');
-        $logslink = '<a title="'.$logstext.'" '.$CFG->frametarget.' href="'.
+        $logslink = '<li><a title="'.$logstext.'" '.$CFG->frametarget.' href="'.
                     $CFG->wwwroot.'/course/report/log/index.php?chooselog=1&amp;user=0&amp;date=0&amp;id='.
                        $course->id.'&amp;modid='.$selectmod->cm.'">'.
-                    '<img class="icon log" src="'.$CFG->pixpath.'/i/log.gif" alt="'.$logstext.'" /></a>';
+                    '<img class="icon log" src="'.$CFG->pixpath.'/i/log.gif" alt="'.$logstext.'" /></a></li>';
 
     }
     if ($backmod) {
         $backtext= get_string('activityprev', 'access');
-        $backmod = '<form action="'.$CFG->wwwroot.'/mod/'.$backmod->mod.'/view.php" '.$CFG->frametarget.'><fieldset class="invisiblefieldset">'.
+        $backmod = '<li><form action="'.$CFG->wwwroot.'/mod/'.$backmod->mod.'/view.php" '.$CFG->frametarget.'><fieldset class="invisiblefieldset">'.
                    '<input type="hidden" name="id" value="'.$backmod->cm.'" />'.
                    '<button type="submit" title="'.$backtext.'">'.$THEME->larrow.
-                   '<span class="accesshide">'.$backtext.'</span></button></fieldset></form>';
+                   '<span class="accesshide">'.$backtext.'</span></button></fieldset></form></li>';
     }
     if ($nextmod) {
         $nexttext= get_string('activitynext', 'access');
-        $nextmod = '<form action="'.$CFG->wwwroot.'/mod/'.$nextmod->mod.'/view.php"  '.$CFG->frametarget.'><fieldset
+        $nextmod = '<li><form action="'.$CFG->wwwroot.'/mod/'.$nextmod->mod.'/view.php"  '.$CFG->frametarget.'><fieldset
         class="invisiblefieldset">'.
                    '<input type="hidden" name="id" value="'.$nextmod->cm.'" />'.
                    '<button type="submit" title="'.$nexttext.'">'.$THEME->rarrow.
-                   '<span class="accesshide">'.$nexttext.'</span></button></fieldset></form>';
+                   '<span class="accesshide">'.$nexttext.'</span></button></fieldset></form></li>';
     }
 
-    return "<table><tr>\n<td>".$logslink .'</td><td>'. $backmod .'</td><td>' .
-            popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenu', $selected, $strjumpto,
-                       '', '', true, $targetwindow).
-            '</td><td>'. $nextmod ."</td>\n</tr></table>";
+    return '<div class="navigation"><ul>'.$logslink . $backmod .
+            '<li>'.popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenupopup', $selected, $strjumpto,
+                       '', '', true, $targetwindow).'</li>'.
+            $nextmod . '</ul></div>';
 }
 
 /**

diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 0d7fbf557f62884bcdacb9762eada3c412ad6fc8..967eae7228628a19eacf28d593bc28f91c11e3bf 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -206,15 +206,15 @@ table.formtable tbody th {
   color: #FFF;
 }
 
-#navmenu {
+.navigation select {
   background-color:#FFFFFF;
 }
 
-#navmenu optgroup {
+.navigation optgroup {
   background-color:#EEEEEE;
 }
 
-#navmenu optgroup option {
+.navigation optgroup option {
   background-color:#FFFFFF;
 }
 

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index de2158f45b9ef5e73c9b97233ca5e20cdbd5d5d3..023db96402b0738fc33aba388e69454565aa3337 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -485,16 +485,30 @@ table.navbar {
   text-align:right;
 }
 
-#navmenu optgroup {
+.navigation ul {
+  margin:0px;
+  padding:0px;
+  list-style-type:none;
+}
+
+.navigation ul li form,
+.navigation ul li {
+  display:inline;
+  margin:0px;
+  padding:0px;
+  margin-left:2px;
+}
+
+.navigation optgroup {
   text-align:center;
   padding-top:4px;
 }
 
-#navmenu option {
+.navigation option {
   text-align:left;
 }
 
-#navmenu optgroup option {
+.navigation optgroup option {
   padding:0px;
 }