aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'juick-spring-www/src/main/webapp')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html1
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html6
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html40
3 files changed, 44 insertions, 3 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
index 0b22deb3..9d763feb 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html
@@ -11,5 +11,6 @@
<p th:text="#{error.pageNotFound.description}">Probably, user deleted this post, or this page never existed.</p>
</article>
</section>
+<p layout:fragment="column" th:replace="views/partial/homecolumn">Main side column</p>
</body>
</html> \ No newline at end of file
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 3c7e4238..5d808f98 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
@@ -28,12 +28,12 @@
<nav class="l">
<th:block th:switch="${#authorization.expression('isAuthenticated()')}">
<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>
+ <a th:case="true" class="a-like" th:href="|/post?body=!+%23${msg.getMid()}/|" th:text="#{message.recommend}">Recommend</a>
</th:block>
<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()}/|" th:text="#{message.recommend}">Recommend</a>
+ class="a-comment" th:href="|/${msg.getMid()}/|" th:text="#{message.comment}">Comment</a>
<th:block th:if="${#authorization.expression('hasRole(''ROLE_ADMIN'')')}">
<a href="#" class="a-popular-plus">+</a>
@@ -46,7 +46,7 @@
class="likes"><i data-icon="ei-heart" data-size="s"></i>
<span th:text="${msg.getLikes()}" th:remove="tag">&nbsp;10</span></a>
<a th:if="${msg.getReplies() > 0}" th:href="|/${msg.getUser().getName()}/${msg.getMid()}|"
- class="replies"><i data-icon="ei-heart" data-size="s"></i>
+ class="replies"><i data-icon="ei-comment" data-size="s"></i>
<span th:text="${msg.getReplies()}" th:remove="tag">&nbsp;42</span>
</a>
</nav>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html
new file mode 100644
index 00000000..25432c2c
--- /dev/null
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
+ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+ layout:decorate="~{layout/mainLayout}">
+<head>
+ <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="${title}">Page title</title>
+</head>
+
+<body>
+<article layout:fragment="content">
+ <h1>Сообщение опубликовано</h1>
+ <p>Поделитесь своим новым постом в социальных сетях:</p>
+ <p class="social" th:if="${sharetwi} != null">
+ <a
+ th:href="|https://twitter.com/intent/tweet?text=${sharetwi}|"
+ class="ico32-twi sharenew">Отправить в Twitter</a>
+ </p>
+ <p class="social">
+ <a th:href="|http://www.livejournal.com/update.bml?subject=${hashtags}&event=${sharelj}&prop_taglist=${tagscomma}|"
+ target="_blank" class="ico32-lj sharenew">Отправить в LiveJournal</a>
+ </p>
+ <p class="social">
+ <a th:href="|https://vk.com/share.php?url=${url}|" class="ico32-vk sharenew">Отправить в ВКонтакте</a>
+ </p>
+ <p class="social">
+ <a th:href="|https://www.facebook.com/sharer/sharer.php?u=${url}|"
+ class="ico32-fb sharenew">Отправить в Facebook</a>
+ </p>
+ <p>Ссылка на сообщение:
+ <a th:href="|http://juick.com/${mid}|" th:text="|http://juick.com/${mid}|">http://juick.com/12345
+ </a>
+ </p>
+</article>
+
+<aside id="column">
+ <p layout:fragment="column" th:replace="views/partial/homecolumn">Main side column</p>
+</aside>
+
+</body>
+</html> \ No newline at end of file