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

---
 .../templates/views/partial/blog_messages.html     | 54 --------------------
 .../templates/views/partial/blog_paginator.html    |  3 --
 .../templates/views/partial/blog_postform.html     | 14 ------
 .../templates/views/partial/homecolumn.html        |  4 --
 .../templates/views/partial/settings_tabs.html     |  7 ---
 .../WEB-INF/templates/views/partial/tags.html      |  3 --
 .../templates/views/partial/thread_message.html    | 57 ----------------------
 7 files changed, 142 deletions(-)
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html
 delete mode 100644 juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html

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

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
deleted file mode 100644
index 5d808f98..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<th:block th:each="msg:${msgs}" xmlns:th="http://www.thymeleaf.org">
-    <article th:data-mid="${msg.getMid()}">
-        <header class="u">
-            @<a th:href="|/${msg.getUser().getName()}/|" th:text="${msg.getUser().getName()}">ugnich</a>:
-            <div class="msg-avatar">
-                <a th:href="|/${msg.getUser().getName()}/|">
-                    <img th:src="|//i.juick.com/a/${msg.getUser().getUid()}.png|"
-                         th:alt="${msg.getUser().getName()}"/>
-                </a>
-            </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>
-                </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>
-        </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()}/|" th:text="#{message.recommend}">Recommend</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.comment}">Comment</a>
-
-            <th:block th:if="${#authorization.expression('hasRole(''ROLE_ADMIN'')')}">
-                <a href="#" class="a-popular-plus">+</a>
-                <a href="#" class="a-popular-minus">-</a>
-                <a href="#" class="a-popular-delete">x</a>
-            </th:block>
-        </nav>
-        <nav class="s">
-            <a th:if="${msg.getLikes() > 0}" th:href="|/${msg.getUser().getName()}/${msg.getMid()}|"
-               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-comment" data-size="s"></i>
-                <span th:text="${msg.getReplies()}" th:remove="tag">&nbsp;42</span>
-            </a>
-        </nav>
-    </article>
-</th:block>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
deleted file mode 100644
index aa1e0466..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p class="page" th:if="${nextpage != null}" xmlns:th="http://www.thymeleaf.org">
-    <a th:href="${nextpage}" rel="prev"><span th:text="#{messages.next}" th:remove="tag">Next</span>&nbsp;→</a>
-</p>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
deleted file mode 100644
index a9ed9f5d..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div th:if="${#authorization.expression('isAuthenticated()')}" xmlns:th="http://www.thymeleaf.org">
-    <form action="/post" th:action="@{/post}" method="post" enctype="multipart/form-data">
-        <section id="newmessage">
-            <textarea name="body" placeholder="Новое сообщение..." th:placeholder="#{postForm.newMessage}"></textarea>
-            <div>
-                <input type="text" class="img" name="img" placeholder="Ссылка на изображение (JPG/PNG, до 10Мб)" th:placeholder="#{postForm.imageLink}" style="margin-bottom: 8pt"/>
-                [(#{postForm.orImageUpload})]
-
-                <input type="text" class="tags" name="tags" placeholder="Теги (через пробел)" th:placeholder="#{postForm.tags}"/><br/>
-                <input type="submit" class="subm" value="Отправить" th:value="#{button.send}"/>
-            </div>
-        </section>
-    </form>
-</div>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
deleted file mode 100644
index 46c146f2..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/homecolumn.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<p class="tags" xmlns:th="http://www.thymeleaf.org">
-    <div th:replace="views/partial/tags">Tags</div>
-    <a href="http://ru.wix.com/" th:if="${showAdv}">конструктор сайтов</a>
-</p>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
deleted file mode 100644
index 253511b5..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/settings_tabs.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="pagetabs" xmlns:th="http://www.thymeleaf.org">
-    <ul>
-        <li><a href="/settings" th:href="@{/settings}" th:text="#{link.settings.main}">Main</a></li>
-        <li><a href="/settings?page=password" th:href="@{/settings?page=password}" th:text="#{link.settings.password}">Password</a></li>
-        <li><a href="/settings?page=about" th:href="@{/settings?page=about}" th:text="#{link.settings.about}">About</a></li>
-    </ul>
-</div>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html
deleted file mode 100644
index f4822b4a..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/tags.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<th:block th:each="tag:${tags}" xmlns:th="http://www.thymeleaf.org">
-    <a th:href="|/tag/${tag}|" th:title="${tag}" th:text="${tag}">Tag</a>
-</th:block>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html
deleted file mode 100644
index 159eebf5..00000000
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/thread_message.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<ul xmlns:th="http://www.thymeleaf.org">
-    <li th:id="|msg-${msg.getMid()}|" th:data-mid="${msg.getMid()}" class="msg msgthread">
-        <div class="msg-cont">
-            <div class="msg-menu"><a href="#"></a></div>
-            <div class="msg-ts" th:text="${msg.getDate()}">01.01.1970</div>
-            <div class="msg-avatar">
-                <a th:href="|/${msg.getUser().getName()}/|">
-                    <img th:src="|//i.juick.com/a/${msg.getUser().getUid()}.png|"
-                         th:alt="${msg.getUser().getName()}"/>
-                </a>
-            </div>
-            <div class="msg-header">
-                @<a th:href="|/${msg.getUser().getName()}/|" th:text="${msg.getUser().getName()}">ugnich</a>:
-                <th:block th:text="${tagsStr}"/>
-            </div>
-            <div class="msg-txt" th:utext="${msg.getText()}">
-                Lorem ipsum
-            </div>
-            <div class="msg-media" th:if="${msg.getAttachmentType() != null}">
-                <a href="|//i.juick.com/p/${msg.getMid()}.${msg.getAttachmentType()}|">
-                    <img src="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|"/>
-                </a>
-            </div>
-            <form th:if="${msg.VisitorCanComment}" action="/comment" method="POST" enctype="multipart/form-data">
-                <input type="hidden" name="mid" th:value="${msg.getMid()}"/>
-                <div class="msg-comment">
-                    <div class="ta-wrapper">
-                        <textarea name="body" rows="1" class="reply" placeholder="Написать комментарий"></textarea>
-                    </div>
-                </div>
-            </form>
-            <div class="msg-recomms" th:text="|Рекомендовали (${recommsCount}): ${recomms}|">Recommended(1): @ugnich</div>
-        </div>
-    </li>
-    <li id="mtoolbar">
-        <ul>
-            <li><a th:href="|/${msg.getMid()}|">
-                <div style="background-position: -64px 0"></div>
-                <th:block th:text="${msg.getMid()}"></th:block>
-            </a></li>
-            <th:block th:if="${#authorization.expression('isAuthenticated()')}">
-                <li th:if="${isSubscribed}"><a th:href="|/post?body=U+%23${msg.getMid()}|">
-                    <div style="background-position: -48px 0"></div>
-                    Подписан</a></li>
-                <li th:if="${isSubscribed == false}"><a th:href="|/post?body=S+%23${msg.getMid()}|">
-                    <div style="background-position: -16px 0"></div>
-                    Подписаться</a></li>
-                <li th:if="${visitorInBL == false}"><a th:href="|/post?body=%21+%23${msg.getMid()}|">
-                    <div style="background-position: -32px 0"></div>
-                    Рекомендовать</a></li>
-                <li th:if="${isOwnMessage}"><a th:href="|/post?body=D+%23${msg.getMid()}|">
-                    <div style="background-position: 0"></div>
-                    Удалить</a></li>
-            </th:block>
-        </ul>
-    </li>
-</ul>
\ No newline at end of file
-- 
cgit v1.2.3