Improve and simplify question layout.

diff --git a/question/type/question.html b/question/type/question.html
index 961b1130d986510cb1ddeced73bd9a6df570c36c..0ca5bbbe58b4916edc5d9a5a7a32c271f15fd686 100644 (file)
--- a/question/type/question.html
+++ b/question/type/question.html
@@ -17,30 +17,30 @@
   </div>
   <div class="content">
     <?php $this->print_question_formulation_and_controls($question, $state, $cmoptions, $options); ?>
-  </div>
-  <div class="grading">
-    <?php $this->print_question_grading_details($question, $state, $cmoptions, $options); ?>
-  </div>
-  <?php if ($comment) { ?>
-    <div class="comment">
-      <?php
-        echo get_string('comment', 'quiz').': ';
-        echo $comment;
-      ?>
-    </div>
-  <?php }
-  echo $commentlink;
-  if ($generalfeedback) { ?>
-    <div class="generalfeedback">
-      <?php echo $generalfeedback ?>
+    <div class="grading">
+      <?php $this->print_question_grading_details($question, $state, $cmoptions, $options); ?>
     </div>
-  <?php }
-  if ($history) { ?>
-    <div class="history">
-      <?php
-        print_string('history', 'quiz');
-        echo $history;
-      ?>
-    </div>
-  <?php } ?>
+    <?php if ($comment) { ?>
+      <div class="comment">
+        <?php
+          echo get_string('comment', 'quiz').': ';
+          echo $comment;
+        ?>
+      </div>
+    <?php }
+    echo $commentlink;
+    if ($generalfeedback) { ?>
+      <div class="generalfeedback">
+        <?php echo $generalfeedback ?>
+      </div>
+    <?php }
+    if ($history) { ?>
+      <div class="history">
+        <?php
+          print_string('history', 'quiz');
+          echo $history;
+        ?>
+      </div>
+    <?php } ?>
+  </div>
 </div>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 0aea8fb7cbfec0dd894ca74166f4c0e4530c1136..4c4c2f31b92ecf6ceda27e80c714287d0d6bac08 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2356,7 +2356,6 @@ body#message-messages {
   width: 5%;
 }
 .que .answer {
-  /* float: right; */
   float: left;
   width: 83%;
   margin-bottom: 0.5em;
@@ -2417,9 +2416,7 @@ body#message-messages {
 .que .commentlink,
 .que .generalfeedback,
 .que .history {
-  float: right;
-  margin: 5px;
-  width: 88%;
+  margin-top: 0.5em;
 }
 
 .importerror {