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 (file)
--- a/src/main/resources/templates/addSone.html
+++ b/src/main/resources/templates/addSone.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.AddSone.Page.Title|l10n|html></h1>
        
@@ -14,4 +14,4 @@
                <button type="submit"><%= Page.AddSone.Button.AddSone|l10n|html></button>
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/createPost.html b/src/main/resources/templates/createPost.html
index 92d2acb..de1196b 100644 (file)
--- a/src/main/resources/templates/createPost.html
+++ b/src/main/resources/templates/createPost.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.CreatePost.Page.Title|l10n|html></h1>
 
@@ -20,4 +20,4 @@
 
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/createReply.html b/src/main/resources/templates/createReply.html
index afd0384..b24a588 100644 (file)
--- a/src/main/resources/templates/createReply.html
+++ b/src/main/resources/templates/createReply.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.CreateReply.Page.Title|l10n|html></h1>
 
@@ -21,4 +21,4 @@
 
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/createSone.html b/src/main/resources/templates/createSone.html
index ad3c6a2..d95415f 100644 (file)
--- a/src/main/resources/templates/createSone.html
+++ b/src/main/resources/templates/createSone.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.Login.CreateSone.Title|l10n|html></h1>
        <div><%= Page.Login.CreateSone.Description|l10n|html></div>
@@ -25,4 +25,4 @@
                </div>
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/deletePost.html b/src/main/resources/templates/deletePost.html
index 38eba8a..bafd2dc 100644 (file)
--- a/src/main/resources/templates/deletePost.html
+++ b/src/main/resources/templates/deletePost.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.DeletePost.Page.Title|l10n|html></h1>
        
@@ -10,4 +10,4 @@
                <button type="submit"><%= Page.DeletePost.Button.No|l10n|html></button>
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/deleteSone.html b/src/main/resources/templates/deleteSone.html
index f370233..d3d7b15 100644 (file)
--- a/src/main/resources/templates/deleteSone.html
+++ b/src/main/resources/templates/deleteSone.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.DeleteSone.Page.Title|l10n|replace needle="{zone}" replacementKey=currentSone.name|html></h1>
 
@@ -22,4 +22,4 @@
                </div>
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/editProfile.html b/src/main/resources/templates/editProfile.html
index a1d80d2..af92665 100644 (file)
--- a/src/main/resources/templates/editProfile.html
+++ b/src/main/resources/templates/editProfile.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.EditProfile.Page.Title|l10n|html></h1>
 
@@ -42,4 +42,4 @@
                <button type="submit"><%= Page.EditProfile.Backup.Button.DownloadBackup|l10n|html></button>
        </form>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/followSone.html b/src/main/resources/templates/followSone.html
index 1952790..196af72 100644 (file)
--- a/src/main/resources/templates/followSone.html
+++ b/src/main/resources/templates/followSone.html
@@ -1,3 +1,3 @@
-<div id="sone">
+<%include include/head.html>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/knownSones.html b/src/main/resources/templates/knownSones.html
index 2ff7b82..f188f56 100644 (file)
--- a/src/main/resources/templates/knownSones.html
+++ b/src/main/resources/templates/knownSones.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.KnownSones.Page.Title|l10n|html></h1>
 
@@ -10,4 +10,4 @@
                <%/foreach>
        </div>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index ba69400..7356fbb 100644 (file)
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,4 +1,4 @@
-<div id="sone">
+<%include include/head.html>
        <%if !sones.empty>
                <h1><%= Page.Login.Page.Title|l10n|html></h1>
                <form method="post">
@@ -52,4 +52,4 @@
                        <button type="submit" name="create-random" value="1"><%= Page.Login.CreateSone.Button.CreateRandom|l10n|html></button>
                </div>
        </form>
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/logout.html b/src/main/resources/templates/logout.html
index 1952790..196af72 100644 (file)
--- a/src/main/resources/templates/logout.html
+++ b/src/main/resources/templates/logout.html
@@ -1,3 +1,3 @@
-<div id="sone">
+<%include include/head.html>
 
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/noPermission.html b/src/main/resources/templates/noPermission.html
index 0ad1c19..78f94d7 100644 (file)
--- a/src/main/resources/templates/noPermission.html
+++ b/src/main/resources/templates/noPermission.html
@@ -1,7 +1,7 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.NoPermission.Page.Title|l10n|html></h1>
 
        <div><%= Page.NoPermission.Text.NoPermission|l10n|html></div>
        
-</div>
+<%include include/tail.html>

diff --git a/src/main/resources/templates/viewPost.html b/src/main/resources/templates/viewPost.html
index 0209b20..867971c 100644 (file)
--- a/src/main/resources/templates/viewPost.html
+++ b/src/main/resources/templates/viewPost.html
@@ -1,7 +1,7 @@
-<div id="sone">
+<%include include/head.html>
 
        <h1><%= Page.ViewPost.Page.Title|l10n|insert needle="{sone}" key=post.sone.niceName|html></h1>
 
        <%include include/viewPost.html>
 
-</div>
+<%include include/tail.html>

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