From 956a31db8fdbf5407071b0ca0a348236cd24b5ca Mon Sep 17 00:00:00 2001
From: Simon Kinane <skinane@fb.com>
Date: Wed, 14 Sep 2022 16:00:57 +0100
Subject: [PATCH] uspot: Improve HTML for captive portal UI

Signed-off-by: Simon Kinane <skinane@fb.com>
---
 .../uspot/files/usr/share/uspot/credentials.uc     | 14 +++++++++-----
 .../ucentral/uspot/files/usr/share/uspot/error.uc  |  3 ++-
 .../ucentral/uspot/files/usr/share/uspot/radius.uc | 14 +++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/feeds/ucentral/uspot/files/usr/share/uspot/credentials.uc b/feeds/ucentral/uspot/files/usr/share/uspot/credentials.uc
index a193e77f4..147a0da6b 100644
--- a/feeds/ucentral/uspot/files/usr/share/uspot/credentials.uc
+++ b/feeds/ucentral/uspot/files/usr/share/uspot/credentials.uc
@@ -3,14 +3,18 @@ Content-Type: text/html
 
 {{ header }}
 {% if (error): %}
-<h1> Invalid credentials </h1>
+<h2> Invalid credentials </h2>
 {% endif %}
 
 <form action="/hotspot" method="POST">
-<label for="fname">Username:</label>
-<input type="text" name="username"><br>
-<label for="fname">Password:</label>
-<input type="password" name="password">
+	<table>
+		<tr><td><label for="fname">Username:</label></td>
+			<td><input type="text" name="username"></td>
+		</tr>
+		<tr><td><label for="fname">Password:</label></td>
+			<td><input type="password" name="password"></td>
+		</tr>
+	</table>
 <input type="hidden" name="action" value="credentials">
 <input type="submit" value="Login" class="btn btn-primary btn-block">
 </form>
diff --git a/feeds/ucentral/uspot/files/usr/share/uspot/error.uc b/feeds/ucentral/uspot/files/usr/share/uspot/error.uc
index f4107f4d1..3ef3f4ecb 100644
--- a/feeds/ucentral/uspot/files/usr/share/uspot/error.uc
+++ b/feeds/ucentral/uspot/files/usr/share/uspot/error.uc
@@ -3,6 +3,7 @@ Content-Type: text/html
 
 {{ header }}
 
-<h1> An Error occured, please try again </h1>
+<h2> An Error occured </h2>
+<h2> Please try again </h2>
 
 {{ footer }}
diff --git a/feeds/ucentral/uspot/files/usr/share/uspot/radius.uc b/feeds/ucentral/uspot/files/usr/share/uspot/radius.uc
index 997eb1497..6b67ce7e7 100644
--- a/feeds/ucentral/uspot/files/usr/share/uspot/radius.uc
+++ b/feeds/ucentral/uspot/files/usr/share/uspot/radius.uc
@@ -3,14 +3,18 @@ Content-Type: text/html
 
 {{ header }}
 {% if (error): %}
-<h1> Invalid credentials </h1>
+<h2> Invalid credentials </h2>
 {% endif %}
 
 <form action="/hotspot" method="POST">
-<label for="fname">Username:</label>
-<input type="text" name="username"><br>
-<label for="fname">Password:</label>
-<input type="password" name="password">
+	<table>
+		<tr><td><label for="fname">Username:</label></td>
+			<td><input type="text" name="username"></td>
+		</tr>
+		<tr><td><label for="fname">Password:</label></td>
+			<td><input type="password" name="password"></td>
+		</tr>
+	</table>
 <input type="hidden" name="action" value="radius">
 <input type="submit" value="Login" class="btn btn-primary btn-block">
 </form>