X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=bead6809e950533d0a13d42d861dc5d300c1c579;hb=HEAD;hp=6c46f91fcc6a8aa1ff343f2b80f7179109fdfed9;hpb=cdd3010b478c9ca818dd6d22d03c81ef4a5ab208;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..c2e69a27 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,62 +1,102 @@
{% 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 %}
-
- {% 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 * 200 %}
+ {% 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 %}