Merge pull request #1166 from wallabag/v2-rss

Add RSS feeds

4 files changed, 145 insertions, 60 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 062e1651..0f4db94e 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -36,3 +36,10 @@ services:
             - @doctrine
         tags:
             - { name: form.type, alias: forgot_password }
+
+    wallabag_core.param_converter.username_rsstoken_converter:
+        class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter
+        tags:
+            - { name: request.param_converter, converter: username_rsstoken_converter }
+        arguments:
+            - @doctrine
diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
index 1835d26e..f2a98dfb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
@@ -5,129 +5,173 @@
 {% block content %}
     <h2>{% trans %}Wallabag configuration{% endtrans %}</h2>
 
-    <form action="{{ path('config') }}" method="post" {{ form_enctype(configForm) }}>
-        {{ form_errors(configForm) }}
+    <form action="{{ path('config') }}" method="post" {{ form_enctype(form.config) }}>
+        {{ form_errors(form.config) }}
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(configForm.theme) }}
-                {{ form_errors(configForm.theme) }}
-                {{ form_widget(configForm.theme) }}
+                {{ form_label(form.config.theme) }}
+                {{ form_errors(form.config.theme) }}
+                {{ form_widget(form.config.theme) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(configForm.items_per_page) }}
-                {{ form_errors(configForm.items_per_page) }}
-                {{ form_widget(configForm.items_per_page) }}
+                {{ form_label(form.config.items_per_page) }}
+                {{ form_errors(form.config.items_per_page) }}
+                {{ form_widget(form.config.items_per_page) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(configForm.language) }}
-                {{ form_errors(configForm.language) }}
-                {{ form_widget(configForm.language) }}
+                {{ form_label(form.config.language) }}
+                {{ form_errors(form.config.language) }}
+                {{ form_widget(form.config.language) }}
             </div>
         </fieldset>
 
-        {{ form_rest(configForm) }}
+        {{ form_rest(form.config) }}
+    </form>
+
+    <h2>{% trans %}RSS configuration{% endtrans %}</h2>
+
+    <form action="{{ path('config') }}" method="post" {{ form_enctype(form.rss) }}>
+        {{ form_errors(form.rss) }}
+
+        <fieldset class="w500p inline">
+            <div class="row">
+                <label>Rss token</label>
+                {% if rss.token %}
+                    {{ rss.token }}
+                {% else %}
+                    <em>No token</em>
+                {% endif %}
+                –
+                <a href="{{ path('generate_token') }}">Regenerate ?</a>
+            </div>
+        </fieldset>
+
+        <fieldset class="w500p inline">
+            <div class="row">
+                <label>Rss links:</label>
+                {% if rss.token %}
+                    <ul>
+                        <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
+                        <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
+                        <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
+                    </ul>
+                {% else %}
+                    <strong>You need to generate a token first.</strong>
+                {% endif %}
+            </div>
+        </fieldset>
+
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.rss.rss_limit) }}
+                {{ form_errors(form.rss.rss_limit) }}
+                {{ form_widget(form.rss.rss_limit) }}
+            </div>
+        </fieldset>
+
+        {{ form_rest(form.rss) }}
     </form>
 
     <h2>{% trans %}User information{% endtrans %}</h2>
 
-    <form action="{{ path('config') }}" method="post" {{ form_enctype(userForm) }}>
-        {{ form_errors(userForm) }}
+    <form action="{{ path('config') }}" method="post" {{ form_enctype(form.user) }}>
+        {{ form_errors(form.user) }}
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(userForm.username) }}
-                {{ form_errors(userForm.username) }}
-                {{ form_widget(userForm.username) }}
+                {{ form_label(form.user.username) }}
+                {{ form_errors(form.user.username) }}
+                {{ form_widget(form.user.username) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(userForm.name) }}
-                {{ form_errors(userForm.name) }}
-                {{ form_widget(userForm.name) }}
+                {{ form_label(form.user.name) }}
+                {{ form_errors(form.user.name) }}
+                {{ form_widget(form.user.name) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(userForm.email) }}
-                {{ form_errors(userForm.email) }}
-                {{ form_widget(userForm.email) }}
+                {{ form_label(form.user.email) }}
+                {{ form_errors(form.user.email) }}
+                {{ form_widget(form.user.email) }}
             </div>
         </fieldset>
 
-        {{ form_rest(userForm) }}
+        {{ form_rest(form.user) }}
     </form>
 
     <h2>{% trans %}Change your password{% endtrans %}</h2>
 
-    <form action="{{ path('config') }}" method="post" {{ form_enctype(pwdForm) }}>
-        {{ form_errors(pwdForm) }}
+    <form action="{{ path('config') }}" method="post" {{ form_enctype(form.pwd) }}>
+        {{ form_errors(form.pwd) }}
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(pwdForm.old_password) }}
-                {{ form_errors(pwdForm.old_password) }}
-                {{ form_widget(pwdForm.old_password) }}
+                {{ form_label(form.pwd.old_password) }}
+                {{ form_errors(form.pwd.old_password) }}
+                {{ form_widget(form.pwd.old_password) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(pwdForm.new_password.first) }}
-                {{ form_errors(pwdForm.new_password.first) }}
-                {{ form_widget(pwdForm.new_password.first) }}
+                {{ form_label(form.pwd.new_password.first) }}
+                {{ form_errors(form.pwd.new_password.first) }}
+                {{ form_widget(form.pwd.new_password.first) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(pwdForm.new_password.second) }}
-                {{ form_errors(pwdForm.new_password.second) }}
-                {{ form_widget(pwdForm.new_password.second) }}
+                {{ form_label(form.pwd.new_password.second) }}
+                {{ form_errors(form.pwd.new_password.second) }}
+                {{ form_widget(form.pwd.new_password.second) }}
             </div>
         </fieldset>
 
-        {{ form_rest(pwdForm) }}
+        {{ form_rest(form.pwd) }}
     </form>
 
     <h2>{% trans %}Add a user{% endtrans %}</h2>
 
-    <form action="{{ path('config') }}" method="post" {{ form_enctype(newUserForm) }}>
-        {{ form_errors(newUserForm) }}
+    <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}>
+        {{ form_errors(form.new_user) }}
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(newUserForm.username) }}
-                {{ form_errors(newUserForm.username) }}
-                {{ form_widget(newUserForm.username) }}
+                {{ form_label(form.new_user.username) }}
+                {{ form_errors(form.new_user.username) }}
+                {{ form_widget(form.new_user.username) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(newUserForm.password) }}
-                {{ form_errors(newUserForm.password) }}
-                {{ form_widget(newUserForm.password) }}
+                {{ form_label(form.new_user.password) }}
+                {{ form_errors(form.new_user.password) }}
+                {{ form_widget(form.new_user.password) }}
             </div>
         </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(newUserForm.email) }}
-                {{ form_errors(newUserForm.email) }}
-                {{ form_widget(newUserForm.email) }}
+                {{ form_label(form.new_user.email) }}
+                {{ form_errors(form.new_user.email) }}
+                {{ form_widget(form.new_user.email) }}
             </div>
         </fieldset>
 
-        {{ form_rest(newUserForm) }}
+        {{ form_rest(form.new_user) }}
     </form>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig
new file mode 100644
index 00000000..5ec9bc03
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
+    <channel>
+        <title>wallabag — {{type}} feed</title>
+        <link>{{ url('unread') }}</link>
+        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
+        <generator>wallabag</generator>
+        <description>wallabag {{type}} elements</description>
+
+        {% for entry in entries %}
+
+            <item>
+                <title><![CDATA[{{ entry.title }}]]></title>
+                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
+                <link>{{ url('view', { 'id': entry.id }) }}</link>
+                <guid>{{ url('view', { 'id': entry.id }) }}</guid>
+                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
+                <description>
+                    <![CDATA[
+                    {%- if entry.content|readingTime > 0 -%}
+                        {% trans %}estimated reading time :{% endtrans %} {{ entry.content|readingTime }} min
+                    {%- else -%}
+                        {% trans %}estimated reading time :{% endtrans %} &lt; 1 min
+                    {%- endif %}
+
+                    {{ entry.content|raw -}}
+                    ]]>
+                </description>
+            </item>
+
+        {% endfor %}
+
+    </channel>
+</rss>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 1df82910..ff1a36a1 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -7,7 +7,7 @@
    4 = Messages
    5 = Article
    6 = Media queries
-   
+
    ========================================================================== */
 
 html {
@@ -42,17 +42,17 @@ body {
   position: absolute;
   top: 2em;
   left: 50%;
-  margin-left: -55px; 
+  margin-left: -55px;
 }
 
 /* ==========================================================================
    1 = Style Guide
    ========================================================================== */
 
-::selection { 
-  color: #FFF;  
+::selection {
+  color: #FFF;
   background-color: #000;
-} 
+}
 
 .desktopHide {
   display: none;
@@ -62,7 +62,7 @@ body {
   position: fixed;
   z-index: 20;
   top: 0.4em;
-  left: 0.6em; 
+  left: 0.6em;
 }
 
 h2, h3, h4 {
@@ -89,7 +89,7 @@ form fieldset {
   margin: 0;
 }
 
-form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
+form input[type="text"], form input[type="number"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
   border: 1px solid #999;
   padding: 0.5em 1em;
   min-width: 12em;
@@ -149,7 +149,7 @@ form button, input[type="submit"] {
 
 #bookmarklet {
   cursor: move;
-}  
+}
 
 h2:after {
   content: "";
@@ -296,7 +296,7 @@ h2:after {
 /* ==========================================================================
    2 = Layout
    ========================================================================== */
-   
+
 #content {
   margin-top: 5em;
   min-height: 30em;
@@ -653,7 +653,7 @@ a.add-to-wallabag-link-after:after {
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
-   
+
 @font-face {
   font-family: 'icomoon';
   src:url('../fonts/icomoon.eot?-s0mcsx');
@@ -866,7 +866,7 @@ blockquote {
   color: #FFF;
   text-decoration: none;
 }
-  
+
   #article_toolbar a:hover, #article_toolbar a:focus {
     background-color: #999;
   }
@@ -1052,7 +1052,7 @@ pre code {
   #article_toolbar a {
     padding: 0.3em 0.4em 0.2em;
   }
-  
+
   #display-mode {
     display: none;
   }