MDL-9615: Correct incorrect use of term breadcrumbs

- $crumbs -> $navlinks


Author: Matt Clarkson <mattc@catalyst.net.nz>
This commit is contained in:
mattc-catalyst 2007-07-05 04:40:48 +00:00
parent 7994464178
commit 3b27b0fe21
99 changed files with 471 additions and 547 deletions

View file

@ -22,8 +22,8 @@
$strsubmitted = get_string("submitted", "assignment");
$strgrade = get_string("grade");
$crumbs[] = array('name' => $strassignments, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strassignments, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple($strassignments, "", $navigation, "", "", true, "", navmenu($course));
@ -45,7 +45,7 @@
$table->align = array ("left", "left", "left", "right");
}
$currentgroup = get_current_group($course->id);
$currentgroup = get_and_set_current_group($course, groupmode($course));
if ($currentgroup and has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_COURSE, $id))) {
$group = groups_get_group($currentgroup, false);
$groupname = " ($group->name)";

View file

@ -959,10 +959,10 @@ class assignment_base {
add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id);
$crumbs[] = array('name' => $this->strassignments, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?a={$this->assignment->id}", 'type' => 'activityinstance');
$crumbs[] = array('name' => $this->strsubmissions, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $this->strassignments, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?a={$this->assignment->id}", 'type' => 'activityinstance');
$navlinks[] = array('name' => $this->strsubmissions, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($this->assignment->name,true), "", $navigation, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));

View file

@ -22,8 +22,8 @@
/// Print the header
$crumbs[] = array('name' => $strchats, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strchats, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple($strchats, '', $navigation, '', '', true, '', navmenu($course));

View file

@ -39,23 +39,20 @@
if ($start and $end and !$confirmdelete) { // Show a full transcript
$crumbs[] = array('name' => $strchats, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strchatreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$navlinks[] = array('name' => $strchats, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strchatreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
'', '', true, '', navmenu($course, $cm));
/// 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, "report.php?id=$cm->id");
} else {
$currentgroup = false;
}
$groupmode = groupmode($course, $cm);
$currentgroup = setup_and_print_groups($course, $groupmode, "report.php?id=$cm->id");
if (!empty($currentgroup)) {
if ($currentgroup) {
$groupselect = " AND groupid = '$currentgroup'";
} else {
$groupselect = "";
@ -95,11 +92,11 @@
/// Print the Sessions display
$crumbs[] = array('name' => $strchats, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strchatreport, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strchats, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($chat->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strchatreport, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($chat->name).": $strchatreport", '', $navigation,
'', '', true, '', navmenu($course, $cm));

View file

@ -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));

View file

@ -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');

View file

@ -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');
}

View file

@ -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.'&amp;sesskey='.sesskey().'&amp;');
} else {
$currentgroup = 0;
}
print_heading(format_string($data->name));
if ($currentgroup) {
$groupselect = " AND groupid = '$currentgroup'";

View file

@ -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));

View file

@ -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';

View file

@ -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)";

View file

@ -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')),

View file

@ -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() {

View file

@ -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';

View file

@ -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.'&amp;search='.s($search).'&amp;sort='.s($sort).
'&amp;order='.s($order).'&amp;');
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.'&amp;search='.s($search).'&amp;sort='.s($sort).
'&amp;order='.s($order).'&amp;');
} else {
$currentgroup = 0;
}
/// Delete any requested records
if ($delete && confirm_sesskey() && (has_capability('mod/data:manageentries', $context) or data_isowner($delete))) {

View file

@ -62,11 +62,11 @@
$strassessments = get_string("assessments", "exercise");
// ... print the header and...
$crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($exercise->name), "", $navigation,
"", "", true);

View file

@ -24,8 +24,8 @@
$strdeadline = get_string("deadline", "exercise");
$strsubmitted = get_string("submitted", "assignment");
$crumbs[] = array('name' => $strexercises, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strexercises, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strexercises", "", $navigation, "", "", true, "", navmenu($course));

View file

@ -50,11 +50,11 @@
$strsubmissions = get_string("submissions", "exercise");
// ... print the header and...
$crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($exercise->name), "", $navigation,
"", "", true);

View file

@ -28,10 +28,10 @@
$strexercise = get_string("modulename", "exercise");
$strupload = get_string("upload");
$crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strupload, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strupload, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($exercise->name)." : $strupload", "", $navigation,
"", "", true);

View file

@ -47,9 +47,9 @@
$strexercise = get_string("modulename", "exercise");
// ...display header...
$crumbs[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($exercise->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($exercise->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($exercise->name), "", $navigation,
"", "", true, update_module_button($cm->id, $course->id, $strexercise), navmenu($course, $cm));
@ -340,14 +340,7 @@
/// Check to see if groups are being used in this exercise
/// and if so, set $currentgroup to reflect the current group
$groupmode = groupmode($course, $cm); // Groups are being used?
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
/// Allow the teacher to change groups (for this session)
if ($groupmode) {
if ($groups = groups_get_groups_names($course->id)) { //TODO:
print_group_menu($groups, $groupmode, $currentgroup, "view.php?id=$cm->id");
}
}
$currentgroup = setup_and_print_groups($course, $groupmode, "view.php?id=$cm->id");
print_heading_with_help(get_string("managingassignment", "exercise"), "managing", "exercise");

View file

@ -97,9 +97,9 @@
unset($SESSION->fromdiscussion);
$crumbs[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name,true), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
$navlinks[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name,true), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
if ($mode) {
@ -136,7 +136,7 @@
$searchform = forum_search_form($course);
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header("$course->shortname: ".format_string($discussion->name), $course->fullname,
$navigation, "", "", true, $searchform, navmenu($course, $cm));

View file

@ -18,7 +18,7 @@
}
require_course_login($course);
$currentgroup = get_current_group($course->id);
$currentgroup = get_and_set_current_group($course, groupmode($course));
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
@ -451,10 +451,10 @@
/// Output the page
$crumbs[] = array('name' => $strforums, 'link' => '', 'type' => 'activity');
$navlinks[] = array('name' => $strforums, 'link' => '', 'type' => 'activity');
print_header("$course->shortname: $strforums", $course->fullname,
build_navigation($crumbs),
build_navigation($navlinks),
"", "", true, $searchform, navmenu($course));
if (!isguest()) {

View file

@ -33,10 +33,10 @@
}
$strforums = get_string('modulenameplural', 'forum');
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
notice_yesno(get_string('noguesttracking', 'forum').'<br /><br />'.get_string('liketologin'),

View file

@ -58,10 +58,10 @@
require_login();
}
$crumbs[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name,true), 'link' => '../forum/index.php?id=$course->id', 'type' => 'activityinstance');
$navlinks[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name,true), 'link' => '../forum/index.php?id=$course->id', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header($course->shortname, $course->fullname, $navigation, '' , '', true, "", navmenu($course, $cm));
@ -98,7 +98,11 @@
}
}
$SESSION->fromurl = $_SERVER["HTTP_REFERER"];
if (isset($_SERVER["HTTP_REFERER"])) {
$SESSION->fromurl = $_SERVER["HTTP_REFERER"];
} else {
$SESSION->fromurl = '';
}
// Load up the $post variable.
@ -112,11 +116,14 @@
$post->userid = $USER->id;
$post->message = '';
$post->groupid = get_current_group($course->id);
if ($post->groupid == 0) {
$post->groupid = -1;
if ($groupmode = groupmode($course, $cm)) {
$post->groupid = get_and_set_current_group($course, $groupmode);
if ($post->groupid == 0) {
$post->groupid = -1; //TODO: why -1??
}
} else {
$post->groupid = -1; //TODO: why -1??
}
forum_set_return();
} else if (!empty($reply)) { // User is writing a new reply
@ -403,12 +410,12 @@
$course = get_record('course', 'id', $forum->course);
$strforums = get_string("modulenameplural", "forum");
$crumbs[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => format_string($post->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
$crumbs[] = array('name' => get_string("prune", "forum"), 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => format_string($post->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
$navlinks[] = array('name' => get_string("prune", "forum"), 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($discussion->name).": ".format_string($post->subject), "", $navigation, '', "", true, "", navmenu($course, $cm));
@ -628,15 +635,15 @@
$strforums = get_string("modulenameplural", "forum");
$crumbs[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
if ($post->parent) {
$crumbs[] = array('name' => format_string($toppost->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => get_string('editing', 'forum'), 'link' => '', 'type' => 'action');
$navlinks[] = array('name' => format_string($toppost->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => get_string('editing', 'forum'), 'link' => '', 'type' => 'action');
} else {
$crumbs[] = array('name' => format_string($toppost->subject), 'link' => '', 'type' => 'action');
$navlinks[] = array('name' => format_string($toppost->subject), 'link' => '', 'type' => 'action');
}
if (empty($post->edit)) {
@ -664,7 +671,7 @@
$forcefocus = empty($reply) ? NULL : 'message';
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strdiscussionname ".
format_string($toppost->subject), $course->fullname,

View file

@ -97,12 +97,12 @@
$strsearchresults = get_string("searchresults", "forum");
$strpage = get_string("page");
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
if (!$search || $showform) {
$crumns[] = array('name' => $strsearch, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple("$strsearch", "", $navigation, 'search.words',
"", "", "&nbsp;", navmenu($course));
@ -119,9 +119,9 @@
$searchform = forum_search_form($course, $search);
$crumbs[] = array('name' => $strsearch, 'link' => "search.php?id=$course->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => s($search, true), 'link' => '', 'type' => 'link');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strsearch, 'link' => "search.php?id=$course->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => s($search, true), 'link' => '', 'type' => 'link');
$navigation = build_navigation($navlinks);
if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $perpage, $totalcount)) {
@ -407,7 +407,7 @@ function forum_clean_search_terms($words, $prefix='') {
function forum_menu_list($course) {
$menu = array();
$currentgroup = get_current_group($course->id);
$currentgroup = get_and_set_current_group($course, groupmode($course));
if ($forums = get_all_instances_in_course("forum", $course)) {
if ($course->format == 'weeks') {

View file

@ -31,10 +31,10 @@
}
$strforums = get_string('modulenameplural', 'forum');
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));
notice_yesno(get_string('noguesttracking', 'forum').'<br /><br />'.get_string('liketologin'),

View file

@ -52,10 +52,10 @@
}
$strforums = get_string('modulenameplural', 'forum');
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header($course->shortname, $course->fullname, $navigation, '', '', true, "", navmenu($course, $cm));

View file

@ -36,11 +36,11 @@
$strsubscribers = get_string("subscribers", "forum");
$strforums = get_string("forums", "forum");
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strsubscribers, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strsubscribers, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
if (has_capability('mod/forum:managesubscriptions', $context)) {
print_header_simple("$strsubscribers", "", $navigation,
@ -54,11 +54,8 @@
}
/// Check to see if groups are being used in this forum
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
$currentgroup = setup_and_print_groups($course, $groupmode, "subscribers.php?id=$forum->id");
} else {
$currentgroup = false;
}
$groupmode = groupmode($course, $cm);
$currentgroup = setup_and_print_groups($course, $groupmode, "subscribers.php?id=$forum->id");
if (empty($USER->subscriptionsediting)) { /// Display an overview of subscribers

View file

@ -40,12 +40,12 @@
$fullname = fullname($user, has_capability('moodle/site:viewfullnames', $syscontext));
// TODO: add new cookie tail here!
$crumbs[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'core');
$crumbs[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id", 'type' => 'title');
$crumbs[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title');
$crumbs[] = array('name' => $strmode, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'core');
$navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id", 'type' => 'title');
$navlinks[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strmode, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $fullname: $strmode", $course->fullname,$navigation);

View file

@ -64,10 +64,10 @@
/// Print header.
$crumbs[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($forum->name), "",
$navigation, "", "", true, $buttontext, navmenu($course, $cm));
@ -82,15 +82,9 @@
notice(get_string('noviewdiscussionspermission', 'forum'));
}
/// find out current groups mode
$groupmode = groupmode($course, $cm);
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
if ($groupmode == SEPARATEGROUPS && ($currentgroup === false) &&
!has_capability('moodle/site:accessallgroups', $context)) {
notice(get_string('notingroup', 'forum'));
}
$currentgroup = setup_and_print_groups($course, $groupmode, 'view.php?id=' . $cm->id);
/// Okay, we can show the discussions. Log the forum view.
if ($cm->id) {
@ -123,40 +117,6 @@
print_box_start('forumcontrol');
/// 2 ways to do this, 1. we can changed the setup_and_print_groups functions
/// in moodlelib, taking in 1 more parameter, and tell the function when to
/// allow student menus, 2, we can just use this code to explicitly print this
/// menu for students in forums.
/// Now we need a menu for separategroups as well!
if ($groupmode == VISIBLEGROUPS || ($groupmode
&& has_capability('moodle/site:accessallgroups', $context))) {
//the following query really needs to change
if ($groups = groups_get_groups_names($course->id)) { //TODO:
print_box_start('groupmenu');
print_group_menu($groups, $groupmode, $currentgroup, "$CFG->wwwroot/mod/forum/view.php?id=$cm->id");
print_box_end(); // groupmenu
}
}
/// Only print menus the student is in any course
else if ($groupmode == SEPARATEGROUPS){
$validgroups = array();
// Get all the groups this guy is in in this course
if ($p = user_group($course->id,$USER->id)){
/// Extract the name and id for the group
foreach ($p as $index => $object){
$validgroups[$object->id] = $object->name;
}
/// Print them in the menu
print_box_start('groupmenu');
print_group_menu($validgroups, $groupmode, $currentgroup, "view.php?id=$cm->id",0);
print_box_end(); // groupmenu
}
}
print_box_start('subscription');
if (!empty($USER->id) && !has_capability('moodle/legacy:guest', $context, NULL, false)) {

View file

@ -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&amp;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&amp;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),

View file

@ -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),

View file

@ -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),

View file

@ -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));

View file

@ -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&amp;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&amp;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),

View file

@ -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),

View file

@ -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));

View file

@ -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&amp;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&amp;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);

View file

@ -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),

View file

@ -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));

View file

@ -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, "&nbsp;", "&nbsp;");
} else {

View file

@ -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));
}

View file

@ -37,8 +37,8 @@
$title = format_string($course->shortname) . ": $strmodulenameplural";
$heading = $course->fullname;
$crumbs[] = array('name' => $strmodulenameplural, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strmodulenameplural, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header($title, $heading, $navigation, "", "", true, "", navmenu($course));

View file

@ -402,8 +402,8 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
$title = format_string($course->shortname) . ": $hotpot->name";
$heading = $course->fullname;
$crumbs[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity');
$crumbs[] = array('name' => $hotpot->name, 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity');
$navlinks[] = array('name' => $hotpot->name, 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$modulecontext = get_context_instance(CONTEXT_MODULE, $cm->id);
@ -414,16 +414,16 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) {
$module = "hotpot";
}
$crumbs[] = array('name' => get_string("report$mode", $module), 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => get_string("report$mode", $module), 'link' => '', 'type' => 'title');
} else {
$crumbs[] = array('name' => get_string("report", "quiz"), 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => get_string("report", "quiz"), 'link' => '', 'type' => 'title');
}
$button = update_module_button($cm->id, $course->id, $strmodulename);
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header($title, $heading, $navigation, "", "", true, $button, navmenu($course, $cm));
print_heading($hotpot->name);
@ -600,10 +600,8 @@ function hotpot_get_report_users($course, $formdata) {
$users = array();
/// Check to see if groups are being used in this module
$currentgroup = false;
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
$currentgroup = setup_and_print_groups($course, $groupmode, "report.php?id=$cm->id&mode=simple");
}
$groupmode = groupmode($course, $cm); //TODO: there is no $cm defined!
$currentgroup = setup_and_print_groups($course, $groupmode, "report.php?id=$cm->id&mode=simple");
$sort = "u.lastname ASC";

View file

@ -53,9 +53,9 @@
$title = format_string($course->shortname) . ": $hotpot->name";
$heading = $course->fullname;
$crumbs[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity');
$crumbs[] = array('name' => get_string("review", "quiz"), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity');
$navlinks[] = array('name' => get_string("review", "quiz"), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
$button = update_module_button($cm->id, $course->id, $strmodulename);

View file

@ -42,10 +42,10 @@
// header strings
$title = format_string($course->shortname.': '.$hotpot->name, true);
$heading = $course->fullname;
$crumbs[] = array('name' => get_string("modulenameplural", "hotpot"), 'link' => $CFG->wwwroot.'/mod/hotpot/index.php?id='.$course->id, 'type' => 'activity');
$crumbs[] = array('name' => $hotpot->name, 'link' => '', 'type' => 'activityinstance');
$navlinks[] = array('name' => get_string("modulenameplural", "hotpot"), 'link' => $CFG->wwwroot.'/mod/hotpot/index.php?id='.$course->id, 'type' => 'activity');
$navlinks[] = array('name' => $hotpot->name, 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
$button = update_module_button($cm->id, $course->id, get_string("modulename", "hotpot"));
$button = '<div style="font-size:0.75em;">'.$button.'</div>';

View file

@ -75,10 +75,10 @@
$entry->format = $defaultformat;
}
$crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $stredit, 'link' => '', 'type' => 'action');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $stredit, 'link' => '', 'type' => 'action');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($journal->name), "", $navigation, "",
"", true, "", navmenu($course, $cm));

View file

@ -17,8 +17,8 @@
$strweek = get_string("week");
$strtopic = get_string("topic");
$crumbs[] = array('name' => $strjournals, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strjournals, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strjournals", "", $navigation,
"", "", true, "", navmenu($course));

View file

@ -38,20 +38,17 @@
$strentries = get_string("entries", "journal");
$strjournals = get_string("modulenameplural", "journal");
$crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strentries, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strentries, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple("$strjournals", "", $navigation, "", "", true);
/// Check to see if groups are being used in this journal
if ($groupmode = groupmode($course, $cm)) { // Groups are being used
$currentgroup = setup_and_print_groups($course, $groupmode, "report.php?id=$cm->id");
} else {
$currentgroup = false;
}
$groupmode = groupmode($course, $cm);
$currentgroup = setup_and_print_groups($course, $groupmode, "report.php?id=$cm->id");
/// Process incoming data if there is any
if ($data = data_submitted()) {

View file

@ -28,9 +28,9 @@
$strjournal = get_string("modulename", "journal");
$strjournals = get_string("modulenameplural", "journal");
$crumbs[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($journal->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($journal->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($journal->name), '', $navigation, '', '', true,
update_module_button($cm->id, $course->id, $strjournal), navmenu($course, $cm));

View file

@ -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);

View file

@ -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);

View file

@ -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));

View file

@ -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,

View file

@ -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));

View file

@ -396,11 +396,11 @@
$strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext)
? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
: "";
$crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strattemptnum, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strattemptnum, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule);
}

View file

@ -310,10 +310,10 @@
$strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext)
? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
: "";
$crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance');
$crumbs[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance');
$navlinks[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple($streditingquiz, '', $navigation, "", "",
true, $strupdatemodule);
@ -350,10 +350,10 @@
? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
: "";
$crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance');
$crumbs[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance');
$navlinks[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple($streditingquiz, '', $navigation, "", "", true, $strupdatemodule);

View file

@ -31,8 +31,8 @@
</form>";
}
$crumbs[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple($strquizzes, '', $navigation,
'', '', true, $streditquestions, navmenu($course));

View file

@ -27,9 +27,9 @@ class quiz_default_report {
$strquizzes = get_string("modulenameplural", "quiz");
$strquiz = get_string("modulename", "quiz");
/// Print the page header
$crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($quiz->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($quiz->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($quiz->name), "", $navigation,
'', $meta, true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));

View file

@ -125,11 +125,11 @@
? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'))
: "";
$crumbs[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strreview, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strreview, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($quiz->name), "", $navigation, "", $headtags, true, $strupdatemodule);
}

View file

@ -28,8 +28,8 @@
$strlastmodified = get_string("lastmodified");
$crumbs[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strresources", $course->fullname, $navigation,
"", "", true, "", navmenu($course));

View file

@ -112,12 +112,12 @@ function resource_base($cmid=0) {
$this->strresource = get_string("modulename", "resource");
$this->strresources = get_string("modulenameplural", "resource");
$this->crumbs[] = array('name' => $this->strresources, 'link' => "index.php?id={$this->course->id}", 'type' => 'activity');
$this->navlinks[] = array('name' => $this->strresources, 'link' => "index.php?id={$this->course->id}", 'type' => 'activity');
if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $this->cm->id))) {
$pagetitle = strip_tags($this->course->shortname.': '.$this->strresource);
$this->crumbs[] = array('name' => $this->strresource, 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => $this->strresource, 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $this->course->fullname, $this->navigation, "", "", true, '', navmenu($this->course, $this->cm));
notice(get_string("activityiscurrentlyhidden"), "$CFG->wwwroot/course/view.php?id={$this->course->id}");
@ -163,10 +163,10 @@ function display_course_blocks_start() {
$USER->editing = $edit;
}
$morebreadcrumbs = array($this->strresources => 'index.php?id='.$this->course->id,
$morenavlinks = array($this->strresources => 'index.php?id='.$this->course->id,
$this->resource->name => '');
$PAGE->print_header($this->course->shortname.': %fullname%', $morebreadcrumbs);
$PAGE->print_header($this->course->shortname.': %fullname%', $morenavlinks);
echo '<table id="layout-table"><tr>';

View file

@ -63,20 +63,20 @@ function display() {
$count = 0;
$subnav = "<a href=\"view.php?id={$cm->id}\">".format_string($resource->name,true)."</a>";
$backsub = '';
$this->crumbs[] = array('name' => format_string($resource->name,true), 'link' => "view.php?id={$cm->id}", 'type' => 'activity');
$this->navlinks[] = array('name' => format_string($resource->name,true), 'link' => "view.php?id={$cm->id}", 'type' => 'activity');
foreach ($subs as $sub) {
$count++;
if ($count < $countsubs) {
$backsub .= "/$sub";
$this->crumbs[] = array('name' => $sub, 'link' => "view.php?id={$cm->id}", 'type' => 'title');
$this->navlinks[] = array('name' => $sub, 'link' => "view.php?id={$cm->id}", 'type' => 'title');
} else {
$this->crumbs[] = array('name' => $sub, 'link' => '', 'type' => 'title');
$this->navlinks[] = array('name' => $sub, 'link' => '', 'type' => 'title');
}
}
} else {
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activity');
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activity');
}
$pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
@ -87,7 +87,7 @@ function display() {
$editfiles = print_single_button("$CFG->wwwroot/files/index.php", $options, get_string("editfiles"), 'get', '', true);
$update = $editfiles.$update;
}
$this->navigation = build_navigation($this->crumbs);
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation,
"", "", true, $update,
navmenu($course, $cm));

View file

@ -84,8 +84,8 @@ function display() {
print_footer($course);
} else { /// Make a page and a pop-up window
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation,
"", "", true, update_module_button($cm->id, $course->id, $this->strresource),
@ -113,8 +113,8 @@ function display() {
}
} else { /// not a popup at all
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation,
"", "", true, update_module_button($cm->id, $course->id, $this->strresource),

View file

@ -64,9 +64,9 @@
print_header($pagetitle, $course->fullname);
} else {
$resource_obj->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$resource_obj->crumbs[] = array('name' => $strdeploy, 'link' => '', 'type' => 'action');
$navigation = build_navigation($resource_obj->crumbs);
$resource_obj->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$resource_obj->navlinks[] = array('name' => $strdeploy, 'link' => '', 'type' => 'action');
$navigation = build_navigation($resource_obj->navlinks);
print_header($pagetitle, $course->fullname, $navigation,
'', '', true,
update_module_button($cm->id, $course->id, $resource_obj->strresource));

View file

@ -373,8 +373,8 @@ class resource_ims extends resource_base {
print_header($pagetitle, $course->fullname.' : '.$resource->name);
} else {
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation, "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm));
}
@ -474,8 +474,8 @@ class resource_ims extends resource_base {
//print_header($pagetitle, $course->fullname.' : '.$resource->name);
print_header();
} else {
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'activityinstance');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation, "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "parent"));
}
/// content - this produces everything else

View file

@ -110,8 +110,8 @@ function display() {
} else { /// not a popup at all
add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
$this->crumbs[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'title');
$this->navigation = build_navigation($this->crumbs);
$this->navlinks[] = array('name' => format_string($resource->name), 'link' => '', 'type' => 'title');
$this->navigation = build_navigation($this->navlinks);
print_header($pagetitle, $course->fullname, $this->navigation,
"", "", true, update_module_button($cm->id, $course->id, $this->strresource),

View file

@ -25,8 +25,8 @@
$strreport = get_string("report",'scorm');
$strlastmodified = get_string("lastmodified");
$crumbs[] = array('name' => $strscorms, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strscorms, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strscorms", "", $navigation,
"", "", true, "", navmenu($course));

View file

@ -51,7 +51,7 @@
// The module SCORM/AICC activity with the first id is the course
$firstscorm = current($scorms);
if (!(($course->format == 'scorm') && ($firstscorm->id == $scorm->id))) {
$crumbs[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
}
}
}
@ -59,8 +59,8 @@
$pagetitle = strip_tags("$course->shortname: ".format_string($scorm->name));
if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_COURSE,$course->id))) {
$crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header($pagetitle, $course->fullname, $navigation,
'', '', true, update_module_button($cm->id, $course->id, $strscorm), '', false);
@ -125,8 +125,8 @@
$bodyscript = 'onunload="main.close();"';
}
$crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
$exitlink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'" title="'.$strexit.'">'.$strexit.'</a> ';
print_header($pagetitle, $course->fullname,

View file

@ -64,29 +64,29 @@
$strattempt = get_string('attempt', 'scorm');
$strname = get_string('name');
$crumbs[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
if (empty($b)) {
if (empty($a)) {
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header("$course->shortname: ".format_string($scorm->name), $course->fullname,$navigation,
'', '', true);
} else {
$crumbs[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$crumbs[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$navlinks[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: ".format_string($scorm->name), $course->fullname,
$navigation, '', '', true);
}
} else {
$crumbs[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$crumbs[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => "report.php?a=$a&user=$user&attempt=$attempt", 'type' => 'title');
$crumbs[] = array('name' => $sco->title, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strreport, 'link' => "report.php?id=$cm->id", 'type' => 'title');
$navlinks[] = array('name' => "$strattempt $attempt - ".fullname($userdata), 'link' => "report.php?a=$a&user=$user&attempt=$attempt", 'type' => 'title');
$navlinks[] = array('name' => $sco->title, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: ".format_string($scorm->name), $course->fullname, $navigation,
'', '', true);

View file

@ -48,7 +48,7 @@
// The module SCORM activity with the least id is the course
$firstscorm = current($scorms);
if (!(($course->format == 'scorm') && ($firstscorm->id == $scorm->id))) {
$crumbs[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity');
}
}
}
@ -63,8 +63,8 @@
//
// Print the page header
//
$crumbs[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navigation = build_navigation($navlinks);
print_header($pagetitle, $course->fullname, $navigation,
'', '', true, update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm));

View file

@ -21,8 +21,8 @@
$strdone = get_string("done", "survey");
$strnotdone = get_string("notdone", "survey");
$crumbs[] = array('name' => $strsurveys, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strsurveys, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strsurveys", "", $navigation,
"", "", true, "", navmenu($course));

View file

@ -65,10 +65,10 @@
<a href=\"view.php?id=$cm->id\">".format_string($survey->name,true)."</a> -> ";
}
$crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($survey->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$crumbs[] = array('name' => $strreport, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($survey->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strreport, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: ".format_string($survey->name), $course->fullname, $navigation,
"", "", true,

View file

@ -33,10 +33,10 @@
$strsurveys = get_string("modulenameplural", "survey");
$strsurveysaved = get_string("surveysaved", "survey");
$crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinstance');
$crumbs[] = array('name' => $strsurveysaved, 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinstance');
$navlinks[] = array('name' => $strsurveysaved, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple("$strsurveysaved", "", $navigation, "");

View file

@ -37,9 +37,9 @@
$strsurveys = get_string("modulenameplural", "survey");
$strsurvey = get_string("modulename", "survey");
$crumbs[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');;
$crumbs[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinistance');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');;
$navlinks[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinistance');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($survey->name), "", $navigation, "", "", true,
update_module_button($cm->id, $course->id, $strsurvey), navmenu($course, $cm));

View file

@ -114,11 +114,11 @@
default: break;
}
}
$crumbs[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
$crumbs[] = array('name' => get_string("administration","wiki"), 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
$navlinks[] = array('name' => get_string("administration","wiki"), 'link' => '', 'type' => 'title');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple("$wiki_entry->pagename", "", $navigation,
$focus, "", true, update_module_button($cm->id, $course->id, $strwiki),

View file

@ -24,8 +24,8 @@
/// Print the header
$crumbs[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strwikis", "", $navigation, "", "", true, "", navmenu($course));

View file

@ -281,10 +281,10 @@
$strwikis = get_string("modulenameplural", "wiki");
$strwiki = get_string("modulename", "wiki");
$crumbs[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$crumbs[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
$navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace');
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple($ewiki_title?$ewiki_title:format_string($wiki->name), "", $navigation,
"", "", $cacheme, update_module_button($cm->id, $course->id, $strwiki),

View file

@ -61,10 +61,10 @@
if ($frameset == "top") {
// removed <base target="_parent" />
// because it does not validate MDL-7861
$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);
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($workshop->name), "",$navigation,
"", '', true);

View file

@ -71,10 +71,10 @@
// ... print the header and...
$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);
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strassessments, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($workshop->name), "", $navigation,
"", "", true);

View file

@ -23,8 +23,8 @@
$strdeadline = get_string("deadline", "workshop");
$strsubmitted = get_string("submitted", "assignment");
$crumbs[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($crumbs);
$navlinks[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity');
$navigation = build_navigation($navlinks);
print_header_simple("$strworkshops", "", $navigation, "", "", true, "", navmenu($course));

View file

@ -51,10 +51,10 @@
$strsubmissions = get_string("submissions", "workshop");
// ... print the header and...
$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);
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($workshop->name), "", $navigation,
"", "", true);

View file

@ -23,10 +23,10 @@
$strworkshop = get_string('modulename', 'workshop');
$strsubmission = get_string('submission', 'workshop');
$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);
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strsubmission, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
print_header_simple(format_string($workshop->name)." : $strsubmission", "", $navigation,
"", "", true);

View file

@ -69,12 +69,12 @@
}
// ...display header...
$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');
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
if ($straction) {
$crumbs[] = array('name' => $straction, 'link' => '', 'type' => 'title');
$navlinks[] = array('name' => $straction, 'link' => '', 'type' => 'title');
}
$navigation = build_navigation($crumbs);
$navigation = build_navigation($navlinks);
print_header_simple(format_string($workshop->name), "", $navigation,
"", "", true, update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));
@ -305,34 +305,12 @@
workshop_grade_assessments($workshop);
}
/// Check to see if groups are being used in this workshop
/*
setup_and_print_groups($course, groupmode($course, $cm), "view.php?id=$cm->id");
$currentgroup = get_current_group($course->id);
*/
/// copied code from assignment module, if this is not the way to do this please change it
/// the above code does not work
/// set_and_print_groups() is not fully implemented as function groups_instance_print_grouping_selector()
/// and function groups_instance_print_group_selector() are missing.
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$changegroup = optional_param('group', -1, PARAM_INT); // choose the current group
/// find out current groups mode
$groupmode = groupmode($course, $cm);
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
/// Now we need a menu for separategroups as well!
if ($groupmode == VISIBLEGROUPS || ($groupmode
&& has_capability('moodle/site:accessallgroups', $context))) {
//the following query really needs to change
if ($groups = groups_get_groups_names($course->id)) { //TODO:
print_box_start('groupmenu');
print_group_menu($groups, $groupmode, $currentgroup, "view.php?id=$cm->id");
print_box_end(); // groupmenu
}
}
$currentgroup = setup_and_print_groups($course, $groupmode, "view.php?id=$cm->id");
/// Print admin links
echo "<table width=\"100%\"><tr><td>";
echo "<a href=\"submissions.php?id=$cm->id&amp;action=adminlist\">".

View file

@ -58,10 +58,10 @@
/// 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);
$navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
$navlinks[] = array('name' => $strassess, 'link' => '', 'type' => 'title');
$navigation = build_navigation($navlinks);
// removed <base target="_parent" /> as it does not validate
print_header_simple(format_string($workshop->name), "", $navigation,