Commit c6d7317b authored by JC Brand's avatar JC Brand

Show the topic in the room info modal

parent 1880b3f2
......@@ -75879,7 +75879,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
toHTML() {
return tpl_chatroom_details_modal(_.extend(this.model.toJSON(), {
'__': __,
'display_name': this.model.getDisplayName(),
'display_name': __('Groupchat info for %1$s', this.model.getDisplayName()),
'num_occupants': this.model.occupants.length
}));
}
......@@ -84247,18 +84247,26 @@ __e(o.display_name) +
'</h5>\n <button type="button" class="close" data-dismiss="modal" aria-label="' +
__e(o.label_close) +
'"><span aria-hidden="true">&times;</span></button>\n </div>\n <div class="modal-body">\n <div class="room-info">\n <p class="room-info"><strong>' +
__e(o.__('Room address (JID)')) +
'</strong>: ' +
__e(o.jid) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Name')) +
'</strong>: ' +
__e(o.name) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Room address (JID)')) +
'</strong>: ' +
__e(o.jid) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Description')) +
'</strong>: ' +
__e(o.description) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Topic')) +
'</strong>: ' +
__e(o.subject.text) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Topic Author')) +
'</strong>: ' +
__e(o.subject.author) +
'</p>\n <p class="room-info"><strong>' +
__e(o.__('Online users')) +
'</strong>: ' +
__e(o.num_occupants) +
......@@ -494,7 +494,7 @@
return tpl_chatroom_details_modal(_.extend(
this.model.toJSON(), {
'__': __,
'display_name': this.model.getDisplayName(),
'display_name': __('Groupchat info for %1$s', this.model.getDisplayName()),
'num_occupants': this.model.occupants.length
})
);
......
......@@ -7,9 +7,11 @@
</div>
<div class="modal-body">
<div class="room-info">
<p class="room-info"><strong>{{{o.__('Room address (JID)')}}}</strong>: {{{o.jid}}}</p>
<p class="room-info"><strong>{{{o.__('Name')}}}</strong>: {{{o.name}}}</p>
<p class="room-info"><strong>{{{o.__('Room address (JID)')}}}</strong>: {{{o.jid}}}</p>
<p class="room-info"><strong>{{{o.__('Description')}}}</strong>: {{{o.description}}}</p>
<p class="room-info"><strong>{{{o.__('Topic')}}}</strong>: {{{o.subject.text}}}</p>
<p class="room-info"><strong>{{{o.__('Topic Author')}}}</strong>: {{{o.subject.author}}}</p>
<p class="room-info"><strong>{{{o.__('Online users')}}}</strong>: {{{o.num_occupants}}}</p>
<p class="room-info"><strong>{{{o.__('Features')}}}</strong>:
<div class="chatroom-features">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment