quiz: MDL-19786 - Un-break the quiz edit page following the OUTPUT changes.

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index f52bb095e06f772e9fd9b3d862339376fa5ed966..4d8f114786450c86bbbb44fc656046e03e4c1a53 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -475,12 +475,21 @@ if ($quiz_qbanktool) {
     $bankclass = '';
     $quizcontentsclass = '';
 } else {
-    $bankclass = 'collapsed';
+    $bankclass = 'collapsed ';
     $quizcontentsclass = 'quizwhenbankcollapsed';
 }
 
-// Nasty short-term hack, becuase I am getting rid of separate print_side_block_start/end functions.
-ob_start();
+echo '<div class="questionbankwindow ' . $bankclass . 'sideblock">';
+echo '<div class="header"><div class="title"><h2>';
+echo get_string('questionbankcontents', 'quiz') .
+        ' <a href="' . $thispageurl->out(false, array('qbanktool' => '1')) .
+       '" id="showbankcmd">[' . get_string('show').
+       ']</a>
+       <a href="' . $thispageurl->out(false, array('qbanktool' => '0')) .
+       '" id="hidebankcmd">[' . get_string('hide').
+       ']</a>';
+echo '</h2></div></div><div class="content">';
+
 echo '<span id="questionbank"></span>';
 echo '<div class="container">';
 echo '<div id="module" class="module">';
@@ -494,17 +503,8 @@ $questionbank->display('editq',
 echo '</div>';
 echo '</div>';
 echo '</div>';
-$qbhtml = ob_get_contents();
-ob_end_clean();
 
-print_side_block(get_string('questionbankcontents', 'quiz') .
-        ' <a href="' . $thispageurl->out(false, array('qbanktool' => '1')) .
-       '" id="showbankcmd">[' . get_string('show').
-       ']</a>
-       <a href="' . $thispageurl->out(false, array('qbanktool' => '0')) .
-       '" id="hidebankcmd">[' . get_string('hide').
-       ']</a>
-       ', $qbhtml, null, null, '', array('class' => 'questionbankwindow ' . $bankclass));
+echo '</div></div>';
 
 echo '<div class="quizcontents ' . $quizcontentsclass . '" id="quizcontentsblock">';
 if ($quiz->shufflequestions) {

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 3b132214d3bb5ce1138984cc5e39ca48f113c466..886efde2d1ed94ea650c10e38d814d40fe424f68 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -3210,6 +3210,7 @@ body.notes .notesgroup {
 
 #qtypechoicecontainer {
   display: none;
+  background: white;
 }
 body.jsenabled #qtypechoicecontainer {
   display: block;