From b9dc2734a3d57dcec9565cd60b866193d90c1502 Mon Sep 17 00:00:00 2001 From: mattc-catalyst Date: Mon, 16 Apr 2007 20:52:48 +0000 Subject: [PATCH] Breadcrumbs: mod/assignment changes - modified to use build_navigation() for creating breadcrumbs. Author: Matt Clarkson Committer: Matt Clarkson --- mod/assignment/index.php | 4 +++- mod/assignment/lib.php | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/mod/assignment/index.php b/mod/assignment/index.php index 1c717c2d6f..9d4b5d4b0b 100644 --- a/mod/assignment/index.php +++ b/mod/assignment/index.php @@ -22,8 +22,10 @@ $strsubmitted = get_string("submitted", "assignment"); $strgrade = get_string("grade"); + $crumbs[] = array('name' => $strassignments, 'link' => '', 'type' => 'activity'); + $navigation = build_navigation($crumbs, $course); - print_header_simple($strassignments, "", $strassignments, "", "", true, "", navmenu($course)); + print_header_simple($strassignments, "", $navigation, "", "", true, "", navmenu($course)); if (! $assignments = get_all_instances_in_course("assignment", $course)) { notice(get_string('noassignments', 'assignment'), "../../course/view.php?id=$course->id"); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 01a8440ced..e7c4760f5c 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -76,20 +76,18 @@ class assignment_base { $this->strassignments = get_string('modulenameplural', 'assignment'); $this->strsubmissions = get_string('submissions', 'assignment'); $this->strlastmodified = get_string('lastmodified'); - - if ($this->course->id != SITEID) { - $this->navigation = "frametarget href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". - "frametarget href=\"index.php?id={$this->course->id}\">$this->strassignments ->"; - } else { - $this->navigation = "frametarget href=\"index.php?id={$this->course->id}\">$this->strassignments ->"; - } - + + $this->navigation[] = array('name' => $this->strassignments, 'link' => "index.php?id={$this->course->id}", 'type' => 'activity'); + $this->pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment.': '.format_string($this->assignment->name,true)); // visibility $context = get_context_instance(CONTEXT_MODULE, $cmid); if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', $context)) { $pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment); + $this->navigation[] = array('name' => $this->strassignment, 'link' => '', 'type' => 'activityinstance'); + $navigation = build_navigation($this->navigation, $this->course); + print_header($pagetitle, $this->course->fullname, "$this->navigation $this->strassignment", "", "", true, '', navmenu($this->course, $this->cm)); notice(get_string("activityiscurrentlyhidden"), "$CFG->wwwroot/course/view.php?id={$this->course->id}"); @@ -143,14 +141,17 @@ class assignment_base { global $CFG; + if ($subpage) { - $extranav = 'frametarget.' href="view.php?id='.$this->cm->id.'">'. - format_string($this->assignment->name,true).' -> '.$subpage; + $this->navigation[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?id={$this->cm->id}", 'type' => 'activityinstance'); + $this->navigation[] = array('name' => $subpage, 'link' => '', 'type' => 'title'); } else { - $extranav = ' '.format_string($this->assignment->name,true); + $this->navigation[] = array('name' => format_string($this->assignment->name,true), 'link' => '', 'type' => 'activityinstance'); } + + $navigation = build_navigation($this->navigation, $this->course); - print_header($this->pagetitle, $this->course->fullname, $this->navigation.$extranav, '', '', + print_header($this->pagetitle, $this->course->fullname, $navigation, '', '', true, update_module_button($this->cm->id, $this->course->id, $this->strassignment), navmenu($this->course, $this->cm)); @@ -358,7 +359,7 @@ class assignment_base { $strname = get_string('name'); $strassignments = get_string('modulenameplural', 'assignment'); $strheading = empty($form->name) ? get_string("type$form->assignmenttype",'assignment') : s(format_string(stripslashes($form->name),true)); - + print_header($this->course->shortname.': '.$strheading, $this->course->fullname, "wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". "wwwroot/mod/assignment/index.php?id={$this->course->id}\">$strassignments -> $strheading"); @@ -994,8 +995,13 @@ class assignment_base { add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id); - print_header_simple(format_string($this->assignment->name,true), "", ''.$this->strassignments.' -> '.format_string($this->assignment->name,true).' -> '. $this->strsubmissions, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm)); - + $crumbs[] = array('name' => $this->strassignments, 'link' => "index.php?id=$course->id", 'type' => 'activity'); + $crumbs[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?a={$this->assignment->id}", 'type' => 'activityinstance'); + $crumbs[] = array('name' => $this->strsubmissions, 'link' => '', 'type' => 'title'); + $navigation = build_navigation($crumbs, $course); + + print_header_simple(format_string($this->assignment->name,true), "", $navigation, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm)); + ///Position swapped /* if ($groupmode = groupmode($course, $cm)) { // Groups are being used -- 2.39.5