From 97ef7ea2cebe05d0c8a99ecfb341eb262608e73a Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 15 Oct 2014 19:02:26 +0100 Subject: [PATCH] MDL-47695 quiz editing: descritions don't have a max mark! So don't show the UI for editing it. Also, don't show non-functional page split/join icons after the quiz has been attempted. --- mod/quiz/classes/output/edit_renderer.php | 14 ++++++++++++-- mod/quiz/styles.css | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php index 33de44b3e30..b045b3122d5 100644 --- a/mod/quiz/classes/output/edit_renderer.php +++ b/mod/quiz/classes/output/edit_renderer.php @@ -380,7 +380,7 @@ class edit_renderer extends \plugin_renderer_base { // Page split/join icon. $joinhtml = ''; - if (!$structure->is_last_slot_in_quiz($question->slot)) { + if ($structure->can_be_edited() && !$structure->is_last_slot_in_quiz($question->slot)) { $joinhtml = $this->page_split_join_button($structure->get_quiz(), $question, !$structure->is_last_slot_on_page($question->slot)); } @@ -759,6 +759,16 @@ class edit_renderer extends \plugin_renderer_base { * @return string HTML to output. */ public function marked_out_of_field($quiz, $question) { + if ($question->length == 0) { + $output = html_writer::span('', + 'instancemaxmark decimalplaces_' . quiz_get_grade_format($quiz)); + + $output .= html_writer::span( + $this->pix_icon('spacer', '', 'moodle', array('class' => 'editicon visibleifjs', 'title' => '')), + 'editing_maxmark'); + return html_writer::span($output, 'instancemaxmarkcontainer infoitem'); + } + $output = html_writer::span(quiz_format_question_grade($quiz, $question->maxmark), 'instancemaxmark decimalplaces_' . quiz_get_grade_format($quiz), array('title' => get_string('maxmark', 'quiz'))); @@ -766,7 +776,7 @@ class edit_renderer extends \plugin_renderer_base { $output .= html_writer::span( html_writer::link( new \moodle_url('#'), - $this->pix_icon('t/editstring', '', 'moodle', array('class' => 'smallicon visibleifjs', 'title' => '')), + $this->pix_icon('t/editstring', '', 'moodle', array('class' => 'editicon visibleifjs', 'title' => '')), array( 'class' => 'editing_maxmark', 'data-action' => 'editmaxmark', diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index 441301b875b..9a00d14dc5a 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -622,6 +622,12 @@ table.quizreviewsummary td.cell { padding: 0.2em; margin: 0.4em; } +#page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer .editicon { + width: 13px; +} +#page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer.infoitem { + background: transparent; +} #page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer form { display: inline; }