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=a137f3c34895954001c1cbb15f1c492630223b8f;hpb=cefbe6a87fee244840e088955aa787a7ad3abb3e;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 a137f3c3..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 %}
@@ -59,17 +62,14 @@
{% set currentTag = null %}
{% if tag is defined %}
{% set currentTag = tag.slug %}
- {% endif %}
- {% if currentRoute == 'homepage' %}
- {% set currentRoute = 'unread' %}
{% endif %}
{{ 'entry.list.export_title'|trans }}
{% if craue_setting('export_epub') %}- EPUB
{% endif %}
{% if craue_setting('export_mobi') %}- MOBI
{% endif %}
{% if craue_setting('export_pdf') %}- PDF
{% endif %}
- {% if craue_setting('export_csv') %}- JSON
{% endif %}
- {% if craue_setting('export_json') %}- CSV
{% endif %}
+ {% if craue_setting('export_json') %}- JSON
{% endif %}
+ {% if craue_setting('export_csv') %}- CSV
{% endif %}
{% if craue_setting('export_txt') %}- TXT
{% endif %}
{% if craue_setting('export_xml') %}- XML
{% endif %}
@@ -83,6 +83,12 @@
{{ 'entry.filters.title'|trans }}
+ {% if currentRoute != 'untagged' and nbEntriesUntagged != 0 %}
+
+ {% endif %}
+