From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 19 Sep 2019 21:38:29 +0000 (-0400)
Subject: Merge tag 'v1.0.86' into develop
X-Git-Tag: v1.1.0^2~110
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=36680e1372ab27f29b5b091fe18f62fd28bae550;p=WP-Themes%2Fpetoskeyarea.git

Merge tag 'v1.0.86' into develop

v1.0.86
---

36680e1372ab27f29b5b091fe18f62fd28bae550
diff --cc front-page.php
index 9d01659,62a419f..479dcb5
--- a/front-page.php
+++ b/front-page.php
@@@ -18,90 -12,70 +18,89 @@@
                  <?php endif;?>
              </div>
          </div>
 -        <div class="rotate">
 +        <div id="quick-picks" class="rotate frontpage-section">
              <div class="row large-collapse">
 -                <?php
 -                get_template_part('parts/glm-blocks');
 -                ?>
 +                <div class="small-12 columns">
 +                    <h1 class="frontpage-section-title">Quick Picks</h1>
 +                </div>
              </div>
 +            <?php get_template_part('parts/quick-picks'); ?>
          </div>
 -        <div id="event" class="rotate">
 -            <div class="row collapse">
 -                <?php
 -                get_template_part('parts/event-feed');
 -                ?>
 +
 +        <div id="area-towns" class="frontpage-section">
 +            <div class="row fullWidth mapRow" data-equalizer>
 +                    
 +                    <div class="small-12 large-6 columns communities-list-container" data-equalizer-watch>
 +                        <h1 class="communities-title show-for-medium-down">Communities</h1>
 +                        <?php get_template_part( 'parts/communities-list' ); ?>
 +                    </div>
 +                    <div class="small-12 large-6 columns communities-map-container show-for-large-up" data-equalizer-watch>
 +                        <div id="communities-map-container">
 +                            <?php get_template_part( 'parts/area-map' ); ?>
 +                        </div>
 +                    </div>
 +            
              </div>
          </div>
 -        <div style="margin-top: 60px;">
 +
 +        <div id="check-us-out" class="frontpage-section">
              <div class="row collapse">
                  <div class="small-12 columns">
 -                    <h1 class="instagram-feed-title">Photos From Our Visitors</h1>
 +                    <h1 class="frontpage-section-title">Check us out. Then check in</h1>
                  </div>
              </div>
 -	    <script id="cr-init__29e870dd64864bda" src="https://starling.crowdriff.com/js/crowdriff.js" async></script>
 +            <?php get_template_part('parts/checkout-checkin'); ?>
          </div>
 -        <div id="map-blog">
 -            <div class="row">
 -                <div class="small-12 medium-6 text-center columns">
 -                    <h1>Navigate the Area</h1>
  
 -<!--
 -                    <map id="community-map" name="community-map">
 -                        <area shape="poly" coords="135,152,126,136,130,126,138,122,148,124,153,128,155,133,155,141,155,144,158,150,160,152,163,155,165,159,159,161,158,184,149,173,143,171,138,167,135,167,128,167,124,157,134,154" data-id="273" alt="petoskey" nohref="nohref" onclick="get_id(this);"/>
 -                        <area shape="poly" coords="75,164,68,151,63,142,65,134,72,131,83,131,90,133,94,143,93,152,83,159,78,162,82,163,88,163,94,166,103,162,97,160,105,155,118,156,117,159,112,160,111,162,104,163,95,169,88,170,76,167,58,167,48,166,47,161,50,159" data-id="276" alt="bay-harbor" onclick="get_id(this);"  nohref="nohref" />
 -                        <area shape="poly" coords="90,300,90,294,96,292,101,293,104,287,108,282,123,279,129,285,131,292,128,303,120,308,119,311,125,317,131,319,133,325,142,325,144,326,139,330,125,322,123,324,124,331,111,327,110,329,106,331,102,327,99,326,89,328,89,326,86,322,95,320,105,315,103,307,99,301" alt="boyne-city" onclick="get_id(this);" data-id="275" nohref="nohref" />
 -                        <area shape="poly" coords="260,88,261,82,260,73,256,63,256,57,259,49,265,48,276,50,281,53,282,60,281,67,278,71,274,75,276,89" alt="alanson" data-id="983" onclick="get_id(this);" nohref="nohref" />
 -                        <area shape="poly" coords="169,141,178,136,187,126,184,109,167,107,159,113,156,121,162,130,167,135,169,139" alt="bay-view"  onclick="get_id(this);" data-id="985" nohref="nohref" />
 -                        <area shape="poly" coords="115,91,119,91,121,84,113,77,110,69,117,58,127,57,137,60,140,69,140,76,135,83,132,86,135,88,136,93,141,92,137,98,131,96,124,96,121,99,121,102,115,99,110,96,110,94" alt="harbor-springs" data-id="274" nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="poly" coords="168,270,168,262,172,256,178,250,180,244,178,235,172,229,165,229,159,230,152,236,151,244,154,251,161,260,164,262,161,269" data-id="981" alt="walloon-lake"  nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="104,393,225,413" alt="petoskey-link" data-id="273" nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="104,418,272,438" alt="harbor-springs-link" data-id="274" nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="105,441,233,461" alt="boyne-city-link" data-id="275" nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="107,469,236,489" alt="bay-harbor-link" data-id="276" nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="105,493,213,513" data-id="983" alt="alanson"  nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="106,517,218,537" data-id="985" alt="bay-view-link"  nohref="nohref" onclick="get_id(this);" />
 -                        <area shape="rect" coords="101,542,252,560" data-id="981" alt="walloon-lake-link"  nohref="nohref" onclick="get_id(this);" />
 -                        </map>
 -                        <img src="<?php echo get_template_directory_uri();?>/assets/map-fpo.png" usemap="#community-map">
 --->
 +        <div id="frontpage-instagram" class="frontpage-section">
 +            <div class="row collapse">
 +                <div class="small-12 columns">
 +                    <h1 class="instagram-feed-title frontpage-section-title">How our guests see us</h1>
 +                </div>
 +            </div>
- 
-             <script id="cr-init__e47b9df4546453a2" src="https://starling.crowdriff.com/js/crowdriff.js" async></script>
++	        <script id="cr-init__29e870dd64864bda" src="https://starling.crowdriff.com/js/crowdriff.js" async></script>
 +        </div>
  
 -                <?php hm_get_template_part( 'parts/community-map-svg', [ 'community_map_caller' => 'front' ] ); ?>
 +        <div id="event" class="rotate frontpage-section">
 +            <div class="row collapse events-carousel-container">
 +                <div id="glma-events-carousel-header">
 +                    <div id="glma-events-carousel-title">
 +                        <h1>Upcoming events</h1>
 +                    </div>
 +                    <div id="glma-events-carousel-more">
 +                        <div><a href="<?php echo get_permalink(152); ?>">View All Events <span class="arrow"></span></a></div> 
 +                    </div>
 +                </div>
 +                <?php get_template_part('parts/event-feed'); ?>
 +            </div>
 +        </div>
  
 +        <?php // Only show this section if the custom field for it is set on the homepage admin page
 +            if ( function_exists("get_field") && get_field("inside_scoop_video_url") ) {
 +        ?>
 +            <div id="inside-scoop" class="frontpage-section">
 +                <div class="row">
 +                    <div class="small-12 columns">
 +                        <h1 class="frontpage-section-title">The inside scoop</h1>
 +                        <iframe width="560" 
 +                                height="315" 
 +                                src=<?php the_field("inside_scoop_video_url"); ?>
 +                                frameborder="0" 
 +                                allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" 
 +                                allowfullscreen>
 +                        </iframe>
 +                    </div>
                  </div>
 +            </div>
 +        <?php } ?>
  
 -                <?php
 -//                    $json = file_get_contents("https://api.hubapi.com/content/api/v2/blog-posts?hapikey=demo");
 -//                    $data = json_decode($json, TRUE);
 -//                    print_r($data);
 -                ?>
 +        <!-- <div id="map-blog" class="frontpage-section">
 +            <div class="row">
                  <div id="blog-feed" class="small-12 medium-6 columns">
                      <h1>From the Blog</h1>
 -                   <!-- <img src="<?php //echo get_template_directory_uri();?>/assets/blog-image-sample.jpg" />
 -                    <h5>Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper</h5>-->
 -<!--                    <p>Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed. . .<a class="read">More</a></p>-->
 -               <?php get_template_part("parts/hubspot"); ?>
 +                     <?php //get_template_part("parts/hubspot"); ?>
                  </div>
              </div>
 -        </div>
 +        </div> -->
      </div>
 -<?php get_footer(); ?>
 +<?php get_footer(); ?>