From 6c64007caedc08defdc18a276f441d47c829c391 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 13 Oct 2010 13:20:52 +0200
Subject: [PATCH] Make the user specify both insert and request URI when
 loading or creating Sones.

---
 src/main/resources/i18n/sone.en.properties |  4 +++-
 src/main/resources/templates/login.html    | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 826f277..55100d4 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -9,12 +9,14 @@ Page.Login.Label.SelectSone=Select Sone:
 Page.Login.Option.NoSone=Select Sone…
 
 Page.Login.LoadSone.Title=Load Sone
-Page.Login.LoadSone.Description=This function can be used to load an existing Sone. You need to specify the {mark}insert key{/mark} of the Sone to load it!
+Page.Login.LoadSone.Description=This function can be used to load an existing Sone. You need to specify both keys of the Sone to load it!
+Page.Login.LoadSone.Label.RequestURI=Sone Request URI:
 Page.Login.LoadSone.Label.InsertURI=Sone Insert URI:
 Page.Login.LoadSone.Button.LoadSone=Load Sone
 
 Page.Login.CreateSone.Title=Create Sone
 Page.Login.CreateSone.Description=Use this function if you want to create a completely new Sone, either at a location of your choosing or a new, random location.
+Page.Login.CreateSone.Label.RequestURI=Sone Request URI:
 Page.Login.CreateSone.Label.InsertURI=Sone Insert URI:
 Page.Login.CreateSone.Label.Name=Sone name:
 Page.Login.CreateSone.Button.CreateFromURI=Create at given URI
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index aad1525..a939bb2 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -14,12 +14,18 @@
 		</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>" />
 		<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>
@@ -32,8 +38,14 @@
 			<input type="text" name="name" />
 		</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>
-- 
2.7.4