From e210cd944729cfc79d7b378ad54bfe9175dcea07 Mon Sep 17 00:00:00 2001 From: mattc-catalyst Date: Mon, 16 Apr 2007 21:35:36 +0000 Subject: [PATCH] Breadcrumbs: mod/workshop changes - Modified to use build_navigation() for breadcrumb generation. Author: Matt Clarkson --- mod/workshop/assess.php | 9 ++++++--- mod/workshop/assessments.php | 15 +++++++-------- mod/workshop/index.php | 7 +++++-- mod/workshop/submissions.php | 9 ++++++--- mod/workshop/upload.php | 9 ++++++--- mod/workshop/view.php | 11 ++++++++--- mod/workshop/viewassessment.php | 10 ++++++---- 7 files changed, 44 insertions(+), 26 deletions(-) diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php index ebe11ac977..f4cfebec09 100644 --- a/mod/workshop/assess.php +++ b/mod/workshop/assess.php @@ -61,9 +61,12 @@ if ($frameset == "top") { // removed // because it does not validate MDL-7861 - print_header_simple(format_string($workshop->name), "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." -> $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 451b70d4ed..e2150838ba 100644 --- 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 = "id\">$course->shortname ->"; - } - $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), "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." -> $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 5e9aae0988..09f3374b64 100644 --- 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 b71a82358e..cdb028049e 100644 --- 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), "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." -> $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 8559b92135..3b880aa347 100644 --- 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", "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." -> $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 df70c59bdd..8cca3b6d94 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -69,9 +69,14 @@ } // ...display header... - print_header_simple(format_string($workshop->name), "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." $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 cba5bbd1e4..7ea7d29171 100644 --- 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 as it does not validate - print_header_simple(format_string($workshop->name), "", - "id\">$strworkshops -> - id\">".format_string($workshop->name,true)." -> $strassess", + print_header_simple(format_string($workshop->name), "", $navigation, "", '', true); // show assessment but don't allow changes -- 2.39.5