Merge branch 'MDL-64746-master' of https://github.com/lucaboesch/moodle

moodle · Mar 7, 2019 · b740fe1 · b740fe1
2 parents 7e51bd2 + eb6a339
commit b740fe1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/blocks/timeline/templates/nav-view-selector.mustache b/blocks/timeline/templates/nav-view-selector.mustache
@@ -24,7 +24,7 @@
 }}
 <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">
-        {{#pix}} i/filter {{/pix}}
+        {{#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}}

diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
@@ -386,6 +386,7 @@ public function get_core_icon_map() {
             'core:t/right' => 'fa-arrow-right',
             'core:t/sendmessage' => 'fa-paper-plane',
             'core:t/show' => 'fa-eye-slash',
+            'core:t/sort_by' => 'fa-sort-amount-asc',
             'core:t/sort_asc' => 'fa-sort-asc',
             'core:t/sort_desc' => 'fa-sort-desc',
             'core:t/sort' => 'fa-sort',

diff --git a/pix/t/sort_by.png b/pix/t/sort_by.png
diff --git a/pix/t/sort_by.svg b/pix/t/sort_by.svg
diff --git a/theme/bootstrapbase/templates/block_timeline/nav-view-selector.mustache b/theme/bootstrapbase/templates/block_timeline/nav-view-selector.mustache
@@ -24,7 +24,7 @@
 }}
 <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">
-        {{#pix}} i/filter {{/pix}}
+        {{#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>