Breadcrumbs: mod/workshop changes

- Modified to use build_navigation() for breadcrumb generation.

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

diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php
index ebe11ac977a2d7eb7599d9c0ae5918c793fa2e03..f4cfebec09ea0546fb68e79b06c77ec3c8a8d6c4 100644 (file)
--- a/mod/workshop/assess.php
+++ b/mod/workshop/assess.php
@@ -61,9 +61,12 @@
     if ($frameset == "top") {
         // removed <base target="_parent" />
         // because it does not validate MDL-7861
-        print_header_simple(format_string($workshop->name), "",
-                     "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                      <a href=\"view.php?id=$cm->id\">".format_string($workshop->name,true)."</a> -> $strassess",
+        $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+        $crumbs[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
+        $navigation = build_navigation($crumbs, $course);
+        
+        print_header_simple(format_string($workshop->name), "",$navigation,
                       "", '', true);
 
         // there can be an assessment record (for teacher submissions), if there isn't...

diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 451b70d4edf38472baf1bd217556dfe542032a8c..e2150838ba68e2d56eb88667b527da035211511c 100644 (file)
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -65,19 +65,18 @@
     require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-    $navigation = "";
-    if ($course->id != SITEID) {
-        $navigation = "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
-    }
-
     $strworkshops = get_string("modulenameplural", "workshop");
     $strworkshop  = get_string("modulename", "workshop");
     $strassessments = get_string("assessments", "workshop");
 
     // ... print the header and...
-    print_header_simple(format_string($workshop->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($workshop->name,true)."</a> -> $strassessments",
+    
+    $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($workshop->name,true), '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($workshop->name), "", $navigation,
                   "", "", true);
 
     /*************** add comment to assessment (by author, assessor or teacher) ***************************/

diff --git a/mod/workshop/index.php b/mod/workshop/index.php
index 5e9aae0988157ae3de259c86235083f6e528856c..09f3374b642e753cf597435a1cf59aa21d7174d8 100644 (file)
--- a/mod/workshop/index.php
+++ b/mod/workshop/index.php
@@ -22,8 +22,11 @@
     $strinfo = get_string("grade")."/".$strinfo = get_string("phase", "workshop");
     $strdeadline = get_string("deadline", "workshop");
     $strsubmitted = get_string("submitted", "assignment");
-
-    print_header_simple("$strworkshops", "", "$strworkshops", "", "", true, "", navmenu($course));
+    
+    $crumbs[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity');
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple("$strworkshops", "", $navigation, "", "", true, "", navmenu($course));
 
     if (! $workshops = get_all_instances_in_course("workshop", $course)) {
         notice("There are no workshops", "../../course/view.php?id=$course->id");

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index b71a82358e93c6704c0fa37126787bdd05e37588..cdb028049e139574cbc76de9fc483d767ddda755 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -51,9 +51,12 @@
     $strsubmissions = get_string("submissions", "workshop");
 
     // ... print the header and...
-    print_header_simple(format_string($workshop->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($workshop->name,true)."</a> -> $strsubmissions",
+    $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($workshop->name,true), '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($workshop->name), "", $navigation,
                   "", "", true);
 
     //...get the action or set up an suitable default

diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php
index 8559b92135210955c8941f4a810b1674ba14dd94..3b880aa347def6c0033edb527212bd2485101246 100644 (file)
--- a/mod/workshop/upload.php
+++ b/mod/workshop/upload.php
@@ -23,9 +23,12 @@
     $strworkshop = get_string('modulename', 'workshop');
     $strsubmission = get_string('submission', 'workshop');
 
-    print_header_simple(format_string($workshop->name)." : $strsubmission", "",
-                 "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                  <a href=\"view.php?a=$workshop->id\">".format_string($workshop->name,true)."</a> -> $strsubmission",
+    $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strsubmission, 'link' => '', 'type' => 'title');
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple(format_string($workshop->name)." : $strsubmission", "", $navigation,
                   "", "", true);
     $timenow = time();
 

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index df70c59bddff7cfb6f3e262aea8f04f95ecabfce..8cca3b6d94cba05c1cfe0eee70fab82b5b1cefb9 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -69,9 +69,14 @@
     }
 
     // ...display header...
-    print_header_simple(format_string($workshop->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($workshop->name,true)."</a> $straction",
+    $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    if ($straction) {
+        $crumbs[] = array('name' => $straction, 'link' => '', 'type' => 'title');
+    }
+    $navigation = build_navigation($crumbs, $course);    
+    
+    print_header_simple(format_string($workshop->name), "", $navigation,
                   "", "", true, update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));
 
 

diff --git a/mod/workshop/viewassessment.php b/mod/workshop/viewassessment.php
index cba5bbd1e49e200eafcd78b1bb22ef11fe1edcc6..7ea7d29171c2302261e8f5733c47736a5c697a6e 100644 (file)
--- a/mod/workshop/viewassessment.php
+++ b/mod/workshop/viewassessment.php
@@ -58,11 +58,13 @@
     /// top frame with the navigation bar and the assessment form
 
     if ($frameset == "top") {
-
+        $crumbs[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+        $crumbs[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
+        $navigation = build_navigation($crumbs, $course);
+        
         // removed <base target="_parent" /> as it does not validate
-        print_header_simple(format_string($workshop->name), "",
-                     "<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
-                      <a href=\"view.php?id=$cm->id\">".format_string($workshop->name,true)."</a> -> $strassess",
+        print_header_simple(format_string($workshop->name), "", $navigation,
                       "", '', true);
 
         // show assessment but don't allow changes