diff options
Diffstat (limited to 'juick-spring-www/src/main/webapp')
| -rw-r--r-- | juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html | 4 | ||||
| -rw-r--r-- | juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html index 2c5aab3b..d57d6791 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html @@ -3,8 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/mainLayout}"> <head> - <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Популярные</title> - <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title> + <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Popular</title> + <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Popular posts</title> </head> <body> diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html index 6fe0e4ff..d1a91217 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html @@ -1,3 +1,5 @@ +<!DOCTYPE html> +<html xmlns:th="http://www.thymeleaf.org"> <th:block th:each="msg:${msgs}"> <article th:data-mid="${msg.getMid()}"> <header class="u"> @@ -10,28 +12,30 @@ </div> <div class="msg-ts"> <a th:href="|/${msg.getUser().getName()}/${msg.getMid()}|"> - <time th:datetime="|${msg.getDate()}Z|" - th:title="|${msg.getDate()} GMT|" - th:text="${msg.getDate()}">01.01.1970</time> + <time th:datetime="|${msg.getDate()}Z|" + th:title="|${msg.getDate()} GMT|" + th:text="${msg.getDate()}">01.01.1970 + </time> </a> </div> <div class="msg-tags" th:text="${msg.getTagsString()}"></div> </header> <p class="ir" th:if="${msg.getAttachmentType() != null}"> <a href="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|"> - <img src="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|" - th:data-fname="|${msg.getMid()}.${msg.getAttachmentType()}|" alt=""/></a> + <img src="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|" + th:data-fname="|${msg.getMid()}.${msg.getAttachmentType()}|" alt=""/></a> </p> <p th:utext="${msg.getText()}">Lorem ipsum</p> <div class="irbr" th:if="${msg.getAttachmentType() != null}"></div> <nav class="l"> <th:block th:switch="${#authorization.expression('isAuthenticated()')}"> - <a th:case="false" class="a-login" th:href="|/${msg.getMid()}/|">Рекомендовать</a> - <a th:case="true" class="a-like" th:href="|/post?body=!+%23${msg.getMid()}/|">Рекомендовать</a> + <a th:case="false" class="a-login" th:href="|/${msg.getMid()}/|" th:text="#{message.recommend}">Recommend</a> + <a th:case="true" class="a-like" th:href="|/post?body=!+%23${msg.getMid()}/|" th:text="#{message.comment}">Comment</a> </th:block> - <a th:if="${#authorization.expression('isAuthenticated()') == false && !msg.ReadOnly}" class="a-login" th:href="|/${msg.getMid()}/|">Комментировать</a> + <a th:if="${#authorization.expression('isAuthenticated()') == false && !msg.ReadOnly}" class="a-login" + th:href="|/${msg.getMid()}/|" th:text="#{message.comment}">Comment</a> <a th:if="${#authorization.expression('isAuthenticated()') == true && !msg.ReadOnly}" - class="a-comment" th:href="|/${msg.getMid()}/|">Комментировать</a> + class="a-comment" th:href="|/${msg.getMid()}/|" th:text="#{message.recommend}">Recommend</a> <th:block th:if="${#authorization.expression('hasRole(''ROLE_ADMIN'')')}"> <a href="#" class="a-popular-plus">+</a> @@ -49,4 +53,5 @@ </a> </nav> </article> -</th:block>
\ No newline at end of file +</th:block> +</html>
\ No newline at end of file |