Merge branch '1.2-release' into 2.0-release

netgen · Nov 5, 2015 · 1b881d0 · 1b881d0
2 parents f009c30 + 9aa6cac
commit 1b881d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/Resources/config/default_settings.yml b/Resources/config/default_settings.yml
@@ -14,6 +14,9 @@ parameters:
     # Default template used to generate tag view page
     eztags.default.tag_view.template: 'NetgenTagsBundle:tag:view.html.twig'
 
+    # Default pagelayout used in tag view page
+    eztags.default.tag_view.pagelayout: 'eZDemoBundle::pagelayout.html.twig'
+
     # Default path prefix to use when generating tag view links
     # Since it's NOT recommended to use empty path prefix here,
     # it will fallback to /tags/view if not specified

diff --git a/Resources/doc/CHANGELOG.md b/Resources/doc/CHANGELOG.md
@@ -1,6 +1,11 @@
 Netgen Tags Bundle changelog
 ============================
 
+2.0.8 (05.11.2015)
+------------------
+
+* Parametrize pagelayout used in tag view page
+
 2.0.7 (28.10.2015)
 ------------------
 
@@ -49,6 +54,11 @@ Netgen Tags Bundle changelog
 * You can now use a container parameter to select which template will `/tags/view` controller use
 * Various bug fixes and optimizations
 
+1.2.5 (05.11.2015)
+------------------
+
+* Parametrize pagelayout used in tag view page
+
 1.2.4 (05.11.2015)
 ------------------
 

diff --git a/Resources/views/tag/view.html.twig b/Resources/views/tag/view.html.twig
@@ -1,4 +1,4 @@
-{% extends "eZDemoBundle::pagelayout.html.twig" %}
+{% extends ezpublish.configResolver.parameter( 'tag_view.pagelayout', 'eztags' ) %}
 
 {% set tagKeyword = netgen_tags_tag_keyword( tag ) %}