X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=3689159bca64e81d70f08bebd03d6617a2641e74;hb=bccf7a70bc22171904a5bb82d282e9c956684abc;hp=61b871f0522a8b20675c344930a7ded93d4773fc;hpb=d0545b6bd6edc38bf06604900b1e20a60e7c8583;p=github%2Fwallabag%2Fwallabag.git 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 61b871f0..3689159b 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 @@ -13,16 +13,23 @@
  • {{ 'entry.view.left_menu.set_as_read'|trans }}
  • {{ entry.domainName|removeWww }}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
    • -
  • {% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}
    • + + {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} + {% if entry.isArchived == 0 %} + {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} + {% endif %} + +
  • {{ 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') %} -
  • public
    • +
  • {{ 'entry.view.left_menu.public_link'|trans }}
    • +
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • {% endif %} {% if craue_setting('share_twitter') %}
  • Tweet
    • {% endif %} {% if craue_setting('share_mail') %}
  • Email
    • {% 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 %} @@ -32,29 +39,33 @@
  • {{ 'entry.view.left_menu.problem.label'|trans }}
    • -
    - {{ 'entry.view.created_at'|trans }}: {{ 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 }} - {% else %} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} - {% endif %} -
    +
    + + {{ entry.createdAt|date('Y-m-d') }} + - {% set nbAnnotations = entry.annotations | length %} - comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} - + + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} + {% if readingTime > 0 %} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} + {% else %} + {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} + {% endif %} + + + comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + +
    {% if entry.previewPicture is not null %}
    {{ entry.title|raw }}
    {% endif %} @@ -75,22 +86,4 @@ "entryId": "{{ entry.id }}" } - - {% endblock %}