From 8b8fb600cdf97c3470b2471d917b39dd0c9cff14 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 20 Oct 2010 16:01:30 +0200
Subject: [PATCH] Move Sone creation to its own template.

---
 src/main/resources/static/css/sone.css             |  4 ++++
 src/main/resources/templates/createSone.html       | 26 +-------------------
 .../resources/templates/include/createSone.html    | 25 +++++++++++++++++++
 src/main/resources/templates/login.html            | 28 +++-------------------
 4 files changed, 33 insertions(+), 50 deletions(-)
 create mode 100644 src/main/resources/templates/include/createSone.html

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 195708a..3787f27 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -261,6 +261,10 @@
 	display: inline;
 }
 
+#sone #create-sone {
+	
+}
+
 #sone #tail .import-key {
 	margin-top: 1em;
 	border-top: solid 1px #ccc;
diff --git a/src/main/resources/templates/createSone.html b/src/main/resources/templates/createSone.html
index 71d7366..eb92652 100644
--- a/src/main/resources/templates/createSone.html
+++ b/src/main/resources/templates/createSone.html
@@ -3,30 +3,6 @@
 	<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<%if errorName> class="error"<%/if>>
-			<label for="name"><%= Page.Login.CreateSone.Label.Name|l10n|html></label>
-			<input type="text" name="name" value="<% name|html>"/>
-		</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<%if errorUri> class="error"<%/if>>
-			<label for="insert-uri"><%= Page.Login.CreateSone.Label.RequestURI|l10n|html></label>
-			<input type="text" name="insert-uri" value="<% insertUri|html>" />
-		</div>
-		<div<%if errorUri> class="error"<%/if>>
-			<label for="insert-uri"><%= Page.Login.CreateSone.Label.InsertURI|l10n|html></label>
-			<input type="text" name="insert-uri" value="<% requestUri|html>" />
-		</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>
diff --git a/src/main/resources/templates/include/createSone.html b/src/main/resources/templates/include/createSone.html
new file mode 100644
index 0000000..318effe
--- /dev/null
+++ b/src/main/resources/templates/include/createSone.html
@@ -0,0 +1,25 @@
+<form id="create-sone" action="createSone.html" method="post">
+	<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+	<div<%if errorName> class="error"<%/if>>
+		<label for="name"><%= Page.Login.CreateSone.Label.Name|l10n|html></label>
+		<input type="text" name="name" value="<% name|html>"/>
+	</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>
+		<button type="submit" name="create-random" value="1"><%= Page.Login.CreateSone.Button.CreateRandom|l10n|html></button>
+	</div>
+	<div<%if errorUri> class="error"<%/if>>
+		<label for="insert-uri"><%= Page.Login.CreateSone.Label.RequestURI|l10n|html></label>
+		<input type="text" name="insert-uri" value="<% insertUri|html>" />
+	</div>
+	<div<%if errorUri> class="error"<%/if>>
+		<label for="insert-uri"><%= Page.Login.CreateSone.Label.InsertURI|l10n|html></label>
+		<input type="text" name="insert-uri" value="<% requestUri|html>" />
+	</div>
+	<div>
+		<button type="submit" name="create-from-uri" value="1"><%= Page.Login.CreateSone.Button.CreateFromURI|l10n|html></button>
+	</div>
+</form>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 804ac83..7f300b8 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -30,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>
-- 
2.7.4