Merge branch 'MDL-66874-master' of git://github.com/junpataleta/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2019-10-14 10:05:27 +02:00
commit 70d33bc399
8 changed files with 13 additions and 9 deletions

View File

@ -60,7 +60,9 @@ class checkbox_toggleall implements renderable, templatable {
* <ul>
* <li><b>id </b> string - The element ID.</li>
* <li><b>name </b> string - The element name.</li>
* <li><b>classes </b> string - CSS classes that you want to add for your checkbox.</li>
* <li><b>classes </b> string - CSS classes that you want to add for your checkbox or toggle controls.
* For button type master toggle controls, this could be any Bootstrap 4 btn classes
* that you might want to add. Defaults to "btn-secondary".</li>
* <li><b>value </b> string|int - The element's value.</li>
* <li><b>checked </b> boolean - Whether to render this initially as checked.</li>
* <li><b>label </b> string - The label for the checkbox element.</li>

View File

@ -31,12 +31,12 @@
"togglegroup": "toggle-group",
"label": "Select everything!",
"checked": true,
"classes": "p-1",
"classes": "btn-primary btn-lg",
"selectall": "Select all",
"deselectall": "Deselect all"
}
}}
<button type="button" id="{{id}}" name="{{name}}" class="btn btn-secondary {{classes}}"
<button type="button" id="{{id}}" name="{{name}}" class="btn {{^classes}}btn-secondary{{/classes}}{{#classes}}{{.}}{{/classes}}"
data-action="toggle"
data-toggle="master"
data-togglegroup="{{togglegroup}}"

View File

@ -33,7 +33,8 @@
"checked": true,
"classes": "p-1",
"selectall": "Select all",
"deselectall": "Deselect all"
"deselectall": "Deselect all",
"labelclasses": "badge badge-info"
}
}}
<input id="{{id}}" name="{{name}}" type="checkbox" {{#classes}}class="{{.}}"{{/classes}} value="{{value}}"

View File

@ -31,7 +31,8 @@
"togglegroup": "toggle-group",
"label": "Select me!",
"checked": true,
"classes": "p-1"
"classes": "p-1",
"labelclasses": "badge badge-info"
}
}}
<input id="{{id}}" name="{{name}}" type="checkbox" {{#classes}}class="{{.}}"{{/classes}} value="{{value}}"

View File

@ -297,7 +297,7 @@ class mod_choice_renderer extends plugin_renderer_base {
'name' => $selectallid,
'value' => 1,
'label' => get_string('selectall'),
'classes' => 'mr-1'
'classes' => 'btn-secondary mr-1'
], true);
$actiondata .= $OUTPUT->render($selectallcheckbox);

View File

@ -1444,7 +1444,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
$checkbox = new \core\output\checkbox_toggleall('listview-entries', false, [
'id' => "entry_{$record->id}",
'name' => 'delcheck[]',
'class' => 'recordcheckbox',
'classes' => 'recordcheckbox',
'value' => $record->id,
]);
$replacement[] = $OUTPUT->render($checkbox);

View File

@ -516,7 +516,7 @@ if ($showactivity) {
'name' => $selectallid,
'value' => 1,
'label' => get_string('selectall'),
'classes' => 'mr-1',
'classes' => 'btn-secondary mr-1',
], true);
echo $OUTPUT->render($mastercheckbox);

View File

@ -267,7 +267,7 @@ if (empty($students)) {
$checkbox = new \core\output\checkbox_toggleall('feedback-non-respondents', false, [
'id' => 'messageuser-' . $student->id,
'name' => 'messageuser[]',
'class' => 'mr-1',
'classes' => 'mr-1',
'value' => $student->id,
'label' => get_string('includeuserinrecipientslist', 'mod_feedback', fullname($student)),
'labelclasses' => 'accesshide',