From: nicolasconnault Date: Thu, 16 Aug 2007 15:01:25 +0000 (+0000) Subject: MDL-10870 All files updated to new build_navigation() method. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=73c24ef80b71173b5070137f6d77c6fed321404f;p=moodle.git MDL-10870 All files updated to new build_navigation() method. --- diff --git a/admin/lang.php b/admin/lang.php index ebac3d372e..2cdb81f641 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -80,8 +80,6 @@ $title = $strlanguage; break; } - $navigation = "$strlanguage -> $title"; - $crumbs[] = array('name' => $strlanguage, 'link' => "$CFG->wwwroot/admin/lang.php"); $navigation = build_navigation($crumbs); diff --git a/admin/pagelib.php b/admin/pagelib.php index 12095b6660..8ff148e197 100644 --- a/admin/pagelib.php +++ b/admin/pagelib.php @@ -15,7 +15,7 @@ define('BLOCK_L_MIN_WIDTH', $lmin); define('BLOCK_L_MAX_WIDTH', $lmax); define('BLOCK_R_MIN_WIDTH', $rmin); define('BLOCK_R_MAX_WIDTH', $rmax); - + page_map_class(PAGE_ADMIN, 'page_admin'); class page_admin extends page_base { @@ -27,7 +27,7 @@ class page_admin extends page_base { // hack alert! // this function works around the inability to store the section name // in default block, maybe we should "improve" the blocks a bit? - function init_extra($section) { + function init_extra($section) { global $CFG; if($this->full_init_done) { @@ -40,7 +40,7 @@ class page_admin extends page_base { $this->section = $section; $this->visiblepathtosection = array(); - + // this part is (potentially) processor-intensive... there's gotta be a better way // of handling this if ($this->pathtosection = $adminroot->path($this->section)) { @@ -54,24 +54,24 @@ class page_admin extends page_base { // all done $this->full_init_done = true; } - + function blocks_get_default() { return 'admin_tree,admin_bookmarks'; } // seems reasonable that the only people that can edit blocks on the admin pages // are the admins... but maybe we want a role for this? - function user_allowed_editing() { + function user_allowed_editing() { return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)); } // has to be fixed. i know there's a "proper" way to do this - function user_is_editing() { + function user_is_editing() { global $USER; return $USER->adminediting; } - function url_get_path() { + function url_get_path() { global $CFG; $adminroot = admin_get_root(); @@ -88,11 +88,11 @@ class page_admin extends page_base { return array('section' => (isset($this->section) ? $this->section : '')); } - function blocks_get_positions() { + function blocks_get_positions() { return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT); } - function blocks_default_position() { + function blocks_default_position() { return BLOCK_POS_LEFT; } @@ -116,7 +116,7 @@ class page_admin extends page_base { $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have. // if not, print_header() has to be called with a $section parameter - // The search page currently doesn't handle block editing + // The search page currently doesn't handle block editing if ($this->section != 'search' and $this->user_allowed_editing()) { $buttons = '
frametarget.' method="get" action="' . $this->url_get_path() . '">'. '
'. @@ -126,8 +126,13 @@ class page_admin extends page_base { $buttons = ' '; } - print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, - implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, ''); + $navlinks = array(); + foreach ($this->visiblepathtosection as $element) { + $navlinks[] = array('name' => $element, 'link' => null, 'type' => 'misc'); + } + $navigation = build_navigation($navlinks); + + print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation,'', '', true, $buttons, ''); } function get_type() { diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php index f6d02e08c2..cc571040ad 100755 --- a/admin/roles/tabs.php +++ b/admin/roles/tabs.php @@ -7,6 +7,7 @@ if (!defined('MOODLE_INTERNAL')) { die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page } +$navlinks = array(); if ($currenttab != 'update') { switch ($context->contextlevel) { @@ -27,8 +28,16 @@ if ($currenttab != 'update') { $strcategories = get_string("categories"); $strcategory = get_string("category"); $strcourses = get_string("courses"); - print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", - "wwwroot/course/index.php\">$strcategories -> wwwroot/course/category.php?id=$category->id\">$category->name -> $straction", "", "", true); + + $navlinks[] = array('name' => $strcategories, + 'link' => "$CFG->wwwroot/course/index.php", + 'type' => 'misc'); + $navlinks[] = array('name' => $category->name, + 'link' => "$CFG->wwwroot/course/category.php?id=$category->id", + 'type' => 'misc'); + $navigation = build_navigation($navlinks); + + print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", $navigation, "", "", true); break; case CONTEXT_COURSE: @@ -38,9 +47,11 @@ if ($currenttab != 'update') { $course = get_record('course', 'id', $context->instanceid); require_login($course); - - print_header($streditcoursesettings, $course->fullname, - "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $straction"); + $navlinks[] = array('name' => $course->shortname, + 'link' => "$CFG->wwwroot/course/view.php?id=$course->id", + 'type' => 'misc'); + $navigation = build_navigation($navlinks); + print_header($streditcoursesettings, $course->fullname, $navigation); } break; @@ -64,9 +75,8 @@ if ($currenttab != 'update') { require_login($course); - $strnav = "wwwroot/mod/$module->name/view.php?id=$cm->id\">$instance->name ->"; - $fullmodulename = get_string("modulename", $module->name); - $streditinga = get_string("editinga", "moodle", $fullmodulename); + $fullmodulename = get_string("modulename", $module->name); + $streditinga = get_string("editinga", "moodle", $fullmodulename); $strmodulenameplural = get_string("modulenameplural", $module->name); if ($module->name == "label") { @@ -75,9 +85,21 @@ if ($currenttab != 'update') { $focuscursor = "form.name"; } - print_header_simple($streditinga, '', - "wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> - $strnav wwwroot/course/mod.php?update=$cm->id&sesskey=".sesskey()."\">$streditinga -> $straction", $focuscursor, "", false); + $navlinks[] = array('name' => $strmodulenameplural, + 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id", + 'type' => 'misc'); + + $navlinks[] = array('name' => $instance->name, + 'link' => "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id"; + 'type' => 'misc'); + + $navlinks[] = array('name' => $streditinga, + 'link' => "$CFG->wwwroot/course/mod.php?update=$cm->id&sesskey=".sesskey(), + 'type' => 'misc'); + + $navigation = build_navigation($navlinks); + + print_header_simple($streditinga, '', $navigation, $focuscursor, "", false); break; @@ -85,7 +107,10 @@ if ($currenttab != 'update') { if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) { if ($block = get_record('block', 'id', $blockinstance->blockid)) { $blockname = print_context_name($context); - $navigation = $blockname. ' -> '.$straction; + + // Prepare the last part of the breadcrumbs first + $navlinks[98] = array('name' => $blockname, 'link' => null, 'type' => 'misc'); + $navlinks[99] = array('name' => $straction, 'link' => null, 'type' => 'misc'); switch ($blockinstance->pagetype) { case 'course-view': @@ -94,16 +119,21 @@ if ($currenttab != 'update') { require_login($course); if ($course->id != SITEID) { - $navigation = "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $navigation"; + $navlinks[0] = array('name' => $course->shortname, + 'link' => "$CFG->wwwroot/course/view.php?id=$course->id", + 'type' => 'misc'); } + $navigation = build_navigation($navlinks); print_header("$straction: $blockname", $course->fullname, $navigation); } break; case 'blog-view': $strblogs = get_string('blogs','blog'); - $navigation = ''. - $strblogs.' -> '.$navigation; + $navlinks[0] = array('name' => $strblogs, + 'link' => $CFG->wwwroot.'/blog/index.php', + 'type' => 'misc'); + $navigation = build_navigation($navlinks); print_header("$straction: $strblogs", $SITE->fullname, $navigation); break; diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php index 9c4d9ed54b..53eabce589 100644 --- a/blocks/rss_client/block_rss_client_action.php +++ b/blocks/rss_client/block_rss_client_action.php @@ -57,7 +57,7 @@ if (!defined('MAGPIE_OUTPUT_ENCODING')) { if (!empty($id)) { - // we get the complete $course object here because print_header assumes this is + // we get the complete $course object here because print_header assumes this is // a complete object (needed for proper course theme settings) if ($course = get_record('course', 'id', $id)) { $context = get_context_instance(CONTEXT_COURSE, $id); @@ -68,13 +68,12 @@ if (!empty($id)) { $straddedit = get_string('feedsaddedit', 'block_rss_client'); - -if (!empty($course)) { - $navigation = ''.$course->shortname.' -> '.$straddedit; -} else { - $navigation = $straddedit; +$link = $CFG->wwwroot.'/course/view.php?id='.$id; +if (empty($course)) { + $link = ''; } - +// $navlinks = array(array('name' => $course->shortname, 'link' => $link, 'type' => 'misc')); +$navigation = build_navigation($navlinks); print_header($straddedit, $straddedit, $navigation); diff --git a/blog/preferences.php b/blog/preferences.php index c53acf4a26..3f5fdce78d 100755 --- a/blog/preferences.php +++ b/blog/preferences.php @@ -42,8 +42,9 @@ $strpreferences = get_string('preferences'); $strblogs = get_string('blogs', 'blog'); - - $navigation = "$strblogs -> $strpreferences"; + $navlinks = array(array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/", 'type' => 'misc')); + $navlinks[] = array('name' => $strpreferences, 'link' => null, 'type' => 'misc'); + $navigation = build_navigation($navlinks); print_header("$site->shortname: $strblogs : $strpreferences", $strblogs, $navigation); print_heading($strpreferences); diff --git a/calendar/preferences.php b/calendar/preferences.php index 048fb99974..806c618af2 100644 --- a/calendar/preferences.php +++ b/calendar/preferences.php @@ -15,7 +15,7 @@ } // Initialize the session variables calendar_session_vars(); - + /// If data submitted, then process and store. if ($form = data_submitted()) { @@ -58,13 +58,14 @@ $strcalendar = get_string('calendar', 'calendar'); $strpreferences = get_string('preferences', 'calendar'); + $navlinks = array(); if ($course->id != SITEID) { - $navigation = "wwwroot/course/view.php?id=$course->id\">$course->shortname -> - $strcalendar -> $strpreferences"; - } else { - $navigation = "$strcalendar -> $strpreferences"; + $navlinks[] = array('name' => $course->shortname, + 'link' => "$CFG->wwwroot/course/view.php?id=$course->id", + 'type' => 'misc'); } - + $navlinks[] = array('name' => $strpreferences, 'link' => 'view.php', 'type' => 'misc'); + $navigation = build_navigation($navlinks); print_header("$site->shortname: $strcalendar: $strpreferences", $strcalendar, $navigation, '', '', true, '', user_login_string($site)); diff --git a/course/edit.php b/course/edit.php index 1e1c69e220..c7f3c052eb 100644 --- a/course/edit.php +++ b/course/edit.php @@ -46,11 +46,11 @@ } // it'll be greyed out but we want these by default anyway. } $course->allowedmods = $allowedmods; - + if ($course->enrolstartdate){ $course->enrolstartdisabled = 0; } - + if ($course->enrolenddate) { $course->enrolenddisabled = 0; } @@ -98,7 +98,7 @@ // assign default role to creator if not already having permission to manage course assignments if (!has_capability('moodle/course:view', $context) or !has_capability('moodle/role:assign', $context)) { role_assign($CFG->creatornewroleid, $USER->id, 0, $context->id); - } + } if ($data->metacourse and has_capability('moodle/course:managemetacourse', $context)) { // Redirect users with metacourse capability to student import @@ -107,8 +107,8 @@ // Redirect to roles assignment redirect($CFG->wwwroot."/$CFG->admin/roles/assign.php?contextid=$context->id"); } - - } else { + + } else { if (!update_course($data)) { print_error('coursenotupdated'); } @@ -127,17 +127,30 @@ $straddnewcourse = get_string("addnewcourse"); $stradministration = get_string("administration"); $strcategories = get_string("categories"); + $navlinks = array(); if (!empty($course)) { - print_header($streditcoursesettings, $course->fullname, - "wwwroot/course/view.php?id=$course->id\">$course->shortname - -> $streditcoursesettings", $editform->focus()); + $navlinks[] = array('name' => $streditcoursesettings, + 'link' => null, + 'type' => 'misc'); + $title = $streditcoursesettings; + $fullname = $course->fullname; } else { - print_header("$site->shortname: $straddnewcourse", $site->fullname, - "wwwroot/$CFG->admin/index.php\">$stradministration -> ". - "$strcategories -> $straddnewcourse", $editform->focus()); + $navlinks[] = array('name' => $stradministration, + 'link' => "$CFG->wwwroot/$CFG->admin/index.php", + 'type' => 'misc'); + $navlinks[] = array('name' => $strcategories, + 'link' => 'index.php', + 'type' => 'misc'); + $navlinks[] = array('name' => $straddnewcourse, + 'link' => null, + 'type' => 'misc'); + $title = "$site->shortname: $straddnewcourse"; + $fullname = $site->fullname; } + $navigation = build_navigation($navlinks); + print_header($title, $fullname, $navigation, $editform->focus()); print_heading($streditcoursesettings); $editform->display(); diff --git a/files/index.php b/files/index.php index 8f91ffc0ea..156a0db708 100644 --- a/files/index.php +++ b/files/index.php @@ -49,6 +49,9 @@ function html_header($course, $wdir, $formfield=""){ global $CFG, $ME, $choose; + $navlinks = array(); + // $navlinks[] = array('name' => $course->shortname, 'link' => "../course/view.php?id=$course->id", 'type' => 'misc'); + if ($course->id == SITEID) { $strfiles = get_string("sitefiles"); } else { @@ -56,18 +59,22 @@ } if ($wdir == "/") { - $fullnav = "$strfiles"; + $navlinks[] = array('name' => $strfiles, 'link' => null, 'type' => 'misc'); } else { $dirs = explode("/", $wdir); $numdirs = count($dirs); $link = ""; - $navigation = ""; + $navlinks[] = array('name' => $strfiles, + 'link' => $ME."?id=$course->id&wdir=/&choose=$choose", + 'type' => 'misc'); + for ($i=1; $i<$numdirs-1; $i++) { - $navigation .= " -> "; - $link .= "/".urlencode($dirs[$i]); - $navigation .= "id&wdir=$link&choose=$choose\">".$dirs[$i].""; + $link .= "/".urlencode($dirs[$i]); + $navlinks[] = array('name' => $dirs[$i], + 'link' => $ME."?id=$course->id&wdir=$link&choose=$choose", + 'type' => 'misc'); } - $fullnav = "id&wdir=/&choose=$choose\">$strfiles $navigation -> ".$dirs[$numdirs-1]; + $navlinks[] = array('name' => $dirs[$numdirs-1], 'link' => null, 'type' => 'misc'); } @@ -120,13 +127,12 @@ admin_externalpage_print_header(); print_heading(get_string("publicsitefileswarning"), "center", 2); - + } } else { - print_header("$course->shortname: $strfiles", $course->fullname, - "id\">$course->shortname". - " -> $fullnav", $formfield); + $navigation = build_navigation($navlinks); + print_header("$course->shortname: $strfiles", $course->fullname, $navigation, $formfield); } } @@ -192,7 +198,7 @@ echo "

$struploadafile ($strmaxsize) --> $wdir

"; echo ""; - echo "
"; + echo "
"; echo "
"; echo ' '; echo " "; @@ -205,7 +211,7 @@ echo ""; echo ""; echo "
"; - echo "
"; + echo "
"; echo ' '; echo " "; echo " "; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 34cee17a19..e349806c9d 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7090,14 +7090,18 @@ function build_navigation($extranavlinks) { //Site name if ($site = get_site()) { - $navlinks[] = array('name' => format_string($site->shortname), 'link' => "$CFG->wwwroot/", 'type' => 'home'); + $navlinks[] = array('name' => format_string($site->shortname), + 'link' => "$CFG->wwwroot/", + 'type' => 'home'); } if ($COURSE) { if ($COURSE->id != SITEID) { //Course - $navlinks[] = array('name' => format_string($COURSE->shortname), 'link' => "$CFG->wwwroot/course/view.php?id=$COURSE->id",'type' => 'course'); + $navlinks[] = array('name' => format_string($COURSE->shortname), + 'link' => "$CFG->wwwroot/course/view.php?id=$COURSE->id", + 'type' => 'course'); } } @@ -7108,26 +7112,35 @@ function build_navigation($extranavlinks) { //Accessibility: heading hidden from visual browsers by default. $navigation = '

'.get_string('youarehere','access')."

"; @@ -7150,8 +7163,7 @@ function is_newnav($navigation) { * @param object $object The object to check * @return boolean */ -function in_object_vars($var, $object) -{ +function in_object_vars($var, $object) { $class_vars = get_class_vars(get_class($object)); $class_vars = array_keys($class_vars); return in_array($var, $class_vars); diff --git a/mod/data/edit.php b/mod/data/edit.php index 3b062e1293..e823780a09 100755 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -64,16 +64,15 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id); -/// If it's hidden then it's don't show anything. :) +/// If it's hidden then it doesn't show anything. :) if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) { $strdatabases = get_string("modulenameplural", "data"); - $navigation = "id\">$strdatabases ->"; - + $navlinks = array(); $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")); } @@ -161,7 +160,7 @@ if (!has_capability('mod/data:approve', $context)) { $record->approved = 0; } - + $record->groupid = $currentgroup; $record->timemodified = time(); update_record('data_records',$record); diff --git a/mod/lams/mod.html b/mod/lams/mod.html index 8540d10ddd..d34bae9ccd 100644 --- a/mod/lams/mod.html +++ b/mod/lams/mod.html @@ -37,8 +37,8 @@ if (!isset($form->create_sequence_url)) {

Please wait .......

 - - + + @@ -55,7 +55,8 @@ if (!isset($form->create_sequence_url)) { - +
:
:

:

+

:


introduc " onClick="return validate();"> -" onClick="openAuthor(create_sequence_url."&".$LAMSCONSTANTS->param_ldid."=".$form->sequence."'";?>);"> -" onClick="openAuthor(create_sequence_url."'";?>);"> +" onClick="openAuthor(create_sequence_url."&".$LAMSCONSTANTS->param_ldid."=".$form->sequence."'";?>);"> +" onClick="openAuthor(create_sequence_url."'";?>);"> " onclick="refreshLists();"> "> diff --git a/mod/resource/index.php b/mod/resource/index.php index 56cb2e8a67..cd7d7e1db5 100644 --- a/mod/resource/index.php +++ b/mod/resource/index.php @@ -12,11 +12,7 @@ if ($course->id != SITEID) { require_login($course->id); - $navigation = "id\">$course->shortname ->"; - } else { - $navigation = ''; } - add_to_log($course->id, "resource", "view all", "index.php?id=$course->id", ""); $strresource = get_string("modulename", "resource"); @@ -26,12 +22,12 @@ $strname = get_string("name"); $strsummary = get_string("summary"); $strlastmodified = get_string("lastmodified"); - + $navlinks = array(); $navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); - print_header("$course->shortname: $strresources", $course->fullname, $navigation, + print_header("$course->shortname: $strresources", $course->fullname, $navigation, "", "", true, "", navmenu($course)); if (! $resources = get_all_instances_in_course("resource", $course)) { @@ -73,12 +69,12 @@ $extra = ""; } if (!$resource->visible) { // Show dimmed if the mod is hidden - $table->data[] = array ($printsection, + $table->data[] = array ($printsection, "coursemodule\">".format_string($resource->name,true)."", format_text($resource->summary, FORMAT_MOODLE, $options) ); } else { //Show normal if the mod is visible - $table->data[] = array ($printsection, + $table->data[] = array ($printsection, "coursemodule\">".format_string($resource->name,true)."", format_text($resource->summary, FORMAT_MOODLE, $options) ); } @@ -89,6 +85,6 @@ print_table($table); print_footer($course); - + ?>