From 3027600c279ef2be4098028e3c7736a637539e97 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 16 Jun 2018 22:58:33 +0200
Subject: [PATCH] login/edit: password option in label

---
 login/edit.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/login/edit.php b/login/edit.php
index 9611c7d..4e52506 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -144,13 +144,19 @@ foreach ($cols as $col => &$colconf) {
 }
 
 if (isset($user['pass'])) {
-	$hide = empty($_POST['newpass']);
 ?>
-	<li id="pass"<?php if ($hide) print ' hidden style="display:none"'; ?>>
-		<label for="newpass">Wachtwoord:</label>
-		<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
-		<input type="password" name="newpass" value="" placeholder="Nieuw wachtwoord" />
-		<input type="password" name="passconf" value="" placeholder="Nogmaals" />
+	<li><label for="newpass">Wachtwoord:</label>
+<?php
+	if ($hide = empty($_POST['newpass'])) {
+?>
+		<a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wijzigen</a>
+<?php
+	}
+?>
+		<span id="pass"<?php if ($hide) print ' hidden'; ?>>
+			<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
+			<input type="password" name="newpass" value="" placeholder="Nieuw wachtwoord" />
+			<input type="password" name="passconf" value="" placeholder="Nogmaals" />
 <?php
 	if ($error = @$colwarn['pass']) {
 		print " <span class=warn>$error</span>\n";
@@ -161,12 +167,5 @@ if (isset($user['pass'])) {
 }
 ?>
 	</ul>
-	<input type="submit" value="Opslaan" />
+	<p><input type="submit" value="Opslaan" /></p>
 </form>
-
-<?php
-	if ($hide) {
-?>
-	<p><a onclick="document.getElementById('pass').removeAttribute('style'); this.remove()">Wachtwoord wijzigen</a></p>
-<?php
-	}
-- 
2.30.0