mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-62550-master-2' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2019-01-09 15:09:00 +08:00
commit 8cd02f0c51
7 changed files with 43 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/dataprivacy/amd/build/effective_retention_period.min.js vendored
View File

@ -1 +1 @@
define(["jquery"],function(a){var b={PURPOSE_SELECT:"#id_purposeid",RETENTION_FIELD_BOOST:"#id_error_retention_current",RETENTION_FIELD_CLEAN:"#fitem_id_retention_current [data-fieldtype=static]"},c=function(a){this.purposeRetentionPeriods=a,this.registerEventListeners()},d=function(){a(b.PURPOSE_SELECT).off("change")};return c.prototype.purposeRetentionPeriods=[],c.prototype.registerEventListeners=function(){a(b.PURPOSE_SELECT).on("change",function(c){var d=a(c.currentTarget).val(),e=this.purposeRetentionPeriods[d],f=a(b.RETENTION_FIELD_CLEAN);if(f.length>0)f.text(e);else{var g=a(b.RETENTION_FIELD_BOOST),h=g.siblings();h.length>0&&h.text(e)}}.bind(this))},{init:function(a){return d(),new c(a)}}});
define(["jquery"],function(a){var b={PURPOSE_SELECT:"#id_purposeid",RETENTION_FIELD:"#fitem_id_retention_current [data-fieldtype=static]"},c=function(a){this.purposeRetentionPeriods=a,this.registerEventListeners()},d=function(){a(b.PURPOSE_SELECT).off("change")};return c.prototype.purposeRetentionPeriods=[],c.prototype.registerEventListeners=function(){a(b.PURPOSE_SELECT).on("change",function(c){var d=a(c.currentTarget).val(),e=this.purposeRetentionPeriods[d];a(b.RETENTION_FIELD).text(e)}.bind(this))},{init:function(a){return d(),new c(a)}}});

16
admin/tool/dataprivacy/amd/src/effective_retention_period.js
View File

@ -26,8 +26,7 @@ define(['jquery'],
var SELECTORS = {
PURPOSE_SELECT: '#id_purposeid',
RETENTION_FIELD_BOOST: '#id_error_retention_current',
RETENTION_FIELD_CLEAN: '#fitem_id_retention_current [data-fieldtype=static]',
RETENTION_FIELD: '#fitem_id_retention_current [data-fieldtype=static]',
};
/**
@ -65,18 +64,7 @@ define(['jquery'],
$(SELECTORS.PURPOSE_SELECT).on('change', function(ev) {
var selected = $(ev.currentTarget).val();
var selectedPurpose = this.purposeRetentionPeriods[selected];
var cleanSelector = $(SELECTORS.RETENTION_FIELD_CLEAN);
if (cleanSelector.length > 0) {
cleanSelector.text(selectedPurpose);
} else {
var boostSelector = $(SELECTORS.RETENTION_FIELD_BOOST);
var retentionField = boostSelector.siblings();
if (retentionField.length > 0) {
retentionField.text(selectedPurpose);
}
}
$(SELECTORS.RETENTION_FIELD).text(selectedPurpose);
}.bind(this));
};

16
lib/outputrenderers.php
View File

@ -4509,6 +4509,22 @@ EOD;
}
}
// Generate the form element wrapper ids and names to pass to the template.
// This differs between group and non-group elements.
if ($element->getType() === 'group') {
// Group element.
// The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup.
$elementcontext['wrapperid'] = $elementcontext['id'];
// Ensure group elements pass through the group name as the element name so the id_error_{{element.name}} is
// properly set in the template.
$elementcontext['name'] = $elementcontext['groupname'];
} else {
// Non grouped element.
// Creates an id like 'fitem_id_NAME'. E.g. fitem_id_mytextelement.
$elementcontext['wrapperid'] = 'fitem_' . $elementcontext['id'];
}
$context = array(
'element' => $elementcontext,
'label' => $label,

4
theme/boost/scss/moodle/forms.scss
View File

@ -126,10 +126,8 @@ input#id_externalurl {
// Pale grey container for submit buttons.
.form-buttons,
.path-admin .buttons,
#fitem_id_submitbutton,
.fp-content-center form + div,
div.backup-section + form,
#fgroup_id_buttonar {
div.backup-section + form {
@extend .form-group;
padding-left: 0;
}

48
theme/boost/style/moodle.css
View File

@ -3798,10 +3798,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-group, .form-buttons,
.path-admin .buttons,
#fitem_id_submitbutton,
.fp-content-center form + div,
div.backup-section + form,
#fgroup_id_buttonar {
div.backup-section + form {
margin-bottom: 1rem; }
.form-text {
@ -4012,10 +4010,8 @@ div.backup-section + form,
margin-bottom: 0; }
.form-inline .form-group, .form-inline .form-buttons,
.form-inline .path-admin .buttons, .path-admin .form-inline .buttons,
.form-inline #fitem_id_submitbutton,
.form-inline .fp-content-center form + div, .fp-content-center .form-inline form + div,
.form-inline div.backup-section + form,
.form-inline #fgroup_id_buttonar {
.form-inline div.backup-section + form {
display: flex;
flex: 0 0 auto;
flex-flow: row wrap;
@ -14394,7 +14390,7 @@ body.path-question-type {
font: inherit;
position: static;
padding-right: .3em; }
body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type #fitem_id_submitbutton .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type #fgroup_id_buttonar .sr-only {
body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only {
position: static;
width: auto;
height: auto;
@ -15009,10 +15005,8 @@ body.path-question-type .mform fieldset.hidden {
.mform .form-inline .form-group, .mform .form-inline .form-buttons,
.mform .form-inline .path-admin .buttons, .path-admin .mform .form-inline .buttons,
.mform .form-inline #fitem_id_submitbutton,
.mform .form-inline .fp-content-center form + div, .fp-content-center .mform .form-inline form + div,
.mform .form-inline div.backup-section + form,
.mform .form-inline #fgroup_id_buttonar {
.mform .form-inline div.backup-section + form {
margin: 0.1rem 0.25rem 0.1rem 0; }
.mform .form-inline br + label {
@ -15032,10 +15026,8 @@ body.path-question-type .mform fieldset.hidden {
.mform > .form-group, .mform > .form-buttons,
.path-admin .mform > .buttons,
.mform > #fitem_id_submitbutton,
.fp-content-center .mform > form + div,
.mform > div.backup-section + form,
.mform > #fgroup_id_buttonar {
.mform > div.backup-section + form {
margin-left: 1.5rem; }
.editor_atto_content.form-control {
@ -15084,10 +15076,8 @@ input#id_externalurl {
.form-buttons,
.path-admin .buttons,
#fitem_id_submitbutton,
.fp-content-center form + div,
div.backup-section + form,
#fgroup_id_buttonar {
div.backup-section + form {
padding-left: 0; }
.form-item .form-setting .defaultsnext > input {
@ -15297,10 +15287,8 @@ textarea[data-auto-rows] {
[data-fieldtype="modgrade"] .form-group, [data-fieldtype="modgrade"] .form-buttons,
[data-fieldtype="modgrade"] .path-admin .buttons, .path-admin [data-fieldtype="modgrade"] .buttons,
[data-fieldtype="modgrade"] #fitem_id_submitbutton,
[data-fieldtype="modgrade"] .fp-content-center form + div, .fp-content-center [data-fieldtype="modgrade"] form + div,
[data-fieldtype="modgrade"] div.backup-section + form,
[data-fieldtype="modgrade"] #fgroup_id_buttonar {
[data-fieldtype="modgrade"] div.backup-section + form {
padding-bottom: 0.375rem; }
[data-fieldtype="modgrade"] {
@ -15673,10 +15661,8 @@ div#dock {
#page-mod-quiz-mod #id_reviewoptionshdr .form-group, #page-mod-quiz-mod #id_reviewoptionshdr .form-buttons,
#page-mod-quiz-mod #id_reviewoptionshdr .path-admin .buttons, .path-admin #page-mod-quiz-mod #id_reviewoptionshdr .buttons,
#page-mod-quiz-mod #id_reviewoptionshdr #fitem_id_submitbutton,
#page-mod-quiz-mod #id_reviewoptionshdr .fp-content-center form + div, .fp-content-center #page-mod-quiz-mod #id_reviewoptionshdr form + div,
#page-mod-quiz-mod #id_reviewoptionshdr div.backup-section + form,
#page-mod-quiz-mod #id_reviewoptionshdr #fgroup_id_buttonar {
#page-mod-quiz-mod #id_reviewoptionshdr div.backup-section + form {
float: left;
width: 20rem;
display: inline-block;
@ -15999,41 +15985,33 @@ div#dock {
background-color: #fff; }
.path-backup .mform .root_setting .form-group, .path-backup .mform .root_setting .form-buttons,
.path-backup .mform .root_setting .path-admin .buttons, .path-admin .path-backup .mform .root_setting .buttons,
.path-backup .mform .root_setting #fitem_id_submitbutton,
.path-backup .mform .root_setting .fp-content-center form + div, .fp-content-center .path-backup .mform .root_setting form + div,
.path-backup .mform .root_setting div.backup-section + form,
.path-backup .mform .root_setting #fgroup_id_buttonar,
.path-backup .mform .grouped_settings .form-group,
.path-backup .mform .grouped_settings .form-buttons,
.path-backup .mform .grouped_settings .path-admin .buttons,
.path-admin .path-backup .mform .grouped_settings .buttons,
.path-backup .mform .grouped_settings #fitem_id_submitbutton,
.path-backup .mform .grouped_settings .fp-content-center form + div,
.fp-content-center .path-backup .mform .grouped_settings form + div,
.path-backup .mform .grouped_settings div.backup-section + form,
.path-backup .mform .grouped_settings #fgroup_id_buttonar {
.path-backup .mform .grouped_settings div.backup-section + form {
/* These checkboxes with no label on the left. */ }
.path-backup .mform .root_setting .form-group .col-md-3.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-3.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-3.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-3.checkbox, .path-backup .mform .root_setting #fitem_id_submitbutton .col-md-3.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-3.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-3.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-3.checkbox, .path-backup .mform .root_setting #fgroup_id_buttonar .col-md-3.checkbox,
.path-backup .mform .root_setting .form-group .col-md-3.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-3.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-3.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-3.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-3.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-3.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-3.checkbox,
.path-backup .mform .grouped_settings .form-group .col-md-3.checkbox,
.path-backup .mform .grouped_settings .form-buttons .col-md-3.checkbox,
.path-backup .mform .grouped_settings .path-admin .buttons .col-md-3.checkbox,
.path-admin .path-backup .mform .grouped_settings .buttons .col-md-3.checkbox,
.path-backup .mform .grouped_settings #fitem_id_submitbutton .col-md-3.checkbox,
.path-backup .mform .grouped_settings .fp-content-center form + div .col-md-3.checkbox,
.fp-content-center .path-backup .mform .grouped_settings form + div .col-md-3.checkbox,
.path-backup .mform .grouped_settings div.backup-section + form .col-md-3.checkbox,
.path-backup .mform .grouped_settings #fgroup_id_buttonar .col-md-3.checkbox {
.path-backup .mform .grouped_settings div.backup-section + form .col-md-3.checkbox {
width: 0%; }
.path-backup .mform .root_setting .form-group .col-md-9.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-9.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-9.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-9.checkbox, .path-backup .mform .root_setting #fitem_id_submitbutton .col-md-9.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-9.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-9.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-9.checkbox, .path-backup .mform .root_setting #fgroup_id_buttonar .col-md-9.checkbox,
.path-backup .mform .root_setting .form-group .col-md-9.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-9.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-9.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-9.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-9.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-9.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-9.checkbox,
.path-backup .mform .grouped_settings .form-group .col-md-9.checkbox,
.path-backup .mform .grouped_settings .form-buttons .col-md-9.checkbox,
.path-backup .mform .grouped_settings .path-admin .buttons .col-md-9.checkbox,
.path-admin .path-backup .mform .grouped_settings .buttons .col-md-9.checkbox,
.path-backup .mform .grouped_settings #fitem_id_submitbutton .col-md-9.checkbox,
.path-backup .mform .grouped_settings .fp-content-center form + div .col-md-9.checkbox,
.fp-content-center .path-backup .mform .grouped_settings form + div .col-md-9.checkbox,
.path-backup .mform .grouped_settings div.backup-section + form .col-md-9.checkbox,
.path-backup .mform .grouped_settings #fgroup_id_buttonar .col-md-9.checkbox {
.path-backup .mform .grouped_settings div.backup-section + form .col-md-9.checkbox {
width: 100%;
left: 0; }

3
theme/boost/templates/core_form/element-template.mustache
View File

@ -36,12 +36,13 @@
"advanced": false,
"error": null,
"element": {
"wrapperid": "fitem_id_fullname",
"id": "id_fullname",
"name": "fullname"
}
}
}}
<div class="form-group row {{#error}}has-danger{{/error}} fitem {{#element.emptylabel}}femptylabel{{/element.emptylabel}} {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}" {{#element.groupname}}data-groupname="{{.}}"{{/element.groupname}}>
<div id="{{element.wrapperid}}" class="form-group row {{#error}}has-danger{{/error}} fitem {{#element.emptylabel}}femptylabel{{/element.emptylabel}} {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}" {{#element.groupname}}data-groupname="{{.}}"{{/element.groupname}}>
<div class="col-md-3">
<span class="float-sm-right text-nowrap">
{{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}

8
theme/boost/upgrade.txt
View File

@ -1,6 +1,14 @@
This file describes API changes in /theme/boost
information provided here is intended especially for theme designers.
=== 3.7 ===
Form element template
---------------------
A 'wrapperid' has been added to 'templates/core_form/element-template.mustache' to restore unique ids
on Boost form element wrappers. This restores the same unique element ids seen on elements in BS2
themes, which were mistakenly dropped when introducing the Boost theme.
=== 3.5 ===
The Boost theme now uses Bootstrap 4 Stable (BS4S).