From 76a1cf366ebc9f934ee616c314085eb8e03afe9a Mon Sep 17 00:00:00 2001
From: gustav_delius <gustav_delius>
Date: Wed, 22 Mar 2006 12:19:40 +0000
Subject: [PATCH] Don't name script files after the plugin, makes it more
 difficult to base a new plugin on an old one.

---
 .../calculated/{calculated.html => editquestion.html}     | 0
 question/questiontypes/calculated/editquestion.php        | 8 ++++----
 .../description/{description.html => editquestion.html}   | 0
 question/questiontypes/description/editquestion.php       | 2 +-
 .../questiontypes/essay/{essay.html => editquestion.html} | 0
 question/questiontypes/essay/editquestion.php             | 2 +-
 .../questiontypes/match/{match.html => editquestion.html} | 0
 question/questiontypes/match/editquestion.php             | 2 +-
 .../multianswer/{multianswer.html => editquestion.html}   | 0
 question/questiontypes/multianswer/editquestion.php       | 2 +-
 .../multichoice/{multichoice.html => editquestion.html}   | 0
 question/questiontypes/multichoice/editquestion.php       | 2 +-
 .../numerical/{numerical.html => editquestion.html}       | 0
 question/questiontypes/numerical/editquestion.php         | 2 +-
 .../random/{random.html => editquestion.html}             | 0
 question/questiontypes/random/editquestion.php            | 2 +-
 .../{randomsamatch.html => editquestion.html}             | 0
 question/questiontypes/randomsamatch/editquestion.php     | 2 +-
 .../questiontypes/rqp/{rqp.html => editquestion.html}     | 0
 question/questiontypes/rqp/editquestion.php               | 2 +-
 .../shortanswer/{shortanswer.html => editquestion.html}   | 0
 question/questiontypes/shortanswer/editquestion.php       | 2 +-
 .../truefalse/{truefalse.html => editquestion.html}       | 0
 question/questiontypes/truefalse/editquestion.php         | 2 +-
 24 files changed, 15 insertions(+), 15 deletions(-)
 rename question/questiontypes/calculated/{calculated.html => editquestion.html} (100%)
 rename question/questiontypes/description/{description.html => editquestion.html} (100%)
 rename question/questiontypes/essay/{essay.html => editquestion.html} (100%)
 rename question/questiontypes/match/{match.html => editquestion.html} (100%)
 rename question/questiontypes/multianswer/{multianswer.html => editquestion.html} (100%)
 rename question/questiontypes/multichoice/{multichoice.html => editquestion.html} (100%)
 rename question/questiontypes/numerical/{numerical.html => editquestion.html} (100%)
 rename question/questiontypes/random/{random.html => editquestion.html} (100%)
 rename question/questiontypes/randomsamatch/{randomsamatch.html => editquestion.html} (100%)
 rename question/questiontypes/rqp/{rqp.html => editquestion.html} (100%)
 rename question/questiontypes/shortanswer/{shortanswer.html => editquestion.html} (100%)
 rename question/questiontypes/truefalse/{truefalse.html => editquestion.html} (100%)

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 4f7a145fe6..7e87a8b58e 100644
--- 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 eefbdb51ee..9bd6fc6c4e 100644
--- 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 8434ad7fab..4caa90f3dd 100644
--- 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 8cb31fff3b..b36d324583 100644
--- 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 a0124e6bd6..8856cc5b89 100644
--- 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 a3313c54da..63a0f1e251 100644
--- 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 24debdfd85..ea20ecd373 100644
--- 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 3a0a186ee1..80d2301c51 100644
--- 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 cf5b4d28c8..4a039dce92 100644
--- 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 945b3196b2..dd80d83833 100644
--- 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 23808ecd5d..0c5767804e 100644
--- 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 ee3ca68b3a..81a775c73e 100644
--- 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");
 
 ?>
-- 
2.39.5