L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

course MDL-19794 Upgraded print_header and build_navigation calls to use PAGE and OUTPUT equivilants

Browse Source
This commit is contained in:
samhemelryk
2009-09-03 08:47:24 +00:00
parent f716d0dd3d
commit 0a122046bc
25 changed files with 181 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/category.php
+5 -3
View File
@@ -149,9 +149,11 @@
admin_externalpage_setup('coursemgmt', '', $urlparams, $CFG->wwwroot . '/course/category.php');
$PAGE->set_context($context); // Ensure that we are actually showing blocks etc for the cat context
admin_externalpage_print_header();
} else {
$navbaritem = print_course_search('', true, 'navbar');
print_header("$site->shortname: $category->name", "$site->fullname: $strcourses", array(), '', '', true, $navbaritem);
} else {
$PAGE->set_title("$site->shortname: $category->name");
$PAGE->set_heading("$site->fullname: $strcourses");
$PAGE->set_button(print_course_search('', true, 'navbar'));
echo $OUTPUT->header();
}
/// Print link to roles
course/delete.php
+14 -16
View File
@@ -27,19 +27,21 @@
}
$category = $DB->get_record("course_categories", array("id"=>$course->category));
$navlinks = array();
$PAGE->navbar->add($stradministration, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/index.php/'));
$PAGE->navbar->add($strcategories, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/index.php'));
$PAGE->navbar->add($category->name, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/category.php', array('id'=>$course->category)));
if (! $delete) {
$strdeletecheck = get_string("deletecheck", "", $course->shortname);
$strdeletecoursecheck = get_string("deletecoursecheck");
$navlinks[] = array('name' => $stradministration, 'link' => "../$CFG->admin/index.php", 'type' => 'misc');
$navlinks[] = array('name' => $strcategories, 'link' => "index.php", 'type' => 'misc');
$navlinks[] = array('name' => $category->name, 'link' => "category.php?id=$course->category", 'type' => 'misc');
$navlinks[] = array('name' => $strdeletecheck, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strdeletecheck", $site->fullname, $navigation);
$PAGE->navbar->add($strdeletecheck);
$PAGE->set_title("$site->shortname: $strdeletecheck");
$PAGE->set_heading($site->fullname);
echo $OUTPUT->header();
$message = "$strdeletecoursecheck<br /><br />" . format_string($course->fullname) . " (" . format_string($course->shortname) . ")";
echo $OUTPUT->confirm($message, "delete.php?id=$course->id&delete=".md5($course->timemodified), "category.php?id=$course->category");
@@ -62,14 +64,10 @@
$strdeletingcourse = get_string("deletingcourse", "", format_string($course->shortname));
$navlinks[] = array('name' => $stradministration, 'link' => "../$CFG->admin/index.php", 'type' => 'misc');
$navlinks[] = array('name' => $strcategories, 'link' => "index.php", 'type' => 'misc');
$navlinks[] = array('name' => $category->name, 'link' => "category.php?id=$course->category", 'type' => 'misc');
$navlinks[] = array('name' => $strdeletingcourse, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strdeletingcourse", $site->fullname, $navigation);
$PAGE->navbar->add($strdeletingcourse);
$PAGE->set_title("$site->shortname: $strdeletingcourse");
$PAGE->set_heading($site->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading($strdeletingcourse);
delete_course($course);
course/edit.php
+10 -15
View File
@@ -118,30 +118,25 @@
$straddnewcourse = get_string("addnewcourse");
$stradministration = get_string("administration");
$strcategories = get_string("categories");
$navlinks = array();
if (!empty($course)) {
$navlinks[] = array('name' => $streditcoursesettings,
'link' => null,
'type' => 'misc');
$PAGE->navbar->add($streditcoursesettings);
$title = $streditcoursesettings;
$fullname = $course->fullname;
} else {
$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');
$PAGE->navbar->add($stradministration, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/index.php'));
$PAGE->navbar->add($strcategories, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/index.php'));
$PAGE->navbar->add($straddnewcourse);
$title = "$site->shortname: $straddnewcourse";
$fullname = $site->fullname;
}
$navigation = build_navigation($navlinks);
print_header($title, $fullname, $navigation, $editform->focus());
$PAGE->set_title($title);
$PAGE->set_heading($fullname);
$PAGE->set_focuscontrol($editform->focus());
echo $OUTPUT->header();
echo $OUTPUT->heading($streditcoursesettings);
$editform->display();
course/enrol.php
+5 -2
View File
@@ -67,7 +67,7 @@
foreach ($roles as $role) {
if ($role->timestart and ($role->timestart >= time())) {
$message = get_string('enrolmentnotyet', '', userdate($student->timestart));
print_header();
echo $OUTPUT->header();
notice($message, "$CFG->wwwroot/index.php");
}
}
@@ -84,7 +84,10 @@
($course->enrollable == 2 && $course->enrolstartdate > 0 && $course->enrolstartdate > time()) ||
($course->enrollable == 2 && $course->enrolenddate > 0 && $course->enrolenddate <= time())
) {
print_header($course->shortname, $course->fullname, build_navigation(array(array('name'=>$course->shortname,'link'=>'','type'=>'misc'))) );
$PAGE->set_title($course->shortname);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($course->shortname);
echo $OUTPUT->header();
notice(get_string('notenrollable'), "$CFG->wwwroot/index.php");
}
course/import.php
+5 -4
View File
@@ -31,11 +31,12 @@
}
$strimport = get_string('import');
$navlinks = array();
$navlinks[] = array('name' => $strimport, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($course->fullname.': '.$strimport, $course->fullname.': '.$strimport, $navigation);
$PAGE->set_title($course->fullname.': '.$strimport);
$PAGE->set_heading($course->fullname.': '.$strimport);
$PAGE->navbar->add($strimport);
echo $OUTPUT->header();
$imports = get_plugin_list('import');
course/import/activities/index.php
+9 -10
View File
@@ -55,17 +55,16 @@
}
}
$navlinks = array();
$navlinks[] = array('name' => $course->shortname,
'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
'type' => 'misc');
$navlinks[] = array('name' => get_string('import'),
'link' => "$CFG->wwwroot/course/import.php?id=$course->id",
'type' => 'misc');
$navlinks[] = array('name' => $strimportactivities, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
$PAGE->navbar->add($course->shortname, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
$PAGE->navbar->add(get_string('import'), null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id)));
$PAGE->navbar->add($strimportactivities);
$PAGE->set_title("$course->shortname: $strimportactivities");
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
print_header("$course->shortname: $strimportactivities", $course->fullname, $navigation);
require_once('mod.php');
echo $OUTPUT->footer();
course/import/groups/index.php
+8 -10
View File
@@ -40,17 +40,15 @@
}
/// Print the header
$navlinks = array();
$navlinks[] = array('name' => $course->shortname,
'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
'type' => 'misc');
$navlinks[] = array('name' => get_string('import'),
'link' => "$CFG->wwwroot/course/import.php?id=$course->id",
'type' => 'misc');
$navlinks[] = array('name' => $strimportgroups, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
$PAGE->navbar->add($course->shortname, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
$PAGE->navbar->add(get_string('import'), null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id)));
$PAGE->navbar->add($strimportgroups);
print_header("$course->shortname: $strimportgroups", $course->fullname, $navigation);
$PAGE->set_title("$course->shortname: $strimportgroups");
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
/// If a file has been uploaded, then process it
course/importstudents.php
+5 -4
View File
@@ -43,10 +43,11 @@
$strcourses = get_string("courses");
$strshowall = get_string("showall");
print_header("$course->shortname: $strassigncourses",
$site->fullname,
build_navigation(array(array('name' => $strassigncourses, 'link' => null, 'type' => 'misc'))), "searchtext");
$PAGE->navbar->add($strassigncourses);
$PAGE->set_title("$course->shortname: $strassigncourses");
$PAGE->set_heading($site->fullname);
$PAGE->set_focuscontrol("searchtext");
echo $OUTPUT->header();
/// Print a help notice about the need to use this page
course/index.php
+10 -8
View File
@@ -55,10 +55,11 @@
$strcourses = get_string('courses');
$strcategories = get_string('categories');
$navlinks = array();
$navlinks[] = array('name'=>$strcategories,'link'=>'','type'=>'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strcategories", $strcourses, $navigation, '', '', true, update_category_button());
$PAGE->navbar->add($strcategories);
$PAGE->set_title("$site->shortname: $strcategories");
$PAGE->set_heading($strcourses);
$PAGE->set_button(update_category_button());
echo $OUTPUT->header();
echo $OUTPUT->heading($strcategories);
echo skip_main_destination();
echo $OUTPUT->box_start('categorybox');
@@ -66,10 +67,11 @@
echo $OUTPUT->box_end();
print_course_search();
} else {
$strfulllistofcourses = get_string('fulllistofcourses');
print_header("$site->shortname: $strfulllistofcourses", $strfulllistofcourses,
build_navigation(array(array('name'=>$strfulllistofcourses, 'link'=>'','type'=>'misc'))),
'', '', true, update_category_button());
$PAGE->navbar->add($strfulllistofcourses);
$PAGE->set_title("$site->shortname: $strfulllistofcourses");
$PAGE->set_heading($strfulllistofcourses);
$PAGE->set_button(update_category_button());
echo $OUTPUT->header();
echo skip_main_destination();
echo $OUTPUT->box_start('courseboxes');
print_courses(0);
course/info.php
+2 -2
View File
@@ -33,8 +33,8 @@
print_error('coursehidden', '', $CFG->wwwroot .'/');
}
print_header(get_string("summaryof", "", $course->fullname));
$PAGE->set_title(get_string("summaryof", "", $course->fullname));
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($course->fullname) . '<br />(' . format_string($course->shortname) . ')');
if ($course->guest || $course->password) {
course/recent.php
+6 -7
View File
@@ -18,8 +18,6 @@
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$meta = '<meta name="robots" content="none" />'; // prevent duplicate content in search engines MDL-7299
$lastlogin = time() - COURSE_MAX_RECENT_PERIOD;
if (!isguestuser() and !empty($USER->lastcourseaccess[$COURSE->id])) {
if ($USER->lastcourseaccess[$COURSE->id] > $lastlogin) {
@@ -52,11 +50,12 @@
}
$strrecentactivity = get_string('recentactivity');
$navlinks = array();
$navlinks[] = array('name' => $strrecentactivity, 'link' => "recent.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $userinfo, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strrecentactivity", $course->fullname, $navigation, '', $meta);
$PAGE->navbar->add($strrecentactivity, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/recent.php', array('id'=>$course->id)));
$PAGE->navbar->add($userinfo);
$PAGE->set_title("$course->shortname: $strrecentactivity");
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($course->fullname) . ": $userinfo", 3);
$mform->display();
course/report.php
+4 -4
View File
@@ -16,10 +16,10 @@
$strreports = get_string('reports');
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($course->fullname.': '.$strreports, $course->fullname.': '.$strreports, $navigation);
$PAGE->navbar->add($strreports);
$PAGE->set_title($course->fullname.': '.$strreports);
$PAGE->set_heading($course->fullname.': '.$strreports);
echo $OUTPUT->header();
$reports = get_plugin_list('coursereport');
course/report/log/index.php
+14 -9
View File
@@ -81,11 +81,14 @@
admin_externalpage_print_header();
} else {
$navlinks[] = array('name' => $strreports, 'link' => "$CFG->wwwroot/course/report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strlogs, 'link' => "index.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => "$userinfo, $dateinfo", 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($course->shortname .': '. $strlogs, $course->fullname, $navigation);
$PAGE->set_title($course->shortname .': '. $strlogs);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strlogs, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/index.php', array('id'=>$course->id)));
$PAGE->navbar->add("$userinfo, $dateinfo");
echo $OUTPUT->header();
}
echo $OUTPUT->heading(format_string($course->fullname) . ": $userinfo, $dateinfo (".usertimezone().")");
@@ -128,10 +131,12 @@
admin_externalpage_setup('reportlog');
admin_externalpage_print_header();
} else {
$navlinks[] = array('name' => $strreports, 'link' => "$CFG->wwwroot/course/report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strlogs, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($course->shortname .': '. $strlogs, $course->fullname, $navigation, '');
$PAGE->set_title($course->shortname .': '. $strlogs);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strlogs);
echo $OUTPUT->header();
}
echo $OUTPUT->heading(get_string('chooselogs') .':');
course/report/log/indexlive.php
+6 -5
View File
@@ -25,11 +25,12 @@
admin_externalpage_print_header();
} else {
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => "$CFG->wwwroot/course/report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strlogs, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($course->shortname .': '. $strlogs, $course->fullname, $navigation, '');
$PAGE->set_title($course->shortname .': '. $strlogs);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strlogs);
echo $OUTPUT->header();
}
echo $OUTPUT->heading(get_string('loglive', 'coursereport_log'));
course/report/outline/index.php
+6 -7
View File
@@ -30,13 +30,12 @@
$strreports = get_string('reports');
$strviews = get_string('views');
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => "../../report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $stractivityreport, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $stractivityreport", $course->fullname, $navigation);
$PAGE->set_title($course->shortname .': '. $stractivityreport);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($stractivityreport);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($course->fullname));
if (!$logstart = $DB->get_field_sql("SELECT MIN(time) FROM {log}")) {
course/report/participation/index.php
+6 -5
View File
@@ -49,11 +49,12 @@
$action = '';
}
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => "../../report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strparticipation, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strparticipation", $course->fullname, $navigation);
$PAGE->set_title($course->shortname .': '. $strparticipation);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strparticipation);
echo $OUTPUT->header();
$modinfo = get_fast_modinfo($course);
course/report/progress/index.php
+8 -4
View File
@@ -83,10 +83,14 @@ if($csv) {
// Navigation and header
$strreports = get_string("reports");
$strcompletion = get_string('completionreport','completion');
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => "../../report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strcompletion, 'link' => null, 'type' => 'misc');
print_header($strcompletion,$course->fullname,build_navigation($navlinks));
$PAGE->set_title($strcompletion);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strcompletion);
echo $OUTPUT->header();
if($svgcleverness) {
$PAGE->requires->yui_lib('event');
$PAGE->requires->js('course/report/progress/textrotate.js');
course/report/stats/index.php
+7 -8
View File
@@ -50,14 +50,13 @@
$strreports = get_string("reports");
$strstats = get_string('stats');
$menu = report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php");
$navlinks = array();
$navlinks[] = array('name' => $strreports, 'link' => "../../report.php?id=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $strstats, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strstats", $course->fullname, $navigation, '', '', true, '&nbsp;', $menu);
$PAGE->set_title("$course->shortname: $strstats");
$PAGE->set_heading($course->fullname);
$PAGE->set_headingmenu();
$PAGE->navbar->add($strreports, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)));
$PAGE->navbar->add($strstats);
echo $OUTPUT->header(report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php"));
}
require($CFG->dirroot.'/course/report/stats/report.php');
course/request.php
+11 -2
View File
@@ -57,7 +57,11 @@
redirect($returnurl);
} else if ($data = $requestform->get_data()) {
print_header($strtitle, $strtitle, build_navigation($strtitle), $requestform->focus());
$PAGE->set_title($strtitle);
$PAGE->set_heading($strtitle);
$PAGE->navbar->add($strtitle);
$PAGE->set_focuscontrol($requestform->focus());
echo $OUTPUT->header();
echo $OUTPUT->heading($strtitle);
/// Record the request.
@@ -91,7 +95,12 @@
}
/// Show the request form.
print_header($strtitle, $strtitle, build_navigation($strtitle), $requestform->focus());
$PAGE->set_title($strtitle);
$PAGE->set_heading($strtitle);
$PAGE->navbar->add($strtitle);
$PAGE->set_focuscontrol($requestform->focus());
echo $OUTPUT->header();
echo $OUTPUT->heading($strtitle);
$requestform->display();
echo $OUTPUT->footer();
course/reset.php
+5 -4
View File
@@ -24,8 +24,9 @@ $strreset = get_string('reset');
$strresetcourse = get_string('resetcourse');
$strremove = get_string('remove');
$navlinks = array(array('name' => $strresetcourse, 'link' => null, 'type' => 'misc'));
$navigation = build_navigation($navlinks);
$PAGE->navbar->add($strresetcourse);
$PAGE->set_title($course->fullname.': '.$strresetcourse);
$PAGE->set_heading($course->fullname.': '.$strresetcourse);
$mform = new course_reset_form();
@@ -44,7 +45,7 @@ if ($mform->is_cancelled()) {
$mform = new course_reset_form();
} else {
print_header($course->fullname.': '.$strresetcourse, $course->fullname.': '.$strresetcourse, $navigation);
echo $OUTPUT->header();
echo $OUTPUT->heading($strresetcourse);
$data->reset_start_date_old = $course->startdate;
@@ -73,7 +74,7 @@ if ($mform->is_cancelled()) {
}
}
print_header($course->fullname.': '.$strresetcourse, $course->fullname.': '.$strresetcourse, $navigation);
echo $OUTPUT->header();
echo $OUTPUT->heading($strresetcourse);
echo $OUTPUT->box(get_string('resetinfo'));
course/scales.php
+2 -1
View File
@@ -26,7 +26,8 @@
$strhelptext = get_string("helptext");
$stractivities = get_string("activities");
print_header($strscales);
$PAGE->set_title($strscales);
echo $OUTPUT->header();
if ($scaleid) {
if ($scale = $DB->get_record("scale", array('id'=>$scaleid))) {
course/search.php
+12 -11
View File
@@ -95,12 +95,12 @@
$strnovalidcourses = get_string('novalidcourses');
if (empty($search) and empty($blocklist) and empty($modulelist)) {
$navlinks = array();
$navlinks[] = array('name' => $strcourses, 'link' => "index.php", 'type' => 'misc');
$navlinks[] = array('name' => $strsearch, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
$PAGE->navbar->add($strcourses, null, null, navigation_node::TYPE_CUSTOM, new moodle_url($CFG->wwwroot.'/course/index.php'));
$PAGE->navbar->add($strsearch);
$PAGE->set_title("$site->fullname : $strsearch");
$PAGE->set_heading($site->fullname);
print_header("$site->fullname : $strsearch", $site->fullname, $navigation, "", "");
echo $OUTPUT->header();
echo $OUTPUT->box_start();
echo "<center>";
echo "<br />";
@@ -201,15 +201,16 @@
}
}
$navlinks = array();
$navlinks[] = array('name' => $strcourses, 'link' => 'index.php', 'type' => 'misc');
$navlinks[] = array('name' => $strsearch, 'link' => 'search.php', 'type' => 'misc');
$PAGE->navbar->add($strcourses, null, null, navigation_node::TYPE_CUSTOM, new moodle_url($CFG->wwwroot.'/course/index.php'));
$PAGE->navbar->add($strsearch, null, null, navigation_node::TYPE_CUSTOM, new moodle_url($CFG->wwwroot.'/course/search.php'));
if (!empty($search)) {
$navlinks[] = array('name' => "'".s($search)."'", 'link' => null, 'type' => 'misc');
$PAGE->navbar->add(s($search));
}
$navigation = build_navigation($navlinks);
$PAGE->set_title("$site->fullname : $strsearchresults");
$PAGE->set_heading($site->fullname);
$PAGE->set_button($searchform);
print_header("$site->fullname : $strsearchresults", $site->fullname, $navigation, "", "", "", $searchform);
echo $OUTPUT->header();
$lastcategory = -1;
if ($courses) {
course/unenrol.php
+4 -6
View File
@@ -83,12 +83,10 @@
$strunenrol = get_string('unenrol');
$navlinks = array();
$navlinks[] = array('name' => $strunenrol, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $strunenrol", $course->fullname, $navigation);
$PAGE->navbar->add($strunenrol);
$PAGE->set_title("$course->shortname: $strunenrol");
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
if ($userid) {
if (!$user = $DB->get_record('user', array('id'=>$userid))) {
print_error('nousers');
course/user.php
+11 -12
View File
@@ -32,7 +32,7 @@
}
if ($user->deleted) {
print_header();
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('userdeleted'));
echo $OUTPUT->footer();
die;
@@ -101,19 +101,18 @@
$strmode = get_string($mode);
$fullname = fullname($user, true);
$navlinks = array();
$link = null;
if ($course->id != SITEID && has_capability('moodle/course:viewparticipants', $coursecontext)) {
$navlinks[] = array('name' => $strparticipants, 'link' => "../user/index.php?id=$course->id", 'type' => 'misc');
$link = new moodle_url($CFG->wwwroot.'/user/index.php', array('id'=>$course->id));
}
$navlinks[] = array('name' => $fullname, 'link' => "../user/view.php?id=$user->id&amp;course=$course->id", 'type' => 'misc');
$navlinks[] = array('name' => $stractivityreport, 'link' => null, 'type' => 'misc');
$navlinks[] = array('name' => $strmode, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$course->shortname: $stractivityreport ($mode)", $course->fullname, $navigation);
$PAGE->navbar->add($strparticipants, null, null, navigation_node::TYPE_CUSTOM, $link);
$PAGE->navbar->add($fullname, null, null, navigation_node::TYPE_CUSTOM,
new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$user->id, 'course'=>$course->id)));
$PAGE->navbar->add($stractivityreport);
$PAGE->navbar->add($strmode);
$PAGE->set_title("$course->shortname: $stractivityreport ($mode)");
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
/// Print tabs at top
/// This same call is made in:
course/view.php
+6 -3
View File
@@ -194,9 +194,12 @@
}
$title = get_string('course') . ': ' . $course->fullname;
$navigation = build_navigation(array());
print_header($title, $course->fullname, $navigation, '', '', true,
$buttons, user_login_string($course, $USER), false, $bodytags);
$PAGE->set_title($title);
$PAGE->set_heading($course->fullname);
$PAGE->set_button($buttons);
$PAGE->set_headingmenu(user_login_string($course, $USER));
echo $OUTPUT->header();
if ($completion->is_enabled() && ajaxenabled()) {
// This value tracks whether there has been a dynamic change to the page.