Move status update form to post feed page.

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index f39cfef..323cb0e 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -147,6 +147,10 @@ textarea {
        padding-left: 1ex;
 }
 
+#sone #update-status {
+       margin-bottom: 1em;
+}
+
 #sone #update-status label {
        display: none;
 }

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index 2c2cf3f..4e43da4 100644 (file)
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -44,7 +44,6 @@
                                <div id="home-sone">
                                        <% currentSone|store key=sone>
                                        <%include include/viewSone.html>
-                                       <%include include/updateStatus.html>
                                </div>
                        <%/if>
                </div>

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 345f376..59bfee7 100644 (file)
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -4,6 +4,8 @@
 
        <h1><%= Page.Index.PostList.Title|l10n|html></h1>
 
+       <%include include/updateStatus.html>
+
        <div id="posts">
                <%= page|store key=pageParameter>
                <%include include/pagination.html>