Don't name script files after the plugin, makes it more difficult to base a new plugi...

diff --git a/question/questiontypes/calculated/calculated.html b/question/questiontypes/calculated/editquestion.html
similarity index 100%
rename from question/questiontypes/calculated/calculated.html
rename to question/questiontypes/calculated/editquestion.html

diff --git a/question/questiontypes/calculated/editquestion.php b/question/questiontypes/calculated/editquestion.php
index 4f7a145fe67879c25145ca6ec02b54021bea51cf..7e87a8b58e49353e2adeffd1b8c876fe9ac08b58 100644 (file)
--- a/question/questiontypes/calculated/editquestion.php
+++ b/question/questiontypes/calculated/editquestion.php
@@ -4,9 +4,9 @@
 $qtypeobj = $QTYPES[CALCULATED];
 
 if (empty($form)) {
-/*********************************************************/
-/***** First page in question wizard - calculated.html! **/
-/*********************************************************/
+/****************************************************************/
+/***** First page in question wizard - editquestion.html.html! **/
+/****************************************************************/
 // Inside this block everything works as for non-wizardquestions
 
     // The layout of the editing page will only support
@@ -83,7 +83,7 @@ if (empty($form)) {
         }
     }
     print_heading_with_help(get_string("editingcalculated", "quiz"), "calculated", "quiz");
-    require("$CFG->dirroot/question/questiontypes/calculated/calculated.html");
+    require("$CFG->dirroot/question/questiontypes/calculated/editquestion.html");
 } else { // $form is not empty
     /*********************************************************/
     /*****    Any subsequent page of the question wizard    **/

diff --git a/question/questiontypes/description/description.html b/question/questiontypes/description/editquestion.html
similarity index 100%
rename from question/questiontypes/description/description.html
rename to question/questiontypes/description/editquestion.html

diff --git a/question/questiontypes/description/editquestion.php b/question/questiontypes/description/editquestion.php
index eefbdb51ee1ea2f833f4dc3b58cbff3ace889779..9bd6fc6c4edb91b513c67b45de76ba8e61eb309c 100644 (file)
--- a/question/questiontypes/description/editquestion.php
+++ b/question/questiontypes/description/editquestion.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingdescription", "quiz"), "description", "quiz");
-    require("$CFG->dirroot/question/questiontypes/description/description.html");
+    require("$CFG->dirroot/question/questiontypes/description/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/essay/essay.html b/question/questiontypes/essay/editquestion.html
similarity index 100%
rename from question/questiontypes/essay/essay.html
rename to question/questiontypes/essay/editquestion.html

diff --git a/question/questiontypes/essay/editquestion.php b/question/questiontypes/essay/editquestion.php
index 8434ad7fab4d47b37d4116d2b9fe76d5f34cc337..4caa90f3dd6001d0fb700e8633869196998b66f7 100644 (file)
--- a/question/questiontypes/essay/editquestion.php
+++ b/question/questiontypes/essay/editquestion.php
@@ -11,6 +11,6 @@
     }
 
     print_heading_with_help(get_string("editingessay", "quiz"), "essay", "quiz");
-    require("$CFG->dirroot/question/questiontypes/essay/essay.html");
+    require("$CFG->dirroot/question/questiontypes/essay/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/match/match.html b/question/questiontypes/match/editquestion.html
similarity index 100%
rename from question/questiontypes/match/match.html
rename to question/questiontypes/match/editquestion.html

diff --git a/question/questiontypes/match/editquestion.php b/question/questiontypes/match/editquestion.php
index 8cb31fff3be6aa0580d29790bbba8aaf91b216cb..b36d3245830e3131268dde994690153869591792 100644 (file)
--- a/question/questiontypes/match/editquestion.php
+++ b/question/questiontypes/match/editquestion.php
@@ -32,6 +32,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmatch", "quiz"), "match", "quiz");
-    require("$CFG->dirroot/question/questiontypes/match/match.html");
+    require("$CFG->dirroot/question/questiontypes/match/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/multianswer/multianswer.html b/question/questiontypes/multianswer/editquestion.html
similarity index 100%
rename from question/questiontypes/multianswer/multianswer.html
rename to question/questiontypes/multianswer/editquestion.html

diff --git a/question/questiontypes/multianswer/editquestion.php b/question/questiontypes/multianswer/editquestion.php
index a0124e6bd6ddf67ed506d76cfa5f1821e5fc0e78..8856cc5b89f0b7b5eee58f2fd5781c93a7e517e3 100644 (file)
--- a/question/questiontypes/multianswer/editquestion.php
+++ b/question/questiontypes/multianswer/editquestion.php
@@ -49,6 +49,6 @@
     }
     print_heading_with_help(get_string('editingmultianswer', 'quiz'),
                                        'multianswer', 'quiz');
-    require("$CFG->dirroot/question/questiontypes/multianswer/multianswer.html");
+    require("$CFG->dirroot/question/questiontypes/multianswer/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/multichoice/multichoice.html b/question/questiontypes/multichoice/editquestion.html
similarity index 100%
rename from question/questiontypes/multichoice/multichoice.html
rename to question/questiontypes/multichoice/editquestion.html

diff --git a/question/questiontypes/multichoice/editquestion.php b/question/questiontypes/multichoice/editquestion.php
index a3313c54da00b84002ca8f2e0b83f4ff4f96e10e..63a0f1e25181b78bdfa8973548a4efd39a66f475 100644 (file)
--- a/question/questiontypes/multichoice/editquestion.php
+++ b/question/questiontypes/multichoice/editquestion.php
@@ -30,6 +30,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmultichoice", "quiz"), "multichoice", "quiz");
-    require("$CFG->dirroot/question/questiontypes/multichoice/multichoice.html");
+    require("$CFG->dirroot/question/questiontypes/multichoice/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/numerical/numerical.html b/question/questiontypes/numerical/editquestion.html
similarity index 100%
rename from question/questiontypes/numerical/numerical.html
rename to question/questiontypes/numerical/editquestion.html

diff --git a/question/questiontypes/numerical/editquestion.php b/question/questiontypes/numerical/editquestion.php
index 24debdfd85a6637c94f514d88a12b58ccb78631b..ea20ecd3731faf2a0502e96f7c6403b5527d6df4 100644 (file)
--- a/question/questiontypes/numerical/editquestion.php
+++ b/question/questiontypes/numerical/editquestion.php
@@ -22,6 +22,6 @@
     }
 
     print_heading_with_help(get_string("editingnumerical", "quiz"), "numerical", "quiz");
-    require("$CFG->dirroot/question/questiontypes/numerical/numerical.html");
+    require("$CFG->dirroot/question/questiontypes/numerical/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/random/random.html b/question/questiontypes/random/editquestion.html
similarity index 100%
rename from question/questiontypes/random/random.html
rename to question/questiontypes/random/editquestion.html

diff --git a/question/questiontypes/random/editquestion.php b/question/questiontypes/random/editquestion.php
index 3a0a186ee19bae02a57012a54b8c6f721b7483f9..80d2301c5168862fa01a8ac278fa2301cdf616cc 100644 (file)
--- a/question/questiontypes/random/editquestion.php
+++ b/question/questiontypes/random/editquestion.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingrandom", "quiz"), "random", "quiz");
-    require("$CFG->dirroot/question/questiontypes/random/random.html");
+    require("$CFG->dirroot/question/questiontypes/random/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/randomsamatch/randomsamatch.html b/question/questiontypes/randomsamatch/editquestion.html
similarity index 100%
rename from question/questiontypes/randomsamatch/randomsamatch.html
rename to question/questiontypes/randomsamatch/editquestion.html

diff --git a/question/questiontypes/randomsamatch/editquestion.php b/question/questiontypes/randomsamatch/editquestion.php
index cf5b4d28c8a5bdb4c67e71cfc92bc1c797965e5e..4a039dce92bee8817d10b582db0649e03f385a7f 100644 (file)
--- a/question/questiontypes/randomsamatch/editquestion.php
+++ b/question/questiontypes/randomsamatch/editquestion.php
@@ -14,6 +14,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingrandomsamatch", "quiz"), "randomsamatch", "quiz");
-    require("$CFG->dirroot/question/questiontypes/randomsamatch/randomsamatch.html");
+    require("$CFG->dirroot/question/questiontypes/randomsamatch/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/rqp/rqp.html b/question/questiontypes/rqp/editquestion.html
similarity index 100%
rename from question/questiontypes/rqp/rqp.html
rename to question/questiontypes/rqp/editquestion.html

diff --git a/question/questiontypes/rqp/editquestion.php b/question/questiontypes/rqp/editquestion.php
index 945b3196b2e48bb2834c233b6df5a715b2a56480..dd80d83833708c7d5506ddb5cad3cfa1d74515f3 100644 (file)
--- a/question/questiontypes/rqp/editquestion.php
+++ b/question/questiontypes/rqp/editquestion.php
@@ -19,6 +19,6 @@
     }
 
     print_heading_with_help(get_string('editingrqp', 'quiz', $type->name), 'rqp', 'quiz');
-    require('rqp.html');
+    require('editquestion.html');
 
 ?>

diff --git a/question/questiontypes/shortanswer/shortanswer.html b/question/questiontypes/shortanswer/editquestion.html
similarity index 100%
rename from question/questiontypes/shortanswer/shortanswer.html
rename to question/questiontypes/shortanswer/editquestion.html

diff --git a/question/questiontypes/shortanswer/editquestion.php b/question/questiontypes/shortanswer/editquestion.php
index 23808ecd5d9eeaaeabbc32195274d7fe4ee8db38..0c5767804e55378a51f2a3a3b61168f5c6f4be90 100644 (file)
--- a/question/questiontypes/shortanswer/editquestion.php
+++ b/question/questiontypes/shortanswer/editquestion.php
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingshortanswer", "quiz"), "shortanswer", "quiz");
-    require("$CFG->dirroot/question/questiontypes/shortanswer/shortanswer.html");
+    require("$CFG->dirroot/question/questiontypes/shortanswer/editquestion.html");
 
 ?>

diff --git a/question/questiontypes/truefalse/truefalse.html b/question/questiontypes/truefalse/editquestion.html
similarity index 100%
rename from question/questiontypes/truefalse/truefalse.html
rename to question/questiontypes/truefalse/editquestion.html

diff --git a/question/questiontypes/truefalse/editquestion.php b/question/questiontypes/truefalse/editquestion.php
index ee3ca68b3ad1fe9f560d8358433afad36f2339e6..81a775c73ee163376bc08ea95d156200e3d21997 100644 (file)
--- a/question/questiontypes/truefalse/editquestion.php
+++ b/question/questiontypes/truefalse/editquestion.php
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingtruefalse", "quiz"), "truefalse", "quiz");
-    require("$CFG->dirroot/question/questiontypes/truefalse/truefalse.html");
+    require("$CFG->dirroot/question/questiontypes/truefalse/editquestion.html");
 
 ?>