X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=3d20a6bc92418ea3c5e905c3d0f02a5796537375;hb=7a90ca6171995e16b74f14712fafb42b636bdb3e;hp=aa3d6cdcfe6ed1184ba88e7d4a2a610710f52dd6;hpb=222e09f140099f3b1b8f6db1846d35e6810d43a3;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 aa3d6cdc..3d20a6bc 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,27 +1,38 @@
{% 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 }} â
-
- {{ '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.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.previewPicture is not null %}
-
+
{% endif %}
{{ entry.content | raw }}
@@ -73,22 +108,4 @@
"entryId": "{{ entry.id }}"
}
-
-
{% endblock %}