From: moodler Date: Fri, 30 Apr 2004 12:10:46 +0000 (+0000) Subject: Sorry, Eloy, my directions were wrong. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=464fd803fae7a338ae8a41bb01c1190c008d4a19;p=moodle.git Sorry, Eloy, my directions were wrong. I've changed hiddentopics to hiddensections ... --- diff --git a/course/edit.html b/course/edit.html index db59781d9e..3e05b66476 100644 --- a/course/edit.html +++ b/course/edit.html @@ -99,13 +99,13 @@ -

: +

: hiddentopics, ""); - helpbutton("coursehiddentopics", get_string("hiddentopics")); ?> + $choices["0"] = get_string("hiddensectionscollapsed"); + $choices["1"] = get_string("hiddensectionsinvisible"); + choose_from_menu ($choices, "hiddensections", $form->hiddensections, ""); + helpbutton("coursehiddensections", get_string("hiddensections")); ?> diff --git a/lang/en/help/coursehiddensections.html b/lang/en/help/coursehiddensections.html new file mode 100644 index 0000000000..624032e6c7 --- /dev/null +++ b/lang/en/help/coursehiddensections.html @@ -0,0 +1,13 @@ +

Course hidden sections

+ +

This option allows you to decide how the hidden sections in your course + are displayed to students.

+ +

By default, a small area is shown (in collapsed form, usually gray) to + indicate where the hidden section is, though they still can not actually see + the hidden activities and texts. This is particularly useful + in the Weekly format, so that non-class weeks are clear.

+ +

If you choose, these can be completely hidden, so that students + don't even know sections of the course are hidden

+ diff --git a/lang/en/help/coursehiddentopics.html b/lang/en/help/coursehiddentopics.html deleted file mode 100644 index 9f504e5460..0000000000 --- a/lang/en/help/coursehiddentopics.html +++ /dev/null @@ -1,9 +0,0 @@ -

Course hidden topics

- -

This option allows you to decide how the hidden topics in your course - are going to be displayed to students.

- -

They can be completely hidden or shown in collapsed form.

- -

This setting only affects courses using the "Topics" format.

- diff --git a/lang/en/moodle.php b/lang/en/moodle.php index bc52c466cf..9885ad9cf2 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -451,9 +451,9 @@ $string['helptext'] = 'How to write text'; $string['helpwiki'] = 'How to write Wiki text'; $string['helpwriting'] = 'Write carefully'; $string['hide'] = 'Hide'; -$string['hiddentopics'] = 'Hidden Topics'; -$string['hiddentopicscollapsed'] = 'Hidden topics are shown in collapsed form'; -$string['hiddentopicsinvisible'] = 'Hidden topics are completely invisible'; +$string['hiddensections'] = 'Hidden Topics'; +$string['hiddensectionscollapsed'] = 'Hidden sections are shown in collapsed form'; +$string['hiddensectionsinvisible'] = 'Hidden sections are completely invisible'; $string['hidepicture'] = 'Hide picture'; $string['hits'] = 'Hits'; $string['hitsoncourse'] = 'Hits on $a->coursename by $a->username'; diff --git a/lib/db/mysql.php b/lib/db/mysql.php index 30b11289c0..132af2d864 100644 --- a/lib/db/mysql.php +++ b/lib/db/mysql.php @@ -744,14 +744,14 @@ function main_upgrade($oldversion=0) { table_column("event", "", "format", "integer", "4", "unsigned", "0", "not null", "description"); } - if ($oldversion < 2004042703) { - set_config("enablerssfeeds",0); - } - if ($oldversion < 2004042900) { execute_sql(" ALTER TABLE `{$CFG->prefix}course` DROP `showrecent` "); } + if ($oldversion < 2004043001) { /// Change hiddentopics to hiddensections + table_column("course", "hiddentopics", "hiddensections", "integer", "2", "unsigned", "0", "not null"); + } + return $result; } diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql index c779319292..32e6353e2c 100644 --- a/lib/db/mysql.sql +++ b/lib/db/mysql.sql @@ -51,7 +51,7 @@ CREATE TABLE `prefix_course` ( `maxbytes` int(10) unsigned NOT NULL default '0', `showreports` int(4) unsigned NOT NULL default '0', `visible` int(1) unsigned NOT NULL default '1', - `hiddentopics` int(1) unsigned NOT NULL default '0', + `hiddensections` int(2) unsigned NOT NULL default '0', `groupmode` int(4) unsigned NOT NULL default '0', `groupmodeforce` int(4) unsigned NOT NULL default '0', `lang` varchar(10) NOT NULL default '', diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php index 08ea6f0dcc..a49247c5ed 100644 --- a/lib/db/postgres7.php +++ b/lib/db/postgres7.php @@ -482,15 +482,16 @@ function main_upgrade($oldversion=0) { } if ($oldversion < 2004042701) { /// Add hiddentopics field to control hidden topics behaviour - table_column("course", "", "hiddentopics", "integer", "1", "unsigned", "0", "not null", "visible"); + #table_column("course", "", "hiddentopics", "integer", "1", "unsigned", "0", "not null", "visible"); + #See 'hiddensections' further down } if ($oldversion < 2004042702) { /// Add a format field for the description table_column("event", "", "format", "integer", "4", "unsigned", "0", "not null", "description"); } - if ($oldversion < 2004042703) { - set_config("enablerssfeeds",0); + if ($oldversion < 2004043001) { /// Add hiddentopics field to control hidden topics behaviour + table_column("course", "", "hiddensections", "integer", "2", "unsigned", "0", "not null", "visible"); } return $result; diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql index e64899fd3e..15f61a0a28 100644 --- a/lib/db/postgres7.sql +++ b/lib/db/postgres7.sql @@ -29,7 +29,7 @@ CREATE TABLE prefix_course ( maxbytes integer NOT NULL default '0', showreports integer NOT NULL default '0', visible integer NOT NULL default '1', - hiddentopics integer NOT NULL default '0', + hiddensections integer NOT NULL default '0', groupmode integer NOT NULL default '0', groupmodeforce integer NOT NULL default '0', lang varchar(10) NOT NULL default '', diff --git a/version.php b/version.php index 864b32bf7e..7c6e53ace7 100644 --- a/version.php +++ b/version.php @@ -5,7 +5,7 @@ // database to determine whether upgrades should // be performed (see lib/db/*.php) -$version = 2004042900; // The current version is a date (YYYYMMDDXX) +$version = 2004043001; // The current version is a date (YYYYMMDDXX) $release = "1.3 development"; // User-friendly version number