From 19ec20ab89bf938fe2dd1a99b62debc76e199425 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 5 Dec 2014 19:15:41 +0100
Subject: Add option to hide or show password fields

---
 templates/https/_page.html                | 54 -------------------------------
 templates/https/restart.html              |  6 ----
 templates/webinterface/httpd-restart.html |  6 ++++
 templates/webinterface/https.html         | 53 ++++++++++++++++++++++++++++++
 templates/webinterface/passwords.html     | 25 ++++++++++++++
 5 files changed, 84 insertions(+), 60 deletions(-)
 delete mode 100644 templates/https/_page.html
 delete mode 100644 templates/https/restart.html
 create mode 100644 templates/webinterface/httpd-restart.html
 create mode 100644 templates/webinterface/https.html
 create mode 100644 templates/webinterface/passwords.html

(limited to 'templates')

diff --git a/templates/https/_page.html b/templates/https/_page.html
deleted file mode 100644
index bf791526..00000000
--- a/templates/https/_page.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<h1>{{lang_httpsSettings}}</h1>
-
-<form action="?do=Https" method="post">
-	<input type="hidden" name="token" value="{{token}}">
-	<div class="panel panel-default">
-		<div class="panel-heading">{{lang_httpsSettings}}</div>
-		<div class="panel-body">
-			<p>{{lang_description}}</p>
-			<div class="input-group" onclick="$('#moff').prop('checked', true)">
-				<span class="input-group-addon"><input id="moff" type="radio" name="mode" value="off"></span>
-				<span class="form-control">
-					{{lang_noHttps}}
-				</span>
-			</div>
-			<div class="input-group" onclick="$('#mrandom').prop('checked', true)">
-				<span class="input-group-addon"><input id="mrandom" type="radio" name="mode" value="random"></span>
-				<span class="form-control">
-					{{lang_randomCert}}
-				</span>
-			</div>
-			<div class="input-group" onclick="$('#mcustom').prop('checked', true);
-					$('#wcustom').show()">
-				<span class="input-group-addon"><input id="mcustom" type="radio" name="mode" value="custom"></span>
-				<span class="form-control">
-					{{lang_customCert}}
-				</span>
-			</div>
-			<div class="well well-sm" style="display:none" id="wcustom">
-				{{lang_certificate}}
-				<pre class="small">
------BEGIN CERTIFICATE-----
-MIIFfTCCA...
-.....
------END CERTIFICATE-----</pre>
-				<textarea name="certificate" class="form-control small" cols="101" rows="10"></textarea>
-				<hr>
-				{{lang_privateKey}}
-				<pre class="small">
------BEGIN PRIVATE KEY-----
-MIIFfTCCA...
-.....
------END PRIVATE KEY-----</pre>
-				<textarea name="privatekey" class="form-control small" cols="101" rows="10"></textarea>
-				<hr>
-				{{lang_caChain}}
-				<textarea name="cachain" class="form-control small" cols="101" rows="10"></textarea>
-				<hr>
-			</div>
-			<div class="pull-right">
-				<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-			</div>
-		</div>
-	</div>
-</form>
diff --git a/templates/https/restart.html b/templates/https/restart.html
deleted file mode 100644
index cc84aafb..00000000
--- a/templates/https/restart.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="panel panel-default">
-	<div class="panel-heading">{{lang_applyingSettings}}</div>
-	<div class="panel-body">
-		<div data-tm-id="{{taskid}}" data-tm-log="error">{{lang_installAndRestart}}</div>
-	</div>
-</div>
diff --git a/templates/webinterface/httpd-restart.html b/templates/webinterface/httpd-restart.html
new file mode 100644
index 00000000..cc84aafb
--- /dev/null
+++ b/templates/webinterface/httpd-restart.html
@@ -0,0 +1,6 @@
+<div class="panel panel-default">
+	<div class="panel-heading">{{lang_applyingSettings}}</div>
+	<div class="panel-body">
+		<div data-tm-id="{{taskid}}" data-tm-log="error">{{lang_installAndRestart}}</div>
+	</div>
+</div>
diff --git a/templates/webinterface/https.html b/templates/webinterface/https.html
new file mode 100644
index 00000000..ca2a9d04
--- /dev/null
+++ b/templates/webinterface/https.html
@@ -0,0 +1,53 @@
+<form action="?do=WebInterface" method="post">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="https">
+	<div class="panel panel-default">
+		<div class="panel-heading">{{lang_httpsSettings}}</div>
+		<div class="panel-body">
+			<p>{{lang_description}}</p>
+			<div class="input-group" onclick="$('#moff').prop('checked', true)">
+				<span class="input-group-addon"><input id="moff" type="radio" name="mode" value="off"></span>
+				<span class="form-control">
+					{{lang_noHttps}}
+				</span>
+			</div>
+			<div class="input-group" onclick="$('#mrandom').prop('checked', true)">
+				<span class="input-group-addon"><input id="mrandom" type="radio" name="mode" value="random"></span>
+				<span class="form-control">
+					{{lang_randomCert}}
+				</span>
+			</div>
+			<div class="input-group" onclick="$('#mcustom').prop('checked', true);
+					$('#wcustom').show()">
+				<span class="input-group-addon"><input id="mcustom" type="radio" name="mode" value="custom"></span>
+				<span class="form-control">
+					{{lang_customCert}}
+				</span>
+			</div>
+			<div class="well well-sm" style="display:none" id="wcustom">
+				{{lang_certificate}}
+				<pre class="small">
+-----BEGIN CERTIFICATE-----
+MIIFfTCCA...
+.....
+-----END CERTIFICATE-----</pre>
+				<textarea name="certificate" class="form-control small" cols="101" rows="10"></textarea>
+				<hr>
+				{{lang_privateKey}}
+				<pre class="small">
+-----BEGIN PRIVATE KEY-----
+MIIFfTCCA...
+.....
+-----END PRIVATE KEY-----</pre>
+				<textarea name="privatekey" class="form-control small" cols="101" rows="10"></textarea>
+				<hr>
+				{{lang_caChain}}
+				<textarea name="cachain" class="form-control small" cols="101" rows="10"></textarea>
+				<hr>
+			</div>
+			<div class="pull-right">
+				<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/templates/webinterface/passwords.html b/templates/webinterface/passwords.html
new file mode 100644
index 00000000..f9fda016
--- /dev/null
+++ b/templates/webinterface/passwords.html
@@ -0,0 +1,25 @@
+<form action="?do=WebInterface" method="post">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="password">
+	<div class="panel panel-default">
+		<div class="panel-heading">{{lang_passwordFields}}</div>
+		<div class="panel-body">
+			<p>{{lang_description}}</p>
+			<div class="input-group" onclick="$('#pmshow').prop('checked', true)">
+				<span class="input-group-addon"><input id="pmshow" type="radio" name="mode" value="show" {{selected_show}}></span>
+				<span class="form-control">
+					{{lang_showPasswords}}
+				</span>
+			</div>
+			<div class="input-group" onclick="$('#pmhide').prop('checked', true)">
+				<span class="input-group-addon"><input id="pmhide" type="radio" name="mode" value="hide" {{selected_hide}}></span>
+				<span class="form-control">
+					{{lang_hidePasswords}}
+				</span>
+			</div>
+			<div class="pull-right">
+				<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+			</div>
+		</div>
+	</div>
+</form>
-- 
cgit v1.2.3-55-g7522