From 1ebd063f4e35b3840c001ec845ccb7abb634ea18 Mon Sep 17 00:00:00 2001
From: Michael Hawkins <michaelh@moodle.com>
Date: Tue, 22 May 2018 11:25:19 +0800
Subject: [PATCH] MDL-61778 message: Renamed online status icon and replaced
 Boost icon

---
 lib/classes/output/icon_system_fontawesome.php  |   1 +
 message/templates/message_area_contact.mustache |   6 ++++--
 pix/t/online.png                                | Bin 0 -> 323 bytes
 pix/t/online.svg                                |   3 +++
 theme/boost/scss/moodle/message.scss            |   2 +-
 theme/bootstrapbase/less/moodle/message.less    |   2 +-
 theme/bootstrapbase/style/moodle.css            |   2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 pix/t/online.png
 create mode 100644 pix/t/online.svg

diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 0650971c65e..71d15a671e6 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -360,6 +360,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:t/message' => 'fa-comment',
             'core:t/more' => 'fa-caret-down',
             'core:t/move' => 'fa-arrows-v',
+            'core:t/online' => 'fa-circle',
             'core:t/passwordunmask-edit' => 'fa-pencil',
             'core:t/passwordunmask-reveal' => 'fa-eye',
             'core:t/portfolioadd' => 'fa-plus',
diff --git a/message/templates/message_area_contact.mustache b/message/templates/message_area_contact.mustache
index f63e95933e7..2ca50f27611 100644
--- a/message/templates/message_area_contact.mustache
+++ b/message/templates/message_area_contact.mustache
@@ -25,9 +25,11 @@
         <div class="name">
             {{fullname}}
             {{#showonlinestatus}}
-                <span {{^isonline}}class="hidden"{{/isonline}} data-region="contact-icon-online">
-                    {{#pix}} t/go, core, {{#str}} online, message {{/str}} {{/pix}}
+            <div {{#isonline}}class="d-inline status online"{{/isonline}}{{^isonline}}class="hidden"{{/isonline}}>
+                <span class="online-text" data-region="contact-icon-online">
+                    {{#pix}} t/online, core, {{#str}} online, message {{/str}} {{/pix}}
                 </span>
+            </div>
             {{/showonlinestatus}}
             <span {{^isblocked}}class="hidden"{{/isblocked}} data-region="contact-icon-blocked">
                 {{#pix}} t/block, core, {{#str}} contactblocked, message {{/str}} {{/pix}}
diff --git a/pix/t/online.png b/pix/t/online.png
new file mode 100644
index 0000000000000000000000000000000000000000..c449d4a6d3629ea37b881d4665fc302aa2c9d286
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%KnH|hQ(OS=^+1MpwI<R7sn8d^HV1odNDgnxZVG5Es?e^
zL6$}M!X@W7oOhyv-*R5^nJk>Med|XyxkGu5ydGKW4HOe^ZZwGM>|6h*V*T$U6Vq<{
z?D^w#iPymXoPNqR&E@OnZmVWs)VV(`y;)kW(YtP0dGqS9=c~(2Z>I_A*!)$hchB^>
z{_LqZtI>g}_8+&atz0J1yNY+mf*lEYfBG*r_->qcQ)1@tr2C(41^LNd5dTqoqxIaa
z%-uj!{&iHD@6bB;$T8l#rg!<t<<`BcE<QKi^vU>xK-t3X%@qtk7^JzKX8a9W?gI21
NgQu&X%Q~loCIDOOgLwb|

literal 0
HcmV?d00001

diff --git a/pix/t/online.svg b/pix/t/online.svg
new file mode 100644
index 00000000000..64f57e9a6c9
--- /dev/null
+++ b/pix/t/online.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 12 12" preserveAspectRatio="xMinYMid meet" overflow="visible"><circle cx="6" cy="6" r="6" fill="#7d7"/></svg>
\ No newline at end of file
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 8c7846deb93..11be4f635ce 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -33,7 +33,7 @@
 
         &.online {
             .online-text {
-                display: block;
+                display: inherit;
             }
             .offline-text {
                 display: none;
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index ef421323e3c..70aa519cdc2 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -29,7 +29,7 @@
 
         &.online {
             .online-text {
-                display: block;
+                display: inherit;
             }
             .offline-text {
                 display: none;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 6b31450aa76..eb20dce9c6f 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -8128,7 +8128,7 @@ a.ygtvspacer:hover {
   color: #ff6961;
 }
 .messaging-area-container .status.online .online-text {
-  display: block;
+  display: inherit;
 }
 .messaging-area-container .status.online .offline-text {
   display: none;