gradebook MDL-22931 made some of the setting labels more specific and…

… made blocks show on category setting screen
andelacruz · Jul 8, 2010 · 2821c49 · 2821c49
1 parent 36c3fbe
commit 2821c49
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
@@ -28,6 +28,7 @@
     $url->param('id', $id);
 }
 $PAGE->set_url($url);
+$PAGE->set_pagelayout('admin');
 
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
@@ -209,8 +210,10 @@
     redirect($returnurl);
 }
 
-
-print_grade_page_head($courseid, 'edittree', null, $heading);
+$return = false;
+$buttons = false;
+$shownavigation = false;
+print_grade_page_head($courseid, 'edittree', null, $heading, $return, $buttons, $shownavigation);
 
 $mform->display();
 

diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
@@ -101,9 +101,12 @@ function definition() {
         $mform->disabledIf('droplow', 'keephigh', 'noteq', 0);
 
         // Grade item settings
-        $mform->addElement('header', 'general', get_string('gradeitem', 'grades'));
+        // Displayed as Category total to avoid confusion between grade items requiring marking and category totals
+        $mform->addElement('header', 'general', get_string('categorytotal', 'grades'));
+
+        $mform->addElement('text', 'grade_item_itemname', get_string('categorytotalname', 'grades'));
+        $mform->setAdvanced('grade_item_itemname');
 
-        $mform->addElement('text', 'grade_item_itemname', get_string('itemname', 'grades'));
         $mform->addElement('text', 'grade_item_iteminfo', get_string('iteminfo', 'grades'));
         $mform->addHelpButton('grade_item_iteminfo', 'iteminfo', 'grades');
 

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
@@ -28,6 +28,7 @@
     $url->param('id', $id);
 }
 $PAGE->set_url($url);
+$PAGE->set_pagelayout('admin');
 
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
@@ -164,7 +165,10 @@
     redirect($returnurl);
 }
 
-print_grade_page_head($courseid, 'edittree', null, $heading);
+$return = false;
+$buttons = false;
+$shownavigation = false;
+print_grade_page_head($courseid, 'edittree', null, $heading, $return, $buttons, $shownavigation);
 
 $mform->display();
 

diff --git a/grade/lib.php b/grade/lib.php
@@ -610,7 +610,7 @@ public function __construct($id, $link, $string, $parent=null) {
  */
 function print_grade_page_head($courseid, $active_type, $active_plugin=null,
                                $heading = false, $return=false,
-                               $buttons=false) {
+                               $buttons=false, $shownavigation=true) {
     global $CFG, $OUTPUT, $PAGE;
 
     $plugin_info = grade_get_plugin_info($courseid, $active_type, $active_plugin);
@@ -644,12 +644,14 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null,
         $heading = $stractive_plugin;
     }
 
-    if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_DROPDOWN) {
-        $returnval .= print_grade_plugin_selector($plugin_info, $active_type, $active_plugin, $return);
-    }
-    $returnval .= $OUTPUT->heading($heading);
-    if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_TABS) {
-        $returnval .= grade_print_tabs($active_type, $active_plugin, $plugin_info, $return);
+    if ($shownavigation) {
+        if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_DROPDOWN) {
+            $returnval .= print_grade_plugin_selector($plugin_info, $active_type, $active_plugin, $return);
+        }
+        $returnval .= $OUTPUT->heading($heading);
+        if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_TABS) {
+            $returnval .= grade_print_tabs($active_type, $active_plugin, $plugin_info, $return);
+        }
     }
 
     if ($return) {

diff --git a/lang/en/grades.php b/lang/en/grades.php
@@ -113,6 +113,7 @@
 $string['categoryedit'] = 'Edit category';
 $string['categoryname'] = 'Category name';
 $string['categorytotal'] = 'Category total';
+$string['categorytotalname'] = 'Category total name';
 $string['categorytotalfull'] = '{$a->category} total';
 $string['combo'] = 'Tabs and Dropdown menu';
 $string['compact'] = 'Compact';