diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-26 13:53:23 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-26 13:53:23 +0200 |
commit | 7a5043f187a1f9aac37f359c8f407e5febea50f7 (patch) | |
tree | 5f38e2ee0f60d102d27548b7a5f26c25e2afd96d /src/Wallabag/CoreBundle/Resources/views/themes | |
parent | c68720d40eec94c80a316e8ffe04fb22768b3563 (diff) | |
download | wallabag-7a5043f187a1f9aac37f359c8f407e5febea50f7.tar.gz wallabag-7a5043f187a1f9aac37f359c8f407e5febea50f7.tar.zst wallabag-7a5043f187a1f9aac37f359c8f407e5febea50f7.zip |
Added tag label in the page title
Fix #2472
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
3 files changed, 11 insertions, 3 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 3af88b23..f7c9392d 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,7 +1,11 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} | 4 | {% set params = {} %} |
5 | {% if tag is defined %} | ||
6 | {% set params = {'label': tag} %} | ||
7 | {% endif %} | ||
8 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} | ||
5 | {% endblock %} | 9 | {% endblock %} |
6 | 10 | ||
7 | {% block content %} | 11 | {% 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 d1c2f203..42dfee58 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 @@ | |||
7 | {% elseif currentRoute == 'all' %} | 7 | {% elseif currentRoute == 'all' %} |
8 | {{ 'entry.page_titles.filtered'|trans }} | 8 | {{ 'entry.page_titles.filtered'|trans }} |
9 | {% elseif currentRoute == 'tag_entries' %} | 9 | {% elseif currentRoute == 'tag_entries' %} |
10 | {{ 'entry.page_titles.filtered_tags'|trans }} | 10 | {{ 'entry.page_titles.filtered_tags'|trans }} {{ params['label'] }} |
11 | {% elseif currentRoute == 'untagged' %} | 11 | {% elseif currentRoute == 'untagged' %} |
12 | {{ 'entry.page_titles.untagged'|trans }} | 12 | {{ 'entry.page_titles.untagged'|trans }} |
13 | {% else %} | 13 | {% 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 919f94ec..3e678a32 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,7 +1,11 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} | 4 | {% set params = {} %} |
5 | {% if tag is defined %} | ||
6 | {% set params = {'label': tag} %} | ||
7 | {% endif %} | ||
8 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} | ||
5 | {% endblock %} | 9 | {% endblock %} |
6 | 10 | ||
7 | {% block content %} | 11 | {% block content %} |