fixed site defaults, reorganized administartion tree - new category legacy for obsole...

diff --git a/admin/settings/first.php b/admin/settings/first.php
index af89c830f275644139ab414eeb1e4e6df7a5a70a..bc5327f8b09c8bbe9c32084cab0cca5a04ae41c5 100644 (file)
--- a/admin/settings/first.php
+++ b/admin/settings/first.php
@@ -24,6 +24,8 @@ if (file_exists($CFG->dirroot . '/admin/mysql/frame.php')) {
     $ADMIN->add('root', new admin_externalpage('database', get_string('managedatabase'), $CFG->wwwroot . '/' . $CFG->admin . '/mysql/frame.php'));
 }
 
+$ADMIN->add('root', new admin_category('legacy', get_string('legacy','admin')));
+
 // the following is TEMPORARY
 
 $ADMIN->add('root', new admin_category('unsorted', 'Unsorted', 999));

diff --git a/admin/settings/legacy.php b/admin/settings/legacy.php
new file mode 100644 (file)
index 0000000..092c5d1
--- /dev/null
+++ b/admin/settings/legacy.php
@@ -0,0 +1,13 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "userinterface" category
+// "generalsettings" settingpage
+$temp = new admin_settingpage('generallegacy', get_string('generallegacy','admin'));
+$temp->add(new admin_setting_sitesettext('teacher', get_string('wordforteacher'), get_string('wordforteachereg'), '', PARAM_ALPHA));
+$temp->add(new admin_setting_sitesettext('teachers', get_string('wordforteachers'), get_string('wordforteacherseg'), '', PARAM_ALPHA));
+$temp->add(new admin_setting_sitesettext('student', get_string('wordforstudent'), get_string('wordforstudenteg'), '', PARAM_ALPHA));
+$temp->add(new admin_setting_sitesettext('students', get_string('wordforstudents'), get_string('wordforstudentseg'), '', PARAM_ALPHA));
+$ADMIN->add('legacy', $temp);
+
+
+?>
\ No newline at end of file

diff --git a/admin/settings/userinterface.php b/admin/settings/userinterface.php
index bb1456e02a9370a710f86f630088a7c38fb8d925..8228cb1eea76af207463bd75f88087f1f8f40015 100644 (file)
--- a/admin/settings/userinterface.php
+++ b/admin/settings/userinterface.php
@@ -4,6 +4,8 @@
 
 // "frontpage" settingpage
 $temp = new admin_settingpage('frontpage', get_string('frontpage','admin'));
+$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), get_string('fullsitenamehelp'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), get_string('shortsitenamehelp'), '', PARAM_NOTAGS));
 $temp->add(new admin_setting_special_frontpagedesc());
 $temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp'), 1));
 $temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), get_string('newsitemsnumberhelp'), 3, array('0' => '0 ' . get_string('newsitems'),
@@ -17,19 +19,8 @@ $temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnum
                                                                                                                                 '8' => '8 ' . get_string('newsitems'),
                                                                                                                                 '9' => '9 ' . get_string('newsitems'),
                                                                                                                                 '10' => '10 ' . get_string('newsitems'))));
-$temp->add(new admin_setting_special_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
-$temp->add(new admin_setting_special_frontpage(true)); // loggedin version of the setting
-$ADMIN->add('userinterface', $temp);
-
-
-// "generalsettings" settingpage
-$temp = new admin_settingpage('generalsettings', get_string('generalsettings','admin'));
-$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), get_string('fullsitenamehelp'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), get_string('shortsitenamehelp'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_sitesettext('teacher', get_string('wordforteacher'), get_string('wordforteachereg'), '', PARAM_ALPHA));
-$temp->add(new admin_setting_sitesettext('teachers', get_string('wordforteachers'), get_string('wordforteacherseg'), '', PARAM_ALPHA));
-$temp->add(new admin_setting_sitesettext('student', get_string('wordforstudent'), get_string('wordforstudenteg'), '', PARAM_ALPHA));
-$temp->add(new admin_setting_sitesettext('students', get_string('wordforstudents'), get_string('wordforstudentseg'), '', PARAM_ALPHA));
+$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
+$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
 $ADMIN->add('userinterface', $temp);