Commit 1da2cf3b authored by Dan Poltawski's avatar Dan Poltawski
Browse files

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

parents cb151980 a5112298
......@@ -228,7 +228,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
$remarkparams = array(
'name' => '{NAME}[criteria][{CRITERION-id}][remark]',
'id' => $remarkid,
'cols' => '65', 'rows' => '5', 'class' => 'markingguideremark',
'cols' => '65', 'rows' => '5', 'class' => 'markingguideremark form-control',
'aria-labelledby' => '{NAME}-remarklabel{CRITERION-id}'
);
......@@ -239,7 +239,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
if (!empty($comments)) {
// Frequently used comments chooser.
$chooserbuttonid = 'criteria-' . $criterion['id'] . '-commentchooser';
$commentchooserparams = array('id' => $chooserbuttonid, 'class' => 'commentchooser');
$commentchooserparams = array('id' => $chooserbuttonid, 'class' => 'commentchooser btn btn-secondary');
$commentchooser = html_writer::tag('button', get_string('insertcomment', 'gradingform_guide'),
$commentchooserparams);
......@@ -273,7 +273,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
$scoreinputparams = array(
'type' => 'text',
'name' => '{NAME}[criteria][{CRITERION-id}][score]',
'class' => $scoreclass,
'class' => $scoreclass . ' form-control',
'id' => '{NAME}-criteria-{CRITERION-id}-score',
'size' => '3',
'value' => $currentscore,
......@@ -534,7 +534,7 @@ class gradingform_guide_renderer extends plugin_renderer_base {
}
$html = html_writer::start_tag('div', array('class' => 'options'));
$html .= html_writer::tag('div', get_string('guideoptions', 'gradingform_guide'), array('class' => 'optionsheading'));
$attrs = array('type' => 'hidden', 'name' => '{NAME}[options][optionsset]', 'value' => 1);
$attrs = array('type' => 'hidden', 'name' => '{NAME}[options][optionsset]', 'value' => 1, 'class' => 'form-control');
$html .= html_writer::empty_tag('input', $attrs);
foreach ($options as $option => $value) {
$html .= html_writer::start_tag('div', array('class' => 'option '.$option));
......
......@@ -593,6 +593,20 @@ $popout-header-height: 4rem;
padding: 0;
}
.path-mod-assign [data-region="grade-panel"] .gradingform_guide .remark .commentchooser {
float: none;
}
.path-mod-assign [data-region="grade-panel"] .gradingform_guide .markingguideremark {
width: 100%;
}
.path-mod-assign [data-region="grade-panel"] .mform .fitem .felement[data-fieldtype="grading"] {
padding-left: $spacer;
padding-right: $spacer;
}
.path-mod-assign [data-region="grade-panel"] .showmarkerdesc,
.path-mod-assign [data-region="grade-panel"] .showstudentdesc {
background-color: $card-bg;
}
/**
* Mod LTI.
......
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template gradingform_guide/comment_chooser
Moodle comment chooser template for marking guide.
The purpose of this template is to render a list of frequently used comments that can be used by the comment chooser dialog.
Classes required for JS:
* none
Data attributes required for JS:
* none
Context variables required for this template:
* criterionId The criterion ID this chooser template is being generated for.
* comments Array of id / description pairs.
Example context (json):
{
"criterionId": "1",
"comments": [
{
"id": "1",
"description": "Test comment description 1"
},
{
"id": "2",
"description": "Test comment description 2"
}
]
}
}}
<div class="gradingform_guide_comment_chooser" id="comment_chooser">
<div class="list-group">
{{#comments}}
<button class="list-group-item list-group-item-action" id="comment-option-{{criterionId}}-{{id}}" tabindex="0">
{{description}}
</button>
{{/comments}}
</div>
</div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment