From 0c83fd5994861efa728097dd151c994796c39ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 28 Mar 2015 14:27:45 +0100 Subject: Add rss for entries will fix #1000 --- .../CoreBundle/Resources/config/services.yml | 7 ++ .../Resources/views/Config/index.html.twig | 136 +++++++++++++-------- .../Resources/views/Entry/entries.xml.twig | 34 ++++++ 3 files changed, 129 insertions(+), 48 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig (limited to 'src/Wallabag/CoreBundle/Resources') 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..b134b6ca 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -5,129 +5,169 @@ {% block content %}

{% trans %}Wallabag configuration{% endtrans %}

-
- {{ form_errors(configForm) }} + + {{ form_errors(form.config) }}
- {{ 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) }}
- {{ 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) }}
- {{ 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) }}
- {{ form_rest(configForm) }} + {{ form_rest(form.config) }} +
+ +

{% trans %}RSS configuration{% endtrans %}

+ +
+ {{ form_errors(form.rss) }} + +
+
+ + {% if rss.token %} + {{ rss.token }} + {% else %} + No token + {% endif %} + – + Regenerate ? +
+
+ +
+
+ + +
+
+ +
+
+ {{ form_label(form.rss.rss_limit) }} + {{ form_errors(form.rss.rss_limit) }} + {{ form_widget(form.rss.rss_limit) }} +
+
+ + {{ form_rest(form.rss) }}

{% trans %}User information{% endtrans %}

-
- {{ form_errors(userForm) }} + + {{ form_errors(form.user) }}
- {{ 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) }}
- {{ 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) }}
- {{ 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) }}
- {{ form_rest(userForm) }} + {{ form_rest(form.user) }}

{% trans %}Change your password{% endtrans %}

-
- {{ form_errors(pwdForm) }} + + {{ form_errors(form.pwd) }}
- {{ 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) }}
- {{ 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) }}
- {{ 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) }}
- {{ form_rest(pwdForm) }} + {{ form_rest(form.pwd) }}

{% trans %}Add a user{% endtrans %}

-
- {{ form_errors(newUserForm) }} + + {{ form_errors(form.new_user) }}
- {{ 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) }}
- {{ 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) }}
- {{ 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) }}
- {{ form_rest(newUserForm) }} + {{ form_rest(form.new_user) }}
{% 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..6eebc80d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig @@ -0,0 +1,34 @@ + + + + wallabag — {{type}} feed + {{ url('unread') }} + {{ "now"|date('D, d M Y H:i:s') }} + wallabag + wallabag {{type}} elements + + {% for entry in entries %} + + + <![CDATA[{{ entry.title }}]]> + wallabag + {{ url('view', { 'id': entry.id }) }} + {{ url('view', { 'id': entry.id }) }} + {{ entry.createdAt|date('D, d M Y H:i:s') }} + + 0 %} + {% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min + {% else -%} + {% trans %}estimated reading time :{% endtrans %} < 1 min + {% endif -%} + + {{ entry.content -}} + ]]> + + + + {% endfor %} + + + -- cgit v1.2.3