cadey
/
Shuo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #380 from aspic/configurable-network-display 

Adds configurable network form display
This commit is contained in:
Mattias Erming 2015-03-23 00:33:31 +01:00
parent cf88a9dc36 20103a29a5
commit 50c9d7cb82
2 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
client/index.html
View File

@ -88,41 +88,43 @@
<div class="col-sm-12">
<h1 class="title">Connect</h1>
</div>
<div class="col-sm-12">
<h2>Network settings</h2>
</div>
<div class="col-sm-3">
<label>Name</label>
</div>
<div class="col-sm-9">
<input class="input" name="name" value="<%= defaults.name %>">
</div>
<div class="col-sm-3">
<label>Server</label>
</div>
<div class="col-sm-6 col-xs-8">
<input class="input" name="host" value="<%= defaults.host %>">
</div>
<div class="col-sm-3 col-xs-4">
<div class="port">
<input class="input" name="port" value="<%= defaults.port %>">
<div <%= !displayNetwork ? 'style="display: none;"' : ''%>>
<div class="col-sm-12">
<h2>Network settings</h2>
</div>
<div class="col-sm-3">
<label>Name</label>
</div>
<div class="col-sm-9">
<input class="input" name="name" value="<%= defaults.name %>">
</div>
<div class="col-sm-3">
<label>Server</label>
</div>
<div class="col-sm-6 col-xs-8">
<input class="input" name="host" value="<%= defaults.host %>">
</div>
<div class="col-sm-3 col-xs-4">
<div class="port">
<input class="input" name="port" value="<%= defaults.port %>">
</div>
</div>
<div class="clearfix"></div>
<div class="col-sm-3">
<label>Password</label>
</div>
<div class="col-sm-9">
<input class="input" type="password" name="password" value="<%= defaults.password %>">
</div>
<div class="col-sm-3"></div>
<div class="col-sm-9">
<label class="tls">
<input type="checkbox" name="tls" <%= defaults.tls ? 'checked="checked"' : '' %>>
Enable TLS/SSL
</label>
</div>
<div class="clearfix"></div>
</div>
<div class="clearfix"></div>
<div class="col-sm-3">
<label>Password</label>
</div>
<div class="col-sm-9">
<input class="input" type="password" name="password" value="<%= defaults.password %>">
</div>
<div class="col-sm-3"></div>
<div class="col-sm-9">
<label class="tls">
<input type="checkbox" name="tls" <%= defaults.tls ? 'checked="checked"' : '' %>>
Enable TLS/SSL
</label>
</div>
<div class="clearfix"></div>
<div class="col-sm-12">
<h2>User preferences</h2>
</div>

11
defaults/config.js
View File

@ -64,6 +64,17 @@ module.exports = {
//
prefetch: true,
//
// Display network
//
// If set to false Shout will not expose network settings in login
// form, limiting client to connect to the configured network.
//
// @type boolean
// @default true
//
displayNetwork: true,
//
// Log settings
//