From 2aa709e968482756c0343dbecf079913cd16ba52 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 20 Mar 2017 21:30:33 +0100
Subject: [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
---
 .../webinterface/templates/https.html              | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'modules-available/webinterface/templates/https.html')

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>
-- 
cgit v1.2.3-55-g7522


From e12ac023773dfa9b95afcc11afdeb18e0a5785cf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 29 Mar 2017 11:00:48 +0200
Subject: [webinterface] Make line reporting current setting more visible

---
 .../webinterface/lang/en/template-tags.json        |  2 +-
 .../webinterface/templates/https.html              | 26 ++++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'modules-available/webinterface/templates/https.html')

diff --git a/modules-available/webinterface/lang/en/template-tags.json b/modules-available/webinterface/lang/en/template-tags.json
index cdf2b920..efe649cb 100644
--- a/modules-available/webinterface/lang/en/template-tags.json
+++ b/modules-available/webinterface/lang/en/template-tags.json
@@ -5,7 +5,7 @@
     "lang_customCert": "Supply own certificate",
     "lang_generatedSelected": "The server is currently using an automatically generated, self-signed certificate.",
     "lang_hidePasswords": "Mask passwords",
-    "lang_httpsDescription": "Here you can set whether the web interface should be accessible via https. You can chose if you want to use a random self signed certificate, or supply your own.",
+    "lang_httpsDescription": "Here you can set whether the web interface should be accessible via https. You can choose if you want to use a random self signed certificate, or supply your own.",
     "lang_httpsRedirect": "Redirect incoming HTTP requests to HTTPS (if enabled).",
     "lang_httpsSettings": "HTTPS settings",
     "lang_installAndRestart": "Installing certificate and restarting web server",
diff --git a/modules-available/webinterface/templates/https.html b/modules-available/webinterface/templates/https.html
index 294abe49..77585ddf 100644
--- a/modules-available/webinterface/templates/https.html
+++ b/modules-available/webinterface/templates/https.html
@@ -11,18 +11,20 @@
 			{{#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}}
+			<div class="text-info slx-bold">
+				{{#offSelected}}
+				<p>{{lang_offSelected}}</p>
+				{{/offSelected}}
+				{{#unknownSelected}}
+				<p>{{lang_unknownSelected}}</p>
+				{{/unknownSelected}}
+				{{#generatedSelected}}
+				<p>{{lang_generatedSelected}}</p>
+				{{/generatedSelected}}
+				{{#suppliedSelected}}
+				<p>{{lang_suppliedSelected}}</p>
+				{{/suppliedSelected}}
+			</div>
 			{{#httpsEnabled}}
 			<div class="input-group" onclick="$('#moff').prop('checked', true);
 					$('#wcustom').hide()">
-- 
cgit v1.2.3-55-g7522