X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=3906e1e0ebda871dad40b0cf1385635b0f398156;hb=8668796106b856ca041512af27268ce6e49d2caf;hp=e883503e67e7fa90e6a69a93e14e4600d19c42e8;hpb=aeab8b342e462a446c6be54896ac76c41d68b471;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index e883503e..3906e1e0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -2,8 +2,8 @@
{% block head %}
{{ parent() }}
- {% if tag is defined and app.user.config.rssToken %}
-
+ {% if tag is defined and app.user.config.feedToken %}
+
{% endif %}
{% endblock %}
@@ -21,12 +21,15 @@
{% block content %}
{% set listMode = app.user.config.listMode %}
{% set currentRoute = app.request.attributes.get('_route') %}
+ {% if currentRoute == 'homepage' %}
+ {% set currentRoute = 'unread' %}
+ {% endif %}
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
{% if listMode == 0 %}view_list{% else %}view_module{% endif %}
- {% if app.user.config.rssToken %}
- {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %}
+ {% if app.user.config.feedToken %}
+ {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %}
{% endif %}
{% if entries.getNbPages > 1 %}
@@ -39,11 +42,9 @@
{% if listMode == 1 %}
{% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
- {% elseif entry.previewPicture is null %}
- {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
{% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
{% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %}
- {% elseif not entry.previewPicture is null %}
+ {% else %}
{% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry} only %}
{% endif %}
@@ -61,17 +62,14 @@
{% set currentTag = null %}
{% if tag is defined %}
{% set currentTag = tag.slug %}
- {% endif %}
- {% if currentRoute == 'homepage' %}
- {% set currentRoute = 'unread' %}
{% endif %}