From 7dbd7bb7c4ed007bfc2167065cbcf2c658611eb6 Mon Sep 17 00:00:00 2001
From: Ankit Agarwal <ankit@moodle.com>
Date: Thu, 20 Sep 2012 11:51:54 +0800
Subject: [PATCH] MDL-28071 calendar: Accessibility improvments on calendar new
 event page

---
 calendar/event.php      | 2 --
 calendar/event_form.php | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/calendar/event.php b/calendar/event.php
index dbc0c32b370..027527bf9dc 100644
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -194,8 +194,6 @@ $renderer = $PAGE->get_renderer('core_calendar');
 $calendar->add_sidecalendar_blocks($renderer);
 
 echo $OUTPUT->header();
-echo $renderer->start_layout();
 echo $OUTPUT->heading($title);
 $mform->display();
-echo $renderer->complete_layout();
 echo $OUTPUT->footer();
diff --git a/calendar/event_form.php b/calendar/event_form.php
index 9bbae6c259e..5b12a4d04da 100644
--- a/calendar/event_form.php
+++ b/calendar/event_form.php
@@ -48,6 +48,7 @@ class event_form extends moodleform {
         $newevent = (empty($this->_customdata->event) || empty($this->_customdata->event->id));
         $repeatedevents = (!empty($this->_customdata->event->eventrepeats) && $this->_customdata->event->eventrepeats>0);
         $hasduration = (!empty($this->_customdata->hasduration) && $this->_customdata->hasduration);
+        $mform->addElement('header', 'general', get_string('general'));
 
         if ($newevent) {
             $eventtypes = $this->_customdata->eventtypes;
@@ -112,7 +113,8 @@ class event_form extends moodleform {
         $mform->addElement('date_time_selector', 'timestart', get_string('date'));
         $mform->addRule('timestart', get_string('required'), 'required');
 
-        $mform->addElement('radio', 'duration', get_string('eventduration', 'calendar'), get_string('durationnone', 'calendar'), 0);
+        $mform->addElement('header', 'durationdetails', get_string('eventduration', 'calendar'));
+        $mform->addElement('radio', 'duration', null, get_string('durationnone', 'calendar'), 0);
 
         $mform->addElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
         $mform->addElement('date_time_selector', 'timedurationuntil', '&nbsp;');
@@ -127,6 +129,7 @@ class event_form extends moodleform {
 
         if ($newevent) {
 
+            $mform->addElement('header', 'repeatevents', get_string('repeatedevents', 'calendar'));
             $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null, 'repeat');
             $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
             $mform->setType('repeats', PARAM_INT);