From aa6b85d2b7a62b8f4d119ddff2e91349178178b7 Mon Sep 17 00:00:00 2001 From: Mathew May Date: Tue, 3 Oct 2017 11:05:25 +1300 Subject: [PATCH] MDL-57431 mod_quiz: Quiz editing help icon fix --- mod/quiz/classes/output/edit_renderer.php | 5 +++-- mod/quiz/styles.css | 5 +++++ .../moodle-mod_quiz-toolboxes-debug.js | Bin 42087 -> 42105 bytes .../moodle-mod_quiz-toolboxes-min.js | Bin 14303 -> 14321 bytes .../moodle-mod_quiz-toolboxes.js | Bin 42087 -> 42105 bytes mod/quiz/yui/src/toolboxes/js/toolbox.js | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php index 238a1a81f58..e7383924be3 100644 --- a/mod/quiz/classes/output/edit_renderer.php +++ b/mod/quiz/classes/output/edit_renderer.php @@ -443,11 +443,12 @@ class edit_renderer extends \plugin_renderer_base { $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 index 6e85f990e76..ee746fedfc3 100644 --- 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 index e1af1d1f76a8362c33ed5aa9ec5527de16626e7f..76043c76207cf0ab9e11c82af097bb8c64d83123 100644 GIT binary patch delta 33 pcmaEUg6Zc8rVTC}LJE4t8Kr4yIjOoCsW}C@C7A`AT{x8I008KY49oxk delta 14 Wcmex)g6a7QrVTC}o5MJi=KugV7zRNA 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 index 4bbeaf8ab156dcb44c7b5176b45dc038936607ee..1c832fd3743b80feebd89cb28b5013577f1888ce 100644 GIT binary patch delta 60 zcmcbg|1p1qKdX>}UU5cgT3Sx3ZboWOfo@4=!DfF}aUmWqz0#7*9KGV4{1Uy*MdE4V Qj9ilqWJNZ=)%(N&0HK`~AOHXW delta 34 pcmeyEe?NbNKkMd1R&k-pA4Itsxi+_mr-@H?k`)Fr|LJ|^008NT3|IgF 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 index e1af1d1f76a8362c33ed5aa9ec5527de16626e7f..76043c76207cf0ab9e11c82af097bb8c64d83123 100644 GIT binary patch delta 33 pcmaEUg6Zc8rVTC}LJE4t8Kr4yIjOoCsW}C@C7A`AT{x8I008KY49oxk delta 14 Wcmex)g6a7QrVTC}o5MJi=KugV7zRNA diff --git a/mod/quiz/yui/src/toolboxes/js/toolbox.js b/mod/quiz/yui/src/toolboxes/js/toolbox.js index 5d46deb0989..78c4ae92641 100644 --- 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', -- 2.43.0