aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/webapp/WEB-INF/templates/layout
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-12-09 16:14:27 +0300
committerGravatar Vitaly Takmazov2016-12-09 16:14:27 +0300
commit559ae343aa72db04e12b94acfa0bec30ed9a11f1 (patch)
tree5832b97c6a6a4b565de15a474bae86059763d6bb /juick-spring-www/src/main/webapp/WEB-INF/templates/layout
parent22d30c3b50fe0ea4c18c45a4450fb1a8b1f1b1b8 (diff)
juick-spring-www: merge some work from develop branch, port some templates to Thymeleaf
Diffstat (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/layout')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html48
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html8
2 files changed, 8 insertions, 48 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
index bbee7f6a..61062a3b 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
@@ -11,53 +11,21 @@
<script type="text/javascript" src="/scripts.js" th:href="@{/scripts.js}"></script>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Juick.com</title>
-
+ <meta layout:fragment="headers" />
<link rel="icon" href="//i.juick.com/favicon.png"/>
<!--[if lt IE 9 & (!IEMobile 7)]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
</head>
<body>
-
-<section layout:fragment="content">
+<div th:replace="views/partial/navigation">Navigation block</div>
+<section id="content">
+ <p layout:fragment="content">Main content</p>
</section>
+<aside id="column">
+ <p layout:fragment="column">Side column</p>
+</aside>
-<footer>
- <div layout:fragment="custom-footer"></div>
- <div id="footer">
- <div id="footer-right">
- <a href="/settings" th:href="@{/settings}" rel="nofollow" th:text="#{link.settings}">Настройки</a> &#183;
- <a href="/help/contacts" th:href="@{/help/contacts}" rel="nofollow" th:text="#{link.contacts}">Контакты</a> &#183;
- <a href="/help/" th:href="@{/help}" rel="nofollow" th:text="#{link.help}">Справка</a> &#183;
- <a href="/help/adv" th:href="@{/help/adv}" rel="nofollow" th:text="#{link.adv}">Реклама</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="juick.com">juick.com</a> &copy; 2008-2016
- <div th:replace="${@settingsHolder.isShowSponsors()} ? ~{layout/sponsors :: sponsors} : _"></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="${@settingsHolder.isShowSape()}">
- 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>
- </div>
-</footer>
+<footer th:replace="views/partial/footer">Footer</footer>
</body>
</html> \ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html
deleted file mode 100644
index 6c68a867..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/sponsors.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<body>
-<div th:fragment="sponsors">
- <span th:text="#{label.sponsors}">Спонсоры:</span>
-</div>
-</body>
-</html> \ No newline at end of file