juick-spring-www: merge some work from develop branch, port some templates to Thymeleaf

5 files changed, 85 insertions, 0 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
new file mode 100644
index 00000000..6978a2c0
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html
@@ -0,0 +1,34 @@
+<div id="footer">
+    <div id="footer-right">
+        <a href="/settings" rel="nofollow">Настройки</a> &#183;
+        <a href="/help/ru/contacts" rel="nofollow">Контакты</a> &#183;
+        <a href="/help/" rel="nofollow">Справка</a> &#183;
+        <a href="/help/ru/adv" rel="nofollow">Реклама</a>
+    </div>
+    <div id="footer-social">
+        <a href="https://twitter.com/Juick" rel="nofollow" class="ico32-twi">Twitter</a>
+        <a href="https://vk.com/juick" rel="nofollow" class="ico32-vk">ВКонтакте</a>
+        <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 %}
+    </div>
+</div>
+<script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create','UA-385578-4','juick.com');
+        ga('require','displayfeatures');
+        ga('send','pageview');
+        {% 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 %}
+</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
new file mode 100644
index 00000000..5293918d
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
@@ -0,0 +1,6 @@
+<p class="tags">
+    {% include "views/partial/tags.html" %}
+    {% if showAdv %}
+    <a href="http://ru.wix.com/">конструктор сайтов</a>
+    {% endif %}
+</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
new file mode 100644
index 00000000..2863d0c3
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
@@ -0,0 +1,37 @@
+<header>
+    <div id="logo"><a href="/">Juick</a></div>
+    <nav id="global">
+        <ul>
+            <li><a href="/">Популярные</a></li>
+            <li><a href="/?show=all" rel="nofollow">Все сообщения</a></li>
+            <li><a href="/?show=photos" rel="nofollow">Фотографии</a></li>
+        </ul>
+    </nav>
+    <div id="search">
+        <form action="/">
+            <input type="text" name="search" class="text" placeholder="Поиск" 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>
+</header>
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
new file mode 100644
index 00000000..d7901d5e
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
@@ -0,0 +1,5 @@
+<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
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html
new file mode 100644
index 00000000..4d05b7fb
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html
@@ -0,0 +1,3 @@
+{% for tag in tags %}
+    <a href="/tag/{{ tag | urlencode }}" title="{{ tag }}">{{ tag }}</a>
+{% endfor %}
\ No newline at end of file