Skip to content
GitLab
Commit 9f93263a authored by Eloy Lafuente's avatar Eloy Lafuente
Browse files

Merge branch 'MDL-65005-master' of git://github.com/junpataleta/moodle

parents 8253ec74 78af6dec
Hide whitespace changes
Inline Side-by-side
blocks/timeline/templates/nav-day-filter.mustache
View file @ 9f93263a
......@@ -23,20 +23,27 @@
{}
}}
<div data-region="day-filter" class="dropdown">
<button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} ariadayfilter, block_timeline {{/str}}" aria-controls="menudayfilter">
{{#pix}} i/duration {{/pix}}
<span class="sr-only">
{{#str}} ariadayfilter, block_timeline {{/str}}
<span data-active-item-text>{{#str}} next30days, block_timeline {{/str}}</span>
<span class="sr-only" data-active-item-text>
{{#all}} {{#str}} all, core {{/str}} {{/all}}
{{#overdue}} {{#str}} overdue, block_timeline {{/str}} {{/overdue}}
{{#next7days}} {{#str}}next7days, block_timeline {{/str}} {{/next7days}}
{{#next30days}} {{#str}}next30days, block_timeline {{/str}} {{/next30days}}
{{#next3months}} {{#str}}next3months, block_timeline {{/str}} {{/next3months}}
{{#next6months}} {{#str}}next6months, block_timeline {{/str}} {{/next6months}}
</span>
</button>
<div role="menu" class="dropdown-menu" data-show-active-item>
<div id="menudayfilter" role="menu" class="dropdown-menu" data-show-active-item>
<a
class="dropdown-item {{#all}} active {{/all}}"
href="#"
data-from="-14"
data-filtername="all"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} all, core {{/str}}{{/str}}"
role="menuitem"
{{#all}}aria-current="true"{{/all}}
>
{{#str}} all, core {{/str}}
</a>
......@@ -47,10 +54,12 @@
data-to="0"
data-filtername="overdue"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} overdue, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#overdue}}aria-current="true"{{/overdue}}
>
{{#str}} overdue, block_timeline {{/str}}
</a>
<div class="dropdown-divider"></div>
<div class="dropdown-divider" role="separator"></div>
<h6 class="dropdown-header">{{#str}} duedate, block_timeline {{/str}}</h6>
<a
class="dropdown-item {{#next7days}} active {{/next7days}}"
......@@ -59,6 +68,8 @@
data-to="7"
data-filtername="next7days"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next7days, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#next7days}}aria-current="true"{{/next7days}}
>
{{#str}} next7days, block_timeline {{/str}}
</a>
......@@ -69,6 +80,8 @@
data-to="30"
data-filtername="next30days"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next30days, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#next30days}}aria-current="true"{{/next30days}}
>
{{#str}} next30days, block_timeline {{/str}}
</a>
......@@ -79,6 +92,8 @@
data-to="90"
data-filtername="next3months"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next3months, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#next3months}}aria-current="true"{{/next3months}}
>
{{#str}} next3months, block_timeline {{/str}}
</a>
......@@ -89,6 +104,8 @@
data-to="180"
data-filtername="next6months"
aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next6months, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#next6months}}aria-current="true"{{/next6months}}
>
{{#str}} next6months, block_timeline {{/str}}
</a>
......
blocks/timeline/templates/nav-view-selector.mustache
View file @ 9f93263a
......@@ -23,20 +23,23 @@
{}
}}
<div data-region="view-selector" class="btn-group">
<button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} ariaviewselector, block_timeline{{/str}}" aria-controls="menusortby">
{{#pix}} t/sort_by {{/pix}}
<span class="sr-only">
{{#sorttimelinecourses}}<span data-active-item-text>{{/sorttimelinecourses}}{{#str}} ariaviewselector, block_timeline{{/str}}{{#sorttimelinecourses}}</span>{{/sorttimelinecourses}}
{{#sorttimelinedates}}<span data-active-item-text>{{/sorttimelinedates}}{{#str}} sortbydates, block_timeline {{/str}}{{#sorttimelinedates}}</span>{{/sorttimelinedates}}
<span class="sr-only" data-active-item-text>
{{#sorttimelinecourses}}{{#str}} sortbycourses, block_timeline{{/str}}{{/sorttimelinecourses}}
{{#sorttimelinedates}}{{#str}} sortbydates, block_timeline {{/str}}{{/sorttimelinedates}}
</span>
</button>
<div role="menu" class="dropdown-menu dropdown-menu-right list-group hidden" data-show-active-item data-skip-active-class="true" >
<div id="menusortby" role="menu" class="dropdown-menu dropdown-menu-right list-group hidden" data-show-active-item data-skip-active-class="true">
<a
class="dropdown-item {{#sorttimelinedates}}active{{/sorttimelinedates}}"
href="#view_dates_{{uniqid}}"
data-toggle="tab"
data-filtername="sortbydates"
aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbydates, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#sorttimelinedates}}aria-current="true"{{/sorttimelinedates}}
>
{{#str}} sortbydates, block_timeline {{/str}}
</a>
......@@ -46,6 +49,8 @@
data-toggle="tab"
data-filtername="sortbycourses"
aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbycourses, block_timeline {{/str}}{{/str}}"
role="menuitem"
{{#sorttimelinecourses}}aria-current="true"{{/sorttimelinecourses}}
>
{{#str}} sortbycourses, block_timeline {{/str}}
</a>
......
blocks/timeline/tests/behat/block_timeline_courses.feature
View file @ 9f93263a
......@@ -36,7 +36,7 @@ Feature: The timeline block allows users to see upcoming courses
Scenario: Next 30 days in course view
Given I log in as "student1"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
When I click on "Sort by courses" "link" in the "Timeline" "block"
Then I should see "Course 1" in the "Timeline" "block"
And I should see "Course 2" in the "Timeline" "block"
......@@ -52,9 +52,9 @@ Feature: The timeline block allows users to see upcoming courses
Scenario: All in course view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
And I click on "All" "link" in the "Timeline" "block"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
And I click on "Sort by courses" "link" in the "Timeline" "block"
When I click on "More courses" "button" in the "Timeline" "block"
Then I should see "Course 3" in the "Timeline" "block"
......@@ -73,9 +73,9 @@ Feature: The timeline block allows users to see upcoming courses
Scenario: Persistent sort filter
Given I log in as "student1"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
And I click on "Sort by dates" "link" in the "Timeline" "block"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
And I click on "Sort by courses" "link" in the "Timeline" "block"
And I reload the page
Then I should see "Course 1" in the "Timeline" "block"
......
blocks/timeline/tests/behat/block_timeline_dates.feature
View file @ 9f93263a
......@@ -33,7 +33,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: Next 7 days in date view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
When I click on "Next 7 days" "link" in the "Timeline" "block"
Then I should see "Test choice 1 closes" in the "Timeline" "block"
And I should see "Test feedback 1 closes" in the "Timeline" "block"
......@@ -44,7 +44,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: Overdue in date view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
When I click on "Overdue" "link" in the "Timeline" "block"
Then I should see "Test assign 1 is due" in the "Timeline" "block"
And I should not see "Test choice 2 closes" in the "Timeline" "block"
......@@ -55,7 +55,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: All in date view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
When I click on "All" "link" in the "Timeline" "block"
Then I should see "Test assign 1 is due" in the "Timeline" "block"
And I should see "Test feedback 1 closes" in the "Timeline" "block"
......@@ -75,7 +75,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: All in date view no next
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
And I click on "All" "link" in the "Timeline" "block"
And I click on "5" "button" in the "Timeline" "block"
When I click on "25" "link" in the "Timeline" "block"
......@@ -89,7 +89,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: Persistent All in date view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
When I click on "All" "link" in the "Timeline" "block"
And I reload the page
Then I should see "Test assign 1 is due" in the "Timeline" "block"
......@@ -110,7 +110,7 @@ Feature: The timeline block allows users to see upcoming activities
Scenario: Persistent Overdue in date view
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
When I click on "Overdue" "link" in the "Timeline" "block"
And I reload the page
Then I should see "Test assign 1 is due" in the "Timeline" "block"
......
blocks/timeline/tests/behat/block_timeline_pagelimit_persistence.feature
View file @ 9f93263a
......@@ -35,9 +35,9 @@ Feature: The timeline block allows user persistence of their page limits
Scenario: Toggle the page limit 5 - 25
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
And I click on "All" "link" in the "Timeline" "block"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
And I click on "Sort by dates" "link" in the "Timeline" "block"
When I click on "5" "button" in the "Timeline" "block"
And I click on "25" "link"
......@@ -48,9 +48,9 @@ Feature: The timeline block allows user persistence of their page limits
Scenario: Toggle the page limit 25 - 5
Given I log in as "student1"
And I click on "Next 30 days" "button" in the "Timeline" "block"
And I click on "Filter timeline items" "button" in the "Timeline" "block"
And I click on "All" "link" in the "Timeline" "block"
And I click on "Sort" "button" in the "Timeline" "block"
And I click on "Sort timeline items" "button" in the "Timeline" "block"
And I click on "Sort by dates" "link" in the "Timeline" "block"
When I click on "5" "button" in the "Timeline" "block"
And I click on "25" "link"
......
theme/bootstrapbase/templates/block_timeline/nav-day-filter.mustache
View file @ 9f93263a
......@@ -23,43 +23,48 @@
{}
}}
<div data-region="day-filter" class="btn-group">
<button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
aria-label="{{#str}} ariadayfilter, block_timeline {{/str}}" aria-controls="menudayfilter">
{{#pix}} i/duration {{/pix}}
<span class="sr-only">
{{#str}} ariadayfilter, block_timeline {{/str}}
<span data-active-item-text>{{#str}} next30days, block_timeline {{/str}}</span>
<span class="sr-only" data-active-item-text>
{{#all}} {{#str}} all, core {{/str}} {{/all}}
{{#overdue}} {{#str}} overdue, block_timeline {{/str}} {{/overdue}}
{{#next7days}} {{#str}}next7days, block_timeline {{/str}} {{/next7days}}
{{#next30days}} {{#str}}next30days, block_timeline {{/str}} {{/next30days}}
{{#next3months}} {{#str}}next3months, block_timeline {{/str}} {{/next3months}}
{{#next6months}} {{#str}}next6months, block_timeline {{/str}} {{/next6months}}
</span>
<span data-region="caret" class="caret"></span>
</button>
<ul role="menu" class="dropdown-menu" data-show-active-item>
<ul id="menudayfilter" role="menu" class="dropdown-menu" data-show-active-item>
<li class="dropdown-item {{#all}} active {{/all}}" data-from="-14" data-filtername="all">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} all, core {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} all, core {{/str}}{{/str}}" role="menuitem" {{#all}}aria-current="true"{{/all}}>
{{#str}} all, core {{/str}}
</a>
</li>
<li class="dropdown-item {{#overdue}} active {{/overdue}}" data-from="-14" data-to="0" data-filtername="overdue">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} overdue, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} overdue, block_timeline {{/str}}{{/str}}" role="menuitem" {{#overdue}}aria-current="true"{{/overdue}}>
{{#str}} overdue, block_timeline {{/str}}
</a>
</li>
<li class="divider"></li>
<li class="divider" role="separator"></li>
<li class="dropdown-item {{#next7days}} active {{/next7days}}" data-from="0" data-to="7" data-filtername="next7days">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next7days, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next7days, block_timeline {{/str}}{{/str}}" role="menuitem" {{#next7days}}aria-current="true"{{/next7days}}>
{{#str}} next7days, block_timeline {{/str}}
</a>
</li>
<li class="dropdown-item {{#next30days}} active {{/next30days}}" data-from="0" data-to="30" data-filtername="next30days">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next30days, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next30days, block_timeline {{/str}}{{/str}}" role="menuitem" {{#next30days}}aria-current="true"{{/next30days}}>
{{#str}} next30days, block_timeline {{/str}}
</a>
</li>
<li class="dropdown-item {{#next3months}} active {{/next3months}}" data-from="0" data-to="90" data-filtername="next3months">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next3months, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next3months, block_timeline {{/str}}{{/str}}" role="menuitem" {{#next3months}}aria-current="true"{{/next3months}}>
{{#str}} next3months, block_timeline {{/str}}
</a>
</li>
<li class="dropdown-item {{#next6months}} active {{/next6months}}" data-from="0" data-to="180" data-filtername="next6months">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next6months, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariadayfilteroption, block_timeline, {{#str}} next6months, block_timeline {{/str}}{{/str}}" role="menuitem" {{#next6months}}aria-current="true"{{/next6months}}>
{{#str}} next6months, block_timeline {{/str}}
</a>
</li>
......
theme/bootstrapbase/templates/block_timeline/nav-view-selector.mustache
View file @ 9f93263a
......@@ -23,22 +23,22 @@
{}
}}
<div data-region="view-selector" class="btn-group pull-right">
<button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="{{#str}} ariaviewselector, block_timeline{{/str}}" aria-controls="menusortby">
{{#pix}} t/sort_by {{/pix}}
<span class="sr-only">
{{#str}} ariaviewselector, block_timeline{{/str}}
<span data-active-item-text>{{#str}} sortbydates, block_timeline {{/str}}</span>
</span>
<span data-region="caret" class="caret"></span>
<span class="sr-only" data-active-item-text>
{{#sorttimelinecourses}}{{#str}} sortbycourses, block_timeline{{/str}}{{/sorttimelinecourses}}
{{#sorttimelinedates}}{{#str}} sortbydates, block_timeline {{/str}}{{/sorttimelinedates}}
</span>
</button>
<ul role="menu" class="dropdown-menu dropdown-menu-right" data-show-active-item>
<ul id="menusortby" role="menu" class="dropdown-menu dropdown-menu-right" data-show-active-item>
<li class="dropdown-item {{#sorttimelinedates}}active{{/sorttimelinedates}}" data-target="#view_dates_{{uniqid}}" data-toggle="tab" data-filtername="sortbydates">
<a href="#" aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbydates, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbydates, block_timeline {{/str}}{{/str}}" role="menuitem" {{#sorttimelinedates}}aria-current="true"{{/sorttimelinedates}}>
{{#str}} sortbydates, block_timeline {{/str}}
</a>
</li>
<li class="dropdown-item {{#sorttimelinecourses}}active{{/sorttimelinecourses}}" data-target="#view_courses_{{uniqid}}" data-toggle="tab" data-filtername="sortbycourses">
<a href="#" aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbycourses, block_timeline {{/str}}{{/str}}">
<a href="#" aria-label="{{#str}} ariaviewselectoroption, block_timeline, {{#str}} sortbycourses, block_timeline {{/str}}{{/str}}" role="menuitem" {{#sorttimelinecourses}}aria-current="true"{{/sorttimelinecourses}}>
{{#str}} sortbycourses, block_timeline {{/str}}
</a>
</li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment