From 0052ba069577d8013f11a57bcfd42848ed14fb98 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Wed, 30 Jun 2021 19:56:38 +0700
Subject: [PATCH] Make user panel a bit prettier

---
 static/default.css  |  16 ++++
 views/admin.qtpl    |  43 ++++-----
 views/admin.qtpl.go | 207 +++++++++++++++++++++-----------------------
 3 files changed, 136 insertions(+), 130 deletions(-)

diff --git a/static/default.css b/static/default.css
index 1968603..bfb855f 100644
--- a/static/default.css
+++ b/static/default.css
@@ -419,3 +419,19 @@ kbd {
 		color: #ddd;
 	}
 }
+
+/*
+ * Tables
+ */
+
+.users-table {
+	width: 100%;
+}
+
+.users-table td {
+	white-space: nowrap;
+}
+
+.table-cell--fill {
+	width: 100%;
+}
diff --git a/views/admin.qtpl b/views/admin.qtpl
index 9136225..2b77e49 100644
--- a/views/admin.qtpl
+++ b/views/admin.qtpl
@@ -11,7 +11,7 @@
 			<li><a href="/about">About this wiki</a></li>
 			<li><a href="/user-list">User list</a></li>
 			<li><a href="/update-header-links">Update header links</a></li>
-			<li><a href="/admin/users">Manage users</a></li>
+			<li><a href="/admin/users/">Manage users</a></li>
 		</ul>
 	</section>
 	<section>
@@ -28,12 +28,6 @@
 				<input type="submit" class="btn">
 			</fieldset>
 		</form>
-		<form action="/admin/reindex-users" method="POST" style="float:left">
-			<fieldset>
-				<legend>Reindex users</legend>
-				<input type="submit" class="btn">
-			</fieldset>
-		</form>
 	</section>
 </main>
 </div>
@@ -45,28 +39,28 @@
 	<h1>Manage users</h1>
 
 	<form action="/admin/reindex-users" method="post">
-		<button class="btn btn_accent" type="submit">Reindex users</button>
+		<button class="btn" type="submit">Reindex users</button>
 	</form>
 
 	<h2>Users list</h2>
 
-	<table>
+	<table class="users-table">
 	<thead>
 		<tr>
 			<th>Name</th>
 			<th>Group</th>
 			<th>Registered at</th>
-			<th></th>
+			<th aria-label="Actions"></th>
 		</tr>
 	</thead>
 	<tbody>
 	{% for _, u := range userList %}
 		<tr>
-			<td>
-				<a href="/hypha/{%s cfg.UserHypha %}/{%s u.Name %}">{%s u.Name %}</a>
+			<td class="table-cell--fill">
+				<a href="/hypha/{%u cfg.UserHypha %}/{%u u.Name %}">{%s u.Name %}</a>
 			</td>
 			<td>{%s u.Group %}</td>
-			<td>{%s u.RegisteredAt.Format("2006-01-02 15:04:05-0700") %}</td>
+			<td>{%s u.RegisteredAt.UTC().Format("2006-01-02 15:04") %}</td>
 			<td>
 				<a href="/admin/users/{%u u.Name %}/edit">Edit</a>
 			</td>
@@ -84,18 +78,19 @@
 	<h1>{%s u.Name %}</h1>
 
 	<form action="" method="post">
-		<label for="group">Group:</label>
-		<select id="group" name="group">
-			<option{% if u.Group == "anon" %} selected{% endif %}>anon</option>
-			<option{% if u.Group == "editor" %} selected{% endif %}>editor</option>
-			<option{% if u.Group == "trusted" %} selected{% endif %}>trusted</option>
-			<option{% if u.Group == "moderator" %} selected{% endif %}>moderator</option>
-			<option{% if u.Group == "admin" %} selected{% endif %}>admin</option>
-		</select>
-		<br>
-		<br>
+		<div class="form-field">
+			<label for="group">Group:</label>
+			<select id="group" name="group">
+				<option{% if u.Group == "anon" %} selected{% endif %}>anon</option>
+				<option{% if u.Group == "editor" %} selected{% endif %}>editor</option>
+				<option{% if u.Group == "trusted" %} selected{% endif %}>trusted</option>
+				<option{% if u.Group == "moderator" %} selected{% endif %}>moderator</option>
+				<option{% if u.Group == "admin" %} selected{% endif %}>admin</option>
+			</select>
+		</div>
 
-		<button class="btn btn_accent" type="submit">Update</button>
+		<button class="btn" type="submit">Update</button>
+		<a class="btn btn_weak" href="/admin/users/">Cancel</a>
 	</form>
 </main>
 </div>
diff --git a/views/admin.qtpl.go b/views/admin.qtpl.go
index dc0a210..17c4c65 100644
--- a/views/admin.qtpl.go
+++ b/views/admin.qtpl.go
@@ -36,7 +36,7 @@ func StreamAdminPanelHTML(qw422016 *qt422016.Writer) {
 			<li><a href="/about">About this wiki</a></li>
 			<li><a href="/user-list">User list</a></li>
 			<li><a href="/update-header-links">Update header links</a></li>
-			<li><a href="/admin/users">Manage users</a></li>
+			<li><a href="/admin/users/">Manage users</a></li>
 		</ul>
 	</section>
 	<section>
@@ -53,241 +53,236 @@ func StreamAdminPanelHTML(qw422016 *qt422016.Writer) {
 				<input type="submit" class="btn">
 			</fieldset>
 		</form>
-		<form action="/admin/reindex-users" method="POST" style="float:left">
-			<fieldset>
-				<legend>Reindex users</legend>
-				<input type="submit" class="btn">
-			</fieldset>
-		</form>
 	</section>
 </main>
 </div>
 `)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 }
 
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 func WriteAdminPanelHTML(qq422016 qtio422016.Writer) {
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	StreamAdminPanelHTML(qw422016)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	qt422016.ReleaseWriter(qw422016)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 }
 
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 func AdminPanelHTML() string {
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	WriteAdminPanelHTML(qb422016)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	qs422016 := string(qb422016.B)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 	return qs422016
-//line views/admin.qtpl:40
+//line views/admin.qtpl:34
 }
 
-//line views/admin.qtpl:42
+//line views/admin.qtpl:36
 func StreamAdminUsersPanelHTML(qw422016 *qt422016.Writer, userList []*user.User) {
-//line views/admin.qtpl:42
+//line views/admin.qtpl:36
 	qw422016.N().S(`
 <div class="layout">
 <main class="main-width">
 	<h1>Manage users</h1>
 
 	<form action="/admin/reindex-users" method="post">
-		<button class="btn btn_accent" type="submit">Reindex users</button>
+		<button class="btn" type="submit">Reindex users</button>
 	</form>
 
 	<h2>Users list</h2>
 
-	<table>
+	<table class="users-table">
 	<thead>
 		<tr>
 			<th>Name</th>
 			<th>Group</th>
 			<th>Registered at</th>
-			<th></th>
+			<th aria-label="Actions"></th>
 		</tr>
 	</thead>
 	<tbody>
 	`)
-//line views/admin.qtpl:63
+//line views/admin.qtpl:57
 	for _, u := range userList {
-//line views/admin.qtpl:63
+//line views/admin.qtpl:57
 		qw422016.N().S(`
 		<tr>
-			<td>
+			<td class="table-cell--fill">
 				<a href="/hypha/`)
-//line views/admin.qtpl:66
-		qw422016.E().S(cfg.UserHypha)
-//line views/admin.qtpl:66
+//line views/admin.qtpl:60
+		qw422016.N().U(cfg.UserHypha)
+//line views/admin.qtpl:60
 		qw422016.N().S(`/`)
-//line views/admin.qtpl:66
-		qw422016.E().S(u.Name)
-//line views/admin.qtpl:66
+//line views/admin.qtpl:60
+		qw422016.N().U(u.Name)
+//line views/admin.qtpl:60
 		qw422016.N().S(`">`)
-//line views/admin.qtpl:66
+//line views/admin.qtpl:60
 		qw422016.E().S(u.Name)
-//line views/admin.qtpl:66
+//line views/admin.qtpl:60
 		qw422016.N().S(`</a>
 			</td>
 			<td>`)
-//line views/admin.qtpl:68
+//line views/admin.qtpl:62
 		qw422016.E().S(u.Group)
-//line views/admin.qtpl:68
+//line views/admin.qtpl:62
 		qw422016.N().S(`</td>
 			<td>`)
-//line views/admin.qtpl:69
-		qw422016.E().S(u.RegisteredAt.Format("2006-01-02 15:04:05-0700"))
-//line views/admin.qtpl:69
+//line views/admin.qtpl:63
+		qw422016.E().S(u.RegisteredAt.UTC().Format("2006-01-02 15:04"))
+//line views/admin.qtpl:63
 		qw422016.N().S(`</td>
 			<td>
 				<a href="/admin/users/`)
-//line views/admin.qtpl:71
+//line views/admin.qtpl:65
 		qw422016.N().U(u.Name)
-//line views/admin.qtpl:71
+//line views/admin.qtpl:65
 		qw422016.N().S(`/edit">Edit</a>
 			</td>
 		</tr>
 	`)
-//line views/admin.qtpl:74
+//line views/admin.qtpl:68
 	}
-//line views/admin.qtpl:74
+//line views/admin.qtpl:68
 	qw422016.N().S(`
 	</tbody>
 	</table>
 </main>
 </div>
 `)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 }
 
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 func WriteAdminUsersPanelHTML(qq422016 qtio422016.Writer, userList []*user.User) {
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	StreamAdminUsersPanelHTML(qw422016, userList)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	qt422016.ReleaseWriter(qw422016)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 }
 
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 func AdminUsersPanelHTML(userList []*user.User) string {
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	WriteAdminUsersPanelHTML(qb422016, userList)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	qs422016 := string(qb422016.B)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 	return qs422016
-//line views/admin.qtpl:79
+//line views/admin.qtpl:73
 }
 
-//line views/admin.qtpl:81
+//line views/admin.qtpl:75
 func StreamAdminUsersUserHTML(qw422016 *qt422016.Writer, u *user.User) {
-//line views/admin.qtpl:81
+//line views/admin.qtpl:75
 	qw422016.N().S(`
 <div class="layout">
 <main class="main-width">
 	<h1>`)
-//line views/admin.qtpl:84
+//line views/admin.qtpl:78
 	qw422016.E().S(u.Name)
-//line views/admin.qtpl:84
+//line views/admin.qtpl:78
 	qw422016.N().S(`</h1>
 
 	<form action="" method="post">
-		<label for="group">Group:</label>
-		<select id="group" name="group">
-			<option`)
-//line views/admin.qtpl:89
+		<div class="form-field">
+			<label for="group">Group:</label>
+			<select id="group" name="group">
+				<option`)
+//line views/admin.qtpl:84
 	if u.Group == "anon" {
-//line views/admin.qtpl:89
+//line views/admin.qtpl:84
 		qw422016.N().S(` selected`)
-//line views/admin.qtpl:89
+//line views/admin.qtpl:84
 	}
-//line views/admin.qtpl:89
+//line views/admin.qtpl:84
 	qw422016.N().S(`>anon</option>
-			<option`)
-//line views/admin.qtpl:90
+				<option`)
+//line views/admin.qtpl:85
 	if u.Group == "editor" {
-//line views/admin.qtpl:90
+//line views/admin.qtpl:85
 		qw422016.N().S(` selected`)
-//line views/admin.qtpl:90
+//line views/admin.qtpl:85
 	}
-//line views/admin.qtpl:90
+//line views/admin.qtpl:85
 	qw422016.N().S(`>editor</option>
-			<option`)
-//line views/admin.qtpl:91
+				<option`)
+//line views/admin.qtpl:86
 	if u.Group == "trusted" {
-//line views/admin.qtpl:91
+//line views/admin.qtpl:86
 		qw422016.N().S(` selected`)
-//line views/admin.qtpl:91
+//line views/admin.qtpl:86
 	}
-//line views/admin.qtpl:91
+//line views/admin.qtpl:86
 	qw422016.N().S(`>trusted</option>
-			<option`)
-//line views/admin.qtpl:92
+				<option`)
+//line views/admin.qtpl:87
 	if u.Group == "moderator" {
-//line views/admin.qtpl:92
+//line views/admin.qtpl:87
 		qw422016.N().S(` selected`)
-//line views/admin.qtpl:92
+//line views/admin.qtpl:87
 	}
-//line views/admin.qtpl:92
+//line views/admin.qtpl:87
 	qw422016.N().S(`>moderator</option>
-			<option`)
-//line views/admin.qtpl:93
+				<option`)
+//line views/admin.qtpl:88
 	if u.Group == "admin" {
-//line views/admin.qtpl:93
+//line views/admin.qtpl:88
 		qw422016.N().S(` selected`)
-//line views/admin.qtpl:93
+//line views/admin.qtpl:88
 	}
-//line views/admin.qtpl:93
+//line views/admin.qtpl:88
 	qw422016.N().S(`>admin</option>
-		</select>
-		<br>
-		<br>
+			</select>
+		</div>
 
-		<button class="btn btn_accent" type="submit">Update</button>
+		<button class="btn" type="submit">Update</button>
+		<a class="btn btn_weak" href="/admin/users/">Cancel</a>
 	</form>
 </main>
 </div>
 `)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 }
 
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 func WriteAdminUsersUserHTML(qq422016 qtio422016.Writer, u *user.User) {
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	StreamAdminUsersUserHTML(qw422016, u)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	qt422016.ReleaseWriter(qw422016)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 }
 
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 func AdminUsersUserHTML(u *user.User) string {
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	WriteAdminUsersUserHTML(qb422016, u)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	qs422016 := string(qb422016.B)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 	return qs422016
-//line views/admin.qtpl:102
+//line views/admin.qtpl:97
 }