Merge branch 'MDL-85451-405' of https://github.com/junpataleta/moodle into MOODLE_405_STABLE

blocks/timeline/templates/event-list-content.mustache

@@ -66,7 +66,7 @@
 <div class="pb-2" data-region="event-list-wrapper">
     {{#eventsbyday}}
         <div class="mt-3" data-region="event-list-content-date" data-timestamp="{{dayTimestamp}}">
-            <h5 class="h6 d-inline {{^courseview}}font-weight-bold px-2{{/courseview}}">{{#userdate}} {{dayTimestamp}}, {{#str}} strftimedaydate, core_langconfig {{/str}}  {{/userdate}}</h5>
+            <h4 class="h6 d-inline {{^courseview}}font-weight-bold px-2{{/courseview}}">{{#userdate}} {{dayTimestamp}}, {{#str}} strftimedaydate, core_langconfig {{/str}}  {{/userdate}}</h4>
         </div>
         {{> block_timeline/event-list-items }}
     {{/eventsbyday}}

blocks/timeline/templates/event-list-item.mustache

@@ -66,13 +66,13 @@
             </div>
             <div class="event-name-container flex-grow-1 line-height-3 nowrap text-truncate">
                 <div class="d-flex">
-                    <h6 class="event-name mb-0 pb-1 text-truncate">
+                    <h5 class="h6 event-name mb-0 pb-1 text-truncate">
                         {{#overdue}}<span class="badge rounded-pill bg-danger text-white ms-1 float-end">{{#str}} overdue, block_timeline {{/str}}</span>{{/overdue}}
                         <a href="{{url}}"
                                 title="{{name}}"
                                 aria-label='{{#cleanstr}} ariaeventlistitem, block_timeline, { "name": {{#quote}}{{{activityname}}}{{/quote}}, "course": {{#quote}}{{{course.fullnamedisplay}}}{{/quote}}, "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/cleanstr}}'>
                             {{{activityname}}}</a>
-                    </h6>
+                    </h5>
                 </div>
                 <small class="mb-0">
                     {{#courseview}}
@@ -86,7 +86,7 @@
         </div>
         {{#action.actionable}}
         <div class="d-flex timeline-action-button">
-            <h6 class="event-action">
+            <h5 class="h6 event-action">
                 <a class="list-group-item-action btn btn-outline-secondary btn-sm text-nowrap"
                     href="{{action.url}}"
                     aria-label="{{action.name}}"
@@ -96,7 +96,7 @@
                 <span class="badge bg-secondary text-dark">{{action.itemcount}}</span>
                 {{/action.showitemcount}}
                 </a>
-            </h6>
+            </h5>
         </div>
         {{/action.actionable}}
     </div>

blocks/timeline/templates/nav-day-filter.mustache

@@ -60,54 +60,56 @@
             {{#str}} overdue, block_timeline {{/str}}
         </a>
         <div class="dropdown-divider" role="separator"></div>
-        <h6 class="dropdown-header">{{#str}} duedate, block_timeline {{/str}}</h6>
-        <a
-            class="dropdown-item"
-            href="#"
-            data-from="0"
-            data-to="7"
-            data-filtername="next7days"
-            {{#next7days}}aria-current="true"{{/next7days}}
-            aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next7days, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
-        >
-            {{#str}} next7days, block_timeline {{/str}}
-        </a>
-        <a
-            class="dropdown-item"
-            href="#"
-            data-from="0"
-            data-to="30"
-            data-filtername="next30days"
-            {{#next30days}}aria-current="true"{{/next30days}}
-            aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next30days, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
-        >
-            {{#str}} next30days, block_timeline {{/str}}
-        </a>
-        <a
-            class="dropdown-item"
-            href="#"
-            data-from="0"
-            data-to="90"
-            data-filtername="next3months"
-            {{#next3months}}aria-current="true"{{/next3months}}
-            aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next3months, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
-        >
-            {{#str}} next3months, block_timeline {{/str}}
-        </a>
-        <a
-            class="dropdown-item"
-            href="#"
-            data-from="0"
-            data-to="180"
-            data-filtername="next6months"
-            {{#next6months}}aria-current="true"{{/next6months}}
-            aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next6months, block_timeline {{/str}}{{/str}}"
-            role="menuitem"
-        >
-            {{#str}} next6months, block_timeline {{/str}}
-        </a>
+        <div role="group" aria-labelledby="duedatefiltergrouplabel">
+            <div class="h6 dropdown-header" role="presentation" id="duedatefiltergrouplabel">{{#str}} duedate, block_timeline {{/str}}</div>
+            <a
+                    class="dropdown-item"
+                    href="#"
+                    data-from="0"
+                    data-to="7"
+                    data-filtername="next7days"
+                    {{#next7days}}aria-current="true"{{/next7days}}
+                    aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next7days, block_timeline {{/str}}{{/str}}"
+                    role="menuitem"
+            >
+                {{#str}} next7days, block_timeline {{/str}}
+            </a>
+            <a
+                    class="dropdown-item"
+                    href="#"
+                    data-from="0"
+                    data-to="30"
+                    data-filtername="next30days"
+                    {{#next30days}}aria-current="true"{{/next30days}}
+                    aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next30days, block_timeline {{/str}}{{/str}}"
+                    role="menuitem"
+            >
+                {{#str}} next30days, block_timeline {{/str}}
+            </a>
+            <a
+                    class="dropdown-item"
+                    href="#"
+                    data-from="0"
+                    data-to="90"
+                    data-filtername="next3months"
+                    {{#next3months}}aria-current="true"{{/next3months}}
+                    aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next3months, block_timeline {{/str}}{{/str}}"
+                    role="menuitem"
+            >
+                {{#str}} next3months, block_timeline {{/str}}
+            </a>
+            <a
+                    class="dropdown-item"
+                    href="#"
+                    data-from="0"
+                    data-to="180"
+                    data-filtername="next6months"
+                    {{#next6months}}aria-current="true"{{/next6months}}
+                    aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next6months, block_timeline {{/str}}{{/str}}"
+                    role="menuitem"
+            >
+                {{#str}} next6months, block_timeline {{/str}}
+            </a>
+        </div>
     </div>
 </div>

blocks/timeline/tests/behat/block_timeline_courses.feature

@@ -37,8 +37,10 @@ Feature: The timeline block allows users to see upcoming courses
       | student1 | C3 | student |
       | student1 | C4 | student |
 
+  @accessibility
   Scenario: Next 30 days in course view
     Given I log in as "student1"
+    And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests
     And I click on "Filter timeline by date" "button" in the "Timeline" "block"
     And I click on "Next 30 days" "link" in the "Timeline" "block"
     And I click on "Sort timeline items" "button" in the "Timeline" "block"
@@ -61,6 +63,7 @@ Feature: The timeline block allows users to see upcoming courses
     And "Test feedback 2" "link" should not exist in the "Timeline" "block"
     And "Test feedback 3" "link" should not exist in the "Timeline" "block"
     And "Test assign 1" "link" should not exist in the "Timeline" "block"
+    And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests
 
   Scenario: All in course view
     Given I log in as "student1"

blocks/timeline/tests/behat/block_timeline_dates.feature

@@ -50,9 +50,11 @@ Feature: The timeline block allows users to see upcoming activities
     And "Test assign 1" "link" should not exist in the "Timeline" "block"
     And I should not see "Assignment is due · Course 1" in the "Timeline" "block"
 
+  @accessibility
   Scenario: Overdue in date view
     Given I log in as "student1"
     And I click on "Filter timeline by date" "button" in the "Timeline" "block"
+    And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests
     When I click on "Overdue" "link" in the "Timeline" "block"
     Then "Test assign 1" "link" should exist in the "Timeline" "block"
     And I should see "Assignment is due · Course 1" in the "Timeline" "block"
@@ -63,6 +65,7 @@ Feature: The timeline block allows users to see upcoming activities
     And "Test choice 3" "link" should not exist in the "Timeline" "block"
     And "Test feedback 3" "link" should not exist in the "Timeline" "block"
     And "Test feedback 4" "link" should not exist in the "Timeline" "block"
+    And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests
 
   Scenario: All in date view
     Given I log in as "student1"