Breadcrumbs: mod/journal changes

- Modified to use build_navigation() for breadcrumb generation.

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

diff --git a/mod/journal/edit.php b/mod/journal/edit.php
index 7d2045c17bf47b30ddd228e070ea28886c6bc1af..ea57ff6c88c947e8f72a111cbaef8c42266b8173 100644 (file)
--- a/mod/journal/edit.php
+++ b/mod/journal/edit.php
@@ -75,9 +75,12 @@
         $entry->format = $defaultformat;
     }
 
-    print_header_simple(format_string($journal->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strjournals</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($journal->name,true)."</a> -> $stredit", "",
+    $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $stredit, 'link' => '', 'type' => 'action');
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple(format_string($journal->name), "", $navigation, "",
                   "", true, "", navmenu($course, $cm));
 
     echo "<center>\n";

diff --git a/mod/journal/index.php b/mod/journal/index.php
index 2dbf763bf0e71e6dcf998b4f4f7a06ee1a836ea7..c5de71b19741d1c7fff02e821e34cb9d28d8a503 100644 (file)
--- a/mod/journal/index.php
+++ b/mod/journal/index.php
@@ -16,8 +16,11 @@
     $strjournals = get_string("modulenameplural", "journal");
     $strweek = get_string("week");
     $strtopic = get_string("topic");
+    
+    $crumbs[] = array('name' => $strjournals, 'link' => '', 'type' => 'activity');
+    $navigation = build_navigation($crumbs, $course);
 
-    print_header_simple("$strjournals", "", "$strjournals", 
+    print_header_simple("$strjournals", "", $navigation, 
                  "", "", true, "", navmenu($course));
 
 

diff --git a/mod/journal/report.php b/mod/journal/report.php
index 47f7179b4282b4bc15143e0333e2ea2930f0df9f..3984042bb3bd91a7f6556c65c2acdf13909bc3d5 100644 (file)
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -38,9 +38,12 @@
     $strentries = get_string("entries", "journal");
     $strjournals = get_string("modulenameplural", "journal");
 
-    print_header_simple("$strjournals", "",
-                 "<a href=\"index.php?id=$course->id\">$strjournals</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($journal->name,true)."</a> -> $strentries", "", "", true);
+    $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strentries, 'link' => '', 'type' => 'title');
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple("$strjournals", "", $navigation, "", "", true);
 
 
 /// Check to see if groups are being used in this journal

diff --git a/mod/journal/view.php b/mod/journal/view.php
index 0db45fdc02fc5163394168a722f9f1ea6e0ea6cd..4fe6dc1ebddd664e863102f23816bb2ad53cd03c 100644 (file)
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -27,9 +27,12 @@
 
     $strjournal = get_string("modulename", "journal");
     $strjournals = get_string("modulenameplural", "journal");
+    
+    $crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($journal->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
 
-    print_header_simple(format_string($journal->name), '',
-                 "<a href=\"index.php?id=$course->id\">$strjournals</a> -> ".format_string($journal->name), '', '', true,
+    print_header_simple(format_string($journal->name), '', $navigation, '', '', true,
                   update_module_button($cm->id, $course->id, $strjournal), navmenu($course, $cm));
 
     if (isteacher($course->id)) {