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=6c5d260160ced8a769089640d5fb625bb411837c;hb=2b04b300f83cd4bb288c1fd00e2b77ec4f557a00;hp=8636e3be11b029ac8146225b66f08e7e37529052;hpb=49e2854d5c15bbce3f24f91da34450e8f209295b;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 8636e3be..6c5d2601 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,13 +1,50 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
+{% block head %}
+ {{ parent() }}
+ {% if tag is defined and app.user.config.feedToken %}
+
+ {% endif %}
+{% endblock %}
+
+{% block title %}
+ {% 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 currentRoute = app.request.attributes.get('_route') %}
+ {% if currentRoute == 'homepage' %}
+ {% set currentRoute = 'unread' %}
+ {% endif %}
+ {% set listMode = app.user.config.listMode %}
+
-
+
+
{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
@@ -18,43 +55,63 @@
{{ '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) %}
+
+
{{ entry.content|striptags|slice(0, 300) }}…
{% else %}
-
+
+ {% for tag in entry.tags | slice(0, 3) %}
+ - {{ tag.label }}
+ {% endfor %}
+
+
{% endif %}
{% endfor %}
+ {% if entries.getNbPages > 1 %}
+ {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+ {% endif %}
+
-
{{ form_label(form.readingTime) }}
@@ -134,7 +203,6 @@
-
-
- {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+
+ {% endif %}
{% endblock %}