Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
f20d391e
Commit
f20d391e
authored
Feb 28, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show chat room occupants' states.
parent
f2f05ff4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
4 deletions
+49
-4
css/converse.css
css/converse.css
+22
-1
docs/CHANGES.md
docs/CHANGES.md
+1
-0
sass/_chatrooms.scss
sass/_chatrooms.scss
+19
-1
sass/_core.scss
sass/_core.scss
+4
-0
src/converse-muc.js
src/converse-muc.js
+2
-1
src/templates/occupant.html
src/templates/occupant.html
+1
-1
No files found.
css/converse.css
View file @
f20d391e
...
@@ -1164,6 +1164,9 @@
...
@@ -1164,6 +1164,9 @@
#conversejs
{
#conversejs
{
width
:
100%
;
width
:
100%
;
width
:
100vw
;
}
}
width
:
100vw
;
}
}
#converse-embedded-chat
.circle
,
#conversejs
.circle
{
border-radius
:
50%
;
}
#converse-embedded-chat
::selection
,
#converse-embedded-chat
::selection
,
#conversejs
::selection
{
#conversejs
::selection
{
background-color
:
#DCF9F6
;
}
background-color
:
#DCF9F6
;
}
...
@@ -2353,7 +2356,7 @@
...
@@ -2353,7 +2356,7 @@
display
:
block
;
display
:
block
;
font-size
:
12px
;
font-size
:
12px
;
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
2px
5px
;
padding
:
0.2em
0.5em
0.2em
0
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
white-space
:
nowrap
;
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
[
class
^=
"icon-"
],
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
[
class
*=
" icon-"
],
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
[
class
^=
"icon-"
],
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
[
class
*=
" icon-"
],
...
@@ -2366,6 +2369,24 @@
...
@@ -2366,6 +2369,24 @@
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
{
cursor
:
pointer
;
}
cursor
:
pointer
;
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
.occupant-status
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.occupant
.occupant-status
{
display
:
inline-block
;
margin-right
:
0.5em
;
width
:
0.5em
;
height
:
0.5em
;
}
#converse-embedded-chat
.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
{
background-color
:
green
;
}
#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
{
background-color
:
red
;
}
#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
{
background-color
:
orange
;
}
#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
{
background-color
:
orange
;
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.moderator
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.moderator
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.moderator
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
ul
li
.moderator
{
color
:
#D24E2B
;
}
color
:
#D24E2B
;
}
...
...
docs/CHANGES.md
View file @
f20d391e
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
*
Templates are no longer stored as attributes on the
`_converse`
object.
*
Templates are no longer stored as attributes on the
`_converse`
object.
If you need a particular template, use
`require`
to load it.
If you need a particular template, use
`require`
to load it.
-
Show the chat states of room occupants. [jcbrand]
-
The no-jQuery build has been renamed from
`converse.nojquery.js`
to
-
The no-jQuery build has been renamed from
`converse.nojquery.js`
to
`converse-no-jquery.js`
to fit the convention used for other build names.
`converse-no-jquery.js`
to fit the convention used for other build names.
[jcbrand]
[jcbrand]
...
...
sass/_chatrooms.scss
View file @
f20d391e
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
display
:
block
;
display
:
block
;
font-size
:
$font-size-small
;
font-size
:
$font-size-small
;
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
2px
5px
;
padding
:
0
.2em
0
.5em
0
.2em
0
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
white-space
:
nowrap
;
[
class
^=
"icon-"
],
[
class
*=
" icon-"
]
{
[
class
^=
"icon-"
],
[
class
*=
" icon-"
]
{
...
@@ -139,6 +139,24 @@
...
@@ -139,6 +139,24 @@
}
}
&
.occupant
{
&
.occupant
{
cursor
:
pointer
;
cursor
:
pointer
;
.occupant-status
{
display
:
inline-block
;
margin-right
:
0
.5em
;
width
:
0
.5em
;
height
:
0
.5em
;
&
.occupant-online
{
background-color
:
green
;
}
&
.occupant-dnd
{
background-color
:
red
;
}
&
.occupant-away
{
background-color
:
darkorange
;
}
&
.occupant-xa
{
background-color
:
orange
;
}
}
}
}
&
.moderator
{
&
.moderator
{
color
:
$moderator-color
;
color
:
$moderator-color
;
...
...
sass/_core.scss
View file @
f20d391e
...
@@ -20,6 +20,10 @@
...
@@ -20,6 +20,10 @@
width
:
100vw
;
width
:
100vw
;
}
}
.circle
{
border-radius
:
50%
;
}
::selection
{
::selection
{
background-color
:
$highlight-color
;
background-color
:
$highlight-color
;
}
}
...
...
src/converse-muc.js
View file @
f20d391e
...
@@ -1928,6 +1928,7 @@
...
@@ -1928,6 +1928,7 @@
var
new_el
=
tpl_occupant
(
var
new_el
=
tpl_occupant
(
_
.
extend
(
_
.
extend
(
{
'
jid
'
:
''
,
{
'
jid
'
:
''
,
'
show
'
:
'
online
'
,
'
hint_occupant
'
:
__
(
'
Click to mention this user in your message.
'
),
'
hint_occupant
'
:
__
(
'
Click to mention this user 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.
'
),
...
@@ -2077,7 +2078,7 @@
...
@@ -2077,7 +2078,7 @@
data
.
status
=
child
.
textContent
||
null
;
data
.
status
=
child
.
textContent
||
null
;
break
;
break
;
case
"
show
"
:
case
"
show
"
:
data
.
show
=
child
.
textContent
||
null
;
data
.
show
=
child
.
textContent
||
'
online
'
;
break
;
break
;
case
"
x
"
:
case
"
x
"
:
if
(
child
.
getAttribute
(
"
xmlns
"
)
===
Strophe
.
NS
.
MUC_USER
)
{
if
(
child
.
getAttribute
(
"
xmlns
"
)
===
Strophe
.
NS
.
MUC_USER
)
{
...
...
src/templates/occupant.html
View file @
f20d391e
...
@@ -10,4 +10,4 @@
...
@@ -10,4 +10,4 @@
{[
}
]}
{[
}
]}
{[
if
(!
_
.
includes
(["
visitor
",
"
occupant
",
"
moderator
"],
role
))
{
]}
{[
if
(!
_
.
includes
(["
visitor
",
"
occupant
",
"
moderator
"],
role
))
{
]}
title=
"{{{ jid }}} {{{ hint_occupant }}}"
title=
"{{{ jid }}} {{{ hint_occupant }}}"
{[
}
]}
>
{{{nick}}}
</li>
{[
}
]}
>
<div
class=
"occupant-status occupant-{{{show}}} circle"
></div>
{{{nick}}}
</li>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment