diff options
| author | Simon Rettberg | 2017-03-20 21:30:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-03-20 21:30:33 +0100 |
| commit | 2aa709e968482756c0343dbecf079913cd16ba52 (patch) | |
| tree | 6284e55c25d48b0d434042c9baccfeb9842db8bc /modules-available/webinterface/templates | |
| parent | [sysconfig] Add ConfigTgz::rebuildAllConfigs() (diff) | |
| download | slx-admin-2aa709e968482756c0343dbecf079913cd16ba52.tar.gz slx-admin-2aa709e968482756c0343dbecf079913cd16ba52.tar.xz slx-admin-2aa709e968482756c0343dbecf079913cd16ba52.zip | |
[webinterface] Remember last HTTPS config; add redirect to HTTPS setting
Functionality in the LighttpdHttps task is still missing, so the new
redirect setting doesn't really do anything yet.
This refs #3058 @2h
Diffstat (limited to 'modules-available/webinterface/templates')
| -rw-r--r-- | modules-available/webinterface/templates/https.html | 32 | ||||
| -rw-r--r-- | modules-available/webinterface/templates/passwords.html | 1 |
2 files changed, 30 insertions, 3 deletions
diff --git a/modules-available/webinterface/templates/https.html b/modules-available/webinterface/templates/https.html index dfd2a3fe..294abe49 100644 --- a/modules-available/webinterface/templates/https.html +++ b/modules-available/webinterface/templates/https.html @@ -5,9 +5,24 @@ <div class="panel-heading">{{lang_httpsSettings}}</div> <div class="panel-body"> <p>{{lang_httpsDescription}}</p> - {{^httpsEnabled}} - <p>{{lang_HttpsIsDisabled}}</p> - {{/httpsEnabled}} + {{^httpsUsed}} + {{lang_youreNotUsingHttps}} + {{/httpsUsed}} + {{#httpsUsed}} + {{lang_youreUsingHttps}} + {{/httpsUsed}} + {{#offSelected}} + <p>{{lang_offSelected}}</p> + {{/offSelected}} + {{#unknownSelected}} + <p>{{lang_unknownSelected}}</p> + {{/unknownSelected}} + {{#generatedSelected}} + <p>{{lang_generatedSelected}}</p> + {{/generatedSelected}} + {{#suppliedSelected}} + <p>{{lang_suppliedSelected}}</p> + {{/suppliedSelected}} {{#httpsEnabled}} <div class="input-group" onclick="$('#moff').prop('checked', true); $('#wcustom').hide()"> @@ -31,6 +46,7 @@ {{lang_customCert}} </span> </div> + <div class="well well-sm" style="display:none" id="wcustom"> {{lang_certificate}} <pre class="small"> @@ -52,6 +68,16 @@ MIIFfTCCA... <textarea name="cachain" class="form-control small" cols="101" rows="10"></textarea> <hr> </div> + + <br> + <div class="input-group"> + <span class="input-group-addon"><input id="httpsredirect" type="checkbox" name="httpsredirect" value="on" {{redirect_checked}}></span> + <span class="form-control" onclick="$('#httpsredirect').prop('checked', !$('#httpsredirect').prop('checked'))"> + {{lang_httpsRedirect}} + </span> + </div> + <br> + <div class="pull-right"> <button type="submit" class="btn btn-primary">{{lang_save}}</button> </div> diff --git a/modules-available/webinterface/templates/passwords.html b/modules-available/webinterface/templates/passwords.html index 1f23dfc4..8481d884 100644 --- a/modules-available/webinterface/templates/passwords.html +++ b/modules-available/webinterface/templates/passwords.html @@ -17,6 +17,7 @@ {{lang_hidePasswords}} </span> </div> + <br> <div class="pull-right"> <button type="submit" class="btn btn-primary">{{lang_save}}</button> </div> |