From: mattc-catalyst <mattc-catalyst>
Date: Mon, 16 Apr 2007 21:20:20 +0000 (+0000)
Subject: Breadcrumbs: mod/lesson changes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f8513eca8d5c51bab94552024d0d75c1130e5de5;p=moodle.git

Breadcrumbs: mod/lesson changes

- Modified to use build_navigation() for breadcrumb generation.


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

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index 87b1b4e684..f897cda414 100644
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -35,8 +35,13 @@
     $strimportquestions = get_string("importquestions", "lesson");
     $strlessons = get_string("modulenameplural", "lesson");
 
-    print_header_simple("$strimportquestions", " $strimportquestions",
-                 "<a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>-> $strimportquestions");
+    $crumbs[] = array('name' => $strlesson, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($lesson->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strimportquestions, 'link' => '', 'type' => 'title');
+            
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple("$strimportquestions", " $strimportquestions", $navigation);
 
     if ($form = data_submitted()) {   /// Filename
 
diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index bdc744eb03..4aa26e29db 100644
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -44,8 +44,13 @@
     $strimportppt = get_string("importppt", "lesson");
     $strlessons = get_string("modulenameplural", "lesson");
 
-    print_header_simple("$strimportppt", " $strimportppt",
-                 "<a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"$CFG->wwwroot/mod/$modname/view.php?id=$cm->id\">".format_string($mod->name,true)."</a>-> $strimportppt");
+    $crumbs[] = array('name' => $strlessons, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($mod->name,true), 'link' => "$CFG->wwwroot/mod/$modname/view.php?id=$cm->id", 'type' => 'activityinstance');
+    $crumbs[] = array('name' => $strimportppt, 'link' => '', 'type' => 'title');
+            
+    $navigation = build_navigation($crumbs, $course);
+
+    print_header_simple("$strimportppt", " $strimportppt", $navigation);
 
     if ($form = data_submitted()) {   /// Filename
 
diff --git a/mod/lesson/index.php b/mod/lesson/index.php
index 26c90cc810..ddc567a267 100644
--- a/mod/lesson/index.php
+++ b/mod/lesson/index.php
@@ -30,13 +30,11 @@
 
 /// Print the header
 
-    if ($course->id != SITEID) {
-        $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->";
-    } else {
-        $navigation = '';
-    }
+    $crumbs[] = array('name' => $strlessons, 'link' => '', 'type' => 'activity');
+    
+    $navigation = build_navigation($crumbs, $course);
 
-    print_header("$course->shortname: $strlessons", $course->fullname, "$navigation $strlessons", "", "", true, "", navmenu($course));
+    print_header("$course->shortname: $strlessons", $course->fullname, $navigation, "", "", true, "", navmenu($course));
 
 /// Get all the appropriate data
 
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 4a0211bff9..8e536542ae 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -239,25 +239,14 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') {
     }
 
 /// Header setup
-    $navigation = array();
-    if ($course->id != SITEID) {
-        $navigation[$course->shortname] = "$CFG->wwwroot/course/view.php?id=$course->id";
-    }
-    $navigation[$strlessons] = "$CFG->wwwroot/mod/lesson/index.php?id=$course->id";
-    $navigation[$strname]    = '';
-
-    $urls = array();
-    foreach($navigation as $text => $href) {
-        if (empty($href)) {
-            $urls[] = $text;
-        } else {
-            $urls[] = '<a href="'.$href.'">'.$text.'</a>';
-        }
-    }
-    $breadcrumb = implode(' -> ', $urls);
-
+    
+    $crumbs[] = array('name' => $strlessons, 'link' => "$CFG->wwwroot/mod/lesson/index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => $strname, 'link' => '', 'type' => 'activityinstance');
+    
+    $navigation = build_navigation($crumbs, $course);
+    
 /// Print header, heading, tabs and messages
-    print_header("$course->shortname: $strname", $course->fullname, $breadcrumb,
+    print_header("$course->shortname: $strname", $course->fullname, $navigation,
                   '', '', true, $button, navmenu($course, $cm));
 
     if (has_capability('mod/lesson:manage', $context)) {
diff --git a/mod/lesson/pagelib.php b/mod/lesson/pagelib.php
index b8b2c5fe13..0e0d777af9 100644
--- a/mod/lesson/pagelib.php
+++ b/mod/lesson/pagelib.php
@@ -76,29 +76,13 @@ class page_lesson extends page_generic_activity {
             $title = "{$this->courserecord->shortname}: $activityname";
         }
 
-    /// Build the breadcrumb
-        $breadcrumbs = array();
-        if ($this->courserecord->id != SITEID) {
-           $breadcrumbs[$this->courserecord->shortname] = "$CFG->wwwroot/course/view.php?id={$this->courserecord->id}";
+        $crumbs[] = array('name' => get_string('modulenameplural', $this->activityname), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/index.php?id={$this->courserecord->id}", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($this->activityrecord->name), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/view.php?id={$this->modulerecord->id}", 'type' => 'activityinstance');
+    
+        if (!empty($morebreadcrumbs)) {
+            $breadcrumbs = array_merge($crumbs, $morebreadcrumbs);
         }
-        $breadcrumbs[get_string('modulenameplural', 'lesson')] = "$CFG->wwwroot/mod/lesson/index.php?id={$this->courserecord->id}";
-
-        if (empty($morebreadcrumbs)) {
-            $breadcrumbs[$activityname] = '';
-        } else {
-            $breadcrumbs[$activityname] = "$CFG->wwwroot/mod/lesson/view.php?id={$this->modulerecord->id}&amp;pageid=$this->lessonpageid";
-            $breadcrumbs = array_merge($breadcrumbs, $morebreadcrumbs);
-        }
-        // Convert to breadcrumb string
-        $urls = array();
-        foreach($breadcrumbs as $text => $href) {
-            if (empty($href)) {
-                $urls[] = $text;
-            } else {
-                $urls[] = '<a href="'.$href.'">'.$text.'</a>';
-            }
-        }
-        $breadcrumb = implode(' -> ', $urls);
+ 
 
     /// Build the buttons
         if (has_capability('mod/lesson:edit', $context)) {
@@ -148,7 +132,9 @@ class page_lesson extends page_generic_activity {
             $meta = '';
         // }
 
-        print_header($title, $this->courserecord->fullname, $breadcrumb, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
+        $navigation = build_navigation($crumbs, $this->courserecord);
+
+        print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
 
         if (has_capability('mod/lesson:manage', $context)) {
             print_heading_with_help($activityname, 'overview', 'lesson');