Show the MUC server in a bookmarked room's info view
This commit is contained in:
parent
0bab19fafd
commit
bc1fa24315
@ -9,6 +9,7 @@
|
|||||||
- sinon 2.1.0
|
- sinon 2.1.0
|
||||||
- eslint 3.19.0
|
- eslint 3.19.0
|
||||||
|
|
||||||
|
- Show the MUC server in a bookmarked room's info view (in the bookmarks list). [jcbrand]
|
||||||
- Enable creation of `dist/converse-muc-embedded.js` build file for the
|
- Enable creation of `dist/converse-muc-embedded.js` build file for the
|
||||||
embedded MUC room demo. [jcbrand]
|
embedded MUC room demo. [jcbrand]
|
||||||
- Use `noConflict` to avoid polluting globale namespace with lodash and Backbone. [jcbrand]
|
- Use `noConflict` to avoid polluting globale namespace with lodash and Backbone. [jcbrand]
|
||||||
|
@ -2427,6 +2427,7 @@
|
|||||||
// 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).find('span.spinner').replaceWith(
|
$(el).find('span.spinner').replaceWith(
|
||||||
tpl_room_description({
|
tpl_room_description({
|
||||||
|
'server': Strophe.getDomainFromJid(stanza.getAttribute('from')),
|
||||||
'desc': $stanza.find('field[var="muc#roominfo_description"] value').text(),
|
'desc': $stanza.find('field[var="muc#roominfo_description"] value').text(),
|
||||||
'occ': $stanza.find('field[var="muc#roominfo_occupants"] value').text(),
|
'occ': $stanza.find('field[var="muc#roominfo_occupants"] value').text(),
|
||||||
'hidden': $stanza.find('feature[var="muc_hidden"]').length,
|
'hidden': $stanza.find('feature[var="muc_hidden"]').length,
|
||||||
@ -2441,6 +2442,7 @@
|
|||||||
'temporary': $stanza.find('feature[var="muc_temporary"]').length,
|
'temporary': $stanza.find('feature[var="muc_temporary"]').length,
|
||||||
'unmoderated': $stanza.find('feature[var="muc_unmoderated"]').length,
|
'unmoderated': $stanza.find('feature[var="muc_unmoderated"]').length,
|
||||||
'label_desc': __('Description:'),
|
'label_desc': __('Description:'),
|
||||||
|
'label_server': __('Server:'),
|
||||||
'label_occ': __('Occupants:'),
|
'label_occ': __('Occupants:'),
|
||||||
'label_features': __('Features:'),
|
'label_features': __('Features:'),
|
||||||
'label_requires_auth': __('Requires authentication'),
|
'label_requires_auth': __('Requires authentication'),
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<!-- FIXME: check markup in mockup -->
|
<!-- FIXME: check markup in mockup -->
|
||||||
<div class="room-info">
|
<div class="room-info">
|
||||||
|
<p class="room-info"><strong>{{{label_server}}}</strong> {{{server}}}</p>
|
||||||
<p class="room-info"><strong>{{{label_desc}}}</strong> {{{desc}}}</p>
|
<p class="room-info"><strong>{{{label_desc}}}</strong> {{{desc}}}</p>
|
||||||
<p class="room-info"><strong>{{{label_occ}}}</strong> {{{occ}}}</p>
|
<p class="room-info"><strong>{{{label_occ}}}</strong> {{{occ}}}</p>
|
||||||
<p class="room-info"><strong>{{{label_features}}}</strong>
|
<p class="room-info"><strong>{{{label_features}}}</strong>
|
||||||
|
Loading…
Reference in New Issue
Block a user