From a46ed6f917e805065a2c349f592b1e232f65c08d Mon Sep 17 00:00:00 2001
From: mattc-catalyst <mattc-catalyst>
Date: Mon, 16 Apr 2007 21:38:34 +0000
Subject: [PATCH] Breadcrumbs: mod/exercise changes

- Modified to use build_navigation() for breadcrumb generation.


Author: Matt Clarkson <mattc@catalyst.net.nz>
---
 mod/exercise/assessments.php | 10 +++++++---
 mod/exercise/index.php       |  7 +++++--
 mod/exercise/submissions.php |  9 ++++++---
 mod/exercise/upload.php      |  9 ++++++---
 mod/exercise/view.php        |  7 +++++--
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 49774da9c1..9b07dd2ef4 100644
--- 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 28e55acdf8..edc48b4c7b 100644
--- 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 88e63ad4e5..7f12018c98 100644
--- 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 7f2e3d2c3e..e7632e0182 100644
--- 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 6ae1121b85..ef863befbf 100644
--- 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)) {
-- 
2.39.5