From 9a5b76dfbdfa49c8e9bc2e58a2a3f5dd25697f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <69369238+mrpauloen@users.noreply.github.com>
Date: Tue, 23 Aug 2022 20:52:17 +0200
Subject: [PATCH 1/3] New branch

---
 inc/template-tags.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index 53403e9..9b93d23 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -11,7 +11,7 @@
   *
   * This function changes the way you see (in header section)
   * your site tile (or blog name), depends on different pages
-  * See line: 36 in header.php file
+  * See line: 61 in header.php file
   *
   * @since The Bootstrap Blog 0.1
   */
@@ -22,6 +22,13 @@ function the_bootstrap_blog__site_title(){
  	if ( is_attachment() ) {
  		$site_title =  __( 'Attachment', 'the-bootstrap-blog');
  	}
+  // if feature is active, it display post title instead of site title,
+  // then site title from the article container is removed
+  // since v 0.1.5
+  elseif ( is_single() and get_theme_mod( 'header_as_title' ) ){
+     $site_title = the_bootstrap_blog__padlock() . single_post_title('', FALSE);
+  }
+
  	elseif ( is_404() ) {
  		$site_title =  __( '404', 'the-bootstrap-blog');
  	}
@@ -53,9 +60,18 @@ function the_bootstrap_blog__site_title(){
  * @since The Bootstrap Blog 0.1.4
  */
 function the_bootstrap_blog__site_description(){
-  global $wp_query;
+  global $wp_query, $post;
 
-  if ( is_archive() ){
+  // if there is attachment page display: Attachment
+ 	if ( is_attachment() ) {
+    echo get_queried_object()->post_title;
+ 	}
+    // if feature is active, it display post excerpt instead of site description,
+  elseif ( is_single() and get_theme_mod( 'header_as_title' ) ){
+    remove_filter( 'get_the_excerpt', 'the_bootstrap_blog__filter__excerpt_more' );
+    echo get_the_excerpt( $post );
+  }
+  elseif ( is_archive() ){
       the_archive_title();
   } elseif ( is_404() ) {
        esc_html_e( 'Sorry, no posts matched your criteria.', 'the-bootstrap-blog' );

From 9dc0f93190d0c8a7fb82cc30e26bda5de77e53c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <69369238+mrpauloen@users.noreply.github.com>
Date: Thu, 25 Aug 2022 21:19:36 +0200
Subject: [PATCH 2/3] Header as title feature

---
 README.md                     | 13 +++++++---
 header.php                    |  2 +-
 inc/customizer/customizer.php | 47 +++++++++++++++++++++++++++++++++++
 inc/template-tags.php         | 21 ++++++++--------
 readme.txt                    | 22 +++++++++-------
 single.php                    |  7 ++++--
 style.css                     |  6 ++---
 7 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 6d84189..c28953c 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 Summary:           | The Bootstrap Blog
 -------------------|----------------
 Contributors:      | [mrpauloen](https://profiles.wordpress.org/mrpauloen/)
-Version:           | 0.1.4.4
+Version:           | 0.1.5
 Requires at least: | 5.5
-Tested up to:      | 5.8
+Tested up to:      | 6.0
 Requires PHP:  	   | 7.0
 License:           | GPLv2 or later
 License URI:       | http://www.gnu.org/licenses/gpl-2.0.html
@@ -148,13 +148,18 @@ https://wordpress.org/support/theme/the-bootstrap-blog
 
 ## Changelog
 
+### 0.1.5
+*Released: August, 2022*
+
+* Added: Header as Title feature
+
 ### 0.1.4.4
-*Released: November 14, 2021
+*Released: November 14, 2021*
 
 * Added: support JS
   - Remove the `no-js` class from body if JS is supported
 * Removed: unnecessary comment_reply_link filter hook
-  - fixed by new patch (51081)
+  - fixed by new WordPress patch (51081)
 
 ### 0.1.4.3
 *Released: July 24, 2021*
diff --git a/header.php b/header.php
index 7efc02b..8169b2e 100644
--- a/header.php
+++ b/header.php
@@ -58,7 +58,7 @@
 		echo esc_attr( ' has-custom-header');
 	}
 	?>">
-		<h1 class="site-title"><?php the_bootstrap_blog__site_title(); ?></h1><br/>
+		<h1 id="site-title" class="site-title"><?php the_bootstrap_blog__site_title(); ?></h1><br/>
 		<p class="lead site-description<?php
 		if ( ! $has_header_image ){
 			echo esc_attr( ' text-muted' );
diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
index 15a569a..f8ae432 100644
--- a/inc/customizer/customizer.php
+++ b/inc/customizer/customizer.php
@@ -373,6 +373,53 @@ public function render_content() {
 			)
 		);
 
+
+		/**
+		 *
+		 * Option three - Header as title
+		 * Display post title in header section in place of sites title & tagline
+		 *
+		 * @since The Bootstrap Blog 0.1.5
+		 */
+
+			$wp_customize->add_section(
+				'header_as_title_section',
+				array(
+					'title'      => __( 'Header as title', 'the-bootstrap-blog' ),
+					'description'	=> __( 'Display post title in header section in place of sites title and tagline',  'the-bootstrap-blog' ),
+					'description_hidden' => true,
+
+			) );
+
+			/**
+			 * Display header as title
+			 *
+			 * @return boolean True on success, false on failure.
+			 */
+
+			$wp_customize->add_setting(
+				// $id
+				'header_as_title',
+				// $args
+				array(
+					'default'			=> false,
+					'type'				=> 'theme_mod',
+					'capability'		=> 'edit_theme_options',
+					'sanitize_callback'	=> 'the_bootstrap_blog__sanitize_checkbox'
+				)
+			);
+
+			$wp_customize->add_control(
+				// $id
+				'header_as_title_control',
+				// $args
+				array(
+					'label'			=> __( 'Header as title', 'the-bootstrap-blog' ),
+					'settings'		=> 'header_as_title',
+					'section'		=> 'header_as_title_section',
+					'type'			=> 'checkbox'
+			)
+			);
 }
 add_action( 'customize_register', 'the_bootstrap_blog__theme_customize', 11 );
 
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 9b93d23..bcae1d3 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -22,26 +22,27 @@ function the_bootstrap_blog__site_title(){
  	if ( is_attachment() ) {
  		$site_title =  __( 'Attachment', 'the-bootstrap-blog');
  	}
-  // if feature is active, it display post title instead of site title,
-  // then site title from the article container is removed
-  // since v 0.1.5
+  /**
+   * if feature is active, it display post title instead of site title,
+   * then site title from the article container is removed
+   * @since v 0.1.5
+   */
   elseif ( is_single() and get_theme_mod( 'header_as_title' ) ){
-     $site_title = the_bootstrap_blog__padlock() . single_post_title('', FALSE);
+     $site_title = the_bootstrap_blog__padlock() . single_post_title( '', FALSE );
   }
-
  	elseif ( is_404() ) {
- 		$site_title =  __( '404', 'the-bootstrap-blog');
+ 		$site_title =  __( '404', 'the-bootstrap-blog' );
  	}
   elseif ( is_search() ) {
     /* translators: %s: search query variable */
     $site_title =  sprintf ( __( 'Search for: <i>%s</i>', 'the-bootstrap-blog' ), get_search_query() );
   }
-	elseif ( is_author()   ) {
- 	$site_title =  __( 'Author', 'the-bootstrap-blog');
+	elseif ( is_author() ) {
+ 	$site_title =  __( 'Author', 'the-bootstrap-blog' );
  	}
  	// if there is archive display: Archive
- 	elseif ( is_archive()  ) {
- 	$site_title =  __( 'Archive', 'the-bootstrap-blog');
+ 	elseif ( is_archive() ) {
+ 	$site_title =  __( 'Archive', 'the-bootstrap-blog' );
  	}
  	// in other any cases display hyperlinked blog name
  	else {
diff --git a/readme.txt b/readme.txt
index 7ed9a4f..eb033a1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 == The Bootstrap Blog ==
 Requires at least: 5.5
-Tested up to: 5.8
+Tested up to: 6.0
 Version: 0.1.4.4
 License: GPL-2.0-or-later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -10,8 +10,7 @@ A simple two-column blog template built with Bootstrap with custom navigation, h
 
 == Description ==
 
-Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
-
+A simple two-column blog template built with Bootstrap with custom navigation, header, and type.. Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
 
 == Installation ==
 
@@ -38,7 +37,7 @@ Activiation and Use
 
 == Copyright & License Notes ==
 
- The Bootstrap Blog WordPress Theme, Copyright 2016-2021 Paweł Nowak
+ The Bootstrap Blog WordPress Theme, Copyright 2016-2022 Paweł Nowak
  The Bootstrap Blog is distributed under the terms of the GNU GPL
 
 
@@ -139,27 +138,32 @@ https://wordpress.org/support/theme/the-bootstrap-blog
 
 == Changelog ==
 
+=== 0.1.5 ===
+''Released: August, 2022''
+
+* Added: Header as Title feature
+
 === 0.1.4.4 ===
-*Released: November 14, 2021*
+''Released: November 14, 2021''
 
 * Added: support JS
 ** Remove the no-js class from body if JS is supported
 * Removed: unnecessary comment_reply_link filter hook
-** fixed by new patch (51081)
+** fixed by new WordPres patch (51081)
 
 
 === 0.1.4.3 ===
-*Released: July 24, 2021*
+''Released: July 24, 2021''
 
 * Fixed small issue with Akismet hidden textarea field
 
 === 0.1.4.1-2 ===
-*Released: December 27, 2020*
+''Released: December 27, 2020''
 
 * Fixed small bugs in translations strings
 
 === 0.1.4 ===
-*Released: December 26, 2020*
+''Released: December 26, 2020''
 
 * New features added:
 ** Custom footer text (with predefined tags)
diff --git a/single.php b/single.php
index e15b1bf..6941ff4 100644
--- a/single.php
+++ b/single.php
@@ -18,9 +18,12 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'blog-post' ); ?>>
 
-	<h2 class="blog-post-title"><?php the_bootstrap_blog__padlock(); the_title(); ?> <?php the_bootstrap_blog__sticky_pin(); ?></h2>
+	<?php if ( ! get_theme_mod( 'header_as_title' ) ) { ?>
+  <h2 class="blog-post-title"><?php the_bootstrap_blog__padlock(); the_title(); ?> <?php the_bootstrap_blog__sticky_pin(); ?></h2>
 
-<?php // Get condition once so there is no repetitions
+<?php }
+
+// Get condition once so there is no repetitions
 $password_required = post_password_required();
 
 if ( ! $password_required ){ ?>
diff --git a/style.css b/style.css
index 755d94e..a175bc0 100644
--- a/style.css
+++ b/style.css
@@ -3,9 +3,9 @@ Theme Name: The Bootstrap Blog
 Author: mrpauloen
 Author URI: https://profiles.wordpress.org/mrpauloen/
 Description: Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
-Version: 0.1.4.4
+Version: 0.1.5
 Requires at least: 5.5
-Tested up to: 5.8
+Tested up to: 6.0
 Requires PHP: 7.0
 Tags: two-columns, custom-menu, custom-background, right-sidebar, custom-header, featured-images, sticky-post, theme-options, threaded-comments, translation-ready, blog
 License: GPLv2 or later
@@ -15,7 +15,7 @@ Domain Path: /languages
 
 == Copyright & License Notes ==
 
- The Bootstrap Blog WordPress Theme, Copyright 2016-2021 Paweł Nowak
+ The Bootstrap Blog WordPress Theme, Copyright 2016-2022 Paweł Nowak
  The Bootstrap Blog is distributed under the terms of the GNU GPL
 
 

From 953f1222c475804bd01c66ee12e53e632447985d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <69369238+mrpauloen@users.noreply.github.com>
Date: Thu, 25 Aug 2022 21:23:23 +0200
Subject: [PATCH 3/3] .

---
 readme.txt | 2 +-
 style.css  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index eb033a1..44d5895 100644
--- a/readme.txt
+++ b/readme.txt
@@ -10,7 +10,7 @@ A simple two-column blog template built with Bootstrap with custom navigation, h
 
 == Description ==
 
-A simple two-column blog template built with Bootstrap with custom navigation, header, and type.. Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
+Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
 
 == Installation ==
 
diff --git a/style.css b/style.css
index a175bc0..a0b1ed8 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name: The Bootstrap Blog
 Author: mrpauloen
 Author URI: https://profiles.wordpress.org/mrpauloen/
-Description: Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
+Description: A simple two-column WordPress theme, built on Bootstrap 4 with custom navigation, header, and type. Based on the popular Bootstrap 4 library, this theme shows how mobile friendly CSS framework can be used to create sleek, simple, fast and functional websites, with ease and intuitive way in modern front-end web developmen days.
 Version: 0.1.5
 Requires at least: 5.5
 Tested up to: 6.0