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

diff --git a/calendar/event.php b/calendar/event.php
index b497b0a9ef2518a239f7326086e71ddfbaa5850a..ea18110a71ebc3ca7fe92a231d01c50a5096478f 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -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();
 

diff --git a/calendar/export.php b/calendar/export.php
index 1ec6009712f38a18ee105faf3dc305e9dae35c29..0ebc55899cbde75ca0d36758f212d30aa03607e1 100644 (file)
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -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();
 

diff --git a/calendar/preferences.php b/calendar/preferences.php
index 692d985ef3158cf988384761a9587bcd135e0f4b..39fb7aa92d044de0def514a3dd90b0344ab8b96f 100644 (file)
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -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);
 

diff --git a/calendar/view.php b/calendar/view.php
index e394b133d4740e46ab8e60b6d01a624312437e83..4cb9bc8e8f1c420f0ff57758afd3247ecf3d8c77 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -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();