Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle

moodle · Dec 18, 2017 · 2d08e65 · 2d08e65
2 parents e95db34 + aa6b85d
commit 2d08e65
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php
@@ -443,11 +443,12 @@ public function section_shuffle_questions(structure $structure, $section) {
             $help = '';
         }
 
+        $helpspan = html_writer::span($help, 'shuffle-help-tip');
         $progressspan = html_writer::span('', 'shuffle-progress');
         $checkbox = html_writer::empty_tag('input', $checkboxattributes);
-        $label = html_writer::label(get_string('shufflequestions', 'quiz') . ' ' . $help,
+        $label = html_writer::label(get_string('shufflequestions', 'quiz'),
                 $checkboxattributes['id'], false);
-        return html_writer::span($progressspan . $checkbox . $label,
+        return html_writer::span($progressspan . $checkbox . $label. ' ' . $helpspan,
                 'instanceshufflequestions', array('data-action' => 'shuffle_questions'));
     }
 

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
@@ -739,6 +739,11 @@ table.quizreviewsummary td.cell {
     margin: 0.3em 20px 0 0;
 }
 
+.instanceshufflequestions [type="checkbox"] {
+    vertical-align: middle;
+    margin-right: .5rem;
+}
+
 #page-mod-quiz-edit ul.section {
     margin: 0;
     padding: 0 20px;

diff --git a/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes-debug.js b/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes-debug.js
@@ -52,7 +52,7 @@ var CSS = {
         EDITSECTION: 'a.editing_section',
         EDITSECTIONICON: 'a.editing_section .icon',
         EDITSHUFFLEQUESTIONSACTION: 'input.cm-edit-action[data-action]',
-        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress',
+        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress .shuffle-help-tip',
         HIDE: 'a.editing_hide',
         HIGHLIGHT: 'a.editing_highlight',
         INSTANCENAME: 'span.instancename',

diff --git a/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes-min.js b/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes-min.js
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes.js b/mod/quiz/yui/build/moodle-mod_quiz-toolboxes/moodle-mod_quiz-toolboxes.js
@@ -52,7 +52,7 @@ var CSS = {
         EDITSECTION: 'a.editing_section',
         EDITSECTIONICON: 'a.editing_section .icon',
         EDITSHUFFLEQUESTIONSACTION: 'input.cm-edit-action[data-action]',
-        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress',
+        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress .shuffle-help-tip',
         HIDE: 'a.editing_hide',
         HIGHLIGHT: 'a.editing_highlight',
         INSTANCENAME: 'span.instancename',

diff --git a/mod/quiz/yui/src/toolboxes/js/toolbox.js b/mod/quiz/yui/src/toolboxes/js/toolbox.js
@@ -50,7 +50,7 @@ var CSS = {
         EDITSECTION: 'a.editing_section',
         EDITSECTIONICON: 'a.editing_section .icon',
         EDITSHUFFLEQUESTIONSACTION: 'input.cm-edit-action[data-action]',
-        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress',
+        EDITSHUFFLEAREA: '.instanceshufflequestions .shuffle-progress .shuffle-help-tip',
         HIDE: 'a.editing_hide',
         HIGHLIGHT: 'a.editing_highlight',
         INSTANCENAME: 'span.instancename',