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/entry.html.twig') 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/entry.html.twig') 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/entry.html.twig') 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 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/entry.html.twig') 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 --- .../Resources/views/themes/material/Entry/entry.html.twig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig') 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/entry.html.twig') 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 --- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig') 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/entry.html.twig') 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 }} ✎