From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 16 Oct 2017 16:21:26 +0000 (-0400)
Subject: Hotfix for nev version
X-Git-Tag: v1.6.69^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=405f6edef417386964d0aa8e1f39966e04c04c01;p=WP-Plugins%2Fglm-member-db-events.git

Hotfix for nev version

Update the time output for event profile pages if the date is the same.
---

diff --git a/index.php b/index.php
index 31d7f82..8e3b6df 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
 
- * Version: 1.6.68
+ * Version: 1.6.69
 
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
@@ -22,7 +22,7 @@
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
 
- * @version 1.6.68
+ * @version 1.6.69
 
  */
 
@@ -47,7 +47,7 @@ if (!defined('ABSPATH')) {
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.68');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.69');
 define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.4');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/readme.txt b/readme.txt
index 99cc0cd..bd88b2e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -25,6 +25,17 @@ e.g.
 1. Activate the plugin through the 'Plugins' menu in WordPress
 
 == Changelog ==
+= 1.6.69 =
+* Fix event detail page description output.
+* Fix output if more than one time schedule. Show's date only once if it
+  repeats.
+
+= 1.6.68 =
+* bugfix for timezone offset when importing events from ical feed.
+
+= 1.6.67 =
+* Update the time display for event profile pages.
+
 = 1.6.66 =
 * Adding commonHooks.php for setting up hook for both admin and front.
 * Work for setting up event titles on themes that use titles outside of page
diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index aa6212f..5c9d822 100644
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -35,64 +35,69 @@
                                         <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.locations.name}">
                                         <input type="hidden" id="EventLat" name="EventLat" value="{$event.locations.lat}">
                                         <input type="hidden" id="EventLon" name="EventLon" value="{$event.locations.lon}">
-                                        <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
-                                    </form>
-                                {/if}
-                            </div>
-                        {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) }
-                            <div class="small-12 medium-5 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>
-                                    </div>
-                                    <div id="event-lat" rel="{$event.member.lat}"></div>
-                                    <div id="event-lon" rel="{$event.member.lon}"></div>
-                                    <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
-                                        <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.member.member_name}">
-                                        <input type="hidden" id="EventLat" name="EventLat" value="{$event.member.lat}">
-                                        <input type="hidden" id="EventLon" name="EventLon" value="{$event.member.lon}">
-                                        <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
-                                    </form>
-                                {/if}
-                            </div>
-                        {/if}
-                        <div class="small-12 medium-{if $event.locations || $event.use_member_location.value || $event.other_ref_dest}7{else}12{/if} column">
-                            <div id="glm-event-detail-dates">
-                                {foreach $event.recurrences as $rec}
+                                    <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
+                                </form>
+                            {/if}
+                        </div>
+                    {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) }
+                        <div class="small-12 medium-5 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>
+                                </div>
+                                <div id="event-lat" rel="{$event.member.lat}"></div>
+                                <div id="event-lon" rel="{$event.member.lon}"></div>
+                                <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
+                                    <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.member.member_name}">
+                                    <input type="hidden" id="EventLat" name="EventLat" value="{$event.member.lat}">
+                                    <input type="hidden" id="EventLon" name="EventLon" value="{$event.member.lon}">
+                                    <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
+                                </form>
+                            {/if}
+                        </div>
+                    {/if}
+                    <div class="small-12 medium-{if $event.locations || $event.use_member_location.value || $event.other_ref_dest}7{else}12{/if} column">
+                        <div id="glm-event-detail-dates">
+                            {$lastDate = ''}
+                            {foreach $event.recurrences as $rec}
+
+                                {$eDate = $rec.from_date.timestamp|date_format:"%A, %B %e, %Y"}
+                                {if $eDate != $lastDate}
+                                    {$lastDate = $eDate}
                                     <div class="glm-event-date">
                                         <span class="date-tag"></span>
                                         <span class="glm-date-display">
-
                                     {if $event.recurrences.0.recurring.value == 1} Occurring {/if}
 
-                                    {$rec.from_date.timestamp|date_format:"%A, %B %e, %Y"}
-                                      {if $rec.from_date.date != $rec.to_date.date}
-                                        - {$rec.to_date.timestamp|date_format:"%B %e, %Y"}
-                                       {else if $rec.specific_dates}
-                                        - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}
-                                      {/if}
+                                    {$eDate}
+                                        {if $rec.from_date.date != $rec.to_date.date}
+                                            - {$rec.to_date.timestamp|date_format:"%B %e, %Y"}
+                                        {else if $rec.specific_dates}
+                                            - {$rec.specific_dates|@end|date_format:"%B %e, %Y"}
+                                        {/if}
 
                                         </span>
 
-                                    {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
-                                    <span class="agenda-days-of-week">
-                                        on
-                                        {foreach $rec.day_of_week.names as $day}
-                                        {if $day == "Thursday"}
-                                            <span> {$day|substr:0:4} </span>
-                                         {else}
-                                            <span> {$day|substr:0:3} </span>
-                                         {/if}
-                                         {/foreach}
+                                        {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 }
+                                            <span class="agenda-days-of-week">
+                                            on
+                                            {foreach $rec.day_of_week.names as $day}
+                                                {if $day == "Thursday"}
+                                                    <span> {$day|substr:0:4} </span>
+                                                {else}
+                                                    <span> {$day|substr:0:3} </span>
+                                                 {/if}
+                                             {/foreach}
 
-                                    </span>
-                                    {/if}
+                                            </span>
+                                        {/if}
 
                                     </div>
-                                    <div class="glm-event-times">
+                                {/if}
+                                <div class="glm-event-times">
 
-                                        <span class="time-tag"></span>
+                                    <span class="time-tag"></span>
 
                                     <span>
                                     {if !$event.all_day}
@@ -112,9 +117,9 @@
 
 
 
-                                        {if $expired} <span style="color:red;"> (Expired) </span> {/if}
-                                    </div>
-                                {/foreach}
+                                    {if $expired} <span style="color:red;"> (Expired) </span> {/if}
+                                </div>
+                            {/foreach}
                             </div>
                             {if $event.hide_address.name == 'No'}
                                 {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)}
@@ -178,7 +183,7 @@
                     </div><!-- /.row #3 -->
                 </div><!-- /.small-12 .column -->
                 <div class="small-12 column">
-                    <p>{$event.descr}</p>
+                    {$event.descr}
                 </div>
             </div><!-- /.row #2 -->
         </div><!-- /.small-12 .large-9 .large-centered -->