X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=e87ba201a957ebcfd0feccf8d7890c88002e704e;hb=293730656d696dab8cdbc8447a0e970a58ff77d2;hp=6c46f91fcc6a8aa1ff343f2b80f7179109fdfed9;hpb=60e722040665c836fb9d3c4a35c37aad5c1cba64;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..e87ba201 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,61 +1,101 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} +{% block title %}{{ entry.title|e|default('entry.default_title'|trans)|raw }} ({{ entry.domainName|removeWww }}){% endblock %} {% block content %}
-

{{ entry.title|raw }} ✎

+

{{ entry.title|e|default('entry.default_title'|trans)|raw }} ✎

-
- {{ '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 }} +
+ + {{ entry.createdAt|date('Y-m-d H:i') }} + + + {% if entry.publishedAt is not null %} + + {{ entry.publishedAt|date('Y-m-d H:i') }} + {% endif %} -
- {% set nbAnnotations = entry.annotations | length %} - comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} - - {% if entry.previewPicture is not null %} -
{{ entry.title|raw }}
- {% 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 %} + {{ '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.originUrl is not empty %} + launch + + {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} + + {% endif %} + + +
{{ entry.content | raw }}
@@ -73,22 +113,4 @@ "entryId": "{{ entry.id }}" } - - {% endblock %}