mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +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
|
@ -15,8 +15,8 @@
|
|||
|
||||
$strchoice = get_string("modulename", "choice");
|
||||
$strchoices = get_string("modulenameplural", "choice");
|
||||
$crumbs[] = array('name' => $strchoices, 'link' => '', 'type' => 'activity');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strchoices, 'link' => '', 'type' => 'activity');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple("$strchoices", "", $navigation, "", "", true, "", navmenu($course));
|
||||
|
||||
|
|
|
@ -38,16 +38,22 @@
|
|||
redirect("report.php?id=$cm->id");
|
||||
}
|
||||
|
||||
if ($download <> "xls" and $download <> "txt" and $download <> "ods") {
|
||||
if (!$download) {
|
||||
|
||||
$crumbs[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($choice->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$crumbs[] = array('name' => $strresponses, 'link' => '', 'type' => 'title');
|
||||
$navlinks[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($choice->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strresponses, 'link' => '', 'type' => 'title');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($choice->name).": $strresponses", "", $navigation, "", '', true,
|
||||
update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));
|
||||
/// Check to see if groups are being used in this choice
|
||||
$groupmode = groupmode($course, $cm);
|
||||
setup_and_print_groups($course, $groupmode, 'report.php?id='.$id);
|
||||
} else {
|
||||
$groupmode = groupmode($course, $cm);
|
||||
get_and_set_current_group($course, $groupmode);
|
||||
}
|
||||
|
||||
$users = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.firstname ASC');
|
||||
|
|
|
@ -58,22 +58,26 @@ if ($action == 'delchoice') {
|
|||
|
||||
|
||||
/// Display the choice and possibly results
|
||||
$crumbs[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($choice->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($choice->name), 'link' => '', 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($choice->name), "", $navigation, "", "", true,
|
||||
update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));
|
||||
|
||||
add_to_log($course->id, "choice", "view", "view.php?id=$cm->id", $choice->id, $cm->id);
|
||||
|
||||
|
||||
/// Check to see if groups are being used in this choice
|
||||
$groupmode = groupmode($course, $cm);
|
||||
setup_and_print_groups($course, $groupmode, 'view.php?id='.$id);
|
||||
|
||||
if (has_capability('mod/choice:readresponses', $context)) {
|
||||
choice_show_reportlink($choice, $course->id, $cm->id);
|
||||
} else if (!$cm->visible) {
|
||||
notice(get_string("activityiscurrentlyhidden"));
|
||||
choice_show_reportlink($choice, $course->id, $cm->id, $groupmode);
|
||||
}
|
||||
|
||||
echo '<div class="clearer"></div>';
|
||||
|
||||
if ($choice->text) {
|
||||
print_box(format_text($choice->text, $choice->format), 'generalbox', 'intro');
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue