MDL-13050 Modules were updated, and grades.php files were added to the lesson and...

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index c8a9c773505286b9eab0cd9eecd5f71e75818b3d..be5f1ef4c7a4733ddebafaa14c11c7d003866eae 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1020,7 +1020,26 @@ class assignment_base {
 
         add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id);
 
-        $navigation = build_navigation($this->strsubmissions, $this->cm);
+        $navlinks = array();
+        $navlinks[] = array(
+                'name' => get_string('grades'),
+                'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+                'type' => 'link');
+        $navlinks[] = array(
+                'name' => get_string('modulenameplural', $cm->modname),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+                'type' => 'activity');
+        $navlinks[] = array(
+                'name' => format_string($cm->name),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+                'type' => 'activityinstance');
+        $navlinks[] = array(
+                'name' => $this->strsubmissions,
+                'link' => '',
+                'type' => 'link');
+        
+        $navigation = build_navigation($navlinks);
+
         print_header_simple(format_string($this->assignment->name,true), "", $navigation,
                 '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
 

diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php
index 68d5bb4d9b3f4f115b07d5770bbc19cb070a08eb..e733f96140a4fb6e76732e1819cbbe5565678101 100644 (file)
--- a/mod/exercise/submissions.php
+++ b/mod/exercise/submissions.php
@@ -50,7 +50,25 @@
     $strsubmissions = get_string("submissions", "exercise");
 
     // ... print the header and...
-    $navigation = build_navigation($strsubmissions, $cm);
+    $navlinks = array();
+    $navlinks[] = array(
+            'name' => get_string('grades'),
+            'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+            'type' => 'link');
+    $navlinks[] = array(
+            'name' => get_string('modulenameplural', $cm->modname),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+            'type' => 'activity');
+    $navlinks[] = array(
+            'name' => format_string($cm->name),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+            'type' => 'activityinstance');
+    $navlinks[] = array(
+            'name' => $strsubmissions,
+            'link' => ,
+            'type' => 'title');
+    
+    $navigation = build_navigation($navlinks);
     print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true);
 

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 8a96fc7aa2b4c6ea7bd25589f52b8549f3d3f192..8b84f834ae3e87f0508157ee74dbd9db99a5337e 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -64,7 +64,21 @@
 
 
 /// Print header.
-    $navigation = build_navigation('', $cm);
+    $navlinks = array();
+    $navlinks[] = array(
+            'name' => get_string('grades'),
+            'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+            'type' => 'link');
+    $navlinks[] = array(
+            'name' => get_string('modulenameplural', $cm->modname),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+            'type' => 'activity');
+    $navlinks[] = array(
+            'name' => format_string($cm->name),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+            'type' => 'activityinstance');
+    
+    $navigation = build_navigation($navlinks);
     print_header_simple(format_string($forum->name), "",
                  $navigation, "", "", true, $buttontext, navmenu($course, $cm));
 

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index af508f2bca1b1e13bbca65d3c25a19acd2595b3a..3dadb7c6d6fe5cfb183b04de5aec37db1110698a 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -225,16 +225,35 @@
     $strwaitingapproval = get_string('waitingapproval', 'glossary');
 
 /// If we are in approval mode, prit special header
+    $navlinks = array();
+    $navlinks[] = array(
+            'name' => get_string('grades'),
+            'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+            'type' => 'link');
+    $navlinks[] = array(
+            'name' => get_string('modulenameplural', $cm->modname),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+            'type' => 'activity');
+    $navlinks[] = array(
+            'name' => format_string($cm->name),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+            'type' => 'activityinstance');
+    
     if ($tab == GLOSSARY_APPROVAL_VIEW) {
         require_capability('mod/glossary:approve', $context);
 
-        $navigation = build_navigation($strwaitingapproval, $cm);
+        $navlinks[] = array(
+                'name' => $strwaitingapproval,
+                'link' => '',
+                'type' => 'title');
+        
+        $navigation = build_navigation($navlinks);
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
 
         print_heading($strwaitingapproval);
     } else { /// Print standard header
-        $navigation = build_navigation('', $cm);
+        $navigation = build_navigation($navlinks);
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
     }

diff --git a/mod/hotpot/grade.php b/mod/hotpot/grade.php
new file mode 100644 (file)
index 0000000..1afda28
--- /dev/null
+++ b/mod/hotpot/grade.php
@@ -0,0 +1,27 @@
+<?php  // $Id$
+
+    require_once("../../config.php");
+
+    $id   = required_param('id', PARAM_INT);          // Course module ID
+
+    if (! $cm = get_coursemodule_from_id('hotpot', $id)) {
+        error("Course Module ID was incorrect");
+    }
+
+    if (! $hotpot = get_record("hotpot", "id", $cm->instance)) {
+        error("hotpot ID was incorrect");
+    }
+
+    if (! $course = get_record("course", "id", $hotpot->course)) {
+        error("Course is misconfigured");
+    }
+
+    require_login($course->id, false, $cm);
+
+    if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+        redirect('report.php?id='.$cm->id);
+    } else {
+        redirect('view.php?id='.$cm->id);
+    }
+
+?>

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index 1e38dbc901df8bee5d7e9e5a2b1526b662cb6361..faa66f7e72861891a05cd66f23eae13c70305d17 100644 (file)
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -399,6 +399,7 @@ function hotpot_delete_selected_attempts(&$hotpot, $del) {
 /// report selector menus
 
 function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
+    global $CFG;
     $strmodulenameplural = get_string("modulenameplural", "hotpot");
     $strmodulename  = get_string("modulename", "hotpot");
 
@@ -406,6 +407,22 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
     $heading = $course->fullname;
     
     $modulecontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    
+    $navlinks = array();
+    $navlinks[] = array(
+            'name' => get_string('grades'),
+            'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+            'type' => 'link');
+    $navlinks[] = array(
+            'name' => get_string('modulenameplural', $cm->modname),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+            'type' => 'activity');
+    $navlinks[] = array(
+            'name' => format_string($cm->name),
+            'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+            'type' => 'activityinstance');
+    
+
     if (has_capability('mod/hotpot:viewreport',$modulecontext)) {
         if ($mode=='overview' || $mode=='simplestat' || $mode=='fullstat') {
             $module = "quiz";
@@ -413,10 +430,18 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
             $module = "hotpot";
         }
 
-        $navigation = build_navigation(get_string("report$mode", $module), $cm);
+        $navlinks[] = array(
+                'name' => get_string("report$mode", $module),
+                'link' => '',
+                'type' => 'title');
     } else {
-        $navigation = build_navigation(get_string("report", "quiz"), $cm);
+        $navlinks[] = array(
+                'name' => get_string("report", "quiz"),
+                'link' => '',
+                'type' => 'title');
     }
+    
+    $navigation = build_navigation($navlinks);
 
     $button = update_module_button($cm->id, $course->id, $strmodulename);
     print_header($title, $heading, $navigation, "", "", true, $button, navmenu($course, $cm));

diff --git a/mod/lesson/grade.php b/mod/lesson/grade.php
new file mode 100644 (file)
index 0000000..66d2c19
--- /dev/null
+++ b/mod/lesson/grade.php
@@ -0,0 +1,27 @@
+<?php  // $Id$
+
+    require_once("../../config.php");
+
+    $id   = required_param('id', PARAM_INT);          // Course module ID
+
+    if (! $cm = get_coursemodule_from_id('lesson', $id)) {
+        error("Course Module ID was incorrect");
+    }
+
+    if (! $lesson = get_record("lesson", "id", $cm->instance)) {
+        error("lesson ID was incorrect");
+    }
+
+    if (! $course = get_record("course", "id", $lesson->course)) {
+        error("Course is misconfigured");
+    }
+
+    require_login($course->id, false, $cm);
+
+    if (has_capability('mod/lesson:grade', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+        redirect('report.php?id='.$cm->id);
+    } else {
+        redirect('view.php?id='.$cm->id);
+    }
+
+?>

diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index a5a05c07aa13118cf33c5510f4a791a6102b84b6..19545c930085e887cba212bcc8b4a1736c112eca 100644 (file)
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -27,7 +27,21 @@ class quiz_default_report {
         $strquizzes = get_string("modulenameplural", "quiz");
         $strquiz  = get_string("modulename", "quiz");
     /// Print the page header
-        $navigation = build_navigation('', $cm);
+        $navlinks = array();
+        $navlinks[] = array(
+                'name' => get_string('grades'),
+                'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+                'type' => 'link');
+        $navlinks[] = array(
+                'name' => get_string('modulenameplural', $cm->modname),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+                'type' => 'activity');
+        $navlinks[] = array(
+                'name' => format_string($cm->name),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+                'type' => 'activityinstance');
+        
+        $navigation = build_navigation($navlinks);
         
         print_header_simple(format_string($quiz->name), "", $navigation,
                      '', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 49266aa43380e623128e0313e3c47999d5e3b884..a9ce44aaeb27077fe93ae8aaf44c13af9bb6d83f 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -68,7 +68,32 @@
     }
 
     // ...display header...
+
+    if ($action == 'teachersview') {
+        $navlinks = array();
+        $navlinks[] = array(
+                'name' => get_string('grades'),
+                'link' => $CFG->wwwroot . '/grade/report/index.php?id=' . $cm->course,
+                'type' => 'link');
+        $navlinks[] = array(
+                'name' => get_string('modulenameplural', $cm->modname),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/index.php?id=' . $cm->course,
+                'type' => 'activity');
+        $navlinks[] = array(
+                'name' => format_string($cm->name),
+                'link' => $CFG->wwwroot . '/mod/' . $cm->modname . '/view.php?id=' . $cm->id,
+                'type' => 'activityinstance');
+        $navlinks[] = array(
+                'name' => $action,
+                'link' => '',
+                'type' => 'title');
+        
+
+        $navigation = build_navigation($navlinks);    
+    } else {
     $navigation = build_navigation($action, $cm);    
+    }
+
     print_header_simple(format_string($workshop->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));