supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2066 from thelounge/xpaw/fix-509

Browse Source 
Display password field when displayNetwork is false
This commit is contained in:
Pavel Djundik 2018-02-17 10:37:04 +02:00 committed by GitHub
commit c0442e4c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/views/windows/connect.tpl
View File

@ -37,12 +37,6 @@
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="col-sm-3">
<label for="connect:password">Password</label>
</div>
<div class="col-sm-9">
<input class="input" id="connect:password" type="password" name="password" value="{{defaults.password}}">
</div>
<div class="col-sm-9 col-sm-offset-3"> <div class="col-sm-9 col-sm-offset-3">
<label class="tls"> <label class="tls">
<input type="checkbox" name="tls" {{#if defaults.tls}}checked{{/if}} {{#if lockNetwork}}disabled{{/if}}> <input type="checkbox" name="tls" {{#if defaults.tls}}checked{{/if}} {{#if lockNetwork}}disabled{{/if}}>
@ -69,6 +63,12 @@
<input class="input username" id="connect:username" name="username" value="{{defaults.username}}"> <input class="input username" id="connect:username" name="username" value="{{defaults.username}}">
</div> </div>
{{/unless}} {{/unless}}
<div class="col-sm-3">
<label for="connect:password">Password</label>
</div>
<div class="col-sm-9">
<input class="input" id="connect:password" type="password" name="password" value="{{defaults.password}}">
</div>
<div class="col-sm-3"> <div class="col-sm-3">
<label for="connect:realname">Real name</label> <label for="connect:realname">Real name</label>
</div> </div>

1
src/server.js
View File

@ -513,6 +513,7 @@ function getClientConfiguration() {
config.defaults = _.pick(Helper.config.defaults, [ config.defaults = _.pick(Helper.config.defaults, [
"nick", "nick",
"username", "username",
"password",
"realname", "realname",
"join", "join",
]); ]);