X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=8ca194f6429f71f2361619dfc2a47f23669c28ea;hb=3d9950792c0aef20643ce1c5f81670e1f7194af9;hp=6c46f91fcc6a8aa1ff343f2b80f7179109fdfed9;hpb=3e860ff1ce19d045b4d5af4e30bd3d56300a683c;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 6c46f91f..8ca194f6 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 @@ -1,11 +1,11 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} +{% block title %}{{ entry.title|e|raw }} ({{ entry.domainName|removeWww }}){% endblock %} {% block content %}
-

{{ entry.title|raw }} ✎

+

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

@@ -13,14 +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') %}
  • {{ '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 %} @@ -30,31 +39,35 @@
  • {{ '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 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 %} + - {% set nbAnnotations = entry.annotations | length %} - comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} - + comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + +
    {% if entry.previewPicture is not null %} -
    {{ entry.title|raw }}
    +
    {{ entry.title|e|raw }}
    {% endif %}
    {{ entry.content | raw }} @@ -73,22 +86,4 @@ "entryId": "{{ entry.id }}" } - - {% endblock %}