Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Also show a hint explaining the roomchat status

Browse Source
This commit is contained in:
JC Brand 2017-02-28 06:46:21 +01:00
parent f20d391ea6
commit bccdedc64f
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/converse.css
View File

@ -2375,15 +2375,16 @@
margin-right: 0.5em; margin-right: 0.5em;
width: 0.5em; width: 0.5em;
height: 0.5em; } height: 0.5em; }
#converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-chat,
#conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online { #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online,
#conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-chat {
background-color: green; } background-color: green; }
#converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd,
#conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd { #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd {
background-color: red; } background-color: red; }
#converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-away, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-away,
#conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-away { #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-away {
background-color: orange; } background-color: darkorange; }
#converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-xa, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-xa,
#conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-xa { #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-xa {
background-color: orange; } background-color: orange; }

3
sass/_chatrooms.scss
View File

@ -144,7 +144,8 @@
margin-right: 0.5em; margin-right: 0.5em;
width: 0.5em; width: 0.5em;
height: 0.5em; height: 0.5em;
&.occupant-online { &.occupant-online,
&.occupant-chat {
background-color: green; background-color: green;
} }
&.occupant-dnd { &.occupant-dnd {

9
src/converse-core.js
View File

@ -95,6 +95,15 @@
'chat': 1, // We currently don't differentiate between "chat" and "online" 'chat': 1, // We currently don't differentiate between "chat" and "online"
'online': 1 'online': 1
}; };
_converse.PRETTY_CHAT_STATUS = {
'offline': 'Offline',
'unavailable': 'Unavailable',
'xa': 'Extended Away',
'away': 'Away',
'dnd': 'Do not disturb',
'chat': 'Chattty',
'online': 'Online'
};
_converse.ANONYMOUS = "anonymous"; _converse.ANONYMOUS = "anonymous";
_converse.CLOSED = 'closed'; _converse.CLOSED = 'closed';
_converse.EXTERNAL = "external"; _converse.EXTERNAL = "external";

6
src/converse-muc.js
View File

@ -1925,11 +1925,13 @@
}, },
render: function () { render: function () {
var show = this.model.get('show') || 'online';
var new_el = tpl_occupant( var new_el = tpl_occupant(
_.extend( _.extend(
{ 'jid': '', { 'jid': '',
'show': 'online', 'show': show,
'hint_occupant': __('Click to mention this user in your message.'), 'hint_show': _converse.PRETTY_CHAT_STATUS[show],
'hint_occupant': __('Click to mention '+this.model.get('nick')+' in your message.'),
'desc_moderator': __('This user is a moderator.'), 'desc_moderator': __('This user is a moderator.'),
'desc_occupant': __('This user can send messages in this room.'), 'desc_occupant': __('This user can send messages in this room.'),
'desc_visitor': __('This user can NOT send messages in this room.') 'desc_visitor': __('This user can NOT send messages in this room.')

2
src/templates/occupant.html
View File

@ -10,4 +10,4 @@
{[ } ]} {[ } ]}
{[ if (!_.includes(["visitor", "occupant", "moderator"], role)) { ]} {[ if (!_.includes(["visitor", "occupant", "moderator"], role)) { ]}
title="{{{ jid }}} {{{ hint_occupant }}}" title="{{{ jid }}} {{{ hint_occupant }}}"
{[ } ]}><div class="occupant-status occupant-{{{show}}} circle"></div>{{{nick}}}</li> {[ } ]}><div class="occupant-status occupant-{{{show}}} circle" title="{{{hint_show}}}"></div>{{{nick}}}</li>