L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-84772-main' of https://github.com/roland04/moodle into main

Browse Source
This commit is contained in:
Paul Holden
2025-03-20 17:16:28 +00:00
parent bb411f2ac7 887753e821
commit 7abacc344e
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/templates/datafilter/filter_match.mustache
+1 -1
View File
@@ -40,7 +40,7 @@
}
}}
<div data-filterregion="filtermatch" class="hidden">
<div data-filterregion="filtermatch" class="hidden hstack gap-2">
<label for="core-filter-jointype-{{uniqid}}" class="my-0" aria-hidden="true">
{{#str}}match{{/str}}
</label>
lib/templates/datafilter/filter_row.mustache
+4 -4
View File
@@ -36,10 +36,10 @@
<div data-filterregion="filter" data-filter-type="">
<fieldset>
<legend class="visually-hidden">{{#str}}filterrowlegend, core, {{rownumber}}{{/str}}</legend>
<div class="border-radius my-2 p-2 bg-white border d-flex flex-wrap flex-column flex-md-row align-items-md-stretch mx-0">
<div class="border-radius my-2 p-2 bg-white border d-flex flex-wrap flex-column flex-md-row align-items-md-center gap-2 mx-0">
<div class="d-flex flex-column flex-md-row align-items-md-center my-1">
<label for="core-filter_row-jointype-{{uniqid}}" class="me-md-2 mb-md-0">{{#str}}match{{/str}}</label>
<select class="form-select mb-1 mb-md-0 me-md-2" data-filterfield="join" id="core-filter_row-jointype-{{uniqid}}">
<select class="form-select" data-filterfield="join" id="core-filter_row-jointype-{{uniqid}}">
<option value="0">{{#str}}none{{/str}}</option>
<option selected=selected value="1">{{#str}}any{{/str}}</option>
<option value="2">{{#str}}all{{/str}}</option>
@@ -47,14 +47,14 @@
</div>
<label class="visually-hidden pt-2 my-1" for="core-filter_row-filtertype-{{uniqid}}">{{#str}}filtertype{{/str}}</label>
<select class="form-select my-1 mb-md-0 me-md-2" data-filterfield="type" id="core-filter_row-filtertype-{{uniqid}}">
<select class="form-select" data-filterfield="type" id="core-filter_row-filtertype-{{uniqid}}">
<option value="">{{#str}}selectfiltertype{{/str}}</option>
{{#filtertypes}}
<option value="{{name}}">{{title}}</option>
{{/filtertypes}}
</select>
<div data-filterregion="value" class="d-md-block flex-column align-items-start flex-lg-row my-1"></div>
<div data-filterregion="value" class="d-flex flex-column flex-md-row align-items-md-center gap-2"></div>
<button data-filteraction="remove" class="ms-auto icon-no-margin icon-size-4 btn text-reset" aria-label="{{#str}}clearfilterrow{{/str}}">
{{#pix}}e/cancel_solid_circle{{/pix}}
lib/templates/datafilter/filtertypes/datetime_mode.mustache
+1 -1
View File
@@ -55,7 +55,7 @@
id="core-filter_row-{{filtertype}}-mode-{{uniqid}}"
name="{{filtertype}}-mode"
data-filterfield="{{filtertype}}-mode"
class="custom-select mr-2 mt-1"
class="form-select"
>
{{#modeoptions}}
<option value="{{value}}" {{selected}}>{{label}}</option>
lib/templates/datafilter/filtertypes/datetime_selector.mustache
+2 -2
View File
@@ -45,7 +45,7 @@
<input
id="core-filter_row-{{filtertype}}-after-{{uniqid}}"
type="datetime-local"
class="custom-select"
class="form-control"
name="{{filtertype}}[0]"
value="{{aftervalue}}"
data-filterfield="{{filtertype}}1"
@@ -61,7 +61,7 @@
<input
id="core-filter_row-{{filtertype}}-before-{{uniqid}}"
type="datetime-local"
class="custom-select"
class="form-control"
name="{{filtertype}}[1]"
value="{{beforevalue}}"
data-filterfield="{{filtertype}}2"
question/bank/editquestion/templates/add_new_question.mustache
+1 -1
View File
@@ -28,7 +28,7 @@
]
}
}}
<div class="createnewquestion mb-1">
<div class="createnewquestion">
{{^canadd}}
{{#str}} nopermissionadd, question{{/str}}
{{/canadd}}
question/templates/question_bank_controls.mustache
+2 -2
View File
@@ -27,6 +27,6 @@
"controls": "<div><button class=\"btn btn-secondary\">Control 1</button><button class=\"btn btn-secondary\">Control 2</button></div>"
}
}}
<div class="d-grid gap-2 d-md-flex justify-content-start mb-2">
<div class="d-flex flex-wrap flex-column flex-md-row align-items-md-center gap-2 mb-2">
{{{controls}}}
</div>
</div>