From fa9f307dfe33b09edb3adbd8a3e246e167d9e9f7 Mon Sep 17 00:00:00 2001 From: Max Myers Date: Tue, 1 Nov 2016 11:25:21 -0400 Subject: [PATCH 1/7] Update HTML indents to soft tabs (2 spaces) --- 404.php | 100 +++++++++---------- archive.php | 73 +++++++------- author.php | 123 ++++++++++++------------ comments.php | 104 ++++++++++---------- footer.php | 35 +++---- functions.php | 1 - header.php | 90 ++++++++--------- index.php | 93 +++++++++--------- loop-templates/content-blank.php | 3 +- loop-templates/content-empty.php | 3 +- loop-templates/content-none.php | 30 +++--- loop-templates/content-page.php | 34 +++---- loop-templates/content-search.php | 28 +++--- loop-templates/content-single.php | 42 ++++---- loop-templates/content-verticalpage.php | 32 +++--- loop-templates/content.php | 62 ++++++------ page-templates/blank.php | 17 ++-- page-templates/empty.php | 11 ++- page-templates/fullwidthpage.php | 47 ++++----- page-templates/vertical-one-page.php | 44 ++++----- page.php | 53 +++++----- search.php | 75 ++++++++------- searchform.php | 19 ++-- sidebar-footerfull.php | 8 +- sidebar-hero.php | 12 +-- sidebar-statichero.php | 10 +- sidebar.php | 6 +- single.php | 57 +++++------ woocommerce.php | 53 +++++----- 29 files changed, 630 insertions(+), 635 deletions(-) diff --git a/404.php b/404.php index 03a279af..0e4fb9e5 100644 --- a/404.php +++ b/404.php @@ -4,74 +4,76 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
+
-
+
-
- -
+
-

-
+
-
+
-

+
- +

- +
- +
-
+

-

+ -
    - 'count', - 'order' => 'DESC', - 'show_count' => 1, - 'title_li' => '', - 'number' => 10, - ) ); - ?> -
+ -
- - + - ' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap' ), convert_smilies( ':)' ) ) . '

'; - the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=$archive_content" ); - ?> +
- +

-
- -
+
    + 'count', + 'order' => 'DESC', + 'show_count' => 1, + 'title_li' => '', + 'number' => 10, + ) ); + ?> +
-
- -
+
+ + + + ' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap' ), convert_smilies( ':)' ) ) . '

'; + the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=$archive_content" ); + ?> + + + +
+ + + + + +
+ +
+ +
- - - - diff --git a/archive.php b/archive.php index 3cdd9721..749fe9b3 100644 --- a/archive.php +++ b/archive.php @@ -7,58 +7,59 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
- -
+
- +
-
- ', '' ); - the_archive_description( '
', '
' ); - ?> -
+
- - +
- + - +
+ ', '' ); + the_archive_description( '
', '
' ); + ?> +
- + + - + - + - + -
- -
+ - + + + + +
+ +
+ +
- -
- + +
+ diff --git a/author.php b/author.php index aec32bc3..b00bba9d 100644 --- a/author.php +++ b/author.php @@ -6,80 +6,81 @@ * * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
- -
- -
- - +
-

nickname; ?>

+
- ID ) ) : ?> - ID); ?> - +
-
- user_url ) ) : ?> -
-
user_url; ?>
- +
- user_description ) ) : ?> -
-
user_description; ?>
- -
- -

nickname; ?>:

- -
- -
    - - - -
  • - - , - in -
    • - - +
    - + - +

    nickname; ?>

    - + ID ) ) : ?> + ID); ?> + - - - - -
+
+ user_url ) ) : ?> +
+
user_url; ?>
+ -
- -
+ user_description ) ) : ?> +
+
user_description; ?>
+ + - +

nickname; ?>:

+ + + +
    + + + + +
  • + + , + in +
    • + + + + + + + + + + + + +
+ + + +
+ + + +
+ +
- - - - - \ No newline at end of file + diff --git a/comments.php b/comments.php index b66224a1..d75a09e9 100644 --- a/comments.php +++ b/comments.php @@ -14,70 +14,70 @@ * return early without loading the comments. */ if ( post_password_required() ) { - return; + return; } ?>
- + - -

- ' . get_the_title() . '' ); - ?> -

+ +

+ ' . get_the_title() . '' ); + ?> +

- 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> - - + 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> + + -
    - 'ol', - 'short_ping' => true, - ) ); - ?> -
+
    + 'ol', + 'short_ping' => true, + ) ); + ?> +
- 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> - - + 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> + + - + - -

- + - +

- + + + + +
diff --git a/footer.php b/footer.php index 69cb705b..9c8b9c71 100644 --- a/footer.php +++ b/footer.php @@ -6,41 +6,42 @@ * * @package understrap */ + $the_theme = wp_get_theme(); ?> - + - - + - + diff --git a/functions.php b/functions.php index 00564e90..1cd52963 100644 --- a/functions.php +++ b/functions.php @@ -62,7 +62,6 @@ require get_template_directory() . '/inc/bootstrap-wp-navwalker.php'; */ require get_template_directory() . '/inc/bootstrap-wp-gallery.php'; - /** * Load WooCommerce functions. */ diff --git a/header.php b/header.php index 2c4c4fa2..3ba7f05c 100755 --- a/header.php +++ b/header.php @@ -6,72 +6,62 @@ * * @package understrap */ -?> +?> + > - - - - - - - - - + + + + + + + + + > -
- +
+
- - - -
- - - - - - diff --git a/index.php b/index.php index 325fec8c..97d41d14 100644 --- a/index.php +++ b/index.php @@ -11,64 +11,61 @@ * @package understrap */ -get_header(); ?> + get_header(); - + } +?> -
- -
+
-
- -
- -
- - +
- +
- +
- +
- - - - - + - - - - -
- -
- - + -
- -
- -
+ + + + + + + + + + + + + + + + +
+ + + +
+ +
+ +
diff --git a/loop-templates/content-blank.php b/loop-templates/content-blank.php index b491e01e..956858e2 100644 --- a/loop-templates/content-blank.php +++ b/loop-templates/content-blank.php @@ -6,5 +6,4 @@ */ ?> - - + diff --git a/loop-templates/content-empty.php b/loop-templates/content-empty.php index b491e01e..956858e2 100644 --- a/loop-templates/content-empty.php +++ b/loop-templates/content-empty.php @@ -6,5 +6,4 @@ */ ?> - - + diff --git a/loop-templates/content-none.php b/loop-templates/content-none.php index 38429da1..1d66c08a 100644 --- a/loop-templates/content-none.php +++ b/loop-templates/content-none.php @@ -11,31 +11,31 @@
-
+
-

+

-
+
-
+
- + -

Get started here.', 'understrap' ), esc_url( admin_url( 'post-new.php' ) ) ); ?>

+

Get started here.', 'understrap' ), esc_url( admin_url( 'post-new.php' ) ) ); ?>

- + -

- +

+ - + -

+

- + - + + +
-
-
diff --git a/loop-templates/content-page.php b/loop-templates/content-page.php index 0ac14958..ac8eb686 100644 --- a/loop-templates/content-page.php +++ b/loop-templates/content-page.php @@ -8,31 +8,31 @@
> -
+
- ', '' ); ?> + ', '' ); ?> -
+
- ID, 'large' ); ?> - -
+ ID, 'large' ); ?> - +
- '
' . __( 'Pages:', 'understrap' ), - 'after' => '
', - ) ); - ?> + -
+ '
' . __( 'Pages:', 'understrap' ), + 'after' => '
', + ) ); + ?> -
+
- ', '' ); ?> +
-
+ ', '' ); ?> + +
diff --git a/loop-templates/content-search.php b/loop-templates/content-search.php index 871b96fd..cada1984 100644 --- a/loop-templates/content-search.php +++ b/loop-templates/content-search.php @@ -6,32 +6,32 @@ diff --git a/loop-templates/content-single.php b/loop-templates/content-single.php index 988f6652..cb49f932 100644 --- a/loop-templates/content-single.php +++ b/loop-templates/content-single.php @@ -6,37 +6,37 @@
> -
+
- ', '' ); ?> + ', '' ); ?> -
+
- + -
+
-
+
- ID, 'large' ); ?> - -
+ ID, 'large' ); ?> - - - '
' . __( 'Pages:', 'understrap' ), - 'after' => '
', - ) ); - ?> +
-
+ -
+ '
' . __( 'Pages:', 'understrap' ), + 'after' => '
', + ) ); + ?> - +
- +
+ + + +
diff --git a/loop-templates/content-verticalpage.php b/loop-templates/content-verticalpage.php index 2ec44ec5..6b208653 100755 --- a/loop-templates/content-verticalpage.php +++ b/loop-templates/content-verticalpage.php @@ -10,31 +10,31 @@
> -
+
- ', '' ); ?> + ', '' ); ?> -
+
- ID, 'large' ); ?> + ID, 'large' ); ?> -
+
- + - '
' . __( 'Pages:', 'understrap' ), - 'after' => '
', - ) ); - ?> + '
' . __( 'Pages:', 'understrap' ), + 'after' => '
', + ) ); + ?> -
+
-
+
- ', '' ); ?> + ', '' ); ?> -
+
diff --git a/loop-templates/content.php b/loop-templates/content.php index f45242f7..b3d25580 100644 --- a/loop-templates/content.php +++ b/loop-templates/content.php @@ -5,42 +5,42 @@ ?> \ No newline at end of file +
+ + + + '
' . __( 'Pages:', 'understrap' ), + 'after' => '
', + ) ); + ?> + +
+ +
+ + + +
+ + diff --git a/page-templates/blank.php b/page-templates/blank.php index 59959f79..ec1aa515 100644 --- a/page-templates/blank.php +++ b/page-templates/blank.php @@ -7,10 +7,9 @@ * @package understrap */ ?> - > - + @@ -20,13 +19,13 @@ - - - + + + - + - - - + + + diff --git a/page-templates/empty.php b/page-templates/empty.php index 2f70db79..48341800 100644 --- a/page-templates/empty.php +++ b/page-templates/empty.php @@ -7,12 +7,13 @@ * @package understrap */ -get_header(); ?> + get_header(); +?> - + - + - + - \ No newline at end of file + diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php index aae9ba12..75357600 100644 --- a/page-templates/fullwidthpage.php +++ b/page-templates/fullwidthpage.php @@ -7,37 +7,38 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
- -
-
+
- +
- +
- - comments_template(); - - endif; - ?> + - + + + + +
+ +
+ +
-
- -
- -
-
- \ No newline at end of file + diff --git a/page-templates/vertical-one-page.php b/page-templates/vertical-one-page.php index affe81d3..36ede506 100755 --- a/page-templates/vertical-one-page.php +++ b/page-templates/vertical-one-page.php @@ -7,46 +7,46 @@ * @package understrap */ -get_header(); ?> + get_header(); +?> 'page', - 'post__not_in' => array( $exclude ), - 'orderby' => 'menu_order', - 'order' => 'ASC' -); - -$qry = new WP_Query( $args ); + $exclude = get_option( 'page_for_posts' ); + $args = array( + 'post_type' => 'page', + 'post__not_in' => array( $exclude ), + 'orderby' => 'menu_order', + 'order' => 'ASC' + ); + $qry = new WP_Query( $args ); ?>
-
+
-
+
-
+
- have_posts() ): $qry->the_post() ?> -
- -
+ have_posts() ): $qry->the_post() ?> +
+ +
- - + + -
+
-
+
-
+
diff --git a/page.php b/page.php index 86045db3..481e85b3 100644 --- a/page.php +++ b/page.php @@ -10,41 +10,42 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
- -
+
- +
- +
- +
- + -
- -
- - + + + + + + +
+ +
+ + + +
+ +
-
- -
-
diff --git a/search.php b/search.php index 268b6f36..3e494745 100644 --- a/search.php +++ b/search.php @@ -5,57 +5,58 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
- -
+
- +
-
+
-

' . get_search_query() . '' ); ?>

- -
+
- - + - +
- +

' . get_search_query() . '' ); ?>

- +
- + + - + - + -
- -
+ - + + + + + + + + + + + + +
+ +
-
- - - - \ No newline at end of file + diff --git a/searchform.php b/searchform.php index dba81808..84e7db22 100644 --- a/searchform.php +++ b/searchform.php @@ -5,12 +5,13 @@ * @package understrap */ ?> - + + diff --git a/sidebar-footerfull.php b/sidebar-footerfull.php index acfbff7f..144140fd 100644 --- a/sidebar-footerfull.php +++ b/sidebar-footerfull.php @@ -1,11 +1,11 @@ - + - diff --git a/sidebar-hero.php b/sidebar-hero.php index d9559e8d..fc830466 100644 --- a/sidebar-hero.php +++ b/sidebar-hero.php @@ -1,15 +1,15 @@ - + -
+
-
+
- + -
+
-
+
diff --git a/sidebar-statichero.php b/sidebar-statichero.php index 466305ed..a07df9c3 100644 --- a/sidebar-statichero.php +++ b/sidebar-statichero.php @@ -1,11 +1,11 @@ - - -
+ - +
-
+ + +
diff --git a/sidebar.php b/sidebar.php index 0648f4e3..b0c23a7a 100644 --- a/sidebar.php +++ b/sidebar.php @@ -6,12 +6,12 @@ */ if ( ! is_active_sidebar( 'sidebar-1' ) ) { - return; + return; } ?> diff --git a/single.php b/single.php index d552f777..7241fef1 100644 --- a/single.php +++ b/single.php @@ -5,42 +5,43 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
-
- -
- -
+
- +
- +
- +
- - - + -
- -
- - + + + + + + + + +
+ +
+ + + +
+ +
-
- - - diff --git a/woocommerce.php b/woocommerce.php index 90b9134a..92689a5a 100644 --- a/woocommerce.php +++ b/woocommerce.php @@ -10,40 +10,41 @@ * @package understrap */ -get_header(); ?> + get_header(); +?>
- -
- -
- -
- +
- col-md-8col-md-12 content-area"> - woocommerce_content(); +
- } else { + - //For ANY product archive. - //Product taxonomy, product search or /shop landing page etc. - woocommerce_get_template('archive-product.php'); - - } - ?> + + +
+ +
+ + + +
- - -
- - - -
- From 8f973a35256a07b28f6cb6b5e0415b40c69ea9ad Mon Sep 17 00:00:00 2001 From: Max Myers Date: Tue, 1 Nov 2016 11:33:40 -0400 Subject: [PATCH 2/7] Don't include a trailing slash in self-closing elements --- inc/custom-comments.php | 6 +++--- searchform.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/custom-comments.php b/inc/custom-comments.php index a4febc17..f7504d10 100644 --- a/inc/custom-comments.php +++ b/inc/custom-comments.php @@ -10,11 +10,11 @@ $html5 = current_theme_supports( 'html5', 'comment-form' ) ? 1 : 0; $fields = array( 'author' => '
' . ' ' . - '
', + '', 'email' => '', + '', 'url' => '
' . - '
', + '', ); return $fields; } diff --git a/searchform.php b/searchform.php index 84e7db22..1c40bf5f 100644 --- a/searchform.php +++ b/searchform.php @@ -9,9 +9,9 @@ From d0c0cddfc156849202c396b6bfa08d8d24bb78e0 Mon Sep 17 00:00:00 2001 From: Max Myers Date: Tue, 1 Nov 2016 12:13:23 -0400 Subject: [PATCH 3/7] Update HTML attribute order --- 404.php | 6 +- archive.php | 6 +- author.php | 8 +- comments.php | 6 +- footer.php | 6 +- header.php | 6 +- inc/bootstrap-wp-gallery.php | 180 +++++++------- inc/bootstrap-wp-navwalker.php | 313 ++++++++++++------------ inc/custom-comments.php | 2 +- index.php | 6 +- loop-templates/content-none.php | 2 +- loop-templates/content-page.php | 2 +- loop-templates/content-search.php | 2 +- loop-templates/content-single.php | 4 +- loop-templates/content-verticalpage.php | 2 +- loop-templates/content.php | 2 +- page-templates/fullwidthpage.php | 6 +- page-templates/vertical-one-page.php | 6 +- page.php | 6 +- search.php | 4 +- searchform.php | 6 +- sidebar.php | 2 +- single.php | 6 +- woocommerce.php | 4 +- 24 files changed, 296 insertions(+), 297 deletions(-) diff --git a/404.php b/404.php index 0e4fb9e5..1dcaf2fe 100644 --- a/404.php +++ b/404.php @@ -8,13 +8,13 @@ ?>
-
+
-
+
-
+
diff --git a/archive.php b/archive.php index 749fe9b3..17298be9 100644 --- a/archive.php +++ b/archive.php @@ -12,13 +12,13 @@
-
+
-
+
-
+
diff --git a/author.php b/author.php index b00bba9d..c3d38038 100644 --- a/author.php +++ b/author.php @@ -11,13 +11,13 @@
-
+
-
+
-
+
@@ -53,7 +53,7 @@
  • - + , in
    • diff --git a/comments.php b/comments.php index d75a09e9..7559d8f7 100644 --- a/comments.php +++ b/comments.php @@ -18,7 +18,7 @@ if ( post_password_required() ) { } ?> -
    +
    @@ -31,7 +31,7 @@ if ( post_password_required() ) { 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> -