From 9820abe11c0c037f50bb2f7ddbb0bd19646264dc Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 7 Apr 2017 10:29:52 +0300
Subject: juick-www: merge juick-spring-www i18n, drop thymeleaf

---
 .../WEB-INF/templates/layout/partial/footer.html   | 37 ---------------
 .../templates/layout/partial/navigation.html       | 55 ----------------------
 2 files changed, 92 deletions(-)
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html

(limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial')

diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html
deleted file mode 100644
index 1d565db3..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/footer.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<footer layout:fragment="footer" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-    <div id="footer">
-        <div id="footer-right">
-            <a href="/help/ru/contacts" th:href="@{/help/contacts}" th:text="#{link.contacts}" rel="nofollow">Контакты</a> &#183;
-            <a href="/help/" th:href="@{/help/}" th:text="#{link.help}" rel="nofollow">Справка</a> &#183;
-            <a href="/help/ru/adv" th:href="@{/help/adv}" th:text="#{link.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">VK</a>
-            <a href="https://www.facebook.com/JuickCom" rel="nofollow" class="ico32-fb">Facebook</a>
-        </div>
-        <div id="footer-left">
-            <a href="http://juick.com">juick.com</a> &copy; 2008-2017
-            <div th:if="${showSponsors}">
-                <span th:text="#{label.sponsors}">Спонсоры:</span>
-                <span th:text="${links}">&nbsp;</span>
-            </div>
-        </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');
-    </script>
-    <script th:if="${showSape}">
-        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);
-        })();
-    </script>
-</footer>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
deleted file mode 100644
index 3b2d3bff..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<header layout:fragment="nav" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-    <div id="logo"><a href="/" th:href="@{/}">Juick</a></div>
-    <nav id="global">
-        <ul>
-            <li><a href="/" th:href="@{/}" th:text="#{link.popular}">Популярные</a></li>
-            <li><a href="/?show=all" th:href="@{/?show=all}" rel="nofollow" th:text="#{link.allMessages}">Все сообщения</a></li>
-            <li><a href="/?show=photos" th:href="@{/?show=photos}" rel="nofollow" th:text="#{link.withPhotos}">Фотографии</a></li>
-        </ul>
-    </nav>
-    <div id="search">
-        <form action="/">
-            <input type="text" name="search" class="text" placeholder="Поиск"
-                   th:placeholder="#{label.search}" th:value="${param.search}"/>
-        </form>
-    </div>
-    <section id="headdiv">
-        <th:block th:if="${#authorization.expression('isAuthenticated()')}">
-            <nav id="user">
-                <ul>
-                    <li>
-                        <a href="/?show=my" th:href="@{/?show=my}" th:text="#{link.my}">Моя лента</a>
-                    </li>
-                    <li>
-                        <a href="/pm/inbox" th:href="@{/pm/inbox}" th:text="#{link.privateMessages}">Приватные</a>
-                    </li>
-                    <li>
-                        <a href="/?show=discuss" th:href="@{/?show=discuss}" th:text="#{link.discuss}">Обсуждения</a>
-                    </li>
-                    <li>
-                        <a href="/?show=recommended" th:href="@{/?show=recommended}" th:text="#{link.recommended}">Рекомендации</a>
-                    </li>
-                </ul>
-            </nav>
-            <nav id="actions">
-                <ul>
-                    <li>
-                        <a href="/#post" th:href="@{/#post}" th:text="#{link.postMessage}">Написать</a>
-                    </li>
-                    <li>
-                        <a href="/ugnich" th:href="@{/{userName}(userName=${#authentication.name})}" th:text="'@'+${#authentication.name}">@ugnich</a>
-                    </li>
-                    <li>
-                        <a href="/settings" th:href="@{/settings}" th:text="#{link.settings}" rel="nofollow">Настройки</a>
-                    </li>
-                    <li>
-                        <a href="/logout" th:href="@{/logout}" th:text="#{link.logout}">Выйти</a>
-                    </li>
-                </ul>
-            </nav>
-        </th:block>
-        <th:block th:if="${#authorization.expression('isAnonymous()')}">
-            <p>[(#{message.loginForSending(@{/login})})]</p>
-        </th:block>
-    </section>
-</header>
\ No newline at end of file
-- 
cgit v1.2.3