Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle

moodle · Nov 8, 2017 · 29adfbc · 29adfbc
2 parents 4e73acf + 65c52e0
commit 29adfbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
@@ -840,6 +840,9 @@ public function start_attempt_button($buttontext, moodle_url $url,
 
         $button = new single_button($url, $buttontext);
         $button->class .= ' quizstartbuttondiv';
+        if ($popuprequired) {
+            $button->class .= ' quizsecuremoderequired';
+        }
 
         $popupjsoptions = null;
         if ($popuprequired && $popupoptions) {

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
@@ -360,11 +360,13 @@ table.quizattemptsummary .noreviewmessage {
     font-size: 0.7em;
 }
 
-.quizstartbuttondiv.quizsecuremoderequired input {
+.quizstartbuttondiv.quizsecuremoderequired input,
+.quizstartbuttondiv.quizsecuremoderequired button {
     display: none;
 }
 
-.jsenabled .quizstartbuttondiv.quizsecuremoderequired input {
+.jsenabled .quizstartbuttondiv.quizsecuremoderequired input,
+.jsenabled .quizstartbuttondiv.quizsecuremoderequired button {
     display: inline;
 }