From 2f682b5e3cfc3fc5f961b60129be7bc90e0d6a03 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 28 Dec 2016 22:38:21 +0300
Subject: juick-www: now on spring-webmvc

---
 juick-www/src/main/webapp/WEB-INF/views/404.html   |  11 ++
 juick-www/src/main/webapp/WEB-INF/views/help.html  |  10 ++
 .../main/webapp/WEB-INF/views/partial/footer.html  |  34 +++++
 .../webapp/WEB-INF/views/partial/homecolumn.html   |   6 +
 .../webapp/WEB-INF/views/partial/navigation.html   |  37 +++++
 .../WEB-INF/views/partial/settings_tabs.html       |   5 +
 .../main/webapp/WEB-INF/views/partial/tags.html    |   3 +
 .../src/main/webapp/WEB-INF/views/pm_inbox.html    |  37 +++++
 .../src/main/webapp/WEB-INF/views/pm_sent.html     |  33 +++++
 .../main/webapp/WEB-INF/views/settings_about.html  |  20 +++
 .../webapp/WEB-INF/views/settings_auth-email.html  |   9 ++
 .../main/webapp/WEB-INF/views/settings_main.html   | 156 +++++++++++++++++++++
 .../webapp/WEB-INF/views/settings_password.html    |  17 +++
 .../webapp/WEB-INF/views/settings_privacy.html     |   9 ++
 .../main/webapp/WEB-INF/views/settings_result.html |   9 ++
 .../src/main/webapp/WEB-INF/views/signup.html      |  41 ++++++
 16 files changed, 437 insertions(+)
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/404.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/help.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/tags.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_about.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_main.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_password.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/settings_result.html
 create mode 100644 juick-www/src/main/webapp/WEB-INF/views/signup.html

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

diff --git a/juick-www/src/main/webapp/WEB-INF/views/404.html b/juick-www/src/main/webapp/WEB-INF/views/404.html
new file mode 100644
index 00000000..21f42d75
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/404.html
@@ -0,0 +1,11 @@
+{% extends "layouts/content" %}
+{% block content %}
+    <article>
+        <h1>Страница не найдена</h1>
+        <p>Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.</p>
+    </article>
+{% endblock %}
+
+{% block "column" %}
+{% include "views/partial/homecolumn" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/help.html b/juick-www/src/main/webapp/WEB-INF/views/help.html
new file mode 100644
index 00000000..a4b76676
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/help.html
@@ -0,0 +1,10 @@
+{% extends "layouts/content" %}
+{% 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/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
new file mode 100644
index 00000000..6978a2c0
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
@@ -0,0 +1,34 @@
+<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/webapp/WEB-INF/views/partial/homecolumn.html b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
new file mode 100644
index 00000000..28a73662
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/homecolumn.html
@@ -0,0 +1,6 @@
+<p class="tags">
+    {% include "views/partial/tags" %}
+    {% if showAdv %}
+    <a href="http://ru.wix.com/">конструктор сайтов</a>
+    {% endif %}
+</p>
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
new file mode 100644
index 00000000..2863d0c3
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
@@ -0,0 +1,37 @@
+<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/webapp/WEB-INF/views/partial/settings_tabs.html b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
new file mode 100644
index 00000000..d7901d5e
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
@@ -0,0 +1,5 @@
+<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/webapp/WEB-INF/views/partial/tags.html b/juick-www/src/main/webapp/WEB-INF/views/partial/tags.html
new file mode 100644
index 00000000..4d05b7fb
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/tags.html
@@ -0,0 +1,3 @@
+{% 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/webapp/WEB-INF/views/pm_inbox.html b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
new file mode 100644
index 00000000..cb55582a
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
@@ -0,0 +1,37 @@
+{% extends "layouts/content" %}
+{% 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" %}
+{% endblock %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
new file mode 100644
index 00000000..41f3814b
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
@@ -0,0 +1,33 @@
+{% extends "layouts/content" %}
+{% 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" %}
+{% endblock %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_about.html b/juick-www/src/main/webapp/WEB-INF/views/settings_about.html
new file mode 100644
index 00000000..a11a1609
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_about.html
@@ -0,0 +1,20 @@
+{% extends "layouts/content" %}
+{% 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" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html b/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
new file mode 100644
index 00000000..e7ed985a
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_auth-email.html
@@ -0,0 +1,9 @@
+{% extends "layouts/content" %}
+{% block content %}
+<article>
+    <p>{{ result }}</p><p><a href="/settings">Settings</a>.</p>
+</article>
+{% endblock %}
+{% block "column" %}
+{% include "views/partial/settings_tabs" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
new file mode 100644
index 00000000..39c6d875
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
@@ -0,0 +1,156 @@
+{% extends "layouts/content" %}
+{% 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" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_password.html b/juick-www/src/main/webapp/WEB-INF/views/settings_password.html
new file mode 100644
index 00000000..d7883546
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_password.html
@@ -0,0 +1,17 @@
+{% extends "layouts/content" %}
+{% 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" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html b/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
new file mode 100644
index 00000000..29ed5e95
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_privacy.html
@@ -0,0 +1,9 @@
+{% extends "layouts/content" %}
+{% block content %}
+<article>
+    <p>Privacy</p>
+</article>
+{% endblock %}
+{% block "column" %}
+{% include "views/partial/settings_tabs" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_result.html b/juick-www/src/main/webapp/WEB-INF/views/settings_result.html
new file mode 100644
index 00000000..88a52938
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_result.html
@@ -0,0 +1,9 @@
+{% extends "layouts/content" %}
+{% block content %}
+<article>
+    <p>{{ result | raw }}</p>
+</article>
+{% endblock %}
+{% block "column" %}
+{% include "views/partial/settings_tabs" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/signup.html b/juick-www/src/main/webapp/WEB-INF/views/signup.html
new file mode 100644
index 00000000..e454f7dd
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/views/signup.html
@@ -0,0 +1,41 @@
+{% extends "layouts/content" %}
+{% 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
-- 
cgit v1.2.3