moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-28071-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-09-24 15:06:25 +12:00
commit 9c8299972d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar/event.php
View file

@ -194,8 +194,6 @@ $renderer = $PAGE->get_renderer('core_calendar');
$calendar->add_sidecalendar_blocks($renderer); $calendar->add_sidecalendar_blocks($renderer);
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $renderer->start_layout();
echo $OUTPUT->heading($title); echo $OUTPUT->heading($title);
$mform->display(); $mform->display();
echo $renderer->complete_layout();
echo $OUTPUT->footer(); echo $OUTPUT->footer();

5
calendar/event_form.php
View file

@ -48,6 +48,7 @@ class event_form extends moodleform {
$newevent = (empty($this->_customdata->event) || empty($this->_customdata->event->id)); $newevent = (empty($this->_customdata->event) || empty($this->_customdata->event->id));
$repeatedevents = (!empty($this->_customdata->event->eventrepeats) && $this->_customdata->event->eventrepeats>0); $repeatedevents = (!empty($this->_customdata->event->eventrepeats) && $this->_customdata->event->eventrepeats>0);
$hasduration = (!empty($this->_customdata->hasduration) && $this->_customdata->hasduration); $hasduration = (!empty($this->_customdata->hasduration) && $this->_customdata->hasduration);
$mform->addElement('header', 'general', get_string('general'));
if ($newevent) { if ($newevent) {
$eventtypes = $this->_customdata->eventtypes; $eventtypes = $this->_customdata->eventtypes;
@ -112,7 +113,8 @@ class event_form extends moodleform {
$mform->addElement('date_time_selector', 'timestart', get_string('date')); $mform->addElement('date_time_selector', 'timestart', get_string('date'));
$mform->addRule('timestart', get_string('required'), 'required'); $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('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
$mform->addElement('date_time_selector', 'timedurationuntil', ' '); $mform->addElement('date_time_selector', 'timedurationuntil', ' ');
@ -127,6 +129,7 @@ class event_form extends moodleform {
if ($newevent) { if ($newevent) {
$mform->addElement('header', 'repeatevents', get_string('repeatedevents', 'calendar'));
$mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null, 'repeat'); $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null, 'repeat');
$mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"'); $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
$mform->setType('repeats', PARAM_INT); $mform->setType('repeats', PARAM_INT);