Breadcrumbs: mod/data changes

- Modified to use build_navigation() for breadcrumb generation.
- Removed print_header method is now provided by base class.

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

diff --git a/mod/data/edit.php b/mod/data/edit.php
index c6e9999cb62cea045ad507dd7771dc720f2969af..d403eff4adce202e46ca325ec263cd8f9d84411a 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -68,8 +68,12 @@
     if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) {
         $strdatabases = get_string("modulenameplural", "data");
         $navigation = "<a href=\"index.php?id=$course->id\">$strdatabases</a> ->";
-        print_header_simple(format_string($data->name), "",
-                 "$navigation ".format_string($data->name), "", "", true, '', navmenu($course, $cm));
+        
+        $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+        $navigation = build_navigation($crumbs, $course);
+        
+        print_header_simple(format_string($data->name), "", $navigation, "", "", true, '', navmenu($course, $cm));
         notice(get_string("activityiscurrentlyhidden"));
     }
 
@@ -109,7 +113,11 @@
 /// Print the page header
     $strdata = get_string('modulenameplural','data');
 
-    print_header_simple($data->name, '', "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name",
+    $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple($data->name, '', $navigation,
                         '', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
                         navmenu($course, $cm), '', '');
 

diff --git a/mod/data/field/latlong/kml.php b/mod/data/field/latlong/kml.php
index b1fcf746001f1a7f78fe07ca7eb40aef785dea00..9b0ce5b6da345bf6e8d1dd0d0b6cbe1b82c5a078 100644 (file)
--- a/mod/data/field/latlong/kml.php
+++ b/mod/data/field/latlong/kml.php
@@ -57,10 +57,12 @@ require_course_login($course, true, $cm);
 
 /// If it's hidden then it's don't show anything.  :)
 if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities',get_context_instance(CONTEXT_MODULE, $cm->id))) {
-    $strdatabases = get_string("modulenameplural", "data");
-    $navigation = "<a href=\"index.php?id=$course->id\">$strdatabases</a> ->";
-    print_header_simple(format_string($data->name), "",
-             "$navigation ".format_string($data->name), "", "", true, '', navmenu($course, $cm));
+    $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
+        
+    print_header_simple(format_string($data->name), "", $navigation,
+        "", "", true, '', navmenu($course, $cm));
     notice(get_string("activityiscurrentlyhidden"));
 }
 

diff --git a/mod/data/import.php b/mod/data/import.php
index 53a82644aabe502c2d4804780e825d9ab0c0b922..f97af278965a278442d17de024587b653a54497f 100755 (executable)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -75,7 +75,12 @@
 
 /// Print the page header
     $strdata = get_string('modulenameplural','data');
-    print_header_simple($data->name, "", "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name", "", "", true, "", navmenu($course));
+    
+    $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple($data->name, "", $navigation, "", "", true, "", navmenu($course));
     print_heading(format_string($data->name));
 
 /// Groups needed for Add entry tab

diff --git a/mod/data/index.php b/mod/data/index.php
index 0f026d4a7e6872a629ebe332e848f17fc54ff33e..739497d5fe2b21273a4fdd0195cbb9dec01c53c8 100755 (executable)
--- a/mod/data/index.php
+++ b/mod/data/index.php
@@ -41,8 +41,11 @@
     $strtopic = get_string('topic');
     $strname = get_string('name');
     $strdata = get_string('modulename','data');
+    
+    $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');    
+    $navigation = build_navigation($crumbs, $course);
 
-    print_header_simple($strdata, '', $strdata, '', '', true, "", navmenu($course));
+    print_header_simple($strdata, '', $navigation, '', '', true, "", navmenu($course));
 
     if (! $datas = get_all_instances_in_course("data", $course)) {
         notice("There are no databases", "$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 60344b2b674ea94fc8fd6c6934918ab59c3cca69..5a694aef709bd74014b1f94a891c0b863ba5b389 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1571,8 +1571,12 @@ function data_print_header($course, $cm, $data, $currenttab='') {
     global $CFG, $displaynoticegood, $displaynoticebad;
 
     $strdata = get_string('modulenameplural','data');
-
-    print_header_simple($data->name, '', "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name",
+    $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => $data->name, 'link' => '', 'type' => 'activityinstance');
+    
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple($data->name, '', $navigation,
             '', '', true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
             navmenu($course, $cm));
 

diff --git a/mod/data/pagelib.php b/mod/data/pagelib.php
index 2b84d2597a0f0afeb261cce16995a88ab9d3b2f2..942b8905adcc6540dc62be4dee1a92b3f29a21f9 100755 (executable)
--- a/mod/data/pagelib.php
+++ b/mod/data/pagelib.php
@@ -29,57 +29,7 @@ class page_data extends page_generic_activity {
     }
 
     function print_header($title, $morebreadcrumbs = NULL, $meta) {
-        global $USER, $CFG;
-
-        $this->init_full();
-        $replacements = array(
-            '%fullname%' => format_string($this->activityrecord->name)
-        );
-        foreach($replacements as $search => $replace) {
-            $title = str_replace($search, $replace, $title);
-        }
-
-        if($this->courserecord->id == SITEID) {
-            $breadcrumbs = array();
-        }
-        else {
-            $breadcrumbs = array($this->courserecord->shortname => $CFG->wwwroot.'/course/view.php?id='.$this->courserecord->id);
-        }
-
-        $breadcrumbs[get_string('modulenameplural', 'data')] = $CFG->wwwroot.'/mod/data/index.php?id='.$this->courserecord->id;
-        $breadcrumbs[format_string($this->activityrecord->name)]            = $CFG->wwwroot.'/mod/data/view.php?id='.$this->modulerecord->id;
-
-        if(!empty($morebreadcrumbs)) {
-            $breadcrumbs = array_merge($breadcrumbs, $morebreadcrumbs);
-        }
-
-        $total     = count($breadcrumbs);
-        $current   = 1;
-        $crumbtext = '';
-        foreach($breadcrumbs as $text => $href) {
-            if($current++ == $total) {
-                $crumbtext .= ' '.$text;
-            }
-            else {
-                $crumbtext .= ' <a href="'.$href.'">'.$text.'</a> ->';
-            }
-        }
-
-        if(empty($morebreadcrumbs) && $this->user_allowed_editing()) {
-            $buttons = '<table><tr><td>'.update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'data')).'</td>';
-            if(!empty($CFG->showblocksonmodpages)) {
-                $buttons .= '<td><form '.$CFG->frametarget.' method="get" action="view.php">'.
-                    '<input type="hidden" name="id" value="'.$this->modulerecord->id.'" />'.
-                    '<input type="hidden" name="edit" value="'.($this->user_is_editing()?'off':'on').'" />'.
-                    '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>';
-            }
-            $buttons .= '</tr></table>';
-        }
-        else {
-            $buttons = '&nbsp;';
-        }
-        print_header($title, $this->courserecord->fullname, $crumbtext, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
-
+        parent::print_header($title, $morebreadcrumbs, '', $meta);
     }
 
     function get_type() {

diff --git a/mod/data/templates.php b/mod/data/templates.php
index fc78f0d9d65c9f782581e23940295d4837af7b8f..2183b0eb70f2fdbcae63b5d15bf698641866da6d 100755 (executable)
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -95,8 +95,12 @@
     $meta .= '}'."\n";
     $meta .= '//]]>'."\n";
     $meta .= '</script>'."\n";
-
-    print_header_simple($data->name, '', "<a href='index.php?id=$course->id'>$strdata</a> -> $data->name",
+    
+    $crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+    $navigation = build_navigation($crumbs, $course);
+    
+    print_header_simple($data->name, '', $navigation,
                         '', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
                         navmenu($course, $cm), '', $bodytag);
 

diff --git a/mod/data/view.php b/mod/data/view.php
index 99b6d9bbb41e7ba188556a0e17828ca6eb16db5d..26e54930582340fff866527a1b44719e38bacab6 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -89,9 +89,13 @@
 /// If it's hidden then it's don't show anything.  :)
     if (empty($cm->visible) and !has_capability('mod/data:managetemplates', $context)) {
         $strdatabases = get_string("modulenameplural", "data");
-        $navigation = "<a href=\"index.php?id=$course->id\">$strdatabases</a> ->";
+        
+        $crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
+        $navigation = build_navigation($crumbs, $course);
+        
         print_header_simple(format_string($data->name), "",
-                 "$navigation ".format_string($data->name), "", "", true, '', navmenu($course, $cm));
+                 $navigation, "", "", true, '', navmenu($course, $cm));
         notice(get_string("activityiscurrentlyhidden"));
     }