From e4b46f77ef2984b33f4dff0efea0585c7ab0cfbf Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 26 Jun 2016 13:36:53 +0200 Subject: work --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 270c077f..cebde1ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -167,6 +167,7 @@ {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_widget(form.user._token) }} + {{ 'config.user.delete_account' | trans }}
-- cgit v1.2.3 From bb0c78f4a636fcc8f60dd3b42ad733e7f31e0bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 8 Sep 2016 14:07:36 +0200 Subject: Added check if there is only one user Added translations and documentation --- .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 3 +++ .../Resources/views/themes/material/Config/index.html.twig | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index ff7ef73a..29575272 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -148,6 +148,9 @@ {{ form_widget(form.user._token) }} {{ form_widget(form.user.save) }} + {% if enabled_users > 1 %} + {{ 'config.form_user.delete_account' | trans }} + {% endif %}

{{ 'config.tab_menu.password'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index cebde1ac..5aa3eabe 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -167,7 +167,10 @@ {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_widget(form.user._token) }} - {{ 'config.user.delete_account' | trans }} + + {% if enabled_users > 1 %} + {{ 'config.form_user.delete_account' | trans }} + {% endif %}
-- cgit v1.2.3 From 71254701b7e5364516b7510e9237c00c678dac1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 8 Sep 2016 16:00:39 +0200 Subject: Changed tests --- .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 2 +- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 29575272..b10db473 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -149,7 +149,7 @@ {{ form_widget(form.user._token) }} {{ form_widget(form.user.save) }} {% if enabled_users > 1 %} - {{ 'config.form_user.delete_account' | trans }} + {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5aa3eabe..a8a3f9dc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -169,7 +169,7 @@ {% if enabled_users > 1 %} - {{ 'config.form_user.delete_account' | trans }} + {% endif %}
-- cgit v1.2.3 From eed812afd0626697d33f7e9d3bfd8eca138c463d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 8 Oct 2016 19:39:12 +0200 Subject: Logout user before deleting it And add a smal description --- .../Resources/views/themes/material/Config/index.html.twig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index a8a3f9dc..25d259b8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -169,7 +169,15 @@ {% if enabled_users > 1 %} - +

+ +
+
{{ 'config.delete.title'|trans }}
+

{{ 'config.delete.description'|trans }}

+ +
{% endif %} -- cgit v1.2.3 From 876d77a67d1415c1be56f08e9a2d3b1d294bb61f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 8 Oct 2016 19:39:50 +0200 Subject: Better display and description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmation message isn’t required since it is written in the delete description --- .../Resources/views/themes/baggy/Config/index.html.twig | 12 +++++++++--- .../Resources/views/themes/material/Config/index.html.twig | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index b10db473..54508b6d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -148,11 +148,17 @@ {{ form_widget(form.user._token) }} {{ form_widget(form.user.save) }} - {% if enabled_users > 1 %} - - {% endif %} + {% if enabled_users > 1 %} +

{{ 'config.form_user.delete.title'|trans }}

+ +

{{ 'config.form_user.delete.description'|trans }}

+ + {% endif %} +

{{ 'config.tab_menu.password'|trans }}

{{ form_start(form.pwd) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 25d259b8..8434508d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -172,10 +172,10 @@

-
{{ 'config.delete.title'|trans }}
-

{{ 'config.delete.description'|trans }}

-
{% endif %} -- cgit v1.2.3 From 206bade58a279d7f2e34c2dbada10366b90d2d6b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 1 Oct 2016 09:26:32 +0200 Subject: Add ability to reset some datas - annotations - tags - entries --- .../views/themes/material/Config/index.html.twig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 8434508d..79826e0f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -168,6 +168,22 @@ {{ form_widget(form.user._token) }} +

+ +
+
{{ 'config.reset.title'|trans }}
+

{{ 'config.reset.description'|trans }}

+ + {{ 'config.reset.annotations'|trans }} + + + {{ 'config.reset.tags'|trans }} + + + {{ 'config.reset.entries'|trans }} + +
+ {% if enabled_users > 1 %}

-- cgit v1.2.3 From ca8b49f46e9e45875ef0f9dc88a8315489152e82 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 8 Oct 2016 11:13:55 +0200 Subject: Add baggy reset part --- .../views/themes/baggy/Config/index.html.twig | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 54508b6d..455d0295 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -146,6 +146,28 @@ {% endif %} +

{{ 'config.reset.title'|trans }}

+
+

{{ 'config.reset.description'|trans }}

+ +
+ {{ form_widget(form.user._token) }} {{ form_widget(form.user.save) }} -- cgit v1.2.3 From e61ee56031aa0788f9a40ec245d3c391d219d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:16:41 +0100 Subject: Added QRCode and link to configure android application --- .../Resources/views/themes/material/Config/index.html.twig | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index b53ae2fe..3fbb49ea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -71,6 +71,18 @@ +
+
+
Configure your Android application
+ Touch here to prefill your Android application + +
+ +
+ {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form.config) }} -- cgit v1.2.3 From 3b81212674bb4b2cf51ce51637e0093c952cefde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:48:34 +0100 Subject: Added translations and baggy part --- .../Resources/views/themes/baggy/Config/index.html.twig | 10 ++++++++++ .../Resources/views/themes/material/Config/index.html.twig | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 455d0295..dde9411f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -54,6 +54,16 @@ https://getpocket.com/developer/docs/authentication

+ +
+

{{ 'config.form_settings.android_configuration'|trans }}

+ Touch here to prefill your Android application + + +
{{ form_rest(form.config) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 3fbb49ea..807c9bdc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -73,12 +73,12 @@
-
Configure your Android application
+
{{ 'config.form_settings.android_configuration'|trans }}
Touch here to prefill your Android application
-- cgit v1.2.3 From 68e0efffb8785db84e4c26edeaea3a5bd6622d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 17:20:27 +0100 Subject: Fixed review --- .../Resources/views/themes/baggy/Config/index.html.twig | 14 +++++++------- .../Resources/views/themes/material/Config/index.html.twig | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index dde9411f..ec3b23c8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -56,13 +56,13 @@
-

{{ 'config.form_settings.android_configuration'|trans }}

- Touch here to prefill your Android application - - +

{{ 'config.form_settings.android_configuration'|trans }}

+ Touch here to prefill your Android application + +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 807c9bdc..f69d158f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -79,7 +79,7 @@ -- cgit v1.2.3 From df30af69d2f27914fec5b8d925472d4fdd378bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 7 Nov 2016 09:05:04 +0100 Subject: Added new tag form in mobile view for Material theme Fix #2376 --- .../Resources/views/themes/material/Entry/entry.html.twig | 14 +++----------- .../Resources/views/themes/material/Tag/new_form.html.twig | 3 ++- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 5188eb01..37a29d03 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -53,7 +53,7 @@
-
  • +
  • autorenew {{ 'entry.view.left_menu.re_fetch_content'|trans }} @@ -81,7 +81,7 @@
    • -
  • +
  • delete {{ 'entry.view.left_menu.delete'|trans }} @@ -89,7 +89,7 @@
    • -
  • +
  • label_outline {{ 'entry.view.left_menu.add_a_tag'|trans }} @@ -186,14 +186,6 @@
    • -
  • - - delete - {{ 'entry.view.left_menu.delete'|trans }} - -
    -
    • -
  • error diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig index 6e552560..b702c4b6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig @@ -9,5 +9,6 @@ {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} - {{ form_rest(form) }} + {{ form_widget(form.add, {'attr': {'class': 'btn waves-effect waves-light hide-on-large-only'}}) }} + {{ form_widget(form._token) }} -- cgit v1.2.3 From 8a9604aafe8b8c6ddde4e1be78189af5238588fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 9 Nov 2016 15:44:28 +0100 Subject: Added unmark.it sharing Fix #668 --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 1 + .../Resources/views/themes/material/Entry/entry.html.twig | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 3689159b..b8be0bcc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -31,6 +31,7 @@ {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
    • {% endif %} + {% if craue_setting('share_unmark') %}
  • unmark.it
    • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
    • {% endif %} {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.print'|trans }}
    • {% endif %} {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 37a29d03..eda294d2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -139,6 +139,14 @@ {% endif %} + {% if craue_setting('share_unmark') %} +
  • + + + unmark.it + +
    • + {% endif %} {% if craue_setting('carrot') %}
  • -- cgit v1.2.3 From 3cc78f06799b0c91957767e8d9255e67b30edd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 11:20:11 +0200 Subject: Added shortcuts --- src/Wallabag/CoreBundle/Resources/views/base.html.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index a1a9a136..289458d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -41,6 +41,8 @@ {% block css %} {% endblock %} {% block scripts %} + + {% endblock %} {% block title %}{% endblock %} – wallabag -- cgit v1.2.3 From 94f2057ffefdb164ae388a6971b4ed052082a434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 16 Nov 2016 09:17:12 +0100 Subject: Added CSS class on links --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 6 +++--- .../Resources/views/themes/material/Entry/entry.html.twig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index b8be0bcc..2e9673d5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -11,7 +11,7 @@
    +
    +
    + {{ form_label(form.config.action_mark_as_read) }} + {{ form_errors(form.config.action_mark_as_read) }} + {{ form_widget(form.config.action_mark_as_read) }} +
    +
    +
    {{ form_label(form.config.language) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index f69d158f..e774795b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -51,6 +51,14 @@
    +
    +
    + {{ form_label(form.config.action_mark_as_read) }} + {{ form_errors(form.config.action_mark_as_read) }} + {{ form_widget(form.config.action_mark_as_read) }} +
    +
    +
    {{ form_label(form.config.language) }} -- cgit v1.2.3 From 10b3509757c704943aa9cdd69c1d02bedfa937a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 18 Nov 2016 15:09:21 +0100 Subject: Added http_status in Entry entity --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 7 +++++++ .../Resources/views/themes/material/Entry/entries.html.twig | 8 ++++++++ 2 files changed, 15 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 5d657c7e..86c1c5ec 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -112,6 +112,13 @@
    +
    + {{ form_label(form.httpStatus) }} +
    + {{ form_widget(form.httpStatus) }} +
    +
    +
    {{ form_label(form.readingTime) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 1225e680..a0205ffb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -162,6 +162,14 @@ {{ form_widget(form.language) }}
    +
    + {{ form_label(form.httpStatus) }} +
    + +
    + {{ form_widget(form.httpStatus) }} +
    +
    {{ form_label(form.readingTime) }}
    -- cgit v1.2.3 From ee122a7528f55dfb5f02e351c509d00b756fedaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 4 Nov 2016 23:24:43 +0100 Subject: Added a simple search engine Fix #18 --- .../Resources/views/themes/common/Entry/_title.html.twig | 4 +++- .../views/themes/material/Entry/entries.html.twig | 9 ++++++--- .../views/themes/material/Entry/search_form.html.twig | 14 ++++++++++++++ .../Resources/views/themes/material/layout.html.twig | 16 +++++++--------- 4 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig index 92cabdd9..654c1d2d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig @@ -6,8 +6,10 @@ {{ 'entry.page_titles.archived'|trans }} {% elseif currentRoute == 'all' %} {{ 'entry.page_titles.filtered'|trans }} +{% elseif currentRoute == 'search' %} + {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }} {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }} + {{ 'entry.page_titles.filtered_tags'|trans }} {{ filter }} {% elseif currentRoute == 'untagged' %} {{ 'entry.page_titles.untagged'|trans }} {% else %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 160dbf3d..ff555055 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -1,11 +1,14 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set currentTag = '' %} + {% set filter = '' %} {% if tag is defined %} - {% set currentTag = tag %} + {% set filter = tag %} + {% endif %} + {% if searchTerm is not empty %} + {% set filter = searchTerm %} {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} {% endblock %} {% block content %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig new file mode 100644 index 00000000..9b8ac86d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig @@ -0,0 +1,14 @@ +
    + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% if form_errors(form.term) %} + {{ form_errors(form.term) }} + {% endif %} + + {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} + + {{ form_rest(form) }} +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index f1ef01df..9437a2a8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -89,11 +89,11 @@ add
    • - +
  • filter_list @@ -106,13 +106,11 @@
    • -
    - -
    +     -- cgit v1.2.3 From 32f455c1317bf536aea63147d2c5074ae7425d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 18 Nov 2016 17:36:19 +0100 Subject: Added tests --- .../CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig | 2 ++ src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig index 818513f3..20821b6d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig @@ -9,6 +9,8 @@ {{ form_errors(form.term) }} {% endif %} + + {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} {{ form_rest(form) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index fc024aff..07ff8e14 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -33,7 +33,7 @@
  • {{ 'menu.left.save_link'|trans }}
  • {{ 'menu.left.search'|trans }}
  • {{ 'menu.left.config'|trans }}
    • -- cgit v1.2.3 From 8670250a2674b6b388f3d40a8ba291a4dca41b82 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 19 Nov 2016 14:53:28 +0100 Subject: Add RSS pagination Following https://tools.ietf.org/html/rfc5005#page-4 --- .../Resources/views/themes/common/Entry/entries.xml.twig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig index 288bb54f..16ecaa97 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig @@ -2,7 +2,15 @@ wallabag — {{type}} feed - {{ url('unread') }} + {{ url(type) }} + + {% if entries.hasPreviousPage -%} + + {% endif -%} + {% if entries.hasNextPage -%} + + {% endif -%} + {{ "now"|date('D, d M Y H:i:s') }} wallabag wallabag {{type}} elements -- cgit v1.2.3 From 4f2755a61d02fef7038cc87cd15023de67129b42 Mon Sep 17 00:00:00 2001 From: Thibaud Dauce Date: Mon, 21 Nov 2016 15:37:47 +0100 Subject: Add white-text class to card-title too --- .../views/themes/common/Static/quickstart.html.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index c8a303a6..b7a48551 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig @@ -15,7 +15,7 @@
  • - {{ 'quickstart.configure.title'|trans }} + {{ 'quickstart.configure.title'|trans }}

    {{ 'quickstart.configure.description'|trans }}

    @@ -31,7 +31,7 @@
  • - {{ 'quickstart.first_steps.title'|trans }} + {{ 'quickstart.first_steps.title'|trans }}

    {{ 'quickstart.first_steps.description'|trans }}

    @@ -46,7 +46,7 @@
  • - {{ 'quickstart.migrate.title'|trans }} + {{ 'quickstart.migrate.title'|trans }}

    {{ 'quickstart.migrate.description'|trans }}

    @@ -63,7 +63,7 @@
  • - {{ 'quickstart.developer.title'|trans }} + {{ 'quickstart.developer.title'|trans }}

    {{ 'quickstart.developer.description'|trans }}

    @@ -79,7 +79,7 @@
  • - {{ 'quickstart.docs.title'|trans }} + {{ 'quickstart.docs.title'|trans }}

    {{ 'quickstart.docs.description'|trans }}

    @@ -95,7 +95,7 @@
  • - {{ 'quickstart.support.title'|trans }} + {{ 'quickstart.support.title'|trans }}

    {{ 'quickstart.support.description'|trans }}

    -- cgit v1.2.3 From c526f9e4744ac03aa7ab4ff507d5466eee371b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 20 Nov 2016 10:11:57 +0100 Subject: Added help about shortcuts --- .../views/themes/common/Static/howto.html.twig | 195 ++++++++++++++++++--- 1 file changed, 171 insertions(+), 24 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig index 67a10190..3b02993e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig @@ -7,39 +7,186 @@
    -

    {{ 'howto.page_description'|trans }}

    - -
    - {{ 'howto.form.description'|trans }} -
    - -
    -
    {{ 'howto.top_menu.browser_addons'|trans }}
    -
    -- cgit v1.2.3 From 0df2a4b021e581c7661968a23e5c8dd5de5273c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Nov 2016 21:31:21 +0100 Subject: Fixed entry shortcuts available in list view --- .../CoreBundle/Resources/views/themes/material/layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 551486e0..e5bfc62c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -90,7 +90,7 @@
  • - + search
    • -- cgit v1.2.3 From 9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 11:02:10 +0100 Subject: Added list view --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 6 ++++-- .../views/themes/material/Entry/_card_list.html.twig | 14 ++++++++++++++ .../views/themes/material/Entry/entries.html.twig | 8 ++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index a13fe903..3df990a3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -13,9 +13,11 @@ {% block content %} + {% set viewMode = app.user.config.viewMode %}
    {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
    {% for entry in entries %} -
    +

    {{ entry.title|raw }}

    {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} @@ -50,7 +52,7 @@
  • {{ 'entry.list.delete'|trans }}
  • {{ entry.domainName|removeWww }}
    • - {% if entry.previewPicture is null %} + {% if (entry.previewPicture is null or viewMode == 1) %}
      {% for tag in entry.tags %}
    • {{ tag.label }}
      • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig new file mode 100644 index 00000000..3d971f0b --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig @@ -0,0 +1,14 @@ +
      +
      +
      + + + {{ entry.title| striptags | truncate(120, true, '…') | raw }} + + +

      {{ entry.content|striptags|slice(0, 500)|raw }}…

      +
      + + {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} +
      +
      diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 00e8bf63..2921d366 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -12,9 +12,11 @@ {% endblock %} {% block content %} + {% set viewMode = app.user.config.viewMode %}
      {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} + {% if viewMode == 0 %}view_list{% else %}view_module{% endif %}
      {% if entries.getNbPages > 1 %} {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} @@ -24,8 +26,10 @@
        {% for entry in entries %} -
      • - {% if entry.previewPicture is null %} +
      • + {% if viewMode == 1 %} + {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} + {% elseif entry.previewPicture is null %} {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %} {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %} {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %} -- cgit v1.2.3 From 56a7ce17f3a9a22e0bfc8651cb690a14447e0afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 11:26:08 +0100 Subject: Hide article text on mobile with list mode --- .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 2 +- .../Resources/views/themes/material/Entry/_card_list.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 3df990a3..33863920 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -58,7 +58,7 @@
      • {{ tag.label }}
        • {% endfor %}
      -

      {{ entry.content|striptags|slice(0, 300) }}…

      +

      {{ entry.content|striptags|slice(0, 300) }}…

      {% else %}
        {% for tag in entry.tags | slice(0, 3) %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 3d971f0b..b77cdc14 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig @@ -6,7 +6,7 @@ {{ entry.title| striptags | truncate(120, true, '…') | raw }} -

        {{ entry.content|striptags|slice(0, 500)|raw }}…

        +

        {{ entry.content|striptags|slice(0, 500)|raw }}…

      {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} -- cgit v1.2.3 From 9aa991281ddd315f607cabcfc3b917401d3d2104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 12:08:51 +0100 Subject: Renamed view_mode by list_mode and hide excerpt --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 10 +++++----- .../views/themes/material/Entry/_card_list.html.twig | 12 ++++++++---- .../Resources/views/themes/material/Entry/entries.html.twig | 8 ++++---- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 33863920..a4a56e46 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -13,11 +13,11 @@ {% block content %} - {% set viewMode = app.user.config.viewMode %} + {% set listMode = app.user.config.listMode %}
      {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
      {% for entry in entries %} -
      +

      {{ entry.title|raw }}

      {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} @@ -52,13 +52,13 @@
    • {{ 'entry.list.delete'|trans }}
    • {{ entry.domainName|removeWww }}
    - {% if (entry.previewPicture is null or viewMode == 1) %} + {% if (entry.previewPicture is null or listMode == 1) %} -

    {{ entry.content|striptags|slice(0, 300) }}…

    +

    {{ entry.content|striptags|slice(0, 300) }}…

    {% else %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 2921d366..5fca53ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -12,11 +12,11 @@ {% endblock %} {% block content %} - {% set viewMode = app.user.config.viewMode %} + {% set listMode = app.user.config.listMode %}
    {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} - {% if viewMode == 0 %}view_list{% else %}view_module{% endif %} + {% if listMode == 0 %}view_list{% else %}view_module{% endif %}
    {% if entries.getNbPages > 1 %} {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} @@ -26,8 +26,8 @@
      {% for entry in entries %} -
    • - {% if viewMode == 1 %} +
    • + {% if listMode == 1 %} {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} {% elseif entry.previewPicture is null %} {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %} -- cgit v1.2.3 From 6787afbe0d80f93c0686061b5eb5d75ddef8434d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 30 Nov 2016 16:08:02 +0100 Subject: Added floating button on entry view for mobile --- .../Resources/views/themes/material/Entry/entry.html.twig | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index bed0fdec..0cbf1999 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -257,6 +257,17 @@
      {{ entry.content | raw }}
      + +
      + + menu + + +
    {% endfor %} - - {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} {% endblock %} {% block menu %} -- cgit v1.2.3 From 6ed615ac742a8a4e410d0726e8cec7bd76660d03 Mon Sep 17 00:00:00 2001 From: Simounet Date: Tue, 27 Dec 2016 22:37:24 +0100 Subject: Fix entry reading time --- .../Resources/views/themes/material/Entry/_card_actions.html.twig | 4 +--- .../Resources/views/themes/material/Entry/_reading_time.html.twig | 7 +++++++ .../Resources/views/themes/material/Entry/entry.html.twig | 8 +------- 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig index 56442116..d278da1b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig @@ -1,8 +1,6 @@
    - timer - {{ entry.readingTime / app.user.config.readingSpeed|round }} min  - + {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} today  {{ entry.createdAt|date('Y-m-d') }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig new file mode 100644 index 00000000..1a932a9f --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig @@ -0,0 +1,7 @@ +{% set readingTime = entry.readingTime / app.user.config.readingSpeed %} +timer +{% if readingTime > 0 %} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} +{% else %} + {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} +{% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 0cbf1999..46f89e19 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -214,13 +214,7 @@
    -
    - -
    +