moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-9615: Correct incorrect use of term breadcrumbs

Browse source 
- $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
Download patch file Download diff file Expand all files Collapse all files

8
mod/forum/discuss.php
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));

6
mod/forum/index.php
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()) {

6
mod/forum/markposts.php
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'),

45
mod/forum/post.php
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,

12
mod/forum/search.php
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') {

6
mod/forum/settracking.php
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'),

6
mod/forum/subscribe.php
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));

15
mod/forum/subscribers.php
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

10
mod/forum/user.php
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);

50
mod/forum/view.php
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)) {