From: Laury GvR Date: Fri, 15 Feb 2019 21:58:47 +0000 (-0500) Subject: County buttons on child pages, county+children same template X-Git-Tag: v1.0.0^2~84 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=587393b56712dbe38d13e9884682186d9396501c;p=WP-Themes%2Fuptravel.git County buttons on child pages, county+children same template - County landing page template is not county page template, and is used by both county landing pages and all its children. - New county buttons added to child pages - buttons partial is called before the template check - New checks for Gallery and Business county child pages - County events now make use of the new members_region_id custom field - County id custom field renamed to members_county_id --- diff --git a/county-page-template.php b/county-page-template.php index e69de29..e8b972e 100644 --- a/county-page-template.php +++ b/county-page-template.php @@ -0,0 +1,5 @@ + - - -ID), 'Water') !== false ){ - $memberCategory = '25'; // L: 3, dev70: 25 - } else if(strpos(get_the_title($post->ID), 'Light') !== false ){ - $memberCategory = '21'; // L: 4, ddev70: 21 - } else { - } -} ?> - - - -
-
+ +
+
- - - - - - - - - - - + + + "> <?php echo $icon; ?> - - + +
-
\ No newline at end of file + \ No newline at end of file diff --git a/scss/_countyLanding.scss b/scss/_countyLanding.scss index 18c1764..c05c92c 100644 --- a/scss/_countyLanding.scss +++ b/scss/_countyLanding.scss @@ -10,7 +10,7 @@ .county-landing-page-content-container{ margin-top: 50px; } -.county-landing-members{ +.county-landing-section{ clear: both; } .county-buttons-container { @@ -21,6 +21,7 @@ } #county-buttons-desktop{ background:#65C6F4; + clear: both; } .county-buttons { margin: 20px auto; diff --git a/scss/_main.scss b/scss/_main.scss index 832027c..59da4ec 100644 --- a/scss/_main.scss +++ b/scss/_main.scss @@ -167,8 +167,14 @@ body .cr__load-more-container.cr__clearfix{ } } // Start County Template Styles -#counties-map { +#county-map { text-align: center; + #glm-member-db-front-container { + padding: 0; + } + #glm-member-list-filters-wrapper { + text-align: left; + } } .image-strip{ diff --git a/scss/_page.header.scss b/scss/_page.header.scss index ac211c2..6ec8cf0 100644 --- a/scss/_page.header.scss +++ b/scss/_page.header.scss @@ -311,7 +311,7 @@ body{ } } } - #header-featured{ + main:not(.county-page-template) #header-featured{ position: relative; margin-bottom: 1.25em; #featured-image-content{ diff --git a/sections/county-landing-page.php b/sections/county-landing-page.php deleted file mode 100644 index 2956f40..0000000 --- a/sections/county-landing-page.php +++ /dev/null @@ -1,51 +0,0 @@ -
- -
- - -
-
- - -
- ID); ?> -
-
Show More
- - -
-
- - - - - -
-
-
-
- - -
- - -
-
- -
-
\ No newline at end of file diff --git a/sections/county-page.php b/sections/county-page.php new file mode 100644 index 0000000..7c8dec4 --- /dev/null +++ b/sections/county-page.php @@ -0,0 +1,79 @@ + + +
+
+
+ ID); ?> +
+
Show More
+
+
+ +
+
+ ID); ?> +
+
+ + + + + +
+
+
+
+ +
+ + +
+
+
+
+ +
+ + +
+
+ + + +
+ +
+
+ ID); ?> +
+
+ +
+ + +
+ + + + +
+
+ +
+
+ \ No newline at end of file diff --git a/sections/interior-page.php b/sections/interior-page.php index fff5282..b1d3133 100644 --- a/sections/interior-page.php +++ b/sections/interior-page.php @@ -6,32 +6,39 @@ ?>
- ID), 'Water') !== false ){ - $memberCategory = '25'; // L: 3, dev70: 25 - } else if(strpos(get_the_title($post->ID), 'Light') !== false ){ - $memberCategory = '21'; // L: 4, dev70: 21 - } else { + if ( strpos( get_the_title( $post->ID ), 'Water' ) !== false ) { + $membersCategory = '3'; // L: 3, dev70: 25 + $showHeaderMap = true; + } else if ( strpos( get_the_title( $post->ID ), 'Light' ) !== false ) { + $membersCategory = '4'; // L: 4, dev70: 21 + $showHeaderMap = true; + } else if ( strpos( get_the_title( $post->ID ), 'Business' ) !== false ) { + $membersCategory = true; + $showHeaderMap = true; + } else if ( strpos( get_the_title( $post->ID ), 'Galler' ) !== false ) { + $membersCategory = NULL; + $showHeaderMap = false; } } ?> @@ -52,10 +59,10 @@
ID); ?>
- -
+ +
@@ -65,10 +72,18 @@
+ +
+ +
+
+
+ +
@@ -86,9 +101,6 @@
-
- -
@@ -107,8 +119,8 @@
- - + + @@ -122,10 +134,10 @@
- +
- +
diff --git a/sidebar.php b/sidebar.php index 513064a..8fa2c83 100644 --- a/sidebar.php +++ b/sidebar.php @@ -1,82 +1,73 @@