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

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

Browse Source
This commit is contained in:
Jun Pataleta
2025-02-27 10:22:48 +08:00
parent b20eac7c99 f9d5238ccb
commit 0ad0c882f2
14 changed files with 13743 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.upgradenotes/MDL-80519-2025020702344655.yml
+7
View File
@@ -0,0 +1,7 @@
issueNumber: MDL-80519
notes:
theme_boost:
- message: >-
Added new bs4-compat SCSS file (initially deprecated) to help
third-party plugins the migration process from BS4 to BS5
type: deprecated
admin/tool/analytics/templates/evaluation_options.mustache
+2 -2
View File
@@ -45,12 +45,12 @@
{{#trainedexternally}}
<div class="box mb-4">{{#str}} evaluationmodeinfo, tool_analytics {{/str}}</div>
<div class="form-check custom-radio">
<div class="form-check">
<input class="form-check-input" type="radio" name="evaluationmode" id="id-mode-trainedmodel" value="trainedmodel" checked>
<label class="form-check-label" for="id-mode-trainedmodel">{{#str}} evaluationmodetrainedmodel, tool_analytics {{/str}}</label>
</div>
<div class="form-check custom-radio">
<div class="form-check">
<input class="form-check-input" type="radio" name="evaluationmode" id="id-mode-configuration" value="configuration">
<label class="form-check-label" for="id-mode-configuration">{{#str}} evaluationmodeconfiguration, tool_analytics {{/str}}</label>
</div>
admin/tool/analytics/templates/export_options.mustache
+3 -3
View File
@@ -31,15 +31,15 @@
{
}
}}
<div class="form-check custom-radio">
<div class="form-check">
<input class="form-check-input" type="radio" name="exportoption" id="id-mode-exportdata" value="exportdata">
<label class="form-check-label" for="id-mode-exportdata">{{#str}} exporttrainingdata, tool_analytics {{/str}}</label>
</div>
<div class="form-check custom-radio">
<div class="form-check">
<input class="form-check-input" type="radio" name="exportoption" id="id-mode-exportmodel" value="exportmodel" checked>
<label class="form-check-label" for="id-mode-exportmodel">{{#str}} exportmodel, tool_analytics {{/str}}</label>
</div>
<div class="form-check custom-checkbox ms-5" id="id-includeweights-container">
<div class="form-check ms-5" id="id-includeweights-container">
<input class="form-check-input" type="checkbox" id="id-includeweights" value="1" checked>
<label class="form-check-label" for="id-includeweights">{{#str}} exportincludeweights, tool_analytics {{/str}}</label>
</div>
course/classes/management_renderer.php
+3 -3
View File
@@ -243,7 +243,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$html = html_writer::start_tag('li', $attributes);
$html .= html_writer::start_div('clearfix');
$html .= html_writer::start_div('float-start ' . $checkboxclass);
$html .= html_writer::start_div('form-check custom-checkbox me-1 ');
$html .= html_writer::start_div('form-check me-1 ');
$html .= html_writer::empty_tag('input', $bcatinput);
$labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
$html .= html_writer::tag('label', $labeltext, array(
@@ -624,7 +624,7 @@ class core_course_management_renderer extends plugin_renderer_base {
}
$html .= html_writer::start_div('float-start ' . $checkboxclass);
$html .= html_writer::start_div('form-check custom-checkbox me-1 ');
$html .= html_writer::start_div('form-check me-1 ');
$html .= html_writer::empty_tag('input', $bulkcourseinput);
$labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
$html .= html_writer::tag('label', $labeltext, array(
@@ -1203,7 +1203,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$html .= html_writer::start_div('clearfix');
$html .= html_writer::start_div('float-start');
if ($bulkcourseinput) {
$html .= html_writer::start_div('form-check custom-checkbox me-1');
$html .= html_writer::start_div('form-check me-1');
$html .= html_writer::empty_tag('input', $bulkcourseinput);
$labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
$html .= html_writer::tag('label', $labeltext, array(
course/templates/addresourceoractivitybutton.mustache
+1 -1
View File
@@ -47,7 +47,7 @@
{{^modid}}
<div class="px-1">
{{#pix}} t/add, core {{/pix}}
<span class="activity-add-text pr-1">{{#str}}addresourceoractivity, core{{/str}}</span>
<span class="activity-add-text pe-1">{{#str}}addresourceoractivity, core{{/str}}</span>
</div>
{{/modid}}
{{/hasactionlinks}}
lib/templates/checkbox.mustache
+1 -1
View File
@@ -28,7 +28,7 @@
"label": "Reset options"
}
}}
<div class="form-check custom-checkbox">
<div class="form-check">
<input type="checkbox" name={{{ name }}} class="form-check-input" value={{{ value }}} id="{{{ id }}}" {{#checked}} checked="checked" {{/checked}}>
<label class="form-check-label" for="{{{ id }}}">{{{ label }}}</label>
</div>
message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="p-3 bg-white" data-region="confirm-dialogue" role="alert">
<p class="text-muted" data-region="dialogue-text"></p>
<div class="mb-2 form-check custom-checkbox hidden" data-region="delete-messages-for-all-users-toggle-container">
<div class="mb-2 form-check hidden" data-region="delete-messages-for-all-users-toggle-container">
<input type="checkbox" class="form-check-input" id="delete-messages-for-all-users" data-region="delete-messages-for-all-users-toggle">
<label class="form-check-label text-muted" for="delete-messages-for-all-users">
{{#cleanstr}} deleteforeveryone, core_message {{/cleanstr}}
message/templates/message_drawer_view_settings_body_content.mustache
+1 -1
View File
@@ -42,7 +42,7 @@
<fieldset>
<legend class="visually-hidden">{{#str}} contactableprivacy, message {{/str}}</legend>
{{#privacy}}
<div class="form-check custom-radio mb-2">
<div class="form-check mb-2">
<input
type="radio"
name="message_blocknoncontacts"
payment/templates/gateway.mustache
+1 -1
View File
@@ -41,7 +41,7 @@
}
}}
<div class="form-check custom-radio {{shortname}}">
<div class="form-check {{shortname}}">
<input class="form-check-input" type="radio" name="payby" id="id-payby-{{uniqid}}-{{shortname}}" data-cost="{{cost}}" data-surcharge="{{surcharge}}" value="{{shortname}}" {{#checked}} checked="checked" {{/checked}} />
<label class="form-check-label bg-light border p-3 my-3" for="id-payby-{{uniqid}}-{{shortname}}">
<p class="h3">{{name}}</p>
payment/templates/gateways_placeholder.mustache
+1 -1
View File
@@ -30,7 +30,7 @@
{}
}}
<div class="form-check custom-radio">
<div class="form-check">
<input class="form-check-input" type="radio" disabled />
<label class="form-check-label bg-light border p-3 my-3 w-100">
<div class="bg-pulse-grey mb-2" style="height: 31px; width: 18%"></div>
theme/boost/scss/moodle/bs4-compat.scss
+1009
View File
File diff suppressed because it is too large Load Diff
theme/boost/scss/moodle/deprecated.scss
+3
View File
@@ -46,3 +46,6 @@
@include deprecated-styles();
display: none;
}
// TODO: MDL-84465 Final deprecation in 6.0. Remove this line when the Bootstrap 4 backward compatibility period ends.
@import "bs4-compat";
theme/boost/style/moodle.css
+6355
View File
File diff suppressed because it is too large Load Diff
theme/classic/style/moodle.css
+6355
View File
File diff suppressed because it is too large Load Diff