2 files changed, 79 insertions, 0 deletions
diff --git a/juick-www/src/main/resources/layouts/rss.xml b/juick-www/src/main/resources/layouts/rss.xml
new file mode 100644
index 00000000..61dd3be8
--- /dev/null
+++ b/juick-www/src/main/resources/layouts/rss.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<rss version='2.0' xmlns:atom='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/'
+     xmlns:juick='http://juick.com/'>
+    <channel>
+        <atom:link href='http://rss.juick.com/{{ user.getUName() }}/blog' rel='self' type='application/rss+xml'/>
+        <title>{{ user.getUName() }} - Juick</title>
+        <link>http://juick.com/{{ user.getUName() }}/</link>
+        <description>The latest messages by @{{ user.getUName() }} at Juick</description>
+        <image>
+            <url>http://i.juick.com/a/{{ user.getUID() }}.png</url>
+            <title>{{ user.getUName() }} - Juick</title>
+            <link>http://juick.com/{{ user.getUName() }}/</link>
+        </image>
+        {% for msg in msgs %}
+        <item>
+            <link>http://juick.com/{{ msg.getUser().getUName() }}/{{ msg.getMID() }}</link>
+            <guid>http://juick.com/{{ msg.getUser().getUName() }}/{{ msg.getMID() }}</guid>
+            <title><![CDATA[@{{ msg.getUser().getUName() }}: {% for tag in msg.Tags %} *{{ tag }}{% endfor %}]]></title>
+            <description><![CDATA[{{ msg.getText() | raw }}]]></description>
+            <pubDate>{{ sdfRSS.format(msg.getDate()) }}</pubDate>
+            <comments>http://juick.com/{{ msg.getUser().getUName() }}/{{ msg.getMID() }}</comments>
+            {% for tag in msg.Tags %}
+            <category>{{ tag }}</category>
+            {% endfor %}
+            {% if msg.AttachmentType is not empty %}
+            {% if msg.AttachmentType == "jpg" %}
+            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMID() }}.jpg' type='image/jpeg'/>
+            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMID() }}.jpg'/>
+            {% elseif msg.AttachmentType == "png" %}
+            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMID() }}.png' type='image/png'/>
+            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMID() }}.png'/>
+            {% endif %}
+            {% endif %}
+            <juick:user uid='{{ msg.getUser().getUID() }}'/>
+        </item>
+        {% endfor %}
+    </channel>
+</rss>
+\ 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
new file mode 100644
index 00000000..724ad961
--- /dev/null
+++ b/juick-www/src/main/resources/views/signup.html
@@ -0,0 +1,41 @@
+{% 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