X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=067c8975e575081c3c9f4e8ef02ae8606e87e81e;hb=50f35f0db2be9586205e793f315608eec59c9666;hp=b2d91c9cc3d5f5c22ba9b40b7a5cc4f5c06a855a;hpb=d181bd728565454ec53d960f321ed0a4c3bf26c8;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 b2d91c9c..067c8975 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
@@ -1,9 +1,16 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block head %}
+ {{ parent() }}
+ {% if tag is defined and app.user.config.rssToken %}
+
+ {% endif %}
+{% endblock %}
+
{% block title %}
{% set filter = '' %}
{% if tag is defined %}
- {% set filter = tag %}
+ {% set filter = tag.slug %}
{% endif %}
{% if searchTerm is defined and searchTerm is not empty %}
{% set filter = searchTerm %}
@@ -13,27 +20,31 @@
{% block content %}
{% set listMode = app.user.config.listMode %}
-
-
+ {% set currentRoute = app.request.attributes.get('_route') %}
+ {% if currentRoute == 'homepage' %}
+ {% set currentRoute = 'unread' %}
+ {% endif %}
+
{% 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 %}