MDL-18004 Adding keymanagers for when grade publishing is enabled, plus a few improve...

diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php
index bef6243192a247cdc09c17320f70ea6e8ed94b25..4bb277f046783602b9b88c511912e5a5777e06a5 100644 (file)
--- a/grade/edit/outcome/import.php
+++ b/grade/edit/outcome/import.php
@@ -79,16 +79,10 @@ $systemcontext = get_context_instance(CONTEXT_SYSTEM);
 $caneditsystemscales = has_capability('moodle/course:managescales', $systemcontext);
 
 if ($courseid) {
-    /// Print header
-    print_header_simple($strgrades.': '.$pagename, ': '.$strgrades, $navigation, '', '', true, '', navmenu($course));
-    /// Print the plugin selector at the top
-    print_grade_plugin_selector($courseid, 'edit', 'outcome');
+    print_grade_page_head($courseid, 'outcome', 'import', get_string('importoutcomes', 'grades'));
 
     $caneditcoursescales = has_capability('moodle/course:managescales', $context);
 
-    $currenttab = 'outcomes';
-    require('tabs.php');
-
 } else {
     admin_externalpage_print_header();
     $caneditcoursescales = $caneditsystemscales;

diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php
index b8af5d771d68a3e2cfdc8a0ec2fb17869ae595d2..e8ef67e7cc2589fadc4cba1fdc171e05c6a61737 100644 (file)
--- a/grade/export/keymanager.php
+++ b/grade/export/keymanager.php
@@ -37,11 +37,7 @@ $context = get_context_instance(CONTEXT_COURSE, $id);
 
 require_capability('moodle/grade:export', $context);
 
-$strgrades = get_string('grades', 'grades');
-$navigation = grade_build_nav(__FILE__, null, array('courseid' => $course->id));
-
-print_header($course->shortname.': '.get_string('grades'), $course->fullname, $navigation);
-print_grade_plugin_selector($id, '', '');
+print_grade_page_head($course->id, 'export', 'keymanager', get_string('keymanager', 'grades'));
 
 $stredit         = get_string('edit');
 $strdelete       = get_string('delete');

diff --git a/grade/import/keymanager.php b/grade/import/keymanager.php
index 4aea4c5f708165dfc656d362e91783a2c4c71b65..c1460ac24e3ef6042f1e1c644445ad39d5b6e086 100644 (file)
--- a/grade/import/keymanager.php
+++ b/grade/import/keymanager.php
@@ -37,11 +37,7 @@ $context = get_context_instance(CONTEXT_COURSE, $id);
 
 require_capability('moodle/grade:import', $context);
 
-$strgrades = get_string('grades', 'grades');
-$navigation = grade_build_nav(__FILE__, null, array('courseid' => $course->id));
-
-print_header($course->shortname.': '.get_string('grades'), $course->fullname, $navigation);
-print_grade_plugin_selector($id, '', '');
+print_grade_page_head($course->id, 'import', 'keymanager', get_string('keymanager', 'grades'));
 
 $stredit         = get_string('edit');
 $strdelete       = get_string('delete');

diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php
index a7b41e2740916a6c660bbb3aaea7e7113be8be25..37e8604c6ac46e16232ac83dd298499a092c2b0a 100644 (file)
--- a/grade/import/xml/import.php
+++ b/grade/import/xml/import.php
@@ -71,12 +71,7 @@ if ($importcode !== false) {
         }
 
     } else {
-        $strgrades = get_string('grades', 'grades');
-        $actionstr = get_string('xml', 'grades');
-        $navigation = grade_build_nav(__FILE__, $actionstr, array('courseid' => $course->id));
-
-        print_header($course->shortname.': '.get_string('grades'), $course->fullname, $navigation);
-        print_grade_plugin_selector($id, 'import', 'xml');
+        print_grade_page_head($course->id, 'import', 'xml', get_string('importxml', 'grades'));
 
         grade_import_commit($id, $importcode, $feedback, true);
 

diff --git a/grade/lib.php b/grade/lib.php
index 0fb08c4b952ad81a05dfee7099e24b8ec5903bf8..fc9e10e7ebcbabe46b8384728d80a86e9db6a05a 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -377,7 +377,12 @@ function grade_print_tabs($active_type, $active_plugin, $plugin_info, $return=fa
 
         // If $plugins is actually the definition of a child-less parent link:
         if (!empty($plugins['id'])) {
-            $top_row[] = new tabobject($plugin_type, $plugins['link'], $plugins['string']);
+            $string = $plugins['string'];
+            if (!empty($plugin_info[$active_type]['parent'])) {
+                $string = $plugin_info[$active_type]['parent']['string'];
+            }
+
+            $top_row[] = new tabobject($plugin_type, $plugins['link'], $string);
             continue;
         }
 
@@ -502,10 +507,20 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
 
         if (has_capability('moodle/course:managescales', $context)) {
             $url = $url_prefix.'edit/scale/index.php?id='.$courseid;
+
             if ($active_type == 'scale' and is_null($active_plugin)) {
                 $active = $url;
             }
-            $plugin_info['scale'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('scales'));
+
+            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'),
+                    'parent' => array('id' => 'scale', 'link' => $url, 'string' => get_string('scales')));
+            } else {
+                $plugin_info['scale'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('scales'));
+            }
+
             $count++;
         }
 
@@ -530,6 +545,8 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
                 $active = $url_course;
             } elseif ($active_type == 'outcome' and $active_plugin == 'edit' ) {
                 $active = $url_edit;
+            } elseif ($active_type == 'outcome' and $active_plugin == 'import') {
+                $plugin_info['outcome']['import'] = array('id' => 'import', 'link' => null, 'string' => get_string('importoutcomes', 'grades'));
             }
 
             $count++;
@@ -602,6 +619,24 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
         $plugin_info['export']=$exportnames;
     }
 
+    // Key managers
+    if ($CFG->gradepublishing) {
+        $keymanager_url = $url_prefix.'export/keymanager.php?id='.$courseid;
+        $plugin_info['export']['keymanager'] = array('id' => 'keymanager', 'link' => $keymanager_url, 'string' => get_string('keymanager', 'grades'));
+        if ($active_type == 'export' and $active_plugin == 'keymanager' ) {
+            $active = $keymanager_url;
+        }
+        $count++;
+
+        $keymanager_url = $url_prefix.'import/keymanager.php?id='.$courseid;
+        $plugin_info['import']['keymanager'] = array('id' => 'keymanager', 'link' => $keymanager_url, 'string' => get_string('keymanager', 'grades'));
+        if ($active_type == 'import' and $active_plugin == 'keymanager' ) {
+            $active = $keymanager_url;
+        }
+        $count++;
+    }
+
+
     foreach ($plugin_info as $plugin_type => $plugins) {
         if (!empty($plugins['id']) && $active_plugin == $plugins['id']) {
             $plugin_info['strings']['active_plugin_str'] = $plugins['string'];
@@ -666,6 +701,10 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null, $he
         $first_link = $CFG->wwwroot.'/grade/index.php?id='.$COURSE->id;
     }
 
+    if ($active_type == 'preferences') {
+        $CFG->stylesheets[] = $CFG->wwwroot . '/grade/report/styles.css';
+    }
+
     $navlinks[] = array('name' => $strgrades,
                         'link' => $first_link,
                         'type' => 'misc');
@@ -676,6 +715,11 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null, $he
         $active_type_link = $plugin_info[$active_type]['link'];
     }
 
+    if (!empty($plugin_info[$active_type]['parent']['link'])) {
+        $active_type_link = $plugin_info[$active_type]['parent']['link'];
+        $navlinks[] = array('name' => $stractive_type, 'link' => $active_type_link, 'type' => 'misc');
+    }
+
     if (empty($plugin_info[$active_type]['id'])) {
         $navlinks[] = array('name' => $stractive_type, 'link' => $active_type_link, 'type' => 'misc');
     }
@@ -685,7 +729,7 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null, $he
     $navigation = build_navigation($navlinks);
 
     $title = ': ' . $stractive_plugin;
-    if (empty($plugin_info[$active_type]['id'])) {
+    if (empty($plugin_info[$active_type]['id']) || !empty($plugin_info[$active_type]['parent'])) {
         $title = ': ' . $stractive_type . ': ' . $stractive_plugin;
     }