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

David Monllao · David Monllao · commit 29adfbc3c80a · 2017-11-08T15:56:25.000+01:00
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -360,11 +360,13 @@ table.quizattemptsummary .noreviewmessage {`
`360`	`360`	`font-size: 0.7em;`
`361`	`361`	`}`
`362`	`362`
`363`		`-.quizstartbuttondiv.quizsecuremoderequired input {`
	`363`	`+.quizstartbuttondiv.quizsecuremoderequired input,`
	`364`	`+.quizstartbuttondiv.quizsecuremoderequired button {`
`364`	`365`	`display: none;`
`365`	`366`	`}`
`366`	`367`
`367`		`-.jsenabled .quizstartbuttondiv.quizsecuremoderequired input {`
	`368`	`+.jsenabled .quizstartbuttondiv.quizsecuremoderequired input,`
	`369`	`+.jsenabled .quizstartbuttondiv.quizsecuremoderequired button {`
`368`	`370`	`display: inline;`
`369`	`371`	`}`
`370`	`372`