From e92309a9b641ade4648ac0a970fccdb9dd126b78 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 9 Aug 2022 22:42:46 +0200 Subject: [PATCH 1/3] Fix HTML comments --- 404.php | 2 +- archive.php | 11 ++++++---- author.php | 22 +++++++++++-------- footer.php | 11 +++++----- .../navbar-collapse-bootstrap4.php | 2 +- .../navbar-collapse-bootstrap5.php | 2 +- .../navbar-offcanvas-bootstrap5.php | 2 +- global-templates/right-sidebar-check.php | 5 +++-- header.php | 2 +- inc/pagination.php | 1 + inc/template-tags.php | 2 +- inc/woocommerce.php | 6 ++--- index.php | 18 +++++++++------ loop-templates/content-author.php | 2 +- loop-templates/content-page.php | 2 +- loop-templates/content-search.php | 2 +- loop-templates/content-single.php | 2 +- loop-templates/content.php | 2 +- page-templates/both-sidebarspage.php | 2 +- page-templates/fullwidthpage.php | 4 ++-- page-templates/left-sidebarpage.php | 2 +- page-templates/right-sidebarpage.php | 2 +- page.php | 14 +++++++----- search.php | 18 +++++++++------ single.php | 14 +++++++----- 25 files changed, 89 insertions(+), 63 deletions(-) diff --git a/404.php b/404.php index 4b58b334..492cdc09 100644 --- a/404.php +++ b/404.php @@ -76,7 +76,7 @@ $container = get_theme_mod( 'understrap_container_type' ); - + diff --git a/archive.php b/archive.php index 2607bc0d..97b48cd4 100644 --- a/archive.php +++ b/archive.php @@ -21,8 +21,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -52,12 +54,13 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> -
+ diff --git a/author.php b/author.php index 107050b0..6f1608ca 100644 --- a/author.php +++ b/author.php @@ -20,8 +20,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -82,8 +84,8 @@ $container = get_theme_mod( 'understrap_container_type' ); - - -
+ - - - - +
diff --git a/footer.php b/footer.php index 4d54502b..e436b331 100644 --- a/footer.php +++ b/footer.php @@ -33,15 +33,16 @@ $container = get_theme_mod( 'understrap_container_type' ); -
+ - + - + - + - + + diff --git a/global-templates/navbar-collapse-bootstrap4.php b/global-templates/navbar-collapse-bootstrap4.php index c6235925..dd2126fa 100644 --- a/global-templates/navbar-collapse-bootstrap4.php +++ b/global-templates/navbar-collapse-bootstrap4.php @@ -66,4 +66,4 @@ $container = get_theme_mod( 'understrap_container_type' ); - + diff --git a/global-templates/navbar-collapse-bootstrap5.php b/global-templates/navbar-collapse-bootstrap5.php index ab4bdea7..88ad7254 100644 --- a/global-templates/navbar-collapse-bootstrap5.php +++ b/global-templates/navbar-collapse-bootstrap5.php @@ -62,4 +62,4 @@ $container = get_theme_mod( 'understrap_container_type' ); - + diff --git a/global-templates/navbar-offcanvas-bootstrap5.php b/global-templates/navbar-offcanvas-bootstrap5.php index bccd6d14..cf7cc360 100644 --- a/global-templates/navbar-offcanvas-bootstrap5.php +++ b/global-templates/navbar-offcanvas-bootstrap5.php @@ -69,4 +69,4 @@ $container = get_theme_mod( 'understrap_container_type' ); - + diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php index 1987914d..68c26db2 100644 --- a/global-templates/right-sidebar-check.php +++ b/global-templates/right-sidebar-check.php @@ -7,9 +7,10 @@ // Exit if accessed directly. defined( 'ABSPATH' ) || exit; -?> - +// Closing the primary container from /global-templates/left-sidebar-check.php. +?> + - + diff --git a/inc/pagination.php b/inc/pagination.php index d7f620d7..0a32b976 100644 --- a/inc/pagination.php +++ b/inc/pagination.php @@ -72,6 +72,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) { ?> + + '; + echo ''; get_template_part( 'global-templates/right-sidebar-check' ); echo ''; - echo ''; - echo ''; + echo ''; + echo ''; } } diff --git a/index.php b/index.php index 048ed203..26041211 100644 --- a/index.php +++ b/index.php @@ -29,8 +29,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -52,13 +54,15 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> -
+ - - + - + // Do the right sidebar check and close div#primary. + get_template_part( 'global-templates/right-sidebar-check' ); + ?>
diff --git a/loop-templates/content-author.php b/loop-templates/content-author.php index 46f193ac..a4d1971f 100644 --- a/loop-templates/content-author.php +++ b/loop-templates/content-author.php @@ -44,4 +44,4 @@ defined( 'ABSPATH' ) || exit; - + diff --git a/loop-templates/content-page.php b/loop-templates/content-page.php index 0511c45c..19445996 100644 --- a/loop-templates/content-page.php +++ b/loop-templates/content-page.php @@ -34,4 +34,4 @@ defined( 'ABSPATH' ) || exit; - + diff --git a/loop-templates/content-search.php b/loop-templates/content-search.php index cd6088f2..a78cd438 100644 --- a/loop-templates/content-search.php +++ b/loop-templates/content-search.php @@ -44,4 +44,4 @@ defined( 'ABSPATH' ) || exit; - + diff --git a/loop-templates/content-single.php b/loop-templates/content-single.php index c24d3ed0..987c5e7c 100644 --- a/loop-templates/content-single.php +++ b/loop-templates/content-single.php @@ -40,4 +40,4 @@ defined( 'ABSPATH' ) || exit; - + diff --git a/loop-templates/content.php b/loop-templates/content.php index 53338529..b696eaa5 100644 --- a/loop-templates/content.php +++ b/loop-templates/content.php @@ -47,4 +47,4 @@ defined( 'ABSPATH' ) || exit; - + diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php index 5e9788c7..131da455 100644 --- a/page-templates/both-sidebarspage.php +++ b/page-templates/both-sidebarspage.php @@ -48,7 +48,7 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> - + diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php index b1f161e2..fff2eb45 100644 --- a/page-templates/fullwidthpage.php +++ b/page-templates/fullwidthpage.php @@ -40,11 +40,11 @@ if ( is_front_page() ) { } ?> - + - + diff --git a/page-templates/left-sidebarpage.php b/page-templates/left-sidebarpage.php index 422f67c8..7c95f7d1 100644 --- a/page-templates/left-sidebarpage.php +++ b/page-templates/left-sidebarpage.php @@ -39,7 +39,7 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> - + diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php index a71e3a13..125d578b 100644 --- a/page-templates/right-sidebarpage.php +++ b/page-templates/right-sidebarpage.php @@ -37,7 +37,7 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> - + diff --git a/page.php b/page.php index 91efd02b..d3b9d1e1 100644 --- a/page.php +++ b/page.php @@ -25,8 +25,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -42,10 +44,12 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> -
+ - - +
diff --git a/search.php b/search.php index 17993f05..dee69f8d 100644 --- a/search.php +++ b/search.php @@ -20,8 +20,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -61,13 +63,15 @@ $container = get_theme_mod( 'understrap_container_type' ); -
+ - - + - + // Do the right sidebar check and close div#primary. + get_template_part( 'global-templates/right-sidebar-check' ); + ?>
diff --git a/single.php b/single.php index 80edec6d..38379d84 100644 --- a/single.php +++ b/single.php @@ -18,8 +18,10 @@ $container = get_theme_mod( 'understrap_container_type' );
- - +
@@ -36,10 +38,12 @@ $container = get_theme_mod( 'understrap_container_type' ); } ?> -
+ - - +
From e8a9be1c16f46f6f6be27a44993dc2c413e9b1c8 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Fri, 23 Sep 2022 22:47:15 +0200 Subject: [PATCH 2/3] Fix PHP comment --- archive.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archive.php b/archive.php index 97b48cd4..3013ef30 100644 --- a/archive.php +++ b/archive.php @@ -22,7 +22,7 @@ $container = get_theme_mod( 'understrap_container_type' );
From 97446408dd5a4b4e7cea5e769671a79ff646d742 Mon Sep 17 00:00:00 2001 From: IanDelMar <42134098+IanDelMar@users.noreply.github.com> Date: Tue, 27 Sep 2022 21:00:36 +0200 Subject: [PATCH 3/3] Fix typo --- footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/footer.php b/footer.php index e436b331..0f628225 100644 --- a/footer.php +++ b/footer.php @@ -37,7 +37,7 @@ $container = get_theme_mod( 'understrap_container_type' );
- +