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

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 3bb860f..f44cbf2 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -7,7 +7,7 @@
 			<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> (<% sone.id|html>)</option>
+					<option value="<% sone.id|html>"><% sone.niceName|html> (<% sone.name|html>)</option>
 				<%/foreach>
 			</select>
 			<button type="submit">Select</button>
@@ -17,6 +17,7 @@
 	<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" />
@@ -29,31 +30,9 @@
 			<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="document-name"><%= Page.Login.CreateSone.Label.DocumentName|l10n|html></label>
-			<input type="text" name="document-name" value="<% documentName|html>" />
-		</div>
-		<div>
-			<label for="insert-uri"><%= Page.Login.CreateSone.Label.RequestURI|l10n|html></label>
-			<input type="text" name="insert-uri" value="" />
-		</div>
-		<div>
-			<label for="insert-uri"><%= Page.Login.CreateSone.Label.InsertURI|l10n|html></label>
-			<input type="text" name="insert-uri" value="" />
-		</div>
-		<div>
-			<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>
+	<%include include/createSone.html>
+
 <%include include/tail.html>