From c9d04593dc8a1707ac2ab1872dd2a7c48c54955d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Sat, 2 Feb 2019 11:59:51 +0100
Subject: [PATCH] MDL-64747 block_myoverview: Omit "Sort by" text and add icon
 instead.

---
 .../templates/nav-sort-selector.mustache           |   4 ++--
 lib/classes/output/icon_system_fontawesome.php     |   1 +
 pix/t/sort_by.svg                                  |   3 +++
 theme/boost/style/moodle.css                       |  14 +++++++++-----
 theme/bootstrapbase/style/moodle.css               | Bin 525062 -> 525114 bytes
 5 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 pix/t/sort_by.svg

diff --git a/blocks/myoverview/templates/nav-sort-selector.mustache b/blocks/myoverview/templates/nav-sort-selector.mustache
index 25675559dca..574b5e5eea7 100644
--- a/blocks/myoverview/templates/nav-sort-selector.mustache
+++ b/blocks/myoverview/templates/nav-sort-selector.mustache
@@ -27,10 +27,10 @@
 }}
 
 <div class="m-b-1 mr-1 d-flex align-items-center">
-    <div class="d-none d-md-inline-block mr-1">{{#str}} sortby, core {{/str}}</div>
     <div class="dropdown">
         <button id="sortingdropdown" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"  aria-haspopup="true" aria-expanded="false" aria-label="{{#str}} aria:sortingdropdown, block_myoverview {{/str}}">
-            <span data-active-item-text>
+            {{#pix}} t/sort_by {{/pix}}
+            <span class="d-sm-inline-block" data-active-item-text>
                 {{#title}}{{#str}} title, block_myoverview {{/str}}{{/title}}
                 {{#lastaccessed}}{{#str}} lastaccessed, block_myoverview {{/str}}{{/lastaccessed}}
             </span>
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 0ed5355ef48..d51724bf686 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -386,6 +386,7 @@ class icon_system_fontawesome extends icon_system_font {
             '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-desc',
             '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.svg b/pix/t/sort_by.svg
new file mode 100644
index 00000000000..8d390840363
--- /dev/null
+++ b/pix/t/sort_by.svg
@@ -0,0 +1,3 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 512 512"><path d="M187.298 395.314l-79.984 80.002c-6.248 6.247-16.383 6.245-22.627 0L4.705 395.314C-5.365 385.244 1.807 368 16.019 368H64V48c0-8.837 7.163-16 16-16h32c8.837 0 16 7.163 16 16v320h47.984c14.241 0 21.363 17.264 11.314 27.314zM240 96h256c8.837 0 16-7.163 16-16V48c0-8.837-7.163-16-16-16H240c-8.837 0-16 7.163-16 16v32c0 8.837 7.163 16 16 16zm-16 112v-32c0-8.837 7.163-16 16-16h192c8.837 0 16 7.163 16 16v32c0 8.837-7.163 16-16 16H240c-8.837 0-16-7.163-16-16zm0 256v-32c0-8.837 7.163-16 16-16h64c8.837 0 16 7.163 16 16v32c0 8.837-7.163 16-16 16h-64c-8.837 0-16-7.163-16-16zm0-128v-32c0-8.837 7.163-16 16-16h128c8.837 0 16 7.163 16 16v32c0 8.837-7.163 16-16 16H240c-8.837 0-16-7.163-16-16z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index a083d608c85..483e5a329c9 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -792,6 +792,10 @@
 .fa-sort:before {
   content: ""; }
 
+.fa-sort-amount-desc:before {
+  content: "\f161";
+}
+
 .fa-sort-down:before,
 .fa-sort-desc:before {
   content: ""; }
@@ -6320,7 +6324,7 @@ button.close, .moodle-dialogue-base button.closebutton {
   .bs-popover-top .arrow::before, .bs-popover-auto[x-placement^="top"] .arrow::before {
     bottom: 0;
     border-top-color: rgba(0, 0, 0, 0.25); }
-  
+
   .bs-popover-top .arrow::after,
   .bs-popover-auto[x-placement^="top"] .arrow::after {
     bottom: 1px;
@@ -6340,7 +6344,7 @@ button.close, .moodle-dialogue-base button.closebutton {
   .bs-popover-right .arrow::before, .bs-popover-auto[x-placement^="right"] .arrow::before {
     left: 0;
     border-right-color: rgba(0, 0, 0, 0.25); }
-  
+
   .bs-popover-right .arrow::after,
   .bs-popover-auto[x-placement^="right"] .arrow::after {
     left: 1px;
@@ -6357,7 +6361,7 @@ button.close, .moodle-dialogue-base button.closebutton {
   .bs-popover-bottom .arrow::before, .bs-popover-auto[x-placement^="bottom"] .arrow::before {
     top: 0;
     border-bottom-color: rgba(0, 0, 0, 0.25); }
-  
+
   .bs-popover-bottom .arrow::after,
   .bs-popover-auto[x-placement^="bottom"] .arrow::after {
     top: 1px;
@@ -6386,7 +6390,7 @@ button.close, .moodle-dialogue-base button.closebutton {
   .bs-popover-left .arrow::before, .bs-popover-auto[x-placement^="left"] .arrow::before {
     right: 0;
     border-left-color: rgba(0, 0, 0, 0.25); }
-  
+
   .bs-popover-left .arrow::after,
   .bs-popover-auto[x-placement^="left"] .arrow::after {
     right: 1px;
@@ -8506,7 +8510,7 @@ a.dimmed_text:visited,
   .table, table.collection, table.flexible,
   .generaltable {
     border-collapse: collapse !important; }
-    
+
     .table td,
     table.collection td,
     table.flexible td,
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index d3e0cf4861178897d8ddad5d11c9463bec26c612..45f85af8858985160ab98ff6689e66b779074ce5 100644
GIT binary patch
delta 46
ucmZo`Q`ps}u;HlT<X}&e=A(w~M-3T)m<foPftUq|S%H{s`%y!7$BO{S-V)dV

delta 42
qcmdnhrqI@=u;Hj-^H0O}pN5P;%ml>DK+FQftU%1R{ih+j<3#|aj1v_A

-- 
2.14.3 (Apple Git-98)