Permalink
Browse files

Merge branch 'MDL-34866_23' of git://github.com/rlorenzo/moodle into …

…MOODLE_23_STABLE
  • Loading branch information...
2 parents 864ca7d + 90c510c commit 0547143fad270d28c983e0599046b310afcd812b @stronk7 stronk7 committed Aug 21, 2012
Showing with 12 additions and 4 deletions.
  1. +5 −0 admin/settings/courses.php
  2. +1 −1 course/edit_form.php
  3. +0 −3 course/lib.php
  4. +6 −0 lib/moodlelib.php
@@ -47,6 +47,11 @@
$temp->add(new admin_setting_configselect('moodlecourse/legacyfiles', new lang_string('courselegacyfiles'), new lang_string('courselegacyfiles_help'), key($choices), $choices));
}
+ $choices = array();
+ $choices[COURSE_DISPLAY_SINGLEPAGE] = new lang_string('coursedisplay_single');
+ $choices[COURSE_DISPLAY_MULTIPAGE] = new lang_string('coursedisplay_multi');
+ $temp->add(new admin_setting_configselect('moodlecourse/coursedisplay', new lang_string('coursedisplay'), new lang_string('coursedisplay_help'), COURSE_DISPLAY_SINGLEPAGE, $choices));
+
$temp->add(new admin_setting_heading('groups', new lang_string('groups', 'group'), ''));
$choices = array();
$choices[NOGROUPS] = new lang_string('groupsnone', 'group');
@@ -124,7 +124,7 @@ function definition() {
array(COURSE_DISPLAY_SINGLEPAGE => get_string('coursedisplay_single'),
COURSE_DISPLAY_MULTIPAGE => get_string('coursedisplay_multi')));
$mform->addHelpButton('coursedisplay', 'coursedisplay');
- $mform->setDefault('coursedisplay', COURSE_DISPLAY_SINGLEPAGE);
+ $mform->setDefault('coursedisplay', $courseconfig->coursedisplay);
for ($i = 0; $i <= $courseconfig->maxsections; $i++) {
$sectionmenu[$i] = "$i";
View
@@ -47,9 +47,6 @@
define('MOD_CLASS_ACTIVITY', 0);
define('MOD_CLASS_RESOURCE', 1);
-define('COURSE_DISPLAY_SINGLEPAGE', 0); // display all sections on one page
-define('COURSE_DISPLAY_MULTIPAGE', 1); // split pages into a page per section
-
function make_log_url($module, $url) {
switch ($module) {
case 'course':
View
@@ -480,6 +480,12 @@
*/
define('USER_CAN_IGNORE_FILE_SIZE_LIMITS', -1);
+/**
+ * Course display settings
+ */
+define('COURSE_DISPLAY_SINGLEPAGE', 0); // display all sections on one page
+define('COURSE_DISPLAY_MULTIPAGE', 1); // split pages into a page per section
+
/// PARAMETER HANDLING ////////////////////////////////////////////////////
/**

0 comments on commit 0547143

Please sign in to comment.