Merge branch 'MDL-67970-37' of git://github.com/rezaies/moodle into MOODLE_37_STABLE

This commit is contained in:
Adrian Greeve
2020-03-17 15:26:10 +08:00
11 changed files with 20 additions and 17 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -569,7 +569,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
str.get_string('numberweeks').done(function(strNumberSections) {
var trigger = $(SELECTOR.ADDSECTIONS),
modalTitle = trigger.attr('data-add-sections'),
newSections = trigger.attr('new-sections');
newSections = trigger.attr('data-new-sections');
var modalBody = $('<div><label for="add_section_numsections"></label> ' +
'<input id="add_section_numsections" type="number" min="1" max="' + newSections + '" value="1"></div>');
modalBody.find('label').html(strNumberSections);
+1 -1
View File
@@ -1006,7 +1006,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
$icon = $this->output->pix_icon('t/add', '');
$newsections = $maxsections - $lastsection;
echo html_writer::link($url, $icon . $straddsections,
array('class' => 'add-sections', 'data-add-sections' => $straddsections, 'new-sections' => $newsections));
array('class' => 'add-sections', 'data-add-sections' => $straddsections, 'data-new-sections' => $newsections));
echo html_writer::end_tag('div');
}
}
+1 -1
View File
@@ -3209,7 +3209,7 @@ EOD;
'size' => 13, 'tabindex' => -1, 'id' => 'id_q_' . $id, 'class' => 'form-control');
$contents = html_writer::tag('label', get_string('enteryoursearchquery', 'search'),
array('for' => 'id_q_' . $id, 'class' => 'accesshide')) . html_writer::tag('input', '', $inputattrs);
array('for' => 'id_q_' . $id, 'class' => 'accesshide')) . html_writer::empty_tag('input', $inputattrs);
if ($this->page->context && $this->page->context->contextlevel !== CONTEXT_SYSTEM) {
$contents .= html_writer::empty_tag('input', ['type' => 'hidden',
'name' => 'context', 'value' => $this->page->context->id]);
+1 -1
View File
@@ -92,7 +92,7 @@
{{/menutrigger}}
</a>
{{#secondary}}
<div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}} id="dropdown-menu-{{instance}}">
<div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
{{#items}}
{{#actionmenulink}}
<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>
+6 -8
View File
@@ -57,14 +57,12 @@
</div>
<div class="alloptions">
{{#sections}}
<div class="moduletypetitle">
<label for="item_{{id}}">
<span class="typename">{{label}}</span>
</label>
</div>
{{#items}}
{{>core/chooser_item}}
{{/items}}
<fieldset>
<legend class="moduletypetitle">{{label}}</legend>
{{#items}}
{{>core/chooser_item}}
{{/items}}
</fieldset>
{{/sections}}
</div>
</div>
+1 -1
View File
@@ -63,7 +63,7 @@
]
}
}}
<nav role="navigation" aria-label="{{#str}}breadcrumb, access{{/str}}">
<nav aria-label="{{#str}}breadcrumb, access{{/str}}">
<ol class="breadcrumb">
{{#get_items}}
{{#has_action}}
@@ -44,7 +44,6 @@
data-auto-rows
data-min-rows="3"
data-max-rows="5"
role="textbox"
aria-label="{{#str}} writeamessage, core_message {{/str}}"
placeholder="{{#str}} writeamessage, core_message {{/str}}"
style="resize: none"
+2
View File
@@ -1397,6 +1397,8 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
text-transform: uppercase;
padding-top: 1.2em;
padding-bottom: 0.4em;
margin-bottom: 0.5rem;
font-size: 100%;
}
.choosercontainer #chooseform .option .typename,
+3 -1
View File
@@ -9881,7 +9881,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.choosercontainer #chooseform .moduletypetitle {
text-transform: uppercase;
padding-top: 1.2em;
padding-bottom: 0.4em; }
padding-bottom: 0.4em;
margin-bottom: 0.5rem;
font-size: 100%; }
.choosercontainer #chooseform .option .typename,
.choosercontainer #chooseform .nonoption .typename {
+3 -1
View File
@@ -10118,7 +10118,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.choosercontainer #chooseform .moduletypetitle {
text-transform: uppercase;
padding-top: 1.2em;
padding-bottom: 0.4em; }
padding-bottom: 0.4em;
margin-bottom: 0.5rem;
font-size: 100%; }
.choosercontainer #chooseform .option .typename,
.choosercontainer #chooseform .nonoption .typename {