From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 10 Aug 2018 19:00:56 +0000 (-0400)
Subject: Merge tag 'v1.6.92' into develop
X-Git-Tag: v1.6.96^2~10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=60abab1d96b25fb5084733bc2411a1cb782b5b20;p=WP-Plugins%2Fglm-member-db-events.git

Merge tag 'v1.6.92' into develop

Temporarily commented out maps for event detail
---

60abab1d96b25fb5084733bc2411a1cb782b5b20
diff --cc index.php
index f7e3d9c,8d842bf..ecf7a14
--- a/index.php
+++ b/index.php
@@@ -1,12 -1,10 +1,10 @@@
  <?php
  /**
 - * Plugin Name: GLM Members Database Events
 + * Plugin Name: GLM Associate - Events Add-On
   * Plugin URI: http://www.gaslightmedia.com/
-  * Description: Gaslight Media GLM Assoicate Events Database
- 
-  * Version: 1.6.91
- 
-  * Author: Gaslight Media
+  * Description: Gaslight Media Members Database.
+  * Version: 1.6.92
+  * Author: Chuck Scott
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2
   */
diff --cc views/front/events/detail.html
index d8a38ac,05d3aaa..647cd2c
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@@ -20,11 -20,12 +20,12 @@@
                      <img style="margin: 15px;" src="{$mainImgUrl}{$event.image}">
                  </div>
                  {/if}
 -                <div class="small-12 column"><!-- .small-12 .column -->
 -                    <div class="row"><!-- .row #3 -->
 +                <div class="glmgrid-small-12 glmgrid-column"><!-- .glmgrid-small-12 .glmgrid-column -->
 +                    <div class="glmgrid-row"><!-- .glmgrid-row #3 -->
                          {if $event.locations}
 -                            <div class="event-google-map small-10 small-centered medium-5 medium-uncentered columns">
 +                            <div class="event-google-map glmgrid-small-12 glmgrid-medium-5 glmgrid-medium-uncentered glmgrid-columns">
                                  {if $event.locations.lat && $event.locations.address}
+ <!--                                 
                                      <div id="eventDetailMap">
                                          <div id="eventDetail-map" title="Click to enlarge">map...</div>
                                          <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>
@@@ -40,8 -42,9 +42,9 @@@
                              {/if}
                          </div>
                      {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) }
 -                        <div class="small-12 medium-5 columns">
 +                        <div class="glmgrid-small-12 glmgrid-medium-5 glmgrid-columns">
                              {if $event.member.lat}
+ <!--    
                                  <div id="eventDetailMap">
                                      <div id="eventDetail-map" title="Click to enlarge">map...</div>
                                      <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>