aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-12-11 13:56:26 +0700
committerGravatar Vitaly Takmazov2016-12-11 18:24:38 +0300
commitf2454d531e9e99c406a513d92702858510fef4b9 (patch)
tree19090e8f207e875615bec60d3aa65ac6e4e34e12 /juick-spring-www/src/main/webapp/WEB-INF
parentf9d9f6ac709b0dfe1c1e3f711b2fee6a93f33d42 (diff)
i18n, using SecurityContextHolder for get currentUser (user always not null)
Diffstat (limited to 'juick-spring-www/src/main/webapp/WEB-INF')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/index.html1
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html1
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html3
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/footer.html12
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html31
5 files changed, 22 insertions, 26 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
index 5687985d..1695cd02 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
@@ -10,6 +10,5 @@
<section layout:fragment="content">
<p>Главная страница !</p>
</section>
-
</body>
</html> \ No newline at end of file
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 33995d65..06805dc6 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,7 +11,6 @@
<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>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html
index 0500839b..d935b9d4 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html
@@ -3,7 +3,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/mainLayout}">
<head>
- <title th:text="${title}">Help title</title>
+ <title th:text="#{title.help}">Help title</title>
</head>
<body>
@@ -13,6 +13,5 @@
<aside id="column">
<p layout:fragment="column" th:utext="${help_nav}">Help navigation</p>
</aside>
-
</body>
</html> \ No newline at end of file
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 cc165af7..fb53eb20 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
@@ -5,10 +5,10 @@
<body layout:fragment="footer">
<div id="footer">
<div id="footer-right">
- <a href="/settings" th:href="@{/settings}" rel="nofollow">Настройки</a> &#183;
- <a href="/help/ru/contacts" th:href="@{/help/ru/contacts}" rel="nofollow">Контакты</a> &#183;
- <a href="/help/" th:href="@{/help/}" rel="nofollow">Справка</a> &#183;
- <a href="/help/ru/adv" th:href="@{/help/ru/adv}" rel="nofollow">Реклама</a>
+ <a href="/settings" th:href="@{/settings}" th:text="#{link.settings}" rel="nofollow">Настройки</a> &#183;
+ <a href="/help/ru/contacts" th:href="@{/help/ru/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/ru/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>
@@ -16,8 +16,8 @@
<a href="https://www.facebook.com/JuickCom" rel="nofollow" class="ico32-fb">Facebook</a>
</div>
<div id="footer-left">
- juick.com &copy; 2008-2016
- <th:block th:if="${links != null}"/><br/>Спонсоры: <span th:text="${links}">&nbsp;</span></th:block>
+ <a href="http://juick.com">juick.com</a> &copy; 2008-2016
+ <th:block th:if="${links != null}"/><br/><span th:text="#{label.sponsors}">Спонсоры:</span><span th:text="${links}">&nbsp;</span></th:block>
</div>
</div>
<script>
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 79b41211..51489194 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
@@ -3,40 +3,39 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<body layout:fragment="nav">
- <div id="logo"><a href="/">Juick</a></div>
+ <div id="logo"><a href="/" th:href="@{/}">Juick</a></div>
<nav id="global">
<ul>
- <li><a href="/" th:href="@{/}">Популярные</a></li>
- <li><a href="/?show=all" th:href="@{/?show=all}" rel="nofollow">Все сообщения</a></li>
- <li><a href="/?show=photos" th:href="@{/?show=photos}" rel="nofollow">Фотографии</a></li>
+ <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:value="${param.search}"/>
+ <input type="text" name="search" class="text" placeholder="Поиск" th:placeholder="#{label.search}" th:value="${param.search}"/>
</form>
</div>
- <section id="headdiv" th:switch="${visitor.getUid() > 0}">
- <th:block th:case="true">
+ <section id="headdiv" th:switch="${visitor.isAnonym()}">
+ <th:block th:case="false">
<nav id="user">
<ul>
- <li><a href="/?show=my" th:href="@{/?show=my}">Моя лента</a></li>
- <li><a href="/pm/inbox" th:href="@{/pm/inbox}">Приватные</a></li>
- <li><a href="/?show=discuss" th:href="@{/?show=discuss}">Обсуждения</a></li>
- <li><a href="/?show=recommended" th:href="@{/?show=recommended}">Рекомендации</a></li>
+ <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}">Написать</a></li>
+ <li><a href="/#post" th:href="@{/#post}" th:text="#{link.postMessage}">Написать</a></li>
<li><a href="/ugnich" th:href="@{/{userName}(userName=${visitor.name})}" th:text="'@'+${visitor.name}">@ugnich</a></li>
- <li><a href="/logout" th:href="@{/logout}">Выйти</a></li>
+ <li><a href="/logout" th:href="@{/logout}" th:text="#{link.logout}">Выйти</a></li>
</ul>
</nav>
</th:block>
- <th:block th:case="false">
- <p>Чтобы добавлять сообщения и комментарии, <a href="/login" th:href="@{/login}">представьтесь</a>.
- </p>
+ <th:block th:case="true">
+ <p>[(#{message.loginForSending(@{/login})})]</p>
</th:block>
</section>
</body>