From 7e52491cf9d4852c59f45ab355a46492bedeea9d Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 15 Jul 2013 15:40:44 +0800
Subject: [PATCH] MDL-18375 calendar: moved the location of the calendar type
 select box when editing a course

---
 course/edit_form.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/course/edit_form.php b/course/edit_form.php
index ca311ef4083..3ec565c2151 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -199,6 +199,11 @@ class course_edit_form extends moodleform {
         $mform->addElement('select', 'lang', get_string('forcelanguage'), $languages);
         $mform->setDefault('lang', $courseconfig->lang);
 
+        $calendartypes = array();
+        $calendartypes[''] = get_string('forceno');
+        $calendartypes += core_calendar\type_factory::get_list_of_calendar_types();
+        $mform->addElement('select', 'calendartype', get_string('forcecalendartype', 'calendar'), $calendartypes);
+
         $options = range(0, 10);
         $mform->addElement('select', 'newsitems', get_string('newsitemsnumber'), $options);
         $mform->addHelpButton('newsitems', 'newsitemsnumber');
@@ -273,14 +278,6 @@ class course_edit_form extends moodleform {
         $options[0] = get_string('none');
         $mform->addElement('select', 'defaultgroupingid', get_string('defaultgrouping', 'group'), $options);
 
-        // Multi-Calendar Support - see MDL-18375
-        $mform->addElement('header','', get_string('calendar', 'calendar'));
-
-        $calendartypes = array();
-        $calendartypes[''] = get_string('forceno');
-        $calendartypes += calendar_type_plugin_factory::get_list_of_calendar_types();
-        $mform->addElement('select', 'calendartype', get_string('forcecalendartype', 'calendar'), $calendartypes);
-
         // Customizable role names in this course.
         $mform->addElement('header','rolerenaming', get_string('rolerenaming'));
         $mform->addHelpButton('rolerenaming', 'rolerenaming');