From: David ‘Bombe’ Roden Date: Mon, 18 Oct 2010 10:44:49 +0000 (+0200) Subject: Use head and tail includes on all pages. X-Git-Tag: 0.1-RC1~239 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=861afcbbf8614375bf1359cdd80047686e93c2cc Use head and tail includes on all pages. --- diff --git a/src/main/resources/templates/addSone.html b/src/main/resources/templates/addSone.html index 51a97ce..7f6c26d 100644 --- a/src/main/resources/templates/addSone.html +++ b/src/main/resources/templates/addSone.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.AddSone.Page.Title|l10n|html>

@@ -14,4 +14,4 @@ -
+<%include include/tail.html> diff --git a/src/main/resources/templates/createPost.html b/src/main/resources/templates/createPost.html index 92d2acb..de1196b 100644 --- a/src/main/resources/templates/createPost.html +++ b/src/main/resources/templates/createPost.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.CreatePost.Page.Title|l10n|html>

@@ -20,4 +20,4 @@ -
+<%include include/tail.html> diff --git a/src/main/resources/templates/createReply.html b/src/main/resources/templates/createReply.html index afd0384..b24a588 100644 --- a/src/main/resources/templates/createReply.html +++ b/src/main/resources/templates/createReply.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.CreateReply.Page.Title|l10n|html>

@@ -21,4 +21,4 @@ -
+<%include include/tail.html> diff --git a/src/main/resources/templates/createSone.html b/src/main/resources/templates/createSone.html index ad3c6a2..d95415f 100644 --- a/src/main/resources/templates/createSone.html +++ b/src/main/resources/templates/createSone.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.Login.CreateSone.Title|l10n|html>

<%= Page.Login.CreateSone.Description|l10n|html>
@@ -25,4 +25,4 @@
- +<%include include/tail.html> diff --git a/src/main/resources/templates/deletePost.html b/src/main/resources/templates/deletePost.html index 38eba8a..bafd2dc 100644 --- a/src/main/resources/templates/deletePost.html +++ b/src/main/resources/templates/deletePost.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.DeletePost.Page.Title|l10n|html>

@@ -10,4 +10,4 @@ -
+<%include include/tail.html> diff --git a/src/main/resources/templates/deleteSone.html b/src/main/resources/templates/deleteSone.html index f370233..d3d7b15 100644 --- a/src/main/resources/templates/deleteSone.html +++ b/src/main/resources/templates/deleteSone.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.DeleteSone.Page.Title|l10n|replace needle="{zone}" replacementKey=currentSone.name|html>

@@ -22,4 +22,4 @@
- +<%include include/tail.html> diff --git a/src/main/resources/templates/editProfile.html b/src/main/resources/templates/editProfile.html index a1d80d2..af92665 100644 --- a/src/main/resources/templates/editProfile.html +++ b/src/main/resources/templates/editProfile.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.EditProfile.Page.Title|l10n|html>

@@ -42,4 +42,4 @@ -
+<%include include/tail.html> diff --git a/src/main/resources/templates/followSone.html b/src/main/resources/templates/followSone.html index 1952790..196af72 100644 --- a/src/main/resources/templates/followSone.html +++ b/src/main/resources/templates/followSone.html @@ -1,3 +1,3 @@ -
+<%include include/head.html> -
+<%include include/tail.html> diff --git a/src/main/resources/templates/knownSones.html b/src/main/resources/templates/knownSones.html index 2ff7b82..f188f56 100644 --- a/src/main/resources/templates/knownSones.html +++ b/src/main/resources/templates/knownSones.html @@ -1,4 +1,4 @@ -
+<%include include/head.html>

<%= Page.KnownSones.Page.Title|l10n|html>

@@ -10,4 +10,4 @@ <%/foreach>
- +<%include include/tail.html> diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index ba69400..7356fbb 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,4 +1,4 @@ -
+<%include include/head.html> <%if !sones.empty>

<%= Page.Login.Page.Title|l10n|html>

@@ -52,4 +52,4 @@
- +<%include include/tail.html> diff --git a/src/main/resources/templates/logout.html b/src/main/resources/templates/logout.html index 1952790..196af72 100644 --- a/src/main/resources/templates/logout.html +++ b/src/main/resources/templates/logout.html @@ -1,3 +1,3 @@ -
+<%include include/head.html> -
+<%include include/tail.html> diff --git a/src/main/resources/templates/noPermission.html b/src/main/resources/templates/noPermission.html index 0ad1c19..78f94d7 100644 --- a/src/main/resources/templates/noPermission.html +++ b/src/main/resources/templates/noPermission.html @@ -1,7 +1,7 @@ -
+<%include include/head.html>

<%= Page.NoPermission.Page.Title|l10n|html>

<%= Page.NoPermission.Text.NoPermission|l10n|html>
-
+<%include include/tail.html> diff --git a/src/main/resources/templates/viewPost.html b/src/main/resources/templates/viewPost.html index 0209b20..867971c 100644 --- a/src/main/resources/templates/viewPost.html +++ b/src/main/resources/templates/viewPost.html @@ -1,7 +1,7 @@ -
+<%include include/head.html>

<%= Page.ViewPost.Page.Title|l10n|insert needle="{sone}" key=post.sone.niceName|html>

<%include include/viewPost.html> -
+<%include include/tail.html> diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html index a7686c9..323446a 100644 --- a/src/main/resources/templates/viewSone.html +++ b/src/main/resources/templates/viewSone.html @@ -1,4 +1,4 @@ -
+<%include include/head.html> <%ifnull sone.name> @@ -65,4 +65,4 @@ <%/if> -
+<%include include/tail.html>