From 4db41b53ba711605c7aaa412589e13953de19b34 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Wed, 11 Oct 2017 09:08:49 +0200 Subject: [PATCH 1/5] Calling add_theme_support right away, not in init hook --- .../chisel-starter-theme/Chisel/WpExtensions.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php index 496ace7b..0100d668 100644 --- a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php +++ b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php @@ -10,21 +10,21 @@ */ class WpExtensions { public function __construct() { - add_action( 'init', array( $this, 'extend' ) ); + $this->extend() + add_action( 'init', array( $this, 'init' ) ); } - public function extend() { - $this->themeSupport(); - $this->registerPostTypes(); - $this->registerTaxonomies(); - } - - public function themeSupport() { + private function extend() { add_theme_support( 'post-formats' ); add_theme_support( 'post-thumbnails' ); add_theme_support( 'menus' ); } + public function init() { + $this->registerPostTypes(); + $this->registerTaxonomies(); + } + /** * Use this method to register custom post types */ From 854d0a9626599d138bd644596658904cc65bab64 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Wed, 11 Oct 2017 09:09:21 +0200 Subject: [PATCH 2/5] Adding support for title tag --- .../wp/templates/chisel-starter-theme/Chisel/WpExtensions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php index 0100d668..49c75dd8 100644 --- a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php +++ b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php @@ -18,6 +18,7 @@ private function extend() { add_theme_support( 'post-formats' ); add_theme_support( 'post-thumbnails' ); add_theme_support( 'menus' ); + add_theme_support( 'title-tag' ); } public function init() { From f21a6e0bb436b3bf3586c16de5b692c160d86ade Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Wed, 11 Oct 2017 09:42:13 +0200 Subject: [PATCH 3/5] Removing wp_title in favour of title-tag --- .../app/templates/templates/twig/layouts/base.twig | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/generators/app/templates/templates/twig/layouts/base.twig b/generators/app/templates/templates/twig/layouts/base.twig index f556627c..76c23d9c 100644 --- a/generators/app/templates/templates/twig/layouts/base.twig +++ b/generators/app/templates/templates/twig/layouts/base.twig @@ -1,16 +1,8 @@ - - <% if (projectType == 'wp-with-fe') { %> - {% if wp_title %} - {{ wp_title }} - {{ site.name }} - {% else %} - {{ site.name }} - {% endif %} - <% } else { %> - {{ pageName }} - <%= name %> - <% } %> + <% if (projectType == 'fe') { %> + {{ pageName }} - <%= name %><% } %> From 3ac3f6ce7c6036b60c1bb57c97a81233977b9ac8 Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Wed, 11 Oct 2017 09:42:28 +0200 Subject: [PATCH 4/5] Fixing missing semicolon --- .../wp/templates/chisel-starter-theme/Chisel/WpExtensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php index 49c75dd8..49193e1d 100644 --- a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php +++ b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php @@ -10,7 +10,7 @@ */ class WpExtensions { public function __construct() { - $this->extend() + $this->extend(); add_action( 'init', array( $this, 'init' ) ); } From 264d5272aaf9665e1ea42824bf42e8b23ced0c7b Mon Sep 17 00:00:00 2001 From: Lubos Kmetko Date: Tue, 24 Oct 2017 08:29:54 +0200 Subject: [PATCH 5/5] Renaming extend function back to themeSupport --- .../wp/templates/chisel-starter-theme/Chisel/WpExtensions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php index 49193e1d..441fa1fa 100644 --- a/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php +++ b/generators/wp/templates/chisel-starter-theme/Chisel/WpExtensions.php @@ -10,11 +10,11 @@ */ class WpExtensions { public function __construct() { - $this->extend(); + $this->themeSupport(); add_action( 'init', array( $this, 'init' ) ); } - private function extend() { + private function themeSupport() { add_theme_support( 'post-formats' ); add_theme_support( 'post-thumbnails' ); add_theme_support( 'menus' );