From 73e8df9e444c60b532d923b22e4dbe2efff18ede Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 26 Oct 2016 15:49:44 +0200 Subject: [PATCH] Renamed variable for page title --- .../views/themes/baggy/Entry/entries.html.twig | 6 +++--- .../views/themes/common/Entry/_title.html.twig | 2 +- .../views/themes/material/Entry/entries.html.twig | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) 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 f7c9392d..f19f2922 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,11 +1,11 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set params = {} %} + {% set currentTag = '' %} {% if tag is defined %} - {% set params = {'label': tag} %} + {% set currentTag = tag %} {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} {% endblock %} {% block content %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig index 42dfee58..92cabdd9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig @@ -7,7 +7,7 @@ {% elseif currentRoute == 'all' %} {{ 'entry.page_titles.filtered'|trans }} {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} {{ params['label'] }} + {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }} {% elseif currentRoute == 'untagged' %} {{ 'entry.page_titles.untagged'|trans }} {% else %} 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 3e678a32..5c7cfd65 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,11 +1,11 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set params = {} %} - {% if tag is defined %} - {% set params = {'label': tag} %} - {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} + {% set currentTag = '' %} + {% if tag is defined %} + {% set currentTag = tag %} + {% endif %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} {% endblock %} {% block content %} -- 2.41.0