From fb9f100e8f4f3288b87536faff4b59cacc7b1efb Mon Sep 17 00:00:00 2001 From: FrenchHope Date: Sun, 19 Mar 2017 09:40:31 +0100 Subject: Scuttle sharing --- .../Resources/views/themes/material/Entry/entry.html.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 c3508083..8e60e2b4 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 @@ -131,6 +131,14 @@ {% endif %} + {% if craue_setting('share_scuttle') %} +
  • + + + scuttle + +
    • + {% endif %} {% if craue_setting('share_diaspora') %}
  • -- cgit v1.2.3 From 5e9009ce86a366001616fad5b28cb59dc20ee4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 5 Apr 2017 22:22:16 +0200 Subject: Added publication date --- .../Resources/views/themes/material/Entry/entry.html.twig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 8e60e2b4..c72a22c0 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 @@ -138,7 +138,7 @@ scuttle
    • - {% endif %} + {% endif %} {% if craue_setting('share_diaspora') %}
  • @@ -226,8 +226,14 @@
  • today - {{ entry.createdAt|date('Y-m-d') }} + {{ entry.createdAt|date('Y-m-d H:i') }} +
    • + {% if entry.publishedAt is not null %} +
  • + create + {{ entry.publishedAt|date('Y-m-d H:i') }}
    • + {% endif %}
  • link -- cgit v1.2.3 From 7b0b3622ab2dd909028481b294c91f88a5682671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 6 Apr 2017 09:36:20 +0200 Subject: Added author of article --- .../Resources/views/themes/material/Entry/entry.html.twig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 c72a22c0..8be5fd0d 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 @@ -228,12 +228,20 @@ today {{ entry.createdAt|date('Y-m-d H:i') }}
    • - {% if entry.publishedAt is not null %} + {% if entry.publishedAt is not null %}
  • create {{ entry.publishedAt|date('Y-m-d H:i') }}
    • {% endif %} + {% if entry.publishedBy is not empty %} +
  • + person + {% for author in entry.publishedBy %} + {{ author }}{% if not loop.last %}, {% endif %} + {% endfor %} +
    • + {% endif %}
  • link -- cgit v1.2.3 From 01736b5a2ee2a48403a2462014886bf009f18786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 13 Apr 2017 12:57:31 +0200 Subject: Removed is_public in Entry edit form --- .../CoreBundle/Resources/views/themes/material/Entry/edit.html.twig | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig index 1c5e2aab..b9537975 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig @@ -27,11 +27,6 @@ {{ form_label(form.url) }} {{ form_widget(form.url) }} - -
    - {{ form_widget(form.is_public) }} - {{ form_label(form.is_public) }} -

    {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} -- cgit v1.2.3 From 96e4398072943a181d55947fa788f5ee2b8cbbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 2 May 2017 15:40:15 +0200 Subject: Fixed sandwich menu position in entry view (material theme) --- .../Resources/views/themes/material/Entry/entry.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 8be5fd0d..3c4ad024 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 @@ -11,6 +11,11 @@     -- cgit v1.2.3 From 64f81bc31699ed239e4becec1cfa7ebc0bef2b5a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 31 Mar 2017 20:21:41 +0200 Subject: Adds Webpack support and removes the use for Grunt Signed-off-by: Thomas Citharel use scss Signed-off-by: Thomas Citharel fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes --- .../views/themes/material/Entry/entries.html.twig | 4 ++-- .../Resources/views/themes/material/Entry/entry.html.twig | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 5fca53ae..b2d91c9c 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 @@ -45,7 +45,7 @@ {% endif %} -
    +
    {% set currentRoute = app.request.attributes.get('_route') %} {% set currentTag = '' %} {% if tag is defined %} @@ -68,7 +68,7 @@ {% if form is not null %} -
    +

    {{ 'entry.filters.title'|trans }}

    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 3c4ad024..227dad94 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 @@ -125,8 +125,7 @@ {% endif %} {% if craue_setting('share_shaarli') %}
  • - - + shaarli
    • @@ -141,31 +140,29 @@ {% 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('share_mail') %}
  • - + mail {{ 'entry.view.left_menu.share_email_label'|trans }}
    • -- cgit v1.2.3 From 2003ffa97e98d35130c93d158c453ce9b926b838 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 4 May 2017 17:44:42 +0200 Subject: Fix according to review --- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 227dad94..a796ed26 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 @@ -252,7 +252,7 @@
  • {% for tag in entry.tags %}
    - {{ tag.label }} delete + {{ tag.label }} delete
    {% endfor %}
    • -- cgit v1.2.3 From 34806fab1b26eb626862d45402cb4e265cc0af5b Mon Sep 17 00:00:00 2001 From: Aline Date: Sun, 7 May 2017 15:07:50 +0200 Subject: Fix reviews Signed-off-by: Aline --- .../Resources/views/themes/material/Entry/_reading_time.html.twig | 4 ++-- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 index 1a932a9f..6ba18768 100644 --- 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 @@ -1,7 +1,7 @@ {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} timer {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} {% else %} - {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} + {{ '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 a796ed26..987329a5 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 @@ -132,8 +132,7 @@ {% endif %} {% if craue_setting('share_scuttle') %}
  • - - + scuttle
    • -- cgit v1.2.3 From 4c6ee89c9c70f24209f2bb86de2b3137ab2d801c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 May 2017 17:13:08 +0200 Subject: Fix review again Signed-off-by: Thomas Citharel --- .../views/themes/material/Entry/entry.html.twig | 74 +++++++++++----------- 1 file changed, 38 insertions(+), 36 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 987329a5..47e6e8c3 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 @@ -216,46 +216,48 @@

    {{ entry.title|striptags|raw }} ✎

  • {% if entry.isArchived == 0 %}done{% else %}redo{% endif %} {% if entry.isStarred == 0 %}star_border{% else %}star{% endif %} - delete + delete
    • 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 3ba6253a..174b7b54 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 @@ -10,7 +10,7 @@
  • {% if entry.isArchived == 0 %}done{% else %}redo{% endif %} {% if entry.isStarred == 0 %}star_border{% else %}star{% endif %} - delete + delete
    • 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 58e08cbc..4cff7bf2 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 @@ -82,7 +82,7 @@
  • - + delete {{ 'entry.view.left_menu.delete'|trans }} @@ -253,7 +253,10 @@ @@ -279,7 +282,7 @@ -- cgit v1.2.3 From 21242a02a170208bcdd3ffbdb351f0929f708c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 3 May 2017 11:48:43 +0200 Subject: Added tags on list view --- .../Resources/views/themes/material/Entry/_card_list.html.twig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 174b7b54..24d76a05 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,13 +6,20 @@ {{ entry.title| striptags | truncate(120, true, '…') | raw }} -
      + +
      + {% for tag in entry.tags | slice(0, 3) %} + + {{ tag.label }} delete + + {% endfor %} +
      -- cgit v1.2.3 From 812c980fa5ea03b9282e32a93723e459eee763a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 29 May 2017 10:59:30 +0200 Subject: Fixed tags display on grid view --- .../themes/material/Entry/_card_list.html.twig | 47 ++++++++++++---------- .../views/themes/material/Entry/entries.html.twig | 4 +- 2 files changed, 28 insertions(+), 23 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 24d76a05..8a22f0c8 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 @@ -1,25 +1,30 @@ -
      -
      -
      - - - {{ entry.title| striptags | truncate(120, true, '…') | raw }} - +
      +
      +
      + + + {{ entry.title| striptags | truncate(120, true, '…') | raw }} + + + {{ entry.domainName|removeWww }} + + + +
      + {% for tag in entry.tags | slice(0, 3) %} + + {{ tag.label }} - -
      - {% for tag in entry.tags | slice(0, 3) %} - - {{ tag.label }} delete - - {% endfor %} -
      + {% endfor %} + + +
      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 b2d91c9c..6f657b18 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 @@ -24,9 +24,9 @@

      -
        +
          {% for entry in entries %} -
        • +
        • {% if listMode == 1 %} {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} {% elseif entry.previewPicture is null %} -- cgit v1.2.3 From 91775f36fee13c5e1fd77abf27555e6c77fa93da Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 31 May 2017 14:34:46 +0200 Subject: Add some flex magic Signed-off-by: Thomas Citharel --- .../themes/material/Entry/_card_list.html.twig | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 8a22f0c8..b64e1436 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 @@ -1,30 +1,28 @@
          +
          {% if entry.previewPicture is not null %}{% endif %}
          -
          {{ entry.title| striptags | truncate(120, true, '…') | raw }} + + +
          {{ entry.domainName|removeWww }} - - -
          - {% for tag in entry.tags | slice(0, 3) %} - - {{ tag.label }} - - {% endfor %} - - - + {% for tag in entry.tags | slice(0, 3) %} + + {{ tag.label }} + + {% endfor %}
          +
          -- cgit v1.2.3 From e8911f7c09fa9d8009d7c7ee9fb0c181d2ffbc31 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 10 Jun 2017 15:00:52 +0200 Subject: Add isPublic filter on entries --- .../Resources/views/themes/material/Entry/entries.html.twig | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 6f657b18..5ba42057 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 @@ -102,6 +102,15 @@ {{ form_label(form.previewPicture) }}
          +
          + +
          + +
          + {{ form_widget(form.isPublic) }} + {{ form_label(form.isPublic) }} +
          +
          {{ form_label(form.language) }}
          @@ -121,10 +130,12 @@
          {{ form_label(form.readingTime) }}
          +
          {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
          +
          {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} -- cgit v1.2.3 From bd40f1af88979cb5257206d178d26819e350a24c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 20 Jun 2017 18:29:46 +0200 Subject: Add all entries RSS feed and put links on tag page itself and baggy too Signed-off-by: Thomas Citharel --- .../views/themes/material/Entry/entries.html.twig | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 5ba42057..0c4dc80b 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,9 +1,16 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} +{% block head %} + {{ parent() }} + {% if tag is defined and app.user.config.rssToken %} + + {% endif %} +{% endblock %} + {% block title %} {% set filter = '' %} {% if tag is defined %} - {% set filter = tag %} + {% set filter = tag.slug %} {% endif %} {% if searchTerm is defined and searchTerm is not empty %} {% set filter = searchTerm %} @@ -13,10 +20,14 @@ {% block content %} {% set listMode = app.user.config.listMode %} + {% set currentRoute = app.request.attributes.get('_route') %}
          {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} {% if listMode == 0 %}view_list{% else %}view_module{% endif %} + {% if app.user.config.rssToken %} + {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} + {% endif %}
          {% if entries.getNbPages > 1 %} {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} @@ -46,10 +57,9 @@
          - {% set currentRoute = app.request.attributes.get('_route') %} {% set currentTag = '' %} {% if tag is defined %} - {% set currentTag = tag %} + {% set currentTag = tag.slug %} {% endif %} {% if currentRoute == 'homepage' %} {% set currentRoute = 'unread' %} -- cgit v1.2.3 From bde23a44f8585c0c668719d9e34f06e30e5571aa Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 28 Jul 2017 08:07:09 +0200 Subject: Empty currentTag should be null And when a parameter is null, it won't appear in the url like `?tag=`. --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry') 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 0c4dc80b..9d6fb3f5 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 @@ -57,7 +57,7 @@
          - {% set currentTag = '' %} + {% set currentTag = null %} {% if tag is defined %} {% set currentTag = tag.slug %} {% endif %} -- cgit v1.2.3