X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Flogin.html;h=f44cbf2bbdb8b393e83c86de9cb6cd1288d3064d;hb=18f07325f79a3b93cee8d5f1a53adc0dbb7f1e1d;hp=aad152530d26272b8bb3cf2d248da4623dd7096a;hpb=f64bdc298e7db6fa63e4141e0f1ef921f8de7971;p=Sone.git

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index aad1525..f44cbf2 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 	<%if !sones.empty>
 		<h1><%= Page.Login.Page.Title|l10n|html></h1>
 		<form method="post">
@@ -7,37 +7,32 @@
 			<select name="sone-id">
 				<option disabled="disabled"><%= Page.Login.Option.NoSone|l10n|html></option>
 				<%foreach sones sone>
-					<option value="<% sone.id|html>"><% sone.name|html></option>
+					<option value="<% sone.id|html>"><% sone.niceName|html> (<% sone.name|html>)</option>
 				<%/foreach>
 			</select>
 			<button type="submit">Select</button>
 		</form>
 	<%/if>
 	<h1><%= Page.Login.LoadSone.Title|l10n|html></h1>
-	<div><%= Page.Login.LoadSone.Description|l10n|html|replace needle="{mark}" replacement="<i>"|replace needle="{/mark}" replacement="</i>"></div>
+	<div><%= Page.Login.LoadSone.Description|l10n|html></div>
 	<form action="loadSone.html" method="post">
 		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+		<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+		<div>
+			<label for="request-uri"><%= Page.Login.LoadSone.Label.RequestURI|l10n|html></label>
+			<input type="text" name="request-uri" />
+		</div>
 		<div>
 			<label for="insert-uri"><%= Page.Login.LoadSone.Label.InsertURI|l10n|html></label>
 			<input type="text" name="insert-uri" />
+		</div>
+		<div>
 			<button type="submit"><%= Page.Login.LoadSone.Button.LoadSone|l10n|html></button>
 		</div>
 	</form>
+
 	<h1><%= Page.Login.CreateSone.Title|l10n|html></h1>
 	<div><%= Page.Login.CreateSone.Description|l10n|html></div>
-	<form action="createSone.html" method="post">
-		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-		<div>
-			<label for="name"><%= Page.Login.CreateSone.Label.Name|l10n|html></label>
-			<input type="text" name="name" />
-		</div>
-		<div>
-			<label for="insert-uri"><%= Page.Login.CreateSone.Label.InsertURI|l10n|html></label>
-			<input type="text" name="insert-uri" value="" />
-			<button type="submit" name="create-from-uri" value="1"><%= Page.Login.CreateSone.Button.CreateFromURI|l10n|html></button>
-		</div>
-		<div>
-			<button type="submit" name="create-random" value="1"><%= Page.Login.CreateSone.Button.CreateRandom|l10n|html></button>
-		</div>
-	</form>
-</div>
+	<%include include/createSone.html>
+
+<%include include/tail.html>