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

Merge pull request #340 from pzia/master

Browse Source 
Hide 'Server' Label when hiding server input
This commit is contained in:
JC Brand 2015-03-17 22:28:22 +01:00
commit 9085ed668f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
converse.js
View File

@ -1760,6 +1760,7 @@
this.$el.html( this.$el.html(
converse.templates.room_panel({ converse.templates.room_panel({
'server_input_type': converse.hide_muc_server && 'hidden' || 'text', 'server_input_type': converse.hide_muc_server && 'hidden' || 'text',
'server_label_global_attr': converse.hide_muc_server && ' hidden' || '',
'label_room_name': __('Room name'), 'label_room_name': __('Room name'),
'label_nickname': __('Nickname'), 'label_nickname': __('Nickname'),
'label_server': __('Server'), 'label_server': __('Server'),

2
src/templates/room_panel.html
View File

@ -5,7 +5,7 @@
<label>{{label_nickname}}</label> <label>{{label_nickname}}</label>
<input type="text" name="nick" class="new-chatroom-nick" <input type="text" name="nick" class="new-chatroom-nick"
placeholder="{{label_nickname}}"/> placeholder="{{label_nickname}}"/>
<label>{{label_server}}</label> <label{{server_label_global_attr}}>{{label_server}}</label>
<input type="{{server_input_type}}" name="server" class="new-chatroom-server" <input type="{{server_input_type}}" name="server" class="new-chatroom-server"
placeholder="{{label_server}}"/> placeholder="{{label_server}}"/>
<div class="button-group"> <div class="button-group">