juick-www: now on spring-webmvc

16 files changed, 0 insertions, 437 deletions

diff --git a/juick-www/src/main/resources/views/404.html b/juick-www/src/main/resources/views/404.html
deleted file mode 100644
index c993df4b..00000000
--- a/juick-www/src/main/resources/views/404.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-    <article>
-        <h1>Страница не найдена</h1>
-        <p>Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.</p>
-    </article>
-{% endblock %}
-
-{% block "column" %}
-{% include "views/partial/homecolumn.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/help.html b/juick-www/src/main/resources/views/help.html
deleted file mode 100644
index 3d9960d1..00000000
--- a/juick-www/src/main/resources/views/help.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    {{ content | raw }}
-</article>
-{% endblock %}
-
-{% block "column" %}
-{{ navigation | raw }}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/partial/footer.html b/juick-www/src/main/resources/views/partial/footer.html
deleted file mode 100644
index 6978a2c0..00000000
--- a/juick-www/src/main/resources/views/partial/footer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="footer">
-    <div id="footer-right">
-        <a href="/settings" rel="nofollow">Настройки</a> &#183;
-        <a href="/help/ru/contacts" rel="nofollow">Контакты</a> &#183;
-        <a href="/help/" rel="nofollow">Справка</a> &#183;
-        <a href="/help/ru/adv" rel="nofollow">Реклама</a>
-    </div>
-    <div id="footer-social">
-        <a href="https://twitter.com/Juick" rel="nofollow" class="ico32-twi">Twitter</a>
-        <a href="https://vk.com/juick" rel="nofollow" class="ico32-vk">ВКонтакте</a>
-        <a href="https://www.facebook.com/JuickCom" rel="nofollow" class="ico32-fb">Facebook</a>
-    </div>
-    <div id="footer-left">juick.com &copy; 2008-2016
-        {% if links %}
-        <br/>Спонсоры: {{ links }}
-        {% endif %}
-    </div>
-</div>
-<script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create','UA-385578-4','juick.com');
-        ga('require','displayfeatures');
-        ga('send','pageview');
-        {% if (sapeon) %}
-            var _acic={dataProvider:10};
-            (function(){
-            var e=document.createElement('script');e.type='text/javascript';e.async=true;e.src='//www2.aci'+'nt.net/aci.js';
-            var t=document.getElementsByTagName('script')[0];t.parentNode.insertBefore(e,t);
-            })();
-        {% endif %}
-</script>
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/partial/homecolumn.html b/juick-www/src/main/resources/views/partial/homecolumn.html
deleted file mode 100644
index 5293918d..00000000
--- a/juick-www/src/main/resources/views/partial/homecolumn.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="tags">
-    {% include "views/partial/tags.html" %}
-    {% if showAdv %}
-    <a href="http://ru.wix.com/">конструктор сайтов</a>
-    {% endif %}
-</p>
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/partial/navigation.html b/juick-www/src/main/resources/views/partial/navigation.html
deleted file mode 100644
index 2863d0c3..00000000
--- a/juick-www/src/main/resources/views/partial/navigation.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<header>
-    <div id="logo"><a href="/">Juick</a></div>
-    <nav id="global">
-        <ul>
-            <li><a href="/">Популярные</a></li>
-            <li><a href="/?show=all" rel="nofollow">Все сообщения</a></li>
-            <li><a href="/?show=photos" rel="nofollow">Фотографии</a></li>
-        </ul>
-    </nav>
-    <div id="search">
-        <form action="/">
-            <input type="text" name="search" class="text" placeholder="Поиск" value="{{ search }}"/>
-        </form>
-    </div>
-    <section id="headdiv">
-        {% if visitor.getUID() > 0 %}
-        <nav id="user">
-            <ul>
-                <li><a href="/?show=my">Моя лента</a></li>
-                <li><a href="/pm/inbox">Приватные</a></li>
-                <li><a href="/?show=discuss">Обсуждения</a></li>
-                <li><a href="/?show=recommended">Рекомендации</a></li>
-            </ul>
-        </nav>
-        <nav id="actions">
-            <ul>
-                <li><a href="/#post">Написать</a></li>
-                <li><a href="/{{ visitor.getName() }}">@{{ visitor.getName() }}</a></li>
-                <li><a href="/logout">Выйти</a></li>
-            </ul>
-        </nav>
-        {% else %}
-        <p>Чтобы добавлять сообщения и комментарии, <a href="#" onclick="return Juick.openDialogLogin()">представьтесь</a>.
-        </p>
-        {% endif %}
-    </section>
-</header>
diff --git a/juick-www/src/main/resources/views/partial/settings_tabs.html b/juick-www/src/main/resources/views/partial/settings_tabs.html
deleted file mode 100644
index d7901d5e..00000000
--- a/juick-www/src/main/resources/views/partial/settings_tabs.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="pagetabs"><ul>
-    <li><a href="/settings">Main</a></li>
-    <li><a href="/settings?page=password">Password</a></li>
-    <li><a href="/settings?page=about">About</a></li>
-</ul></div>
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/partial/tags.html b/juick-www/src/main/resources/views/partial/tags.html
deleted file mode 100644
index 4d05b7fb..00000000
--- a/juick-www/src/main/resources/views/partial/tags.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for tag in tags %}
-    <a href="/tag/{{ tag | urlencode }}" title="{{ tag }}">{{ tag }}</a>
-{% endfor %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/pm_inbox.html b/juick-www/src/main/resources/views/pm_inbox.html
deleted file mode 100644
index 36b3e511..00000000
--- a/juick-www/src/main/resources/views/pm_inbox.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-{% if not msgs.isEmpty() %}
-<ul id="private-messages">
-    {% for msg in msgs %}
-    <li class="msg">
-        <div class="msg-cont">
-        	<div class="msg-header">
-                @<a href="/{{ msg.getUser().getName() }}/">{{ msg.getUser().getName() }}</a>:
-                <div class="msg-avatar">
-                	<a href="/{{ msg.getUser().getName() }}/">
-                    	<img src="//i.juick.com/a/{{ msg.getUser().getUID() }}.png" alt="{{ msg.getUser().getName() }}"/>
-                	</a>
-            	</div>
-            	 <div class="msg-ts">{{ msg.getDate() }}</div>
-            </div>
-           
-            <div class="msg-txt">{{ msg.getText() | raw }}</div>
-
-            <form action="/pm/send" method="POST" enctype="multipart/form-data">
-                <input type="hidden" name="uname" value="{{ msg.getUser().getName() }}"/>
-                <div class="msg-comment">
-                    <div class="ta-wrapper">
-                        <textarea name="body" rows="1" class="replypm" placeholder="Написать ответ"></textarea>
-                    </div>
-                </div>
-            </form>
-
-        </div>
-    </li>
-    {% endfor %}
-</ul>
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/homecolumn.html" %}
-{% endblock %}
diff --git a/juick-www/src/main/resources/views/pm_sent.html b/juick-www/src/main/resources/views/pm_sent.html
deleted file mode 100644
index 7c6fb686..00000000
--- a/juick-www/src/main/resources/views/pm_sent.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block 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" 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>
-{% if not msgs.isEmpty() %}
-<ul id="private-messages">
-    {% for msg in msgs %}
-    <li class="msg">
-        <div class="msg-cont">
-        	<div class="msg-header">
-                @<a href="/{{ msg.getUser().getName() }}/">{{ msg.getUser().getName() }}</a>:
-                <div class="msg-avatar">
-                	<a href="/{{ msg.getUser().getName() }}/">
-                    	<img src="//i.juick.com/a/{{ msg.getUser().getUID() }}.png" alt="{{ msg.getUser().getName() }}"/>
-                	</a>
-            	</div>
-            	<div class="msg-ts">{{ msg.getDate() }}</div>
-            </div>
-            <div class="msg-txt">{{ msg.getText() | raw }}</div>
-        </div>
-    </li>
-    {% endfor %}
-</ul>
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/homecolumn.html" %}
-{% endblock %}
diff --git a/juick-www/src/main/resources/views/settings_about.html b/juick-www/src/main/resources/views/settings_about.html
deleted file mode 100644
index 0252af35..00000000
--- a/juick-www/src/main/resources/views/settings_about.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <form action="/settings" method="POST" enctype="multipart/form-data">
-        <p>Full name: <input type="text" name="fullname" value="{{ userinfo.getFullName() }}"/></p>
-        <p>Country: <input type="text" name="country" value="{{ userinfo.getCountry() }}"/></p>
-        <p>URL: <input type="text" name="url" value="{{ userinfo.getUrl() }}" size="32"/><br/>
-            <small>Please, start with &quot;http://&quot;</small></p>
-        <p>About:<br/>
-            <input type="text" name="descr" 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, &lt;50Kb. Also, JPG and GIF supported.</small></p>
-        <p><input type="hidden" name="page" value="about"/><input type="submit" value="  OK  "/></p>
-    </form>
-</article>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/settings_auth-email.html b/juick-www/src/main/resources/views/settings_auth-email.html
deleted file mode 100644
index 79691083..00000000
--- a/juick-www/src/main/resources/views/settings_auth-email.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <p>{{ result }}</p><p><a href="/settings">Settings</a>.</p>
-</article>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/settings_main.html b/juick-www/src/main/resources/views/settings_main.html
deleted file mode 100644
index f4630be2..00000000
--- a/juick-www/src/main/resources/views/settings_main.html
+++ /dev/null
@@ -1,156 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <h1>Настройки</h1>
-    <form action="/settings" method="POST" enctype="multipart/form-data">
-        <fieldset>
-            <legend>Notification options</legend>
-            <p><input type="checkbox" name="jnotify" value="1" {% if notify_options.isRepliesEnabled() %}
-                      checked="checked" {% endif %}/> Reply notifications (&quot;Message posted&quot;)</p>
-            <p><input type="checkbox" name="subscr_notify" value="1" {% if notify_options.isSubscriptionsEnabled() %}
-                      checked="checked" {% endif %}/> Subscriptions notifications (&quot;@user subscribed...&quot;)</p>
-            <p><input type="checkbox" name="recomm" value="1" {% if notify_options.isRecommendationsEnabled() %}
-                      checked="checked" {% endif %}/> Posts recommendations (&quot;Recommended by @user&quot;)</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>
-        {% if telegram_name is not empty %}
-        <form action="/settings" method="post">
-            <div>Telegram: <b>{{ telegram_name }}</b> &mdash;
-                <input type="hidden" name="page" value="telegram-del"/>
-                <input type="submit" value="  Disable  "/>
-            </div>
-        </form>
-        {% else %}
-        <p>To connect Telegram account: send any text message to <a href="https://telegram.me/Juick_bot">@Juick_bot</a>
-        </p>
-        {% endif %}
-    </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>
-                {% for jid in jids %}
-                <label><input type="radio" name="delete" value="xmpp;{{ jid }}">{{ jid }}</label><br/>
-                {% endfor %}
-                {% for auth in auths %}
-                <label><input type="radio" name="delete"
-                              value="xmpp-unauth;{{ auth.getAccount() }}">{{ auth.getAccount() }}</label>
-                &mdash; <a href="#"
-                           onclick="alert(\'To confirm, please send &quot;AUTH {{ auth.getAuthCode() }}&quot; (without quotes) from this account to &quot;juick@juick.com&quot;.\'); return false;">Confirm</a><br/>
-                {% endfor %}
-            </p>
-            {% if jids is not empty %}
-            <p><input type="hidden" name="page" value="jid-del"/><input type="submit" value="  Delete  "/></p>
-            {% endif %}
-            <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>
-                {% for email in emails %}
-                <label><input type="radio" name="account" value="{{ email }}">{{ email }}</label><br/>
-                {% endfor %}
-                {% if emails is empty %}
-                - </p>
-            {% else %}
-            </p>
-            <p><input type="hidden" name="page" value="email-del"/><input type="submit" value="  Delete  "/></p>
-            {% endif %}
-        </form>
-        {% if emails is not empty %}
-        <form action="/settings" method="POST" enctype="multipart/form-data">
-            <p>You can receive all your subscriptions by email:<br/>
-                Sent to <select name="account">
-                    <option value="">Disabled</option>
-                    {% for email in emails %}
-                    <option value="{{ email }}" {% if eopts.getEmail()== email %} selected="selected" {% endif %}>
-                        {{ email }}
-                    </option>
-                    {% endfor %}
-                </select> every day at <select name="time">
-                    {% for hour in hours %}
-                    <option value="{{ hour }}" {% if eopts.getSubscriptionHour() == hour %} selected="selected" {%
-                            endif %}>
-                        {{ hour }}:00 GMT
-                    </option>
-                    {% endfor %}
-                </select>
-                <input type="hidden" name="page" value="email-subscr"/>
-                <input type="submit" value="OK"/></p>
-        </form>
-        {% endif %}
-        <p>&nbsp;</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: {% if ehash is not empty %} <strong>{{ ehash }}</strong> {% else %}-{% endif %}</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>
-        {% if fbstatus.isConnected() %}
-        {% if fbstatus.isCrosspostEnabled() %}
-        <form action="/settings" method="post">
-            <div>
-                Facebook: <b>Enabled</b> &mdash;
-                <input type="hidden" name="page" value="facebook-disable"/>
-                <input type="submit" value="  Disable  "/>
-            </div>
-        </form>
-        {% else %}
-        <form action="/settings" method="post">
-            <div>
-                Facebook: <b>Disabled</b> &mdash;
-                <input type="hidden" name="page" value="facebook-enable"/>
-                <input type="submit" value="  Enable  "/>
-            </div>
-        </form>
-        {% endif %}
-        {% else %}
-        <p>Cross-posting to Facebook: <a href="/_fblogin"><img src="//static.juick.com/facebook-connect.png" alt="Connect to Facebook"/></a></p>
-        {% endif %}
-    </fieldset>
-    <fieldset>
-    <legend style="background: url(//static.juick.com/settings/twitter.png) no-repeat; padding-left: 58px; line-height: 48px;">
-        Twitter</legend>
-    {% if twitter_name is not empty %}
-    <form action="/settings" method="post">
-        <div>Twitter: <b>{{ twitter_name }}</b> &mdash;
-            <input type="hidden" name="page" value="twitter-del"/>
-            <input type="submit" value="  Disable  "/>
-        </div>
-    </form>
-    {% else %}
-    <p>Cross-posting to Twitter: <a href="/_twitter"><img src="//static.juick.com/twitter-connect.png"
-                                                          alt="Connect to Twitter"/></a></p>
-    {% endif %}
-    </fieldset>
-
-</article>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/settings_password.html b/juick-www/src/main/resources/views/settings_password.html
deleted file mode 100644
index e9c2dce0..00000000
--- a/juick-www/src/main/resources/views/settings_password.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <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>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/settings_privacy.html b/juick-www/src/main/resources/views/settings_privacy.html
deleted file mode 100644
index 48756d8e..00000000
--- a/juick-www/src/main/resources/views/settings_privacy.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <p>Privacy</p>
-</article>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/settings_result.html b/juick-www/src/main/resources/views/settings_result.html
deleted file mode 100644
index 3f5482d4..00000000
--- a/juick-www/src/main/resources/views/settings_result.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<article>
-    <p>{{ result | raw }}</p>
-</article>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/views/signup.html b/juick-www/src/main/resources/views/signup.html
deleted file mode 100644
index 724ad961..00000000
--- a/juick-www/src/main/resources/views/signup.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "layouts/content.html" %}
-{% block content %}
-<h1 class="signup-h1">
-    {% if type | slice(0, 1) == 'f' %}
-    <img src="//static.juick.com/settings/facebook.png" alt="Facebook"/>
-    {% elseif type | slice(0, 1)  == 'v' %}
-    <img src="//static.juick.com/settings/vk.png" alt="VKontakte"/>
-    {% elseif type | slice(0, 1)  == 'x' %}
-    <img src="//static.juick.com/settings/xmpp.png" alt="XMPP"/>
-    {% elseif type | slice(0, 1)  == 'd' %}
-    <img src="//telegram.org/favicon.ico?3" alt="Telegram"/>
-    {% endif %}
-    {{ account | raw }}</h1>
-
-<h2 class="signup-h2">Связать с существующим аккаунтом Juick</h2>
-<form action="/signup" method="post">
-    <input type="hidden" name="action" value="link"/>
-    <input type="hidden" name="type" value="{{ type }}"/>
-    <input type="hidden" name="hash" value="{{ hash }}"/>
-    {% if visitor.getUID() > 0 %}
-    <input type="submit" value="Связать с этим аккаунтом"/>
-    {% else %}
-    <p>Имя пользователя: <input type="text" name="username"/></p>
-    <p>Пароль: <input type="password" name="password"/></p>
-    <p><input type="submit" value="    OK    "/></p>
-    {% endif %}
-</form>
-
-<hr class="signup-hr"/>
-
-<h2 class="signup-h2">Создать новый аккаунт Juick</h2>
-<form action="/signup" method="post">
-    <input type="hidden" name="action" value="new"/>
-    <input type="hidden" name="type" value="{{ type }}"/>
-    <input type="hidden" name="hash" value="{{ hash }}"/>
-    <p>Имя пользователя: <input type="text" name="username" id="username"/><br/><i>(От 2-х до 16-и латинских символов
-        и/или цифр, дефис)</i></p>
-    <p>Пароль: <input type="password" name="password"/><br/><i>(от 6-и до 32-х символов)</i></p>
-    <p><input type="submit" value="    OK    "/></p>
-</form>
-{% endblock %}
\ No newline at end of file