moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
skodak 2007-01-06 20:18:44 +00:00
parent d2ce367fb9
commit b1307cbca5
3 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/weblib.php
View file

@ -4222,32 +4222,32 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
if ($selectmod and has_capability('moodle/site:viewreports', $context)) { if ($selectmod and has_capability('moodle/site:viewreports', $context)) {
$logstext = get_string('alllogs'); $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='. $CFG->wwwroot.'/course/report/log/index.php?chooselog=1&amp;user=0&amp;date=0&amp;id='.
$course->id.'&amp;modid='.$selectmod->cm.'">'. $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) { if ($backmod) {
$backtext= get_string('activityprev', 'access'); $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.'" />'. '<input type="hidden" name="id" value="'.$backmod->cm.'" />'.
'<button type="submit" title="'.$backtext.'">'.$THEME->larrow. '<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) { if ($nextmod) {
$nexttext= get_string('activitynext', 'access'); $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">'. class="invisiblefieldset">'.
'<input type="hidden" name="id" value="'.$nextmod->cm.'" />'. '<input type="hidden" name="id" value="'.$nextmod->cm.'" />'.
'<button type="submit" title="'.$nexttext.'">'.$THEME->rarrow. '<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>' . return '<div class="navigation"><ul>'.$logslink . $backmod .
popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenu', $selected, $strjumpto, '<li>'.popup_form($CFG->wwwroot .'/mod/', $menu, 'navmenupopup', $selected, $strjumpto,
'', '', true, $targetwindow). '', '', true, $targetwindow).'</li>'.
'</td><td>'. $nextmod ."</td>\n</tr></table>"; $nextmod . '</ul></div>';
} }
/** /**

6
theme/standard/styles_color.css
View file

@ -206,15 +206,15 @@ table.formtable tbody th {
color: #FFF; color: #FFF;
} }
#navmenu { .navigation select {
background-color:#FFFFFF; background-color:#FFFFFF;
} }
#navmenu optgroup { .navigation optgroup {
background-color:#EEEEEE; background-color:#EEEEEE;
} }
#navmenu optgroup option { .navigation optgroup option {
background-color:#FFFFFF; background-color:#FFFFFF;
} }

20
theme/standard/styles_layout.css
View file

@ -485,16 +485,30 @@ table.navbar {
text-align:right; 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; text-align:center;
padding-top:4px; padding-top:4px;
} }
#navmenu option { .navigation option {
text-align:left; text-align:left;
} }
#navmenu optgroup option { .navigation optgroup option {
padding:0px; padding:0px;
} }