mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Nicols 2016-11-09 15:40:16 +08:00
commit 4cc6477198
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/feedback/edit_form.php
View File

@ -124,10 +124,6 @@ class feedback_edit_create_template_form extends moodleform {
get_string('public', 'feedback'));
}
// buttons
$elementgroup[] = $mform->createElement('submit',
'create_template',
get_string('save_as_new_template', 'feedback'));
$mform->addGroup($elementgroup,
'elementgroup',
@ -135,6 +131,9 @@ class feedback_edit_create_template_form extends moodleform {
array(' '),
false);
// Buttons.
$mform->addElement('submit', 'create_template', get_string('save_as_new_template', 'feedback'));
$mform->setType('templatename', PARAM_TEXT);
$this->set_data(array('id' => $this->_customdata['id']));

3
theme/boost/scss/moodle/modules.scss
View File

@ -9,6 +9,9 @@ select {
width: auto;
}
.path-mod-feedback .feedback_form .col-form-label {
display: block !important; /* stylelint-disable-line declaration-no-important */
}
// Feedback module
.path-mod-feedback .itemactions {
float: right;

4
theme/boost/templates/core_form/element-autocomplete-inline.mustache
View File

@ -9,14 +9,14 @@
{{/error}}
{{{element.attributes}}} >
{{#element.options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{text}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
{{/element.options}}
</select>
{{/element.frozen}}
{{#element.frozen}}
{{#element.options}}
{{#selected}}
{{text}}
{{{text}}}
{{^element.hardfrozen}}
<input type="hidden" name="{{element.name}}" value="{{value}}">
{{/element.hardfrozen}}

4
theme/boost/templates/core_form/element-select-inline.mustache
View File

@ -12,14 +12,14 @@
{{/error}}
{{{element.attributes}}} >
{{#element.options}}
<option value="{{value}}" {{#selected}}selected{{/selected}} {{#disabled}}disabled{{/disabled}} {{{optionattributes}}}>{{text}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}} {{#disabled}}disabled{{/disabled}} {{{optionattributes}}}>{{{text}}}</option>
{{/element.options}}
</select>
{{/element.frozen}}
{{#element.frozen}}
{{#element.options}}
{{#selected}}
{{text}}
{{{text}}}
{{^element.hardfrozen}}
<input type="hidden" name="{{element.name}}" value="{{value}}" id="{{element.id}}">
{{/element.hardfrozen}}

2
theme/boost/templates/core_form/element-select.mustache
View File

@ -19,7 +19,7 @@
{{#element.frozen}}
{{#element.options}}
{{#selected}}
{{text}}
{{{text}}}
{{^element.hardfrozen}}
<input type="hidden" name="{{element.name}}" value="{{value}}" id="{{element.id}}">
{{/element.hardfrozen}}

4
theme/boost/templates/core_form/element-selectwithlink.mustache
View File

@ -9,13 +9,13 @@
{{/error}}
{{{element.attributes}}} >
{{#element.options}}
<option value="{{value}}" {{#selected}}selected{{/selected}} {{#disabled}}disabled{{/disabled}} {{{optionattributes}}}>{{text}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}} {{#disabled}}disabled{{/disabled}} {{{optionattributes}}}>{{{text}}}</option>
{{/element.options}}
</select>
{{/element.frozen}}
{{#element.frozen}}
{{#element.options}}
{{#selected}}{{text}}{{/selected}}
{{#selected}}{{{text}}}{{/selected}}
{{/element.options}}
{{/element.frozen}}
<a class="m-x-1" href="{{{element.link}}}">{{element.linklabel}}</a>

4
theme/boost/templates/core_form/element-tags-inline.mustache
View File

@ -9,13 +9,13 @@
{{/error}}
{{{element.attributes}}} >
{{#element.options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{text}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
{{/element.options}}
</select>
{{/element.frozen}}
{{#element.frozen}}
{{#element.options}}
{{#selected}}{{text}}{{/selected}}
{{#selected}}{{{text}}}{{/selected}}
{{/element.options}}
{{/element.frozen}}
{{#element.managestandardtagsurl}}

4
theme/boost/templates/core_form/element-tags.mustache
View File

@ -9,13 +9,13 @@
{{/error}}
{{{element.attributes}}} >
{{#element.options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{text}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
{{/element.options}}
</select>
{{/element.frozen}}
{{#element.frozen}}
{{#element.options}}
{{#selected}}{{text}}{{/selected}}
{{#selected}}{{{text}}}{{/selected}}
{{/element.options}}
{{/element.frozen}}
{{#element.managestandardtagsurl}}