From 38a9fc5566c84445e00dd731d353892f83b86705 Mon Sep 17 00:00:00 2001 From: skodak Date: Wed, 22 Apr 2009 20:54:06 +0000 Subject: [PATCH] MDL-18930 fixed behaviour of dropdown menu selector in gradebook - the headings are not selectable again like the rest of moodle dropdowns; merged from MOODLE_19_STABLE --- grade/lib.php | 16 +++++++--------- theme/standard/styles_fonts.css | 3 --- theme/standard/styles_layout.css | 8 -------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/grade/lib.php b/grade/lib.php index 24d41e16e7..7d81e657ad 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -326,11 +326,7 @@ function print_grade_plugin_selector($plugin_info, $return=false) { $first_plugin = reset($plugins); - if (is_array($first_plugin)) { - $menu[$first_plugin['link'].'&'] = '**header**'.$plugin_info['strings'][$plugin_type]; - } else { - $menu[$plugins['link']] = '**header**'.$plugins['string']; - } + $menu[$first_plugin['link'].'&'] = '--'.$plugin_info['strings'][$plugin_type]; if (empty($plugins['id'])) { foreach ($plugins as $plugin) { @@ -343,7 +339,6 @@ function print_grade_plugin_selector($plugin_info, $return=false) { /// finally print/return the popup form if ($count > 1) { $select = popup_form('', $menu, 'choosepluginreport', '', get_string('chooseaction', 'grades'), '', '', true, 'self'); - $select = preg_replace('/\>\*\*header\*\*/', ' class="optionheader">', $select); if ($return) { return $select; } else { @@ -455,7 +450,8 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) { $active = $url; } - $plugin_info['settings'] = array('id' => 'coursesettings', 'link' => $url, 'string' => get_string('settings')); + $plugin_info['settings'] = array(); + $plugin_info['settings']['course'] = array('id' => 'coursesettings', 'link' => $url, 'string' => get_string('course')); $count++; } @@ -522,13 +518,15 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) { $active = $url; } + $plugin_info['scale'] = array(); + if ($active_type == 'scale' and $active_plugin == 'edit') { $edit_url = $url_prefix.'edit/scale/edit.php?courseid='.$courseid.'&id='.optional_param('id', 0, PARAM_INT); $active = $edit_url; - $plugin_info['scale'] = array('id' => 'edit', 'link' => $edit_url, 'string' => get_string('edit'), + $plugin_info['scale']['view'] = array('id' => 'edit', 'link' => $edit_url, 'string' => get_string('edit'), 'parent' => array('id' => 'scale', 'link' => $url, 'string' => get_string('scales'))); } else { - $plugin_info['scale'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('scales')); + $plugin_info['scale']['view'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('view')); } $count++; diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css index 7b1180a3e9..e7eb85aa81 100644 --- a/theme/standard/styles_fonts.css +++ b/theme/standard/styles_fonts.css @@ -618,9 +618,6 @@ body#grade-index .grades .header { #grade-aggregation-help code { font-style: normal; } -#choosepluginreport_jump option.optionheader { - font-weight: bold; -} /*** *** Login diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index e2b8531783..4e4a66b875 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -2654,14 +2654,6 @@ div.allcoursegrades { margin-top: 7px; } -#choosepluginreport_jump option { - margin-left: 20px; -} - -#choosepluginreport_jump option.optionheader { - margin-left: 0px; -} - /*** *** Login ***/ -- 2.39.5