From fb9f100e8f4f3288b87536faff4b59cacc7b1efb Mon Sep 17 00:00:00 2001 From: FrenchHope Date: Sun, 19 Mar 2017 09:40:31 +0100 Subject: Scuttle sharing --- .../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 a555691d..5d5e6dd8 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 @@ -30,6 +30,7 @@ {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} + {% if craue_setting('share_scuttle') %}
  • scuttle
    • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
    • {% endif %} {% if craue_setting('share_unmark') %}
  • unmark.it
    • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
    • {% endif %} -- 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 --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 8 +++++++- 1 file changed, 7 insertions(+), 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 5d5e6dd8..8bc7b54c 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 @@ -44,9 +44,15 @@
    - {{ entry.createdAt|date('Y-m-d') }} + {{ entry.createdAt|date('Y-m-d H:i') }} + {% if entry.publishedAt is not null %} + + {{ entry.publishedAt|date('Y-m-d H:i') }} + + {% endif %} + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% if readingTime > 0 %} -- 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/baggy/Entry/entry.html.twig | 10 +++++++++- 1 file changed, 9 insertions(+), 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 8bc7b54c..426ce91c 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 @@ -47,12 +47,20 @@ {{ entry.createdAt|date('Y-m-d H:i') }} - {% if entry.publishedAt is not null %} + {% if entry.publishedAt is not null %} {{ entry.publishedAt|date('Y-m-d H:i') }} {% endif %} + {% if entry.publishedBy is not empty %} + + {% for author in entry.publishedBy %} + {{ author }}{% if not loop.last %}, {% endif %} + {% endfor %} + + {% endif %} + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% if readingTime > 0 %} -- 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 --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 14 +++++++------- .../Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- 2 files changed, 8 insertions(+), 8 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 859b166b..bdd44b54 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 @@ -17,9 +17,9 @@
    {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
    {% if (entry.previewPicture is null or listMode == 1) %}
      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 426ce91c..660211f2 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 @@ -77,7 +77,7 @@ label_outline {{ tag.label }} ✘ {% endfor %}
    -
    -- 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 --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 13 +++++++++++-- 1 file changed, 11 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 6c26d5bf..6424df8d 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,5 +1,12 @@ {% 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 %} @@ -12,12 +19,15 @@ {% endblock %} {% block content %} - + {% set currentRoute = app.request.attributes.get('_route') %} {% set listMode = app.user.config.listMode %}
    {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}