X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FEntry%2Fentries.html.twig;h=0ba6f4f48371bbada89e51027550159141a1b43d;hb=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;hp=f7c9392d690903db4c7070884fe36e703f4f261b;hpb=7a5043f187a1f9aac37f359c8f407e5febea50f7;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index f7c9392d..0ba6f4f4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,19 +1,34 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}
- {% set params = {} %}
+ {% set filter = '' %}
{% if tag is defined %}
- {% set params = {'label': tag} %}
+ {% set filter = tag %}
{% endif %}
- {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %}
+ {% if searchTerm is defined and searchTerm is not empty %}
+ {% set filter = searchTerm %}
+ {% endif %}
+ {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %}
{% endblock %}
{% block content %}
- {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+
+ {% set listMode = app.user.config.listMode %}
+
-
+
+
{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
@@ -24,54 +39,67 @@
{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
{% endif %}
+
+
+ {{ entry.createdAt|date('Y-m-d') }}
+
+
- {% if entry.previewPicture is null %}
+ {% if (entry.previewPicture is null or listMode == 1) %}
-
{{ entry.content|striptags|slice(0, 300) }}…
+
{{ entry.content|striptags|slice(0, 300) }}…
{% else %}
{% for tag in entry.tags | slice(0, 3) %}
- {{ tag.label }}
{% endfor %}
-
![{{ entry.title|raw }}]({{ entry.previewPicture }})
+
![{{ entry.title|e|raw }}]({{ entry.previewPicture }})
{% endif %}
{% endfor %}
+ {% if entries.getNbPages > 1 %}
+ {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+ {% endif %}
+
{% if form is not null %}
-
+
+ {{ form_label(form.httpStatus) }}
+
+ {{ form_widget(form.httpStatus) }}
+
+
+
{{ form_label(form.readingTime) }}