Breadcrumbs: mod/exercise changes

- Modified to use build_navigation() for breadcrumb generation.

Author: Matt Clarkson <mattc@catalyst.net.nz>

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 49774da9c1d588a88c115ca4ed39bc2ba7c04aab..9b07dd2ef48c8aaba8b124b295bdf584d8bd9fe1 100644 (file)
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@@ -62,9 +62,13 @@
     $strassessments = get_string("assessments", "exercise");
 
     // ... print the header and...
-    print_header_simple(format_string($exercise->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strexercises</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($exercise->name,true)."</a> -> $strassessments",
+    $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
+    
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true);
 
     //...get the action

diff --git a/mod/exercise/index.php b/mod/exercise/index.php
index 28e55acdf8de5cadbacbbc04e885da74a8b57bd7..edc48b4c7b893bd214b149c9213508f3d8d12ee1 100644 (file)
--- a/mod/exercise/index.php
+++ b/mod/exercise/index.php
@@ -23,8 +23,11 @@
     $strgrade = get_string("grade");
     $strdeadline = get_string("deadline", "exercise");
     $strsubmitted = get_string("submitted", "assignment");
-
-    print_header_simple("$strexercises", "", "$strexercises", "", "", true, "", navmenu($course));
+    
+    $crumbs[] = array('name' => $strexercises, 'link' => '', 'type' => 'activity');
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple("$strexercises", "", $navigation, "", "", true, "", navmenu($course));
 
     if (! $exercises = get_all_instances_in_course("exercise", $course)) {
         notice("There are no exercises", "../../course/view.php?id=$course->id");

diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php
index 88e63ad4e565d910dd945ecf95ba4398d2a80fe5..7f12018c982d3eaba34983ff2560e4bd8bb86c4a 100644 (file)
--- a/mod/exercise/submissions.php
+++ b/mod/exercise/submissions.php
@@ -50,9 +50,12 @@
     $strsubmissions = get_string("submissions", "exercise");
 
     // ... print the header and...
-    print_header_simple(format_string($exercise->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strexercises</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($exercise->name,true)."</a> -> $strsubmissions",
+    $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
+    
+    $navigation = build_navigation($crumbs, $course);
+    print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true);
 
 

diff --git a/mod/exercise/upload.php b/mod/exercise/upload.php
index 7f2e3d2c3ec5e07997393c144076f9d828e36d91..e7632e01825fe33e3845aa960e626b11ee860ee1 100644 (file)
--- a/mod/exercise/upload.php
+++ b/mod/exercise/upload.php
@@ -28,9 +28,12 @@
     $strexercise  = get_string("modulename", "exercise");
     $strupload      = get_string("upload");
 
-    print_header_simple(format_string($exercise->name)." : $strupload", "",
-                 "<a href=\"index.php?id=$course->id\">$strexercises</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($exercise->name,true)."</a> -> $strupload",
+    $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strupload, 'link' => '', 'type' => 'title');
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple(format_string($exercise->name)." : $strupload", "", $navigation,
                   "", "", true);
 
     // check that this is not a "rapid" second submission, caused by using the back button

diff --git a/mod/exercise/view.php b/mod/exercise/view.php
index 6ae1121b8557562b069babbeff59482d0ce2b25c..ef863befbff6a151aa34cec9ebbc356f16c7e1b4 100644 (file)
--- a/mod/exercise/view.php
+++ b/mod/exercise/view.php
@@ -47,8 +47,11 @@
     $strexercise  = get_string("modulename", "exercise");
 
     // ...display header...
-    print_header_simple(format_string($exercise->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strexercises</a> -> ".format_string($exercise->name),
+    $crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($exercise->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple(format_string($exercise->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strexercise), navmenu($course, $cm));
 
     if (isteacher($course->id)) {