Merge branch 'MDL-68772-master' of https://github.com/Clyxz/moodle

This commit is contained in:
Sara Arjona 2020-06-03 13:17:32 +02:00
commit 7e05ece1b3
2 changed files with 13 additions and 18 deletions

View File

@ -64,15 +64,24 @@ class edit_renderer extends \plugin_renderer_base {
$output .= $this->quiz_state_warnings($structure);
$output .= html_writer::start_div('mod_quiz-edit-top-controls');
$output .= $this->quiz_information($structure);
$output .= $this->maximum_grade_input($structure, $pageurl);
$output .= html_writer::start_div('d-flex justify-content-between flex-wrap mb-1');
$output .= html_writer::start_div('d-flex flex-column justify-content-around');
$output .= $this->quiz_information($structure);
$output .= html_writer::end_tag('div');
$output .= $this->maximum_grade_input($structure, $pageurl);
$output .= html_writer::end_tag('div');
$output .= html_writer::start_div('d-flex justify-content-between flex-wrap mb-1');
$output .= html_writer::start_div('mod_quiz-edit-action-buttons btn-group edit-toolbar', ['role' => 'group']);
$output .= $this->repaginate_button($structure, $pageurl);
$output .= $this->selectmultiple_button($structure);
$output .= html_writer::end_tag('div');
$output .= html_writer::start_div('d-flex flex-column justify-content-around');
$output .= $this->total_marks($quizobj->get_quiz());
$output .= html_writer::end_tag('div');
$output .= html_writer::end_tag('div');
$output .= $this->selectmultiple_controls($structure);
$output .= html_writer::end_tag('div');
@ -204,7 +213,7 @@ class edit_renderer extends \plugin_renderer_base {
'name' => 'repaginate',
'id' => 'repaginatecommand',
'value' => get_string('repaginatecommand', 'quiz'),
'class' => 'btn btn-secondary mb-1',
'class' => 'btn btn-secondary',
'data-header' => $header,
'data-form' => $form,
);
@ -229,7 +238,7 @@ class edit_renderer extends \plugin_renderer_base {
'name' => 'selectmultiple',
'id' => 'selectmultiplecommand',
'value' => get_string('selectmultipleitems', 'quiz'),
'class' => 'btn btn-secondary mb-1'
'class' => 'btn btn-secondary'
);
if (!$structure->can_be_edited()) {
$buttonoptions['disabled'] = 'disabled';

View File

@ -617,10 +617,6 @@ table.quizreviewsummary td.cell {
}
/** Mod quiz edit **/
#page-mod-quiz-edit .statusbar {
margin: 0.6em 0.4em;
}
#page-mod-quiz-edit .statusdisplay {
background-color: #ffc;
clear: both;
@ -640,16 +636,6 @@ table.quizreviewsummary td.cell {
min-height: 2.85em;
}
@media (min-width: 576px) {
#page-mod-quiz-edit .maxgrade,
#page-mod-quiz-edit .totalpoints {
position: absolute;
right: 0;
margin: -2.85em 0 0;
padding: .2em;
}
}
@media (max-width: 576px) {
#page-mod-quiz-edit .maxgrade {
margin-bottom: 0.6em;