From 70383597b40ed24f48b4bfdf79e82e1d6d02bb73 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 16 Jun 2018 16:57:37 +0200
Subject: [PATCH] login/edit: format form inputs as html list

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

diff --git a/login/edit.php b/login/edit.php
index fe70ef9..cfbc2d7 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -109,10 +109,11 @@ if ($_POST) {
 	Geef een e-mailadres op waarmee we u kunnen bereiken indien nodig.
 	Wij zullen dit adres nooit vrij- of doorgeven.
 	</p>
+	<ul class="grid">
 <?php
 foreach ($cols as $col => &$colconf) {
 	print "\t";
-	printf('<label for="%s">%s:</label> ', $col, ucfirst($colconf['label']));
+	printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
 	if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
 		printf('<a href="/%s"><img src="/thumb/%s/%s" /></a><br />',
 			$colconf['target'],
@@ -135,17 +136,13 @@ foreach ($cols as $col => &$colconf) {
 	if ($error = @$colwarn[$col]) {
 		print " <span class=warn>$error</span>\n";
 	}
-	print "<br />\n";
+	print "</li>\n";
 }
 
 if (isset($user['pass'])) {
-	if ($hide = empty($_POST['newpass'])) {
+	$hide = empty($_POST['newpass']);
 ?>
-	<p><a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wachtwoord wijzigen</a></p>
-<?php
-	}
-?>
-	<div id="pass"<?php if ($hide) print ' hidden'; ?>>
+	<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" />
@@ -155,9 +152,17 @@ if (isset($user['pass'])) {
 		print " <span class=warn>$error</span>\n";
 	}
 ?>
-	</div>
+	</li>
 <?php
 }
 ?>
+	</ul>
 	<input type="submit" value="Opslaan" />
 </form>
+
+<?php
+	if ($hide) {
+?>
+	<p><a onclick="document.getElementById('pass').removeAttribute('style'); this.remove()">Wachtwoord wijzigen</a></p>
+<?php
+	}
-- 
2.30.0