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
|
@ -223,12 +223,12 @@ function glossary_comment_print_header($course, $cm, $glossary, $entry, $action)
|
|||
$strglossary = get_string('modulename', 'glossary');
|
||||
$strcomments = get_string('comments', 'glossary');
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => $strcomments, 'link' => "comments.php?id=$cm->id&eid=$entry->id", 'type' => 'title');
|
||||
$crumbs[] = array('name' => $straction, 'link' => '', 'type' => 'action');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strcomments, 'link' => "comments.php?id=$cm->id&eid=$entry->id", 'type' => 'title');
|
||||
$navlinks[] = array('name' => $straction, 'link' => '', 'type' => 'action');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), '', $navigation,
|
||||
'', '', true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -42,10 +42,10 @@
|
|||
$strcomments = get_string("comments", "glossary");
|
||||
$straddcomment = get_string("addcomment", "glossary");
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => $strcomments, 'link' => '', 'type' => 'title');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strcomments, 'link' => '', 'type' => 'title');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(strip_tags("$strcomments: $entry->concept"), "", $navigation,
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -39,10 +39,10 @@
|
|||
|
||||
$strareyousuredelete = get_string("areyousuredelete","glossary");
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "", $navigation,
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -192,11 +192,11 @@ $strglossary = get_string("modulename", "glossary");
|
|||
$strglossaries = get_string("modulenameplural", "glossary");
|
||||
$stredit = empty($e) ? get_string('addentry', 'glossary') : get_string("edit");
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => $stredit, 'link' => '', 'type' => 'title');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $stredit, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "", $navigation, "",
|
||||
"", true, "", navmenu($course, $cm));
|
||||
|
|
|
@ -47,11 +47,11 @@
|
|||
$strglossaries = get_string("modulenameplural", "glossary");
|
||||
$strglossary = get_string("modulename", "glossary");
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id&tab=GLOSSARY_CATEGORY_VIEW", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id&tab=GLOSSARY_CATEGORY_VIEW", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "", $navigation,
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -37,10 +37,10 @@
|
|||
$strexportfile = get_string("exportfile", "glossary");
|
||||
$strexportentries = get_string('exportentries', 'glossary');
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "",$navigation,
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -38,10 +38,10 @@
|
|||
$entryalreadyexist = get_string('entryalreadyexist','glossary');
|
||||
$entryexported = get_string('entryexported','glossary');
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), '', $navigation, '', '', true, '', navmenu($course, $cm));
|
||||
|
||||
|
|
|
@ -51,13 +51,13 @@
|
|||
$strmodulename = get_string("modulename", "glossary");
|
||||
$strdisplayformats = get_string("displayformats","glossary");
|
||||
|
||||
$crumbs[] = array('name' => $stradmin, 'link' => "../../$CFG->admin/index.php", 'type' => 'core');
|
||||
$crumbs[] = array('name' => $strconfiguration, 'link' => "../../$CFG->admin/configure.php", 'type' => 'core');
|
||||
$crumbs[] = array('name' => $strmanagemodules, 'link' => "../../$CFG->admin/modules.php", 'type' => 'core');
|
||||
$crumbs[] = array('name' => $strmodulename, 'link' => "../../$CFG->admin/module.php?module=glossary&sesskey=$USER->sesskey", 'type' => 'core');
|
||||
$crumbs[] = array('name' => $strdisplayformats, 'link' => '', 'type' => 'core');
|
||||
$navlinks[] = array('name' => $stradmin, 'link' => "../../$CFG->admin/index.php", 'type' => 'core');
|
||||
$navlinks[] = array('name' => $strconfiguration, 'link' => "../../$CFG->admin/configure.php", 'type' => 'core');
|
||||
$navlinks[] = array('name' => $strmanagemodules, 'link' => "../../$CFG->admin/modules.php", 'type' => 'core');
|
||||
$navlinks[] = array('name' => $strmodulename, 'link' => "../../$CFG->admin/module.php?module=glossary&sesskey=$USER->sesskey", 'type' => 'core');
|
||||
$navlinks[] = array('name' => $strdisplayformats, 'link' => '', 'type' => 'core');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header("$strmodulename: $strconfiguration", $site->fullname, $navigation);
|
||||
|
||||
|
|
|
@ -45,11 +45,11 @@
|
|||
$strsearch = get_string("search");
|
||||
$strimportentries = get_string('importentriesfromxml', 'glossary');
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => $strimportentries, 'link' => '', 'type' => 'title');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strimportentries, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "", $navigation,
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strglossary),
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
|
||||
/// Print the header
|
||||
$crumbs[] = array('name' => $strglossarys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strglossarys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple("$strglossarys", "", $navigation, "", "", true, "", navmenu($course));
|
||||
|
||||
|
|
|
@ -49,10 +49,10 @@
|
|||
|
||||
$CFG->framename = "newwindow";
|
||||
if ($course->id != SITEID) {
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => '', 'type' => 'activity');
|
||||
$crumbs[] = array('name' => $strsearch, 'link' => '', 'type' => 'title');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => '', 'type' => 'activity');
|
||||
$navlinks[] = array('name' => $strsearch, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header(strip_tags("$course->shortname: $strglossaries $strsearch"), $course->fullname, $navigation, "", "", true, " ", " ");
|
||||
} else {
|
||||
|
|
|
@ -224,22 +224,22 @@
|
|||
$strsearch = get_string("search");
|
||||
$strwaitingapproval = get_string('waitingapproval', 'glossary');
|
||||
|
||||
$crumbs[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$id", 'type' => 'activityinstance');
|
||||
|
||||
/// If we are in approval mode, prit special header
|
||||
if ($tab == GLOSSARY_APPROVAL_VIEW) {
|
||||
require_capability('mod/glossary:approve', $context);
|
||||
|
||||
$crumbs[] = array('name' => $strwaitingapproval, 'link' => '', 'type' => 'title');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strwaitingapproval, 'link' => '', 'type' => 'title');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
|
||||
update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
|
||||
|
||||
print_heading($strwaitingapproval);
|
||||
} else { /// Print standard header
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
|
||||
update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue