Bug #6305 - Quiz settings form field order could be better. Merged from MOODLE_16_STABLE.

diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 9b19f92b86a11b771c7cfbf38a9a6fbc97d9a708..abe9e2323f78a8d2566fff7851dd9bdf58acb404 100644 (file)
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -441,18 +441,6 @@ function output_quiz_options_fields($form, $showfixed) {
     $output = true;
 } ?>
 
-<?php if ($CFG->quiz_fix_popup == $showfixed) { ?>
-    <tr valign="top">
-        <td align="right"><b><?php print_string("popup", "quiz") ?>:</b></td>
-         <td align="left">
-        <?php
-            choose_from_menu($yesnooptions, "popup", "$form->popup", "");
-            helpbutton("popup", get_string("popup","quiz"), "quiz");
-         ?>
-        </td>
-    </tr>
-<?php } else { $hidden = true; } ?>
-
 <?php if ($CFG->quiz_fix_delay1 == $showfixed) { ?>
     <tr valign="top">
         <td align="right"><b><?php print_string("delay1", "quiz") ?>:</b></td>
@@ -477,6 +465,18 @@ function output_quiz_options_fields($form, $showfixed) {
         </tr>
 <?php } else { $hidden = true; } ?>
 
+<?php if ($CFG->quiz_fix_popup == $showfixed) { ?>
+    <tr valign="top">
+        <td align="right"><b><?php print_string("popup", "quiz") ?>:</b></td>
+         <td align="left">
+        <?php
+            choose_from_menu($yesnooptions, "popup", "$form->popup", "");
+            helpbutton("popup", get_string("popup","quiz"), "quiz");
+         ?>
+        </td>
+    </tr>
+<?php } else { $hidden = true; } ?>
+
 <?php if ($CFG->quiz_fix_password == $showfixed) { ?>
     <tr valign="top">
         <td align="right"><b><?php print_string("requirepassword", "quiz") ?>:</b></td>