juick-spring-www: WIP

3 files changed, 28 insertions, 31 deletions

diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html
index 6978a2c0..6fbaecf2 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html
@@ -11,9 +11,7 @@
         <a href="https://www.facebook.com/JuickCom" rel="nofollow" class="ico32-fb">Facebook</a>
     </div>
     <div id="footer-left">juick.com &copy; 2008-2016
-        {% if links %}
-        <br/>Спонсоры: {{ links }}
-        {% endif %}
+        <br th:if="${links}"/>Спонсоры: ${links}
     </div>
 </div>
 <script>
@@ -24,11 +22,11 @@
         ga('create','UA-385578-4','juick.com');
         ga('require','displayfeatures');
         ga('send','pageview');
-        {% if (sapeon) %}
+<th:block th:if="${sapeon}">
             var _acic={dataProvider:10};
             (function(){
             var e=document.createElement('script');e.type='text/javascript';e.async=true;e.src='//www2.aci'+'nt.net/aci.js';
             var t=document.getElementsByTagName('script')[0];t.parentNode.insertBefore(e,t);
             })();
-        {% endif %}
+</th:block>
 </script>
\ 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 5293918d..534e0368 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,6 +1,4 @@
 <p class="tags">
-    {% include "views/partial/tags.html" %}
-    {% if showAdv %}
-    <a href="http://ru.wix.com/">конструктор сайтов</a>
-    {% endif %}
+    <div th:replace="views/partial/tags">Tags</div>
+    <a href="http://ru.wix.com/" th:if="${showAdv}">конструктор сайтов</a>
 </p>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
index 2863d0c3..bd6359d7 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
@@ -9,29 +9,30 @@
     </nav>
     <div id="search">
         <form action="/">
-            <input type="text" name="search" class="text" placeholder="Поиск" value="{{ search }}"/>
+            <input type="text" name="search" class="text" placeholder="Поиск" th:value="${search}"/>
         </form>
     </div>
-    <section id="headdiv">
-        {% if visitor.getUID() > 0 %}
-        <nav id="user">
-            <ul>
-                <li><a href="/?show=my">Моя лента</a></li>
-                <li><a href="/pm/inbox">Приватные</a></li>
-                <li><a href="/?show=discuss">Обсуждения</a></li>
-                <li><a href="/?show=recommended">Рекомендации</a></li>
-            </ul>
-        </nav>
-        <nav id="actions">
-            <ul>
-                <li><a href="/#post">Написать</a></li>
-                <li><a href="/{{ visitor.getName() }}">@{{ visitor.getName() }}</a></li>
-                <li><a href="/logout">Выйти</a></li>
-            </ul>
-        </nav>
-        {% else %}
-        <p>Чтобы добавлять сообщения и комментарии, <a href="#" onclick="return Juick.openDialogLogin()">представьтесь</a>.
-        </p>
-        {% endif %}
+    <section id="headdiv" th:switch="${visitor.getUid() > 0}">
+        <th:block th:case="true">
+            <nav id="user">
+                <ul>
+                    <li><a href="/?show=my">Моя лента</a></li>
+                    <li><a href="/pm/inbox">Приватные</a></li>
+                    <li><a href="/?show=discuss">Обсуждения</a></li>
+                    <li><a href="/?show=recommended">Рекомендации</a></li>
+                </ul>
+            </nav>
+            <nav id="actions">
+                <ul>
+                    <li><a href="/#post">Написать</a></li>
+                    <li><a href="/${visitor.getName()}" th:text="@${visitor.getName()}">@ugnich</a></li>
+                    <li><a href="/logout">Выйти</a></li>
+                </ul>
+            </nav>
+        </th:block>
+        <th:block th:case="false">
+            <p>Чтобы добавлять сообщения и комментарии, <a href="/login">представьтесь</a>.
+            </p>
+        </th:block>
     </section>
 </header>