3 files changed, 21 insertions, 24 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
index 804605dd..df2caf7b 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
@@ -1,12 +1,14 @@
-<form action="/post" method="post" enctype="multipart/form-data">
-    <section id="newmessage">
-        <textarea name="body" placeholder="Новое сообщение..."></textarea>
-        <div>
-            <input type="text" class="img" name="img" placeholder="Ссылка на изображение (JPG/PNG, до 10Мб)" style="margin-bottom: 8pt"/> или <a
-                href="#">загрузить</a><br/>
+<div th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+    <form action="/post" th:action="@{/post}" method="post" enctype="multipart/form-data">
+        <section id="newmessage">
+            <textarea name="body" placeholder="Новое сообщение..." th:placeholder="#{postForm.newMessage}"></textarea>
+            <div>
+                <input type="text" class="img" name="img" placeholder="Ссылка на изображение (JPG/PNG, до 10Мб)" th:placeholder="#{postForm.imageLink}" style="margin-bottom: 8pt"/>
+                [(#{postForm.orImageUpload})]
 
-            <input type="text" class="tags" name="tags" placeholder="Теги (через пробел)"/><br/>
-            <input type="submit" class="subm" value="Отправить"/>
-        </div>
-    </section>
-</form>
-\ No newline at end of file
+                <input type="text" class="tags" name="tags" placeholder="Теги (через пробел)" th:placeholder="#{postForm.tags}"/><br/>
+                <input type="submit" class="subm" value="Отправить" th:value="#{button.send}"/>
+            </div>
+        </section>
+    </form>
+</div>
+\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
index 2f0d707c..cbf25c3b 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
@@ -1,11 +1,4 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-
-<body>
-<p class="tags">
+<p class="tags" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
     <div th:replace="views/partial/tags">Tags</div>
     <a href="http://ru.wix.com/" th:if="${showAdv}">конструктор сайтов</a>
 </p>
-</body>
-</html>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
index d7901d5e..253511b5 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
@@ -1,5 +1,7 @@
-<div id="pagetabs"><ul>
-    <li><a href="/settings">Main</a></li>
-    <li><a href="/settings?page=password">Password</a></li>
-    <li><a href="/settings?page=about">About</a></li>
-</ul></div>
-\ No newline at end of file
+<div id="pagetabs" xmlns:th="http://www.thymeleaf.org">
+    <ul>
+        <li><a href="/settings" th:href="@{/settings}" th:text="#{link.settings.main}">Main</a></li>
+        <li><a href="/settings?page=password" th:href="@{/settings?page=password}" th:text="#{link.settings.password}">Password</a></li>
+        <li><a href="/settings?page=about" th:href="@{/settings?page=about}" th:text="#{link.settings.about}">About</a></li>
+    </ul>
+</div>
+\ No newline at end of file