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 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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 %} -- 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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.httpStatus) }} +
    + {{ form_widget(form.httpStatus) }} +
    +
    +
    {{ form_label(form.readingTime) }} -- cgit v1.2.3 From 398de40517356981a9fe1b9185f5f9e5e498c346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 5 Nov 2016 15:24:42 +0100 Subject: Added search engine in baggy theme --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 9 ++++++--- .../views/themes/baggy/Entry/search_form.html.twig | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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 d1baa283..a13fe903 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 @@ -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 defined and 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/baggy/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig new file mode 100644 index 00000000..818513f3 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig @@ -0,0 +1,15 @@ +
    +

    {{ 'menu.left.search'|trans }}

    + × + {% 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) }} +
    -- 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 ++ 1 file changed, 2 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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) }} -- 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 --- .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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 }}
      • -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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) %} -- 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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 %}
      {% for tag in entry.tags | slice(0, 3) %} -- cgit v1.2.3 From 0a0aa70098a368ee49a0684e5d70a7a2044c0817 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 28 Dec 2016 12:27:00 +0100 Subject: Share tags to Shaarli - Baggy theme --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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..950b3909 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 @@ -29,7 +29,7 @@ {% endif %} {% if craue_setting('share_twitter') %}
      • {% endif %} {% if craue_setting('share_mail') %}
      • {% endif %} - {% if craue_setting('share_shaarli') %}
    • shaarli
      • {% endif %} + {% if craue_setting('share_shaarli') %}
    • shaarli
      • {% endif %} {% if craue_setting('share_diaspora') %}
    • diaspora
      • {% endif %} {% if craue_setting('carrot') %}
    • Carrot
      • {% endif %} {% if craue_setting('show_printlink') %}
    • {{ 'entry.view.left_menu.print'|trans }}
      • {% endif %} -- cgit v1.2.3 From ccb9e79a35cdac9f93de90f577f8ec63fdcc6081 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 29 Dec 2016 19:17:36 +0100 Subject: Fix double overlay on expanded right sidenav --- .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') 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 a4a56e46..95c84686 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 @@ -18,8 +18,8 @@
      {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}