From a494c33ef7e574e68ab5bb83d0bdbd67348af0ef Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 3 Oct 2016 23:08:26 +0200 Subject: Basically, fix everything * Remove install.sh * Assets are now provided * Icons font issues are fixed --- .../views/themes/baggy/Entry/entry.html.twig | 22 +++++++++++--------- .../views/themes/material/Entry/entry.html.twig | 24 ++++++++++++---------- 2 files changed, 25 insertions(+), 21 deletions(-) (limited to 'src') 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 be1e3647..bead6809 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 @@ -21,12 +21,15 @@
  • {{ markAsReadLabel|trans }}
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
    • -
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
    • +
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • - {% if craue_setting('share_public') %}
  • {{ 'entry.view.left_menu.public_link'|trans }}
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • {% endif %} + {% if craue_setting('share_public') %} +
  • {{ 'entry.view.left_menu.public_link'|trans }}
    • +
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • + {% 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 %} @@ -38,18 +41,17 @@
    -
    - {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} -
    + {{ entry.createdAt|date('Y-m-d') }} + -
    + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} {% else %} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} + {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} {% endif %} -
    + {% set nbAnnotations = entry.annotations | length %} comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} 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 209e9e89..d73d2703 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 @@ -47,7 +47,7 @@
  • - link + public {{ 'entry.view.left_menu.view_original_article'|trans }}
    @@ -106,12 +106,14 @@
      {% if craue_setting('share_public') %}
    • - + + link {{ 'entry.view.left_menu.public_link'|trans }}
    • - + + remove_circle {{ 'entry.view.left_menu.delete_public_link'|trans }}
      • @@ -125,22 +127,22 @@ {% endif %} {% if craue_setting('share_shaarli') %}
    • - - shaarli + + shaarli
      • {% endif %} {% if craue_setting('share_diaspora') %}
    • - - diaspora* + + diaspora*
      • {% endif %} {% if craue_setting('carrot') %}
    • - - Carrot + + Carrot
      • {% endif %} @@ -211,7 +213,7 @@
    • - {{ entry.createdAt|date('Y-m-d') }} + + {{ entry.createdAt|date('Y-m-d') }} -- cgit v1.2.3 From f733d8aaa329cc2115d0c94ffe9a0cedf98759b2 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 15:12:48 +0200 Subject: Fix icon position --- .../Resources/views/themes/material/Entry/entry.html.twig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') 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 0a04e972..d52ab01c 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,21 +125,24 @@ {% endif %} {% if craue_setting('share_shaarli') %}
  • - + + shaarli
    • {% endif %} {% if craue_setting('share_diaspora') %}
  • - + + diaspora*
    • {% endif %} {% if craue_setting('carrot') %}
  • - + + Carrot
    • -- cgit v1.2.3