From a591b90dd311bf642e286a5b7b2d9402d3e495aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Thu, 21 Oct 2010 13:07:38 +0200
Subject: [PATCH] Put Sone loading into its own include file.

---
 src/main/resources/i18n/sone.en.properties         |  4 +++-
 src/main/resources/static/css/sone.css             |  6 +-----
 src/main/resources/templates/include/loadSone.html | 25 ++++++++++++++++++++++
 src/main/resources/templates/login.html            | 17 ++-------------
 4 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 src/main/resources/templates/include/loadSone.html

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index bdb95f4..8f26721 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -162,7 +162,9 @@ View.Post.Reply.DeleteLink=Delete
 WebInterface.DefaultText.StatusUpdate=What’s on your mind?
 WebInterface.DefaultText.CreateSoneName=The name of your Sone
 WebInterface.DefaultText.CreateSoneDocumentName=The document name of your Sone (e.g. the “foo” in USK@…/foo/0)
-WebInterface.DefaultText.CreateSoneInsertURI=The Insert Key of your Sone
 WebInterface.DefaultText.CreateSoneRequestURI=The Request Key of your Sone
+WebInterface.DefaultText.CreateSoneInsertURI=The Insert Key of your Sone
+WebInterface.DefaultText.LoadSoneRequestURI=The Request Key of the Sone
+WebInterface.DefaultText.LoadSoneInsertURI=The Insert Key of the Sone
 WebInterface.DefaultText.Reply=Write a Reply…
 WebInterface.DefaultText.SoneRequestURI=Sone Request Key
diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 3d0ac5c..1d426ed 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -320,11 +320,7 @@ textarea {
 	border-top: none;
 }
 
-#sone #add-sone textarea {
-	height: 1.5em;
-}
-
-#sone #create-sone textarea {
+#sone #add-sone textarea, #sone #create-sone textarea, #sone #load-sone textarea {
 	height: 1.5em;
 }
 
diff --git a/src/main/resources/templates/include/loadSone.html b/src/main/resources/templates/include/loadSone.html
new file mode 100644
index 0000000..b90475a
--- /dev/null
+++ b/src/main/resources/templates/include/loadSone.html
@@ -0,0 +1,25 @@
+<script language="javascript">
+	$(document).ready(function() {
+		registerInputTextareaSwap("#sone #load-sone input[name=request-uri]", "WebInterface.DefaultText.LoadSoneRequestURI", "request-uri", false);
+		registerInputTextareaSwap("#sone #load-sone input[name=insert-uri]", "WebInterface.DefaultText.LoadSoneInsertURI", "insert-uri", false);
+
+		/* hide all the labels. */
+		$("#sone #load-sone label").hide();
+	});
+</script>
+
+<form id="load-sone" 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>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index f44cbf2..ff858be 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -13,23 +13,10 @@
 			<button type="submit">Select</button>
 		</form>
 	<%/if>
+
 	<h1><%= Page.Login.LoadSone.Title|l10n|html></h1>
 	<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>
+	<%include include/loadSone.html>
 
 	<h1><%= Page.Login.CreateSone.Title|l10n|html></h1>
 	<div><%= Page.Login.CreateSone.Description|l10n|html></div>
-- 
2.7.4