mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-9615: Correct incorrect use of term breadcrumbs
- $crumbs -> $navlinks Author: Matt Clarkson <mattc@catalyst.net.nz>
This commit is contained in:
parent
7994464178
commit
3b27b0fe21
99 changed files with 471 additions and 547 deletions
|
@ -35,11 +35,11 @@
|
|||
$strimportquestions = get_string("importquestions", "lesson");
|
||||
$strlessons = get_string("modulenameplural", "lesson");
|
||||
|
||||
$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');
|
||||
$navlinks[] = array('name' => $strlesson, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($lesson->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strimportquestions, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple("$strimportquestions", " $strimportquestions", $navigation);
|
||||
|
||||
|
|
|
@ -44,11 +44,11 @@
|
|||
$strimportppt = get_string("importppt", "lesson");
|
||||
$strlessons = get_string("modulenameplural", "lesson");
|
||||
|
||||
$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');
|
||||
$navlinks[] = array('name' => $strlessons, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($mod->name,true), 'link' => "$CFG->wwwroot/mod/$modname/view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strimportppt, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple("$strimportppt", " $strimportppt", $navigation);
|
||||
|
||||
|
|
|
@ -30,9 +30,9 @@
|
|||
|
||||
/// Print the header
|
||||
|
||||
$crumbs[] = array('name' => $strlessons, 'link' => '', 'type' => 'activity');
|
||||
$navlinks[] = array('name' => $strlessons, 'link' => '', 'type' => 'activity');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header("$course->shortname: $strlessons", $course->fullname, $navigation, "", "", true, "", navmenu($course));
|
||||
|
||||
|
|
|
@ -240,10 +240,10 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') {
|
|||
|
||||
/// Header setup
|
||||
|
||||
$crumbs[] = array('name' => $strlessons, 'link' => "$CFG->wwwroot/mod/lesson/index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => $strname, 'link' => '', 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strlessons, 'link' => "$CFG->wwwroot/mod/lesson/index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => $strname, 'link' => '', 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
/// Print header, heading, tabs and messages
|
||||
print_header("$course->shortname: $strname", $course->fullname, $navigation,
|
||||
|
|
|
@ -60,7 +60,7 @@ class page_lesson extends page_generic_activity {
|
|||
*
|
||||
* @return void
|
||||
**/
|
||||
function print_header($title = '', $morebreadcrumbs = array()) {
|
||||
function print_header($title = '', $morenavlinks = array()) {
|
||||
global $CFG;
|
||||
|
||||
$this->init_full();
|
||||
|
@ -76,11 +76,11 @@ class page_lesson extends page_generic_activity {
|
|||
$title = "{$this->courserecord->shortname}: $activityname";
|
||||
}
|
||||
|
||||
$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');
|
||||
$navlinks[] = array('name' => get_string('modulenameplural', $this->activityname), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/index.php?id={$this->courserecord->id}", 'type' => 'activity');
|
||||
$navlinks[] = 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);
|
||||
if (!empty($morenavlinks)) {
|
||||
$navlinks = array_merge($navlinks, $morenavlinks);
|
||||
}
|
||||
|
||||
|
||||
|
@ -132,7 +132,7 @@ class page_lesson extends page_generic_activity {
|
|||
$meta = '';
|
||||
// }
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header($title, $this->courserecord->fullname, $navigation, '', $meta, true, $buttons, navmenu($this->courserecord, $this->modulerecord));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue