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
658c2773
Commit
658c2773
authored
Feb 19, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix showing of room info in rooms list
parent
6cdaa474
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
71 additions
and
94 deletions
+71
-94
css/converse.css
css/converse.css
+16
-28
css/inverse.css
css/inverse.css
+16
-28
sass/_controlbox.scss
sass/_controlbox.scss
+20
-27
src/converse-muc.js
src/converse-muc.js
+5
-3
src/templates/bookmark.html
src/templates/bookmark.html
+2
-0
src/templates/room_item.html
src/templates/room_item.html
+10
-8
src/templates/rooms_list_item.html
src/templates/rooms_list_item.html
+2
-0
No files found.
css/converse.css
View file @
658c2773
...
@@ -5744,14 +5744,22 @@ body.reset {
...
@@ -5744,14 +5744,22 @@ body.reset {
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
{
margin
:
0.5em
0
;
margin
:
0.5em
0
;
text-align
:
left
;
}
text-align
:
left
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
dt
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
{
border
:
none
;
font-size
:
12px
;
color
:
#777
;
font-style
:
normal
;
font-weight
:
normal
;
font-weight
:
normal
;
}
padding
:
0
;
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
li
.room-info
{
padding-bottom
:
0.5em
;
display
:
block
;
text-shadow
:
0
1px
0
#FAFAFA
;
margin-left
:
5px
;
}
word-wrap
:
break-word
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
p
.room-info
{
line-height
:
16px
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
div
.room-info
{
padding
:
0.3em
0
;
clear
:
left
;
width
:
100%
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
{
border
:
none
;
border
:
none
;
...
@@ -5800,26 +5808,6 @@ body.reset {
...
@@ -5800,26 +5808,6 @@ body.reset {
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.add-bookmark.button-on
:hover
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.add-bookmark.button-on
:hover
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.remove-bookmark.button-on
:hover
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.remove-bookmark.button-on
:hover
{
color
:
#206485
;
}
color
:
#206485
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.room-info
{
font-size
:
12px
;
font-style
:
normal
;
font-weight
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
li
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
li
.room-info
{
display
:
block
;
margin-left
:
5px
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
p
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
p
.room-info
{
line-height
:
16px
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
div
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
div
.room-info
{
padding
:
0.3em
0
;
clear
:
left
;
width
:
100%
;
}
#conversejs
#controlbox
#chatrooms
,
#conversejs
#controlbox
#converse-roster
{
#conversejs
#controlbox
#chatrooms
,
#conversejs
#controlbox
#converse-roster
{
margin-top
:
0.75em
;
margin-top
:
0.75em
;
padding-bottom
:
0.75em
;
}
padding-bottom
:
0.75em
;
}
...
...
css/inverse.css
View file @
658c2773
...
@@ -5816,14 +5816,22 @@ body {
...
@@ -5816,14 +5816,22 @@ body {
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
{
margin
:
0.5em
0
;
margin
:
0.5em
0
;
text-align
:
left
;
}
text-align
:
left
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
dt
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
{
border
:
none
;
font-size
:
14px
;
color
:
#777
;
font-style
:
normal
;
font-weight
:
normal
;
font-weight
:
normal
;
}
padding
:
0
;
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
li
.room-info
{
padding-bottom
:
0.5em
;
display
:
block
;
text-shadow
:
0
1px
0
#FAFAFA
;
margin-left
:
5px
;
}
word-wrap
:
break-word
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.room-info
p
.room-info
{
line-height
:
22px
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
div
.room-info
{
padding
:
0.3em
0
;
clear
:
left
;
width
:
100%
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
{
border
:
none
;
border
:
none
;
...
@@ -5872,26 +5880,6 @@ body {
...
@@ -5872,26 +5880,6 @@ body {
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.add-bookmark.button-on
:hover
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.add-bookmark.button-on
:hover
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.remove-bookmark.button-on
:hover
{
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.remove-bookmark.button-on
:hover
{
color
:
#206485
;
}
color
:
#206485
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
.room-info
{
font-size
:
14px
;
font-style
:
normal
;
font-weight
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
li
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
li
.room-info
{
display
:
block
;
margin-left
:
5px
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
p
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
p
.room-info
{
line-height
:
22px
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.available-chatroom
div
.room-info
,
#conversejs
#controlbox
#chatrooms
.rooms-list-container
.rooms-list
.open-chatroom
div
.room-info
{
padding
:
0.3em
0
;
clear
:
left
;
width
:
100%
;
}
#conversejs
#controlbox
#chatrooms
,
#conversejs
#controlbox
#converse-roster
{
#conversejs
#controlbox
#chatrooms
,
#conversejs
#controlbox
#converse-roster
{
margin-top
:
0.75em
;
margin-top
:
0.75em
;
padding-bottom
:
0.75em
;
}
padding-bottom
:
0.75em
;
}
...
...
sass/_controlbox.scss
View file @
658c2773
...
@@ -199,15 +199,28 @@
...
@@ -199,15 +199,28 @@
.rooms-list
{
.rooms-list
{
margin
:
0
.5em
0
;
margin
:
0
.5em
0
;
text-align
:
left
;
text-align
:
left
;
dt
{
border
:
none
;
.room-info
{
color
:
$text-color
;
font-size
:
$font-size-small
;
font-style
:
normal
;
font-weight
:
normal
;
font-weight
:
normal
;
padding
:
0
;
li
.room-info
{
padding-bottom
:
0
.5em
;
display
:
block
;
text-shadow
:
0
1px
0
$text-shadow-color
;
margin-left
:
5px
;
word-wrap
:
break-word
;
}
p
.room-info
{
line-height
:
$line-height
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
}
div
.room-info
{
padding
:
0
.3em
0
;
clear
:
left
;
width
:
100%
;
}
}
.available-chatroom
,
.available-chatroom
,
.open-chatroom
{
.open-chatroom
{
border
:
none
;
border
:
none
;
...
@@ -256,26 +269,6 @@
...
@@ -256,26 +269,6 @@
}
}
color
:
$subdued-color
;
color
:
$subdued-color
;
}
}
.room-info
{
font-size
:
$font-size-small
;
font-style
:
normal
;
font-weight
:
normal
;
}
li
.room-info
{
display
:
block
;
margin-left
:
5px
;
}
p
.room-info
{
line-height
:
$line-height
;
margin
:
0
;
display
:
block
;
white-space
:
normal
;
}
div
.room-info
{
padding
:
0
.3em
0
;
clear
:
left
;
width
:
100%
;
}
}
}
}
}
}
}
...
...
src/converse-muc.js
View file @
658c2773
...
@@ -2717,7 +2717,9 @@
...
@@ -2717,7 +2717,9 @@
* info.
* info.
*/
*/
// All MUC features found here: http://xmpp.org/registrar/disco-features.html
// All MUC features found here: http://xmpp.org/registrar/disco-features.html
el
.
querySelector
(
'
span.spinner
'
).
outerHTML
=
el
.
querySelector
(
'
span.spinner
'
).
remove
();
el
.
insertAdjacentHTML
(
'
beforeEnd
'
,
tpl_room_description
({
tpl_room_description
({
'
jid
'
:
stanza
.
getAttribute
(
'
from
'
),
'
jid
'
:
stanza
.
getAttribute
(
'
from
'
),
'
desc
'
:
_
.
get
(
_
.
head
(
sizzle
(
'
field[var="muc#roominfo_description"] value
'
,
stanza
)),
'
textContent
'
),
'
desc
'
:
_
.
get
(
_
.
head
(
sizzle
(
'
field[var="muc#roominfo_description"] value
'
,
stanza
)),
'
textContent
'
),
...
@@ -2748,13 +2750,13 @@
...
@@ -2748,13 +2750,13 @@
'
label_semi_anon
'
:
__
(
'
Semi-anonymous
'
),
'
label_semi_anon
'
:
__
(
'
Semi-anonymous
'
),
'
label_temp_room
'
:
__
(
'
Temporary room
'
),
'
label_temp_room
'
:
__
(
'
Temporary room
'
),
'
label_unmoderated
'
:
__
(
'
Unmoderated
'
)
'
label_unmoderated
'
:
__
(
'
Unmoderated
'
)
})
})
);
},
},
toggleRoomInfo
(
ev
)
{
toggleRoomInfo
(
ev
)
{
/* Show/hide extra information about a room in the listing.
/* Show/hide extra information about a room in the listing.
*/
*/
const
parent_el
=
ev
.
target
.
parentElement
,
const
parent_el
=
ev
.
target
.
parentElement
.
parentElement
,
div_el
=
parent_el
.
querySelector
(
'
div.room-info
'
);
div_el
=
parent_el
.
querySelector
(
'
div.room-info
'
);
if
(
div_el
)
{
if
(
div_el
)
{
u
.
slideIn
(
div_el
).
then
(
u
.
removeElement
)
u
.
slideIn
(
div_el
).
then
(
u
.
removeElement
)
...
...
src/templates/bookmark.html
View file @
658c2773
<div>
<div
class=
"available-chatroom d-flex flex-row {[ if (o.hidden) { ]} hidden {[ } ]}"
data-room-jid=
"{{{o.jid}}}"
>
<div
class=
"available-chatroom d-flex flex-row {[ if (o.hidden) { ]} hidden {[ } ]}"
data-room-jid=
"{{{o.jid}}}"
>
<a
class=
"open-room w-100"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.open_title}}}"
href=
"#"
>
{{{o.name}}}
</a>
<a
class=
"open-room w-100"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.open_title}}}"
href=
"#"
>
{{{o.name}}}
</a>
<a
class=
"remove-bookmark fa fa-bookmark align-self-center {[ if (o.bookmarked) { ]} button-on {[ } ]}"
<a
class=
"remove-bookmark fa fa-bookmark align-self-center {[ if (o.bookmarked) { ]} button-on {[ } ]}"
...
@@ -6,3 +7,4 @@
...
@@ -6,3 +7,4 @@
<a
class=
"room-info fa fa-info-circle align-self-center"
data-room-jid=
"{{{o.jid}}}"
<a
class=
"room-info fa fa-info-circle align-self-center"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
</div>
</div>
</div>
src/templates/room_item.html
View file @
658c2773
<div
class=
"available-chatroom d-flex flex-row"
>
<div>
<a
class=
"open-room available-room"
<div
class=
"available-chatroom d-flex flex-row"
>
<a
class=
"open-room available-room"
data-room-jid=
"{{{o.jid}}}"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.open_title}}}"
title=
"{{{o.open_title}}}"
href=
"#"
>
{{{o.name}}}
</a>
href=
"#"
>
{{{o.name}}}
</a>
<a
class=
"right room-info icon-room-info"
<a
class=
"right room-info icon-room-info"
data-room-jid=
"{{{o.jid}}}"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
</div>
</div>
</div>
src/templates/rooms_list_item.html
View file @
658c2773
<div>
<div
class=
"available-chatroom d-flex flex-row {[ if (o.num_unread_general) { ]} unread-msgs {[ } ]}"
data-room-jid=
"{{{o.jid}}}"
>
<div
class=
"available-chatroom d-flex flex-row {[ if (o.num_unread_general) { ]} unread-msgs {[ } ]}"
data-room-jid=
"{{{o.jid}}}"
>
{[ if (o.num_unread) { ]}
{[ if (o.num_unread) { ]}
<span
class=
"msgs-indicator"
>
{{{ o.num_unread }}}
</span>
<span
class=
"msgs-indicator"
>
{{{ o.num_unread }}}
</span>
...
@@ -20,3 +21,4 @@
...
@@ -20,3 +21,4 @@
<a
class=
"room-info fa fa-info-circle align-self-center"
data-room-jid=
"{{{o.jid}}}"
<a
class=
"room-info fa fa-info-circle align-self-center"
data-room-jid=
"{{{o.jid}}}"
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
title=
"{{{o.info_title}}}"
href=
"#"
>
</a>
</div>
</div>
<div>
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