mirror of
https://github.com/moodle/moodle.git
synced 2025-08-06 01:16:44 +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
|
@ -69,9 +69,9 @@
|
|||
$strdatabases = get_string("modulenameplural", "data");
|
||||
$navigation = "<a href=\"index.php?id=$course->id\">$strdatabases</a> ->";
|
||||
|
||||
$crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($data->name), "", $navigation, "", "", true, '', navmenu($course, $cm));
|
||||
notice(get_string("activityiscurrentlyhidden"));
|
||||
|
@ -113,23 +113,19 @@
|
|||
/// Print the page header
|
||||
$strdata = get_string('modulenameplural','data');
|
||||
|
||||
$crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple($data->name, '', $navigation,
|
||||
'', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
|
||||
navmenu($course, $cm), '', '');
|
||||
|
||||
print_heading(format_string($data->name));
|
||||
|
||||
/// Check to see if groups are being used here
|
||||
$groupmode = groupmode($course, $cm);
|
||||
$currentgroup = setup_and_print_groups($course, $groupmode, 'edit.php?d='.$data->id);
|
||||
|
||||
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
|
||||
$currentgroup = setup_and_print_groups($course, $groupmode, 'edit.php?d='.$data->id.'&sesskey='.sesskey().'&');
|
||||
} else {
|
||||
$currentgroup = 0;
|
||||
}
|
||||
print_heading(format_string($data->name));
|
||||
|
||||
if ($currentgroup) {
|
||||
$groupselect = " AND groupid = '$currentgroup'";
|
||||
|
|
|
@ -57,9 +57,9 @@ require_course_login($course, true, $cm);
|
|||
|
||||
/// If it's hidden then it's don't show anything. :)
|
||||
if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities',get_context_instance(CONTEXT_MODULE, $cm->id))) {
|
||||
$crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($data->name), "", $navigation,
|
||||
"", "", true, '', navmenu($course, $cm));
|
||||
|
|
|
@ -76,19 +76,16 @@
|
|||
/// Print the page header
|
||||
$strdata = get_string('modulenameplural','data');
|
||||
|
||||
$crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple($data->name, "", $navigation, "", "", true, "", navmenu($course));
|
||||
print_heading(format_string($data->name));
|
||||
|
||||
/// Groups needed for Add entry tab
|
||||
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
|
||||
$currentgroup = get_and_set_current_group($course, $groupmode);
|
||||
} else {
|
||||
$currentgroup = 0;
|
||||
}
|
||||
$groupmode = groupmode($course, $cm);
|
||||
$currentgroup = get_and_set_current_group($course, $groupmode);
|
||||
|
||||
/// Print the tabs
|
||||
$currenttab = 'add';
|
||||
|
|
|
@ -42,8 +42,8 @@
|
|||
$strname = get_string('name');
|
||||
$strdata = get_string('modulename','data');
|
||||
|
||||
$crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple($strdata, '', $navigation, '', '', true, "", navmenu($course));
|
||||
|
||||
|
@ -78,7 +78,7 @@
|
|||
array_push($table->align, 'center');
|
||||
}
|
||||
|
||||
$currentgroup = get_current_group($course->id);
|
||||
$currentgroup = get_and_set_current_group($course, groupmode($course));
|
||||
if ($currentgroup and has_capability('mod/data:manageentries', $context)) {
|
||||
$group = groups_get_group($currentgroup, false);
|
||||
$groupname = " ($group->name)";
|
||||
|
|
|
@ -1687,10 +1687,10 @@ function data_print_header($course, $cm, $data, $currenttab='') {
|
|||
global $CFG, $displaynoticegood, $displaynoticebad;
|
||||
|
||||
$strdata = get_string('modulenameplural','data');
|
||||
$crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => $data->name, 'link' => '', 'type' => 'activityinstance');
|
||||
$navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => $data->name, 'link' => '', 'type' => 'activityinstance');
|
||||
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple($data->name, '', $navigation,
|
||||
'', '', true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
|
||||
|
|
|
@ -28,8 +28,8 @@ class page_data extends page_generic_activity {
|
|||
parent::init_quick($data);
|
||||
}
|
||||
|
||||
function print_header($title, $morebreadcrumbs = NULL, $meta) {
|
||||
parent::print_header($title, $morebreadcrumbs, '', $meta);
|
||||
function print_header($title, $morenavlinks = NULL, $meta) {
|
||||
parent::print_header($title, $morenavlinks, '', $meta);
|
||||
}
|
||||
|
||||
function get_type() {
|
||||
|
|
|
@ -96,9 +96,9 @@
|
|||
$meta .= '//]]>'."\n";
|
||||
$meta .= '</script>'."\n";
|
||||
|
||||
$crumbs[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple($data->name, '', $navigation,
|
||||
'', $meta, true, update_module_button($cm->id, $course->id, get_string('modulename', 'data')),
|
||||
|
@ -108,11 +108,8 @@
|
|||
|
||||
|
||||
/// Groups needed for Add entry tab
|
||||
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
|
||||
$currentgroup = get_and_set_current_group($course, $groupmode);
|
||||
} else {
|
||||
$currentgroup = 0;
|
||||
}
|
||||
$groupmode = groupmode($course, $cm);
|
||||
$currentgroup = get_and_set_current_group($course, $groupmode);
|
||||
|
||||
/// Print the tabs.
|
||||
$currenttab = 'templates';
|
||||
|
|
|
@ -94,9 +94,9 @@
|
|||
if (empty($cm->visible) and !has_capability('mod/data:managetemplates', $context)) {
|
||||
$strdatabases = get_string("modulenameplural", "data");
|
||||
|
||||
$crumbs[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$crumbs[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($crumbs);
|
||||
$navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
|
||||
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
|
||||
$navigation = build_navigation($navlinks);
|
||||
|
||||
print_header_simple(format_string($data->name), "",
|
||||
$navigation, "", "", true, '', navmenu($course, $cm));
|
||||
|
@ -258,6 +258,12 @@
|
|||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
}
|
||||
|
||||
/// Check to see if groups are being used here
|
||||
$groupmode = groupmode($course, $cm);
|
||||
$currentgroup = setup_and_print_groups($course, $groupmode,
|
||||
'view.php?d='.$data->id.'&search='.s($search).'&sort='.s($sort).
|
||||
'&order='.s($order).'&');
|
||||
|
||||
print_heading(format_string($data->name));
|
||||
|
||||
// Do we need to show a link to the RSS feed for the records?
|
||||
|
@ -272,15 +278,6 @@
|
|||
print_box(format_text($data->intro), 'generalbox', 'intro');
|
||||
}
|
||||
|
||||
/// Check to see if groups are being used here
|
||||
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
|
||||
$currentgroup = setup_and_print_groups($course, $groupmode,
|
||||
'view.php?d='.$data->id.'&search='.s($search).'&sort='.s($sort).
|
||||
'&order='.s($order).'&');
|
||||
} else {
|
||||
$currentgroup = 0;
|
||||
}
|
||||
|
||||
/// Delete any requested records
|
||||
|
||||
if ($delete && confirm_sesskey() && (has_capability('mod/data:manageentries', $context) or data_isowner($delete))) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue