diff options
| author |  Vitaly Takmazov | 2017-04-07 10:29:52 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2017-04-07 10:29:52 +0300 |
| commit | 9820abe11c0c037f50bb2f7ddbb0bd19646264dc (patch) | |
| tree | 5a33901fc294546c40b0cdbc65640b041e4c694e /juick-spring-www/src/main/webapp/WEB-INF/templates/views | |
| parent | 6951e2ad47ed4db3dc7d0b08aeadeb09bc3b994d (diff) | |
juick-www: merge juick-spring-www i18n, drop thymeleaf
Diffstat (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates/views')
20 files changed, 0 insertions, 735 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 deleted file mode 100644 index 9d763feb..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html +++ /dev/null @@ -1,16 +0,0 @@ -<!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:text="#{error.pageNotFound}">Page not found</title> -</head> -<body> -<section id="content"> - <article layout:fragment="content"> - <h1 th:text="#{error.pageNotFound}">Page not found</h1> - <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/help.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html deleted file mode 100644 index d935b9d4..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/help.html +++ /dev/null @@ -1,17 +0,0 @@ -<!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:text="#{title.help}">Help title</title> -</head> - -<body> -<section id="content"> - <article layout:fragment="content" th:utext="${help_data}">Help text</article> -</section> -<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/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html deleted file mode 100644 index 24aa9472..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html +++ /dev/null @@ -1,21 +0,0 @@ -<!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> -<th:block layout:fragment="content"> - <div th:replace="views/partial/blog_postform"></div> - <div th:replace="views/partial/blog_messages"></div> - <div th:replace="views/partial/blog_paginator"></div> -</th:block> - -<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 diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html deleted file mode 100644 index 2736ca53..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/login.html +++ /dev/null @@ -1,145 +0,0 @@ -<!DOCTYPE html> -<html xmlns:th="http://www.thymeleaf.org"> -<head> - <meta charset="UTF-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/> - - <title th:text="#{title.loginOrSignup}">Juick</title> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js" defer="defer"></script> - <style> - * { margin: 0; padding: 0; } - html { font-family: sans-serif; } - html { background: #eeeee5; } - body { margin: 100px auto 0 auto; width: 1000px; } - a { color: #069; } - ul { float: left; width: 700px; height: 350px; list-style-type: none; background: url(/static/tagscloud.png) no-repeat; position: relative; } - ul a { position: absolute; display: block; text-indent: 100%; white-space: nowrap; overflow: hidden; } - - #bottom1 { position: absolute; left: 0px; bottom: 10px; width: 100%; text-align: center; color: #555; } - #bottom2 { position: absolute; left: 0px; bottom: -50px; width: 100%; padding-bottom: 20px; text-align: center; font-size: small; color: #777; } - - #signup,#signin { margin-left: 730px; width: 250px; } - #signup { padding-top: 25px; } - #signup>div { width: 100%; margin: 15px 0; } - #signup>div>a { display: block; width: 100%; height: 32px; line-height: 32px; text-indent: 37px; text-decoration: none; overflow: hidden; } - - #facebook a { color: #FFF; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAADNQTFRFO1edX3ewl6bLnKrOoK3QrrrYvMXe2N7r3OLu3+Tv5urz7O/29vf6+Pn7+vv9/Pz9////ykQjsQAAAEZJREFUOMtjYBgFuAATO68ADxdOaUYuATDAqYBbAL8CFgECCjiBcqz4XMiPz3oQEKCtAgEkwEdIAQchBWyEFDAPkDdHsAIAhZkIwz/VK/UAAAAASUVORK5CYII=") no-repeat #3A569C; } - #vk a { color: #FFF; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAHJQTFRFbY+zbo+zbpCzb5C0cpO1c5O2dZW3dpa4e5m6gJ29gZ69lq/In7bNo7jPrcDUs8XXvs3dv87dy9fkztnlz9rm0Nrm093o1N7o1+Dq3OTt3ubu4Ofv5Orw7fH27vL28PP38vX49Pb5+vv8+/z9/Pz9////2jSYlQAAAG5JREFUOMvtkEcOgDAMBE3vvXdIyP+/iMMRKfYHmMtcRtE6AD8f1Is8pyKgAs0RGYO2HSWqMQaoBHVRgYsS3AsrtyFlrqgdJlCLb95gxQO6IkZCqL+KCjz0TQU5ejOf2a3aJXPF7BOB2PvMhp8PDzGRFgEe7xvEAAAAAElFTkSuQmCC") no-repeat #6d8fb3; } - #xmpp>a { color: #333; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAt9QTFRFBj5rCUFoFz5mDEFuDUNqGUJkGUNgAEprEkVtGkRhHURnHEZjAE+BIElmEEx/HEx0PUdTHE5wMEtfO0laJk5sFlN6Nk1cKFBuIlJ1R0pYRExTGF2KMVh1OFhxDGSQT1deNlx6TVhkIGKPUlphKWOFU1tiOmB+Vl1kmlAuNmaDQGpaIG6ba2Q2SGeBN2uUNW+LF3mGRmyLV3BAL3xWgmVJ2VAa2lEb0VYX11UafWlmam9mam5xy1km3lUea29y2VccvF8obHBz21gd4VcXS3ebPoVG1lwl5FkaU3iYYHaH2F0ejHFIx2Iv4V0aP4o+02As218g4l4bPYtFX351KZFaymU43mIrVYoz5mEfT4w0xGsrSo82eXqDw2s+z2k1OZVAT4SoPZU5RZM4NJVYbYc8VoSiWY43WItbuXBK52gYOI20TpM6YYSYfX98T5Q7foB9aYSZSZc8Ro21cYxH7GwdT46e0HFGeopO2HA8V5ZEf4s8528l1HM7UJs5UI+xXoyrWZhGY4ylyHdMwXhXQZS7XpdNU5tH4XJBYJZZcIuhbpJk0HdPU588kohqOZ2pVZS30XpX6XcxSaFrz4FIUqVWWqVCYZm23YBGxYRrZZ2QXpy/5YFC7IA+6oBRb6ZUcKZn44ZSgKJu54hHmJqXbbBNfKh3cq5nYqrMpJyVdrBjx5WCo56diamAjaWdyZeE8JFV8ZJWnqOlaK/Sd7Zh7pVdgbN6x52N8JdfwqCU8ZhgZLbXb7a5grtTmK+UxKKWtqahq6qhd7bHqauop6yvqqyp755pbbzRrK6rwamgib53qq+xra+sobSg86Jza8PJsLKujMVctrGwqLapv7Crr7Wr8ad1srSxj8R9uLOys7WyubSztLazkcZ/sre6tbe0r7m0tri1t7m2vri3uLq3v7m4ubu4nc9mpNBvos2UptJxtNWXtteFuNmbuNyQud2Rut6SwN+aweCbwuGdw+KeweKkF4OfHQAAAadJREFUOMtjeEoAMAwfBQ9vYJO68RCu4BYDq1bXmr2XHoMlnlzet2qGpTgX8y2EFWwensEdrW2FbUAlJ2zDKsqaYwo6eZHcIGzoor/s5IdPSfefPt3nf3Xn3HZpPU8xJAXWIvU88VOffcm78vTptrijJe4OfAmy1kgKzjMlaIfUPvvQcObp03U120ucTZQaGc8je1NZrd8g8cL7eUufPp0wfX2mvVydripKONzkTG1JXvL6TuXTR/Zb5gR6F+Vw30QNqNUss/pqn3/MvrTD7Wy1V9Y0jtXoIZnLv2nSnrfzF3bP3hDRu1wwHzOo1VWOTXn5yi/q7MTJuxTUscTFQyHNc5vfbU1btOCgjNBDbJH1UF5i9/XP6VVrJRUfYo/Nx3YcpS/euOo4Pn6MqeDx44f3LoY2SYnOXBlUfPPug8cwRQxQ6Qf39sda+HqZaQiwGydFlx+4eQ+qAqrg4b3bPqbmNhkrNm5cbGUUHply7d6Dh8hWPH744Oa186eOHDl06NDh46fP33zwEMUEiCMe3L13GwjuPbj38PHTx9jT5OPHj5G9MFQyDgA8riWAv9eLFAAAAABJRU5ErkJggg==") no-repeat #BBB; } - #xmppinfo { background: #FFF; padding: 10px; display: none; } - - #signin { text-align: center; font-size: small; } - #signinform { background: #FFF; padding: 10px 15px; margin-top: 15px; display: none; } - input.txt { width: 212px; border: 1px solid #CCC; margin: 3px 0; padding: 3px; } - input.submit { width: 70px; border: 1px solid #CCC; margin: 3px 0; padding: 3px; } - </style> - <link rel="icon" href="//i.juick.com/favicon.png" th:href="@{/favicon.png}"/> -</head> -<body> - -<ul id="tags"> - <li><a href="/tag/juick" th:href="@{/tag/juick}" style="left: 359px; top: 120px; width: 311px; height: 99px">juick</a></li> - <li><a href="/tag/linux" th:href="@{/tag/linux}" style="left: 201px; top: 100px; width: 98px; height: 35px">linux</a></li> - <li><a href="/tag/android" th:href="@{/tag/android}" style="left: 314px; top: 42px; width: 45px; height: 158px">android</a></li> - <li><a href="/tag/работа" th:href="@{/tag/работа}" style="left: 149px; top: 138px; width: 165px; height: 41px">работа</a></li> - <li><a href="/tag/music" th:href="@{/tag/music}" style="left: 119px; top: 249px; width: 124px; height: 32px">music</a></li> - <li><a href="/tag/windows" th:href="@{/tag/windows}" style="left: 448px; top: 234px; width: 186px; height: 32px">windows</a></li> - <li><a href="/tag/google" th:href="@{/tag/google}" style="left: 244px; top: 252px; width: 134px; height: 41px">google</a></li> - <li><a href="/tag/кино" th:href="@{/tag/кино}" style="left: 68px; top: 83px; width: 97px; height: 28px">кино</a></li> - <li><a href="/tag/фото" th:href="@{/tag/фото}" style="left: 400px; top: 266px; width: 101px; height: 29px">фото</a></li> - <li><a href="/tag/жизнь" th:href="@{/tag/жизнь}" style="left: 554px; top: 266px; width: 125px; height: 27px">жизнь</a></li> - <li><a href="/tag/еда" th:href="@{/tag/еда}" style="left: 46px; top: 196px; width: 71px; height: 32px">еда</a></li> - <li><a href="/tag/музыка" th:href="@{/tag/музыка}" style="left: 61px; top: 111px; width: 139px; height: 27px">музыка</a></li> - <li><a href="/tag/прекрасное" th:href="@{/tag/прекрасное}" style="left: 152px; top: 200px; width: 205px; height: 32px">прекрасное</a></li> - <li><a href="/tag/книги" th:href="@{/tag/книги}" style="left: 148px; top: 293px; width: 103px; height: 25px">книги</a></li> - <li><a href="/tag/цитата" th:href="@{/tag/цитата}" style="left: 325px; top: 301px; width: 126px; height: 27px">цитата</a></li> <li><a href="/tag/games" style="left: 117px; top: 142px; width: 30px; height: 104px">games</a></li> - <li><a href="/tag/ubuntu" th:href="@{/tag/ubuntu}" style="left: 503px; top: 2px; width: 28px; height: 102px">ubuntu</a></li> - <li><a href="/tag/котэ" th:href="@{/tag/котэ}" style="left: 534px; top: 27px; width: 76px; height: 28px">котэ</a></li> - <li><a href="/tag/ВНЕЗАПНО" th:href="@{/tag/ВНЕЗАПНО}" style="left: 501px; top: 293px; width: 146px; height: 23px">ВНЕЗАПНО</a></li> - <li><a href="/tag/юмор" th:href="@{/tag/юмор}" style="left: 73px; top: 53px; width: 84px; height: 28px">юмор</a></li> - <li><a href="/tag/мысли" th:href="@{/tag/мысли}" style="left: 202px; top: 179px; width: 102px; height: 21px">мысли</a></li> - <li><a href="/tag/pic" th:href="@{/tag/pic}" style="left: 400px; top: 78px; width: 33px; height: 38px">pic</a></li> - <li><a href="/tag/политота" th:href="@{/tag/политота}" style="left: 531px; top: 60px; width: 130px; height: 24px">политота</a></li> - <li><a href="/tag/WOT" th:href="@{/tag/WOT}" style="left: 159px; top: 63px; width: 48px; height: 20px">WOT</a></li> - <li><a href="/tag/fail" th:href="@{/tag/fail}" style="left: 8px; top: 170px; width: 34px; height: 27px">fail</a></li> - <li><a href="/tag/погода" th:href="@{/tag/погода}" style="left: 670px; top: 126px; width: 24px; height: 93px">погода</a></li> - <li><a href="/tag/apple" th:href="@{/tag/apple}" style="left: 42px; top: 167px; width: 64px; height: 29px">apple</a></li> - <li><a href="/tag/jabber" th:href="@{/tag/jabber}" style="left: 436px; top: 43px; width: 25px; height: 75px">jabber</a></li> - <li><a href="/tag/тян" th:href="@{/tag/тян}" style="left: 532px; top: 94px; width: 47px; height: 21px">тян</a></li> - <li><a href="/tag/work" th:href="@{/tag/work}" style="left: 359px; top: 55px; width: 58px; height: 23px">work</a></li> - <li><a href="/tag/Python" th:href="@{/tag/Python}" style="left: 240px; top: 63px; width: 74px; height: 23px">Python</a></li> - <li><a href="/tag/Видео" th:href="@{/tag/Видео}" style="left: 266px; top: 232px; width: 76px; height: 20px">Видео</a></li> - <li><a href="/tag/авто" th:href="@{/tag/авто}" style="left: 359px; top: 30px; width: 58px; height: 24px">авто</a></li> - <li><a href="/tag/Anime" th:href="@{/tag/Anime}" style="left: 360px; top: 328px; width: 66px; height: 21px">Anime</a></li> - <li><a href="/tag/игры" th:href="@{/tag/игры}" style="left: 378px; top: 242px; width: 22px; height: 58px">игры</a></li> - <li><a href="/tag/вело" th:href="@{/tag/вело}" style="left: 176px; top: 9px; width: 18px; height: 54px">вело</a></li> - <li><a href="/tag/web" th:href="@{/tag/web}" style="left: 661px; top: 219px; width: 22px; height: 47px">web</a></li> - <li><a href="/tag/YouTube" th:href="@{/tag/YouTube}" style="left: 498px; top: 316px; width: 81px; height: 24px">YouTube</a></li> - <li><a href="/tag/Вопрос" th:href="@{/tag/Вопрос}" style="left: 208px; top: 18px; width: 22px; height: 72px">Вопрос</a></li> - <li><a href="/tag/железо" th:href="@{/tag/железо}" style="left: 159px; top: 318px; width: 75px; height: 16px">железо</a></li> - <li><a href="/tag/Microsoft" th:href="@{/tag/Microsoft}" style="left: 20px; top: 146px; width: 86px; height: 21px">Microsoft</a></li> - <li><a href="/tag/video" th:href="@{/tag/video}" style="left: 616px; top: 101px; width: 51px; height: 19px">video</a></li> - <li><a href="/tag/Россия" th:href="@{/tag/Россия}" style="left: 32px; top: 242px; width: 68px; height: 16px">Россия</a></li> - <li><a href="/tag/java" th:href="@{/tag/java}" style="left: 409px; top: 226px; width: 39px; height: 22px">java</a></li> - <li><a href="/tag/новости" th:href="@{/tag/новости}" style="left: 39px; top: 67px; width: 21px; height: 79px">новости</a></li> - <li><a href="/tag/интернет" th:href="@{/tag/интернет}" style="left: 100px; top: 233px; width: 17px; height: 85px">интернет</a></li> - <li><a href="/tag/steam" th:href="@{/tag/steam}" style="left: 14px; top: 228px; width: 52px; height: 13px">steam</a></li> - <li><a href="/tag/слова" th:href="@{/tag/слова}" style="left: 501px; top: 272px; width: 51px; height: 18px">слова</a></li> - <li><a href="/tag/почта" th:href="@{/tag/почта}" style="left: 477px; top: 27px; width: 17px; height: 56px">почта</a></li> - <li><a href="/tag/help" th:href="@{/tag/help}" style="left: 123px; top: 281px; width: 21px; height: 35px">help</a></li> - <li><a href="/tag/skype" th:href="@{/tag/skype}" style="left: 110px; top: 320px; width: 49px; height: 20px">skype</a></li> - <li><a href="/tag/debian" th:href="@{/tag/debian}" style="left: 461px; top: 47px; width: 16px; height: 51px">debian</a></li> - <li><a href="/tag/win" th:href="@{/tag/win}" style="left: 505px; top: 104px; width: 27px; height: 16px">win</a></li> - <li><a href="/tag/Религия" th:href="@{/tag/Религия}" style="left: 33px; top: 281px; width: 67px; height: 17px">Религия</a></li> - <li><a href="/tag/soft" th:href="@{/tag/soft}" style="left: 286px; top: 86px; width: 28px; height: 14px">soft</a></li> - <li><a href="/tag/Политика" th:href="@{/tag/Политика}" style="left: 144px; top: 281px; width: 75px; height: 12px">Политика</a></li> - <li><a href="/tag/сны" th:href="@{/tag/сны}" style="left: 426px; top: 328px; width: 33px; height: 13px">сны</a></li> - <li><a href="/tag/Питер" th:href="@{/tag/Питер}" style="left: 146px; top: 233px; width: 50px; height: 16px">Питер</a></li> - <li><a href="/tag/bash" th:href="@{/tag/bash}" style="left: 451px; top: 311px; width: 38px; height: 16px">bash</a></li> - <li><a href="/tag/code" th:href="@{/tag/code}" style="left: 279px; top: 310px; width: 39px; height: 16px">code</a></li> - <li><a href="/tag/yandex" th:href="@{/tag/yandex}" style="left: 19px; top: 263px; width: 56px; height: 18px">yandex</a></li> - <li><a href="/tag/firefox" th:href="@{/tag/firefox}" style="left: 452px; top: 295px; width: 48px; height: 16px">firefox</a></li> - <li><a href="/tag/hardware" th:href="@{/tag/hardware}" style="left: 230px; top: 40px; width: 67px; height: 18px">hardware</a></li> - <li><a href="/tag/git" th:href="@{/tag/git}" style="left: 78px; top: 258px; width: 20px; height: 19px">git</a></li> - <li><a href="/tag/dev" th:href="@{/tag/dev}" style="left: 165px; top: 88px; width: 31px; height: 19px">dev</a></li> - <li><a href="/tag/mobile" th:href="@{/tag/mobile}" style="left: 421px; top: 24px; width: 15px; height: 47px">mobile</a></li> - <li><a href="/tag/люди" th:href="@{/tag/люди}" style="left: 151px; top: 184px; width: 43px; height: 15px">люди</a></li> - <li><a href="/tag/php" th:href="@{/tag/php}" style="left: 149px; top: 24px; width: 27px; height: 18px">php</a></li> - <li><a href="/tag/haskell" th:href="@{/tag/haskell}" style="left: 271px; top: 293px; width: 48px; height: 16px">haskell</a></li> - <li><a href="/tag/стихи" th:href="@{/tag/стихи}" style="left: 135px; top: 42px; width: 41px; height: 11px">стихи</a></li> - <li><a href="/tag/photo" th:href="@{/tag/photo}" style="left: 639px; top: 219px; width: 20px; height: 39px">photo</a></li> - <li><a href="/tag/чай" th:href="@{/tag/чай}" style="left: 448px; top: 220px; width: 27px; height: 14px">чай</a></li> - <li><a href="/tag/Опрос" th:href="@{/tag/Опрос}" style="left: 297px; top: 22px; width: 14px; height: 41px">Опрос</a></li> - <li><a href="/tag/Chrome" th:href="@{/tag/Chrome}" style="left: 311px; top: 25px; width: 48px; height: 17px">Chrome</a></li> - <li><a href="/tag/life" th:href="@{/tag/life}" style="left: 255px; top: 311px; width: 23px; height: 16px">life</a></li> - <li><a href="/tag/opera" th:href="@{/tag/opera}" style="left: 226px; top: 232px; width: 38px; height: 14px">opera</a></li> - <li><a href="/tag/programming" th:href="@{/tag/programming}" style="left: 234px; top: 327px; width: 81px; height: 14px">programming</a></li> - <li><a href="/tag/дети" th:href="@{/tag/дети}" style="left: 15px; top: 197px; width: 31px; height: 13px">дети</a></li> - <li><a href="/tag/сериалы" th:href="@{/tag/сериалы}" style="left: 575px; top: 219px; width: 61px; height: 13px">сериалы</a></li> - <li><a href="/tag/учеба" th:href="@{/tag/учеба}" style="left: 616px; top: 84px; width: 43px; height: 17px">учеба</a></li> -</ul> - -<div id="bottom1">juick.com © 2008-2017 <a href="/help/ru/contacts" th:href="@{/help/contacts}" rel="nofollow" th:text="#{link.contacts}">Контакты</a> · <a href="/help/" th:href="@{/help}" rel="nofollow" th:text="#{link.help}">Помощь</a></div> - -<div id="signup"> - <span th:text="#{label.register}">Зарегистрироваться:</span> - <div id="facebook"><a href="/_fblogin" rel="nofollow">Facebook</a></div> - <div id="vk"><a href="/_vklogin" rel="nofollow">VK</a></div> - <div id="xmpp"><a href="#" onclick="$('#xmppinfo').toggle(); return false">XMPP</a> - <div id="xmppinfo">[(#{message.sendLoginToXmpp})]</div> - </div> -</div> -<div id="signin"> - <p th:if="${loginError}" class="error" th:text="#{error.login}">Произошла ошибка, проверьте имя пользователя и пароль</p> - <a href="#" onclick="$('#signinform').toggle(); $('#nickinput').focus(); return false" th:text="#{question.areRegistered}">Уже зарегистрированы?</a> - <div id="signinform"> - <form action="#" th:action="@{/do_login}" method="POST"> - <input class="txt" type="text" name="j_username" placeholder="Имя пользователя" th:placeholder="#{label.username}" id="nickinput"/> - <input class="txt" type="password" name="j_password" placeholder="Пароль" th:placeholder="#{label.password}"/> - <input class="submit" type="submit" value="OK" th:value="#{button.send}"/> - </form> - </div> -</div> -</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 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"> 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"> 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> →</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 diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html deleted file mode 100644 index 80464e65..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html +++ /dev/null @@ -1,45 +0,0 @@ -<!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:text="${title}">Inbox title</title> -</head> - -<body> -<section id="content"> - <ul layout:fragment="content" id="private-messages" th:if="${not #lists.isEmpty(msgs)}"> - <li class="msg" th:each="msg:${msgs}"> - <div class="msg-cont"> - <div class="msg-header"> - @<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" th:text="${msg.getDate()}">01.01.1970</div> - </div> - - <div class="msg-txt" th:utext="${msg.getText()}">Lorem ipsum</div> - - <form action="/pm/send" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="uname" th:value="${msg.getUser().getName()}"/> - <div class="msg-comment"> - <div class="ta-wrapper"> - <textarea name="body" rows="1" class="replypm" placeholder="Write a reply" - th:placeholder="#{postForm.writeReply}"></textarea> - </div> - </div> - </form> - - </div> - </li> - </ul> -</section> -<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 diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html deleted file mode 100644 index 8978ff67..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_sent.html +++ /dev/null @@ -1,42 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <div layout:fragment="content"> - <form action="/pm/send" method="POST" enctype="multipart/form-data"> - <div class="newpm"> - <div class="newpm-to">To: <input type="text" name="uname" placeholder="username" th:value="${uname}"/></div> - <div class="newpm-body"><textarea name="body" rows="2"></textarea></div> - <div class="newpm-send"><input type="submit" value="OK"/></div> - </div> - </form> - <ul id="private-messages" th:if="#{not lists.isEmpty(msgs)}"> - <li class="msg" th:each="msg:${msgs}"> - <div class="msg-cont"> - <div class="msg-header"> - @<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" th:text="${msg.getDate()}">01.01.1970</div> - </div> - <div class="msg-txt" th:utext="${msg.getText()}"></div> - </div> - </li> - </ul> - </div> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/homecolumn">Main side column</p> -</aside> - -</body> -</html> 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 deleted file mode 100644 index 25432c2c..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/posted.html +++ /dev/null @@ -1,40 +0,0 @@ -<!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 diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html deleted file mode 100644 index 6f8f61dd..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_about.html +++ /dev/null @@ -1,31 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <article layout:fragment="content"> - <form action="/settings" method="POST" enctype="multipart/form-data"> - <p>Full name: <input type="text" name="fullname" th:value="${userinfo.getFullName()}"/></p> - <p>Country: <input type="text" name="country" th:value="${userinfo.getCountry()}"/></p> - <p>URL: <input type="text" name="url" th:value="${userinfo.getUrl()}" size="32"/><br/> - <small>Please, start with "http://"</small></p> - <p>About:<br/> - <input type="text" name="descr" th:value="${userinfo.getDescription()}" style="width: 100%"/><br/> - <small>Max. 255 symbols</small></p> - <p>Avatar: <input type="file" name="avatar"/><br/> - <small>Recommendations: PNG, 96x96, <50Kb. Also, JPG and GIF supported.</small></p> - <p><input type="hidden" name="page" value="about"/><input type="submit" value=" OK "/></p> - </form> - </article> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/settings_tabs">Settings navigation</p> -</aside> - -</body> -</html>
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html deleted file mode 100644 index 715d474d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_auth-email.html +++ /dev/null @@ -1,20 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <article layout:fragment="content"> - <p th:text="${result}">Authentication result</p><p><a href="/settings">Settings</a>.</p> - </article> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/settings_tabs">Settings navigation</p> -</aside> - -</body> -</html>
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html deleted file mode 100644 index 2db977f4..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_main.html +++ /dev/null @@ -1,153 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <article layout:fragment="content"> - <h1>Настройки</h1> - <form action="/settings" method="POST" enctype="multipart/form-data"> - <fieldset> - <legend>Notification options</legend> - <p><input type="checkbox" name="jnotify" value="1" - th:checked="${notify_options.isRepliesEnabled()}"/> Reply notifications ("Message posted")</p> - <p><input type="checkbox" name="subscr_notify" value="1" - th:checked="${notify_options.isSubscriptionsEnabled()}"/> Subscriptions notifications ("@user subscribed...")</p> - <p><input type="checkbox" name="recomm" value="1" - th:checked="${notify_options.isRecommendationsEnabled()}"/> Posts recommendations ("Recommended by @user")</p> - <p><input type="hidden" name="page" value="main"/><input type="submit" value=" OK "/></p> - </fieldset> - </form> - <fieldset> - <legend style="background: url(//telegram.org/favicon.ico?3) no-repeat; padding-left: 58px; line-height: 48px;"> - Telegram</legend> - <form action="/settings" method="post" th:if="${telegram_name != null}"> - <div>Telegram: <b th:text="${telegram_name}">telegram_name</b> — - <input type="hidden" name="page" value="telegram-del"/> - <input type="submit" value=" Disable "/> - </div> - </form> - <p th:if="${telegram_name == null}"> - To connect Telegram account: send any text message to <a href="https://telegram.me/Juick_bot">@Juick_bot</a> - </p> - </fieldset> - <form action="/settings" method="POST" enctype="multipart/form-data"> - <fieldset> - <legend style="background: url(//static.juick.com/settings/xmpp.png) no-repeat; padding-left: 58px; line-height: 48px;"> - XMPP accounts - </legend> - <p>Your accounts:</p> - <p> - <th:block th:each="jid:${jids}"> - <label><input type="radio" name="delete" th:value="|xmpp;${jid}}" th:text="${jid}">username@jabber.ru</label><br/> - </th:block> - <th:block th:each="auth:${auths}"> - <label><input type="radio" name="delete" - th:value="|xmpp-unauth;${auth.getAccount()}|" th:text="${auth.getAccount()}">account</label> - — <a href="#" - onclick="alert(\'To confirm, please send "AUTH {{ auth.getAuthCode() }}" (without quotes) from this account to "juick@juick.com".\'); return false;">Confirm</a><br/> - </th:block> - </p> - <p th:if="#{not lists.isEmpty(jids)}"><input type="hidden" name="page" value="jid-del"/><input type="submit" value=" Delete "/></p> - <p>To add new jabber account: send any text message to <a href="xmpp:juick@juick.com?message;body=login">juick@juick.com</a> - </p> - </fieldset> - </form> - <fieldset> - <legend style="background: url(//static.juick.com/settings/email.png) no-repeat; padding-left: 58px; line-height: 48px;"> - E-mail - </legend> - <form action="/settings" method="POST" enctype="multipart/form-data"> - <p>Add account:<br/> - <input type="text" name="account"/> - <input type="hidden" name="page" value="email-add"/> - <input type="submit" value=" Add "/> - </p> - </form> - <form action="/settings" method="POST" enctype="multipart/form-data"> - <p>Your accounts:</p> - <p> - <th:block th:each="email:${emails}"> - <label><input type="radio" name="account" th:value="${email}" th:text="${email}">email@domain.tls</label><br/> - </th:block> - <p th:if="#{lists.isEmpty(emails)}"> - -</p> - <th:block th:if="#{not lists.isEmpty(emails)}"> - </p> - <p><input type="hidden" name="page" value="email-del"/><input type="submit" value=" Delete "/></p> - </th:block> - </form> - <form action="/settings" method="POST" enctype="multipart/form-data" th:if="#{not lists.isEmpty(emails)}"> - <p>You can receive all your subscriptions by email:<br/> - Sent to <select name="account"> - <option value="">Disabled</option> - <option th:each="email:${emails}" th:value="${email}" th:text="${email}" - th:selected="${eopts.getEmail()== email}"> - </option> - </select> every day at <select name="time"> - <th:block th:each="hour:${hours}"> - <option th:value="${hour}" th:selected="${eopts.getSubscriptionHour() == hour}" - th:text="|${hour}:00 GMT|"> - </option> - </th:block> - </select> - <input type="hidden" name="page" value="email-subscr"/> - <input type="submit" value="OK"/></p> - </form> - <p> </p> - <p>You can post to Juick via e-mail. Send your <span style="text-decoration: underline">plain text</span> - messages to special secret e-mail. You can attach one photo or video file.</p> - <p>Secret email: <strong th:if="${ehash != null}" th:text="${ehash}">SecretEmail@juick.com</strong><th:block th:if="${ehash == null}">-</th:block></p> - <form action="/settings" method="post"> - <p><input type="hidden" name="page" value="email"/><input type="submit" value=" Generate new "/></p> - </form> - </fieldset> - <fieldset> - <legend style="background: url(//static.juick.com/settings/facebook.png) no-repeat; padding-left: 58px; line-height: 48px;"> - Facebook - </legend> - <form action="/settings" method="post" th:if="${fbstatus.isConnected() && fbstatus.isCrosspostEnabled()}"> - <div> - Facebook: <b>Enabled</b> — - <input type="hidden" name="page" value="facebook-disable"/> - <input type="submit" value=" Disable "/> - </div> - </form> - <form action="/settings" method="post" th:if="${fbstatus.isConnected() && !fbstatus.isCrosspostEnabled()}"> - <div> - Facebook: <b>Disabled</b> — - <input type="hidden" name="page" value="facebook-enable"/> - <input type="submit" value=" Enable "/> - </div> - </form> - <p th:if="${!fbstatus.isConnected()}">Cross-posting to Facebook: - <a href="/_fblogin"> - <img src="//static.juick.com/facebook-connect.png" alt="Connect to Facebook"/> - </a> - </p> - </fieldset> - <fieldset> - <legend style="background: url(//static.juick.com/settings/twitter.png) no-repeat; padding-left: 58px; line-height: 48px;"> - Twitter</legend> - <form action="/settings" method="post" th:if="${twitter_name != null}"> - <div>Twitter: <b th:text="${twitter_name}">@twitterName</b> — - <input type="hidden" name="page" value="twitter-del"/> - <input type="submit" value=" Disable "/> - </div> - </form> - <p th:if="${twitter_name == null}">Cross-posting to Twitter: <a href="/_twitter"><img src="//static.juick.com/twitter-connect.png" - alt="Connect to Twitter"/></a></p> - </fieldset> - - </article> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/settings_tabs">Settings navigation</p> -</aside> - -</body> -</html>
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html deleted file mode 100644 index c76363e5..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_password.html +++ /dev/null @@ -1,28 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <article layout:fragment="content"> - <fieldset> - <legend>Changing your password</legend> - <form action="/settings" method="post"> - <input type="hidden" name="page" value="password"/> - <p>Change password: <input type="password" name="password" size="8"/> <input type="submit" - value=" Update "/><br/> - <i>(max. length - 16 symbols)</i></p> - </form> - </fieldset> - </article> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/settings_tabs">Settings navigation</p> -</aside> - -</body> -</html>
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html deleted file mode 100644 index 20cb097d..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/settings_result.html +++ /dev/null @@ -1,18 +0,0 @@ -<!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:text="${title}">Settings title</title> -</head> - -<body> -<section id="content"> - <p layout:fragment="content" th:utext="${result}">Settings update status</p> -</section> -<aside id="column"> - <p layout:fragment="column" th:replace="views/partial/settings_tabs">Settings navigation</p> -</aside> - -</body> -</html>
\ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html deleted file mode 100644 index ac7da17f..00000000 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/thread.html +++ /dev/null @@ -1,17 +0,0 @@ -<!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> -<section id="content" th:data-mid="${mid}" style="margin-left: 0; width: 100%"> - <th:block layout:fragment="content"> - <th:block th:replace="views/partial/thread_message"/> - </th:block> -</section> -</body> -</html> - |