moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71373-master' of git://github.com/lucaboesch/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-05-18 22:41:42 +02:00
commit 29b15b76e2
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/tool/usertours/templates/tourstep.mustache
View file

@ -58,9 +58,9 @@
<div class="modal-body" data-placeholder="body"> <div class="modal-body" data-placeholder="body">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-role="previous">{{# str }} previous, moodle {{/ str }}</button> <button type="button" class="btn btn-secondary" data-role="previous" aria-label="{{# str }} previouspage, moodle {{/ str }}">{{# str }} previouspage, moodle {{/ str }}</button>
<button type="button" class="btn btn-primary" data-role="next">{{# str }} next, moodle {{/ str }}</button> <button type="button" class="btn btn-primary" data-role="next" aria-label="{{# str }} nextpage, moodle {{/ str }}">{{# str }} nextpage, moodle {{/ str }}</button>
<button class="btn btn-secondary" data-role="end"> {{# str }} endtour, tool_usertours {{/ str }} </button> <button class="btn btn-secondary" data-role="end" aria-label="{{# str }} endtour, tool_usertours {{/ str }}"> {{# str }} endtour, tool_usertours {{/ str }} </button>
</div> </div>
</div> </div>
</div> </div>

3
enrol/yui/rolemanager/rolemanager.js vendored
View file

@ -366,7 +366,8 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
var i, m = this.get(MANIPULATOR); var i, m = this.get(MANIPULATOR);
var element = Y.Node.create('<div class="popover popover-bottom"><div class="arrow"></div>' + var element = Y.Node.create('<div class="popover popover-bottom"><div class="arrow"></div>' +
'<div class="header popover-title">' + '<div class="header popover-title">' +
'<div role="button" class="close" aria-label="Close">' + '<div role="button" class="close" aria-label="' +
M.util.get_string('closebuttontitle', 'moodle') + '">' +
'<span aria-hidden="true">&times;</span></div>' + '<span aria-hidden="true">&times;</span></div>' +
'<h3>'+M.util.get_string('assignroles', 'role')+'</h3>' + '<h3>'+M.util.get_string('assignroles', 'role')+'</h3>' +
'</div><div class="content popover-content form-inline form-group"></div></div>'); '</div><div class="content popover-content form-inline form-group"></div></div>');

8
lib/templates/paging_bar.mustache
View file

@ -54,9 +54,9 @@
<ul class="mt-1 pagination " data-page-size="{{pagesize}}"> <ul class="mt-1 pagination " data-page-size="{{pagesize}}">
{{#previous}} {{#previous}}
<li class="page-item" data-page-number="{{page}}"> <li class="page-item" data-page-number="{{page}}">
<a href="{{url}}" class="page-link" aria-label="Previous"> <a href="{{url}}" class="page-link" aria-label="{{# str }} previouspage, moodle {{/ str }}">
<span aria-hidden="true">&laquo;</span> <span aria-hidden="true">&laquo;</span>
<span class="sr-only">{{#str}}previous{{/str}}</span> <span class="sr-only">{{#str}}previouspage, moodle{{/str}}</span>
</a> </a>
</li> </li>
{{/previous}} {{/previous}}
@ -88,9 +88,9 @@
{{/last}} {{/last}}
{{#next}} {{#next}}
<li class="page-item" data-page-number="{{page}}"> <li class="page-item" data-page-number="{{page}}">
<a href="{{url}}" class="page-link" aria-label="Next"> <a href="{{url}}" class="page-link" aria-label="{{# str }} nextpage, moodle {{/ str }}">
<span aria-hidden="true">&raquo;</span> <span aria-hidden="true">&raquo;</span>
<span class="sr-only">{{#str}}next{{/str}}</span> <span class="sr-only">{{#str}}nextpage, moodle{{/str}}</span>
</a> </a>
</li> </li>
{{/next}} {{/next}}

2
lib/tests/tablelib_test.php
View file

@ -142,7 +142,7 @@ class core_tablelib_testcase extends advanced_testcase {
$headers = $this->generate_headers(2); $headers = $this->generate_headers(2);
// Search for pagination controls containing 'page-link"\saria-label="Next"'. // Search for pagination controls containing 'page-link"\saria-label="Next"'.
$this->expectOutputRegex('/page-link"\saria-label="Next"/'); $this->expectOutputRegex('/page-link"\saria-label="Next page"/');
$this->run_table_test( $this->run_table_test(
$columns, $columns,