MDL-8032 remove repeated dashes from navmenu - replace with CSS styling

diff --git a/lib/weblib.php b/lib/weblib.php
index 120d5898237091e8437dd141a4730e14e7f806ae..fbc605a6f04a16ec9f68964276f6dd30232ee45c 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4150,12 +4150,12 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
                 has_capability('moodle/course:viewhiddensections', $context)) {
                 $thissection->summary = strip_tags(format_string($thissection->summary,true));
                 if ($course->format == 'weeks' or empty($thissection->summary)) {
-                    $menu[] = '-------------- '. $strsection ." ". $mod->section .' --------------';
+                    $menu[] = '--'.$strsection ." ". $mod->section;
                 } else {
                     if (strlen($thissection->summary) < ($width-3)) {
-                        $menu[] = '-- '.$thissection->summary;
+                        $menu[] = '--'.$thissection->summary;
                     } else {
-                        $menu[] = '-- '.substr($thissection->summary, 0, $width).'...';
+                        $menu[] = '--'.substr($thissection->summary, 0, $width).'...';
                     }
                 }
             }

diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index d7cd969ec93827a778cb044da84031eca747141e..09718008752671fca4284094a7ba30a28261bf01 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -206,6 +206,18 @@ table.formtable tbody th {
   color: #FFF;
 }
 
+#navmenu {
+  background-color:#FFFFFF;
+}
+
+#navmenu optgroup {
+  background-color:#EEEEEE;
+}
+
+#navmenu optgroup option {
+  background-color:#FFFFFF;
+}
+
 /***
  *** Footer
  ***/

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 71f8d53ff4ab73a32b50d510a6c1be4feb451457..2689ca7a0b0e0ebe0163e1c2fd66c989b9ceab29 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -461,6 +461,18 @@ table.navbar {
   text-align:right;
 }
 
+#navmenu optgroup {
+  text-align:center;
+  padding-top:4px;
+}
+
+#navmenu option {
+  text-align:left;
+}
+
+#navmenu optgroup option {
+  padding:0px;
+}
 
 /***
  *** Footer