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

calendar MDL-19793 Upgraded print_header and build_navigation calls to OUTPUT/PAGE equivilants

Browse Source
This commit is contained in:
samhemelryk
2009-09-04 04:26:50 +00:00
parent 05c039e564
commit f22f13330a
4 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/event.php
+11 -10
View File
@@ -70,11 +70,6 @@
calendar_session_vars();
$now = usergetdate(time());
$navlinks = array();
$calendar_navlink = array('name' => $strcalendar,
'link' =>calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$urlcourse.'&',
$now['mday'], $now['mon'], $now['year']),
'type' => 'misc');
$day = intval($now['mday']);
$mon = intval($now['mon']);
@@ -276,11 +271,17 @@
}
require_login($course, false);
$navlinks[] = $calendar_navlink;
$navlinks[] = array('name' => $title, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $navigation,
'eventform.name', '', true, '', user_login_string($site));
$link = calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$urlcourse.'&',
$now['mday'], $now['mon'], $now['year']);
$PAGE->navbar->add($strcalendar, new moodle_url($link));
$PAGE->navbar->add($title);
$PAGE->set_title($site->shortname.': '.$strcalendar.': '.$title);
$PAGE->set_heading($strcalendar);
$PAGE->set_headingmenu(user_login_string($site));
$PAGE->set_focuscontrol('eventform.name');
echo $OUTPUT->header();
echo calendar_overlib_html();
calendar/export.php
+13 -11
View File
@@ -33,16 +33,8 @@ $navlinks = array();
$now = usergetdate(time());
if (!empty($courseid) && $course->id != SITEID) {
$navlinks[] = array('name' => $course->shortname,
'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
'type' => 'misc');
$PAGE->navbar->add($course->shortname, new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
}
$navlinks[] = array('name' => get_string('calendar', 'calendar'),
'link' =>calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$courseid.'&',
$now['mday'], $now['mon'], $now['year']),
'type' => 'misc');
$navlinks[] = array('name' => $pagetitle, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
if(!checkdate($mon, $day, $yr)) {
$day = intval($now['mday']);
@@ -70,8 +62,18 @@ $strcalendar = get_string('calendar', 'calendar');
$prefsbutton = calendar_preferences_button();
// Print title and header
print_header("$site->shortname: $strcalendar: $pagetitle", $strcalendar, $navigation,
'', '', true, $prefsbutton, user_login_string($site));
$link = calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$courseid.'&',
$now['mday'], $now['mon'], $now['year']);
$PAGE->navbar->add(get_string('calendar', 'calendar'), new moodle_url($link));
$PAGE->navbar->add($pagetitle);
$PAGE->set_title($site->shortname.': '.$strcalendar.': '.$pagetitle);
$PAGE->set_heading($strcalendar);
$PAGE->set_headingmenu(user_login_string($site));
$PAGE->set_button($prefsbutton);
$PAGE->set_focuscontrol('eventform.name');
echo $OUTPUT->header();
echo calendar_overlib_html();
calendar/preferences.php
+6 -8
View File
@@ -58,18 +58,16 @@
$strcalendar = get_string('calendar', 'calendar');
$strpreferences = get_string('preferences', 'calendar');
$navlinks = array();
if ($course->id != SITEID) {
$navlinks[] = array('name' => $course->shortname,
'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
'type' => 'misc');
$PAGE->navbar-add($course->shortname, new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)));
}
$navlinks[] = array('name' => $strpreferences, 'link' => 'view.php', 'type' => 'misc');
$navigation = build_navigation($navlinks);
$PAGE->navbar->add($strpreferences, new moodle_url($CFG->wwwroot.'/calendar/view.php'));
print_header("$site->shortname: $strcalendar: $strpreferences", $strcalendar, $navigation,
'', '', true, '', user_login_string($site));
$PAGE->set_title("$site->shortname: $strcalendar: $strpreferences");
$PAGE->set_heading($strcalendar);
$PAGE->set_headingmenu(user_login_string($site));
echo $OUTPUT->header();
echo $OUTPUT->heading($strpreferences);
calendar/view.php
+12 -11
View File
@@ -68,12 +68,10 @@
$pagetitle = '';
$strcalendar = get_string('calendar', 'calendar');
$navlinks = array();
$navlinks[] = array('name' => $strcalendar,
'link' =>calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$courseid.'&',
$now['mday'], $now['mon'], $now['year']),
'type' => 'misc');
$link = calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&course='.$courseid.'&',
$now['mday'], $now['mon'], $now['year']);
$PAGE->navbar->add($strcalendar, new moodle_url($link));
if(!checkdate($mon, $day, $yr)) {
$day = intval($now['mday']);
@@ -84,11 +82,11 @@
switch($view) {
case 'day':
$navlinks[] = array('name' => userdate($time, get_string('strftimedate')), 'link' => null, 'type' => 'misc');
$PAGE->navbar->add(userdate($time, get_string('strftimedate')));
$pagetitle = get_string('dayview', 'calendar');
break;
case 'month':
$navlinks[] = array('name' => userdate($time, get_string('strftimemonthyear')), 'link' => null, 'type' => 'misc');
$PAGE->navbar->add(userdate($time, get_string('strftimemonthyear')));
$pagetitle = get_string('detailedmonthview', 'calendar');
break;
case 'upcoming':
@@ -136,9 +134,12 @@
$prefsbutton = calendar_preferences_button();
// Print title and header
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strcalendar: $pagetitle", $strcalendar, $navigation,
'', '', true, $prefsbutton, user_login_string($site));
$PAGE->set_title("$site->shortname: $strcalendar: $pagetitle");
$PAGE->set_heading($strcalendar);
$PAGE->set_headingmenu(user_login_string($site));
$PAGE->set_button($prefsbutton);
echo $OUTPUT->header();
echo calendar_overlib_html();