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=bdd44b54499b10950097331f380ed1fcc1d4d62e;hb=64f81bc31699ed239e4becec1cfa7ebc0bef2b5a;hp=8d841b4cf477cb02c95c7f01c0b4e5e32471364b;hpb=c146f6940a176142084b4fc3c610d13aca60d90e;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 8d841b4c..bdd44b54 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,15 +1,34 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}
- {% include "@WallabagCore/themes/_title.html.twig" %}
+ {% set filter = '' %}
+ {% if tag is defined %}
+ {% set filter = tag %}
+ {% endif %}
+ {% 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 %}
@@ -20,54 +39,67 @@
{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
{% endif %}
+
+
+ {{ entry.createdAt|date('Y-m-d') }}
+
+
- {% if entry.previewPicture is null %}
-
{{ entry.content|striptags|slice(0, 300) }}…
+ {% if (entry.previewPicture is null or listMode == 1) %}
{% for tag in entry.tags %}
- - {{ tag.label }}
+ - {{ tag.label }}
{% endfor %}
+
{{ entry.content|striptags|slice(0, 300) }}…
{% else %}
{% for tag in entry.tags | slice(0, 3) %}
- - {{ tag.label }}
+ - {{ tag.label }}
{% endfor %}
-
+
{% 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) }}