MDL-14467 - qtype_multichoice help file in the wrong place - merged from 1.8/1.9...

In addition, move the other multichoice help file to the correct location, and update all references.

diff --git a/lang/en_utf8/help/qtype_multichoice/multichoice.html b/lang/en_utf8/help/qtype_multichoice/multichoice.html
new file mode 100644 (file)
index 0000000..4167638
--- /dev/null
+++ b/lang/en_utf8/help/qtype_multichoice/multichoice.html
@@ -0,0 +1,19 @@
+<h1>Multiple Choice questions</h1>
+
+<p>In response to a question (that may include a image) the respondent 
+   chooses from multiple answers. There are two types of multiple choice 
+   questions - single answer and multiple answer.</p>
+
+<p>Single-answer questions allow one and only one answer to be chosen.
+   Generally all the grades for such a question should be positive.</p>
+
+<p>Multiple-answer questions allow one or more answers to be chosen - each answer 
+   may carry a positive or negative grade, so that choosing ALL the options 
+   will not necessarily result in good grade.  If the total grade is negative 
+   then the total grade for this question will be zero.  Careful, it is 
+   possible to create questions that have scores greater than 100%.</p>
+
+<p>Finally, each answer (right or wrong) should include feedback - this feedback
+   will be shown to the respondent next to each of their answers (if the quiz 
+   itself is configured to show feedback).
+</p>

diff --git a/lang/en_utf8/help/qtype_multichoice/multichoiceshuffle.html b/lang/en_utf8/help/qtype_multichoice/multichoiceshuffle.html
new file mode 100644 (file)
index 0000000..83922bb
--- /dev/null
+++ b/lang/en_utf8/help/qtype_multichoice/multichoiceshuffle.html
@@ -0,0 +1,9 @@
+<h1>Shuffle answers</h1>
+
+<p>If you set this option to &quot;Yes&quot;, then the order of the answers
+ is randomly shuffled each time a student starts an attempt at a quiz
+ containing this question - provided that &quot;Shuffle within questions&quot; in
+ the Quiz settings is set to &quot;Yes&quot;.</p>
+
+<p>The intention is simply to make it a little harder for students 
+   to copy from each other.</p>
\ No newline at end of file

diff --git a/lang/en_utf8/help/quiz/index.html b/lang/en_utf8/help/quiz/index.html
index 975ac0faa66d6740863377e65932c712a8e2e776..366c48822e25a6c97c29fdac6a986f6566888806 100644 (file)
--- a/lang/en_utf8/help/quiz/index.html
+++ b/lang/en_utf8/help/quiz/index.html
@@ -30,8 +30,8 @@
   <li><a href="help.php?module=quiz&amp;file=matchgrades.html">Match Grades</a></li>
   <li><a href="help.php?module=quiz&amp;file=matchshuffle.html">Shuffle</a></li>
   <li><a href="help.php?module=quiz&amp;file=maxgrade.html">Maximum grade</a></li>
-  <li><a href="help.php?module=quiz&amp;file=multichoice.html">Multiple choice questions</a></li>
-  <li><a href="help.php?module=quiz&amp;file=multichoiceshuffle.html">Shuffle answers (Multiple choice)</a></li>
+  <li><a href="help.php?module=qtype_multichoice&amp;file=multichoice.html">Multiple choice questions</a></li>
+  <li><a href="help.php?module=qtype_multichoice&amp;file=multichoiceshuffle.html">Shuffle answers (Multiple choice)</a></li>
   <li><a href="help.php?module=quiz&amp;file=numerical.html">Numerical questions</a></li>
   <li><a href="help.php?module=quiz&amp;file=timeopen.html">Opening and closing the quiz</a></li>
   <li><a href="help.php?module=quiz&amp;file=overallfeedback.html">Overall Feedback</a></li>

diff --git a/lang/en_utf8/help/quiz/multichoice.html b/lang/en_utf8/help/quiz/multichoice.html
index 4167638e6c6d2e5d82890f116e8fabd30d34753e..fbc95a1c4154edd13a88d7135703416a0bd70789 100644 (file)
--- a/lang/en_utf8/help/quiz/multichoice.html
+++ b/lang/en_utf8/help/quiz/multichoice.html
@@ -1,3 +1,5 @@
+<!-- This file should now be deleted. It has been moved from the quiz folder to the 
+qtype_multichoice folder. However, it remains here for backward compatibility reasons. -->
 <h1>Multiple Choice questions</h1>
 
 <p>In response to a question (that may include a image) the respondent 

diff --git a/lang/en_utf8/help/quiz/multichoiceshuffle.html b/lang/en_utf8/help/quiz/multichoiceshuffle.html
index 83922bb43b6cb8a4d54196dd2dbdf4d77192abb2..bde0ff7da93c0c3b83a4da84712edf975c55d1a0 100644 (file)
--- a/lang/en_utf8/help/quiz/multichoiceshuffle.html
+++ b/lang/en_utf8/help/quiz/multichoiceshuffle.html
@@ -1,3 +1,5 @@
+<!-- This file should now be deleted. It has been moved from the quiz folder to the 
+qtype_multichoice folder. However, it remains here for backward compatibility reasons. -->
 <h1>Shuffle answers</h1>
 
 <p>If you set this option to &quot;Yes&quot;, then the order of the answers

diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php
index 1ead8d8f414059ddeb71bc654beaf0ad3de8231c..a9feae700ad88142110e98c2d113d6e22a574818 100644 (file)
--- a/question/type/multichoice/edit_multichoice_form.php
+++ b/question/type/multichoice/edit_multichoice_form.php
@@ -26,7 +26,7 @@ class question_edit_multichoice_form extends question_edit_form {
         $mform->setDefault('single', 1);
 
         $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleanswers', 'qtype_multichoice'), null, null, array(0,1));
-        $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'quiz'));
+        $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'qtype_multichoice'));
         $mform->setDefault('shuffleanswers', 1);
 
         $numberingoptions = $QTYPES[$this->qtype()]->get_numbering_styles();