mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-61778-master' of git://github.com/mickhawkins/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2018-06-05 16:40:17 +08:00 committed by Eloy Lafuente (stronk7)
commit 5870677fd4
7 changed files with 11 additions and 5 deletions
lib/classes/output
icon_system_fontawesome.php
message/templates
message_area_contact.mustache
pix/t
online.pngonline.svg
theme
boost/scss/moodle
message.scss
bootstrapbase
less/moodle
message.less
style
moodle.css

1
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',

6
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}}

BIN
pix/t/online.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 323 B

3
pix/t/online.svg Normal file

@ -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>
Side by Side

After

(image error) Size: 342 B

2
theme/boost/scss/moodle/message.scss

@ -33,7 +33,7 @@
&.online {
.online-text {
display: block;
display: inherit;
}
.offline-text {
display: none;

2
theme/bootstrapbase/less/moodle/message.less

@ -29,7 +29,7 @@
&.online {
.online-text {
display: block;
display: inherit;
}
.offline-text {
display: none;

2
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;