X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentry.html.twig;h=660211f2562bb30e8011804531234abc8c848fd8;hb=35941d57ee4d06ec3557d4b126d5f6fd263bcf3a;hp=2e9673d51f6dcb36420ddd8a7adb5bd704c6c519;hpb=1f00547836d1e832b31368413dccb32586206321;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 2e9673d5..660211f2 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 }} â
@@ -29,7 +29,8 @@
{% endif %}
{% if craue_setting('share_twitter') %}
{% 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_scuttle') %}
scuttle{% endif %}
{% if craue_setting('share_diaspora') %}
diaspora{% endif %}
{% if craue_setting('share_unmark') %}
unmark.it{% endif %}
{% if craue_setting('carrot') %}
Carrot{% endif %}
@@ -43,9 +44,23 @@
- {{ entry.createdAt|date('Y-m-d') }}
+ {{ entry.createdAt|date('Y-m-d H:i') }}
+ {% if entry.publishedAt is not null %}
+
+ {{ entry.publishedAt|date('Y-m-d H:i') }}
+
+ {% 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 %}
@@ -62,13 +77,13 @@
label_outline {{ tag.label }} â
{% endfor %}
-
{% if entry.previewPicture is not null %}
-
+
{% endif %}
{{ entry.content | raw }}