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

Merge branch 'MDL-59696-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2017-09-07 11:01:06 +02:00
committed by David Monllao
parent 8ae7ad0294 26c37c0024
commit eafcaa4e41
3 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/templates/url_select.mustache
+35 -24
View File
@@ -8,6 +8,19 @@
"formid": "url_select_form", "formid": "url_select_form",
"sesskey": "sesskey", "sesskey": "sesskey",
"label": "core/url_select", "label": "core/url_select",
"helpicon": {
"title": "Help with something",
"text": "Help with something",
"url": "http://example.org/help",
"linktext": "",
"icon":{
"extraclasses": "iconhelp",
"attributes": [
{"name": "src", "value": "../../../pix/help.svg"},
{"name": "alt", "value": "Help icon"}
]
}
},
"showbutton": "Go", "showbutton": "Go",
"options": [{ "options": [{
"name": "Group 1", "isgroup": true, "options": "name": "Group 1", "isgroup": true, "options":
@@ -25,30 +38,28 @@
<div class="{{classes}}"> <div class="{{classes}}">
<form method="post" action="{{action}}" class="form-inline" id="{{formid}}"> <form method="post" action="{{action}}" class="form-inline" id="{{formid}}">
<input type="hidden" name="sesskey" value="{{sesskey}}"> <input type="hidden" name="sesskey" value="{{sesskey}}">
<div class="form-group"> {{#label}}
{{#label}} <label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>
<label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}> {{label}}
{{label}} </label>
</label> {{/label}}
{{/label}} {{#helpicon}}
{{#helpicon}} {{>core/help_icon}}
{{>core/help_icon}} {{/helpicon}}
{{/helpicon}} <select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="custom-select {{classes}}" name="jump">
<select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="custom-select {{classes}}" name="jump"> {{#options}}
{{#options}} {{#isgroup}}
{{#isgroup}} <optgroup label="{{name}}">
<optgroup label="{{name}}"> {{#options}}
{{#options}} <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option> {{/options}}
{{/options}} </optgroup>
</optgroup> {{/isgroup}}
{{/isgroup}} {{^isgroup}}
{{^isgroup}} <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option> {{/isgroup}}
{{/isgroup}} {{/options}}
{{/options}} </select>
</select>
</div>
{{#showbutton}} {{#showbutton}}
<input type="submit" class="btn btn-secondary" value="{{showbutton}}"> <input type="submit" class="btn btn-secondary" value="{{showbutton}}">
{{/showbutton}} {{/showbutton}}
theme/bootstrapbase/less/moodle/forms.less
+9
View File
@@ -122,6 +122,15 @@ form {
margin-right: .3em; margin-right: .3em;
} }
.custom-select {
max-width: 100%;
}
// Make the submit button align with the .custom-select element.
.custom-select + input[type="submit"] {
margin: 0 0 0 5px;
}
#portfolio-add-button { #portfolio-add-button {
display: inline; display: inline;
} }
theme/bootstrapbase/style/moodle.css
+6
View File
@@ -16539,6 +16539,12 @@ form {
.singleselect label { .singleselect label {
margin-right: .3em; margin-right: .3em;
} }
.custom-select {
max-width: 100%;
}
.custom-select + input[type="submit"] {
margin: 0 0 0 5px;
}
#portfolio-add-button { #portfolio-add-button {
display: inline; display: inline;
} }