From 5b36c29a32ad0609520cb73933c13ae9590ae620 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 30 Aug 2017 13:13:47 -0400
Subject: [PATCH] Update the event detail page urls in the templates.

This is to allow the pageslug attribute to work with these templates.
---
 index.php                                 | 6 +++---
 views/front/events/eventsFeed.html        | 6 +++---
 views/front/events/eventsFrontPage.html   | 8 ++++----
 views/front/events/eventsHomeCurrent.html | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index 26b284d..2a75074 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.59
+ * Version: 1.6.60
 
  * 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.59
+ * @version 1.6.60
 
  */
 
@@ -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.59');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.60');
 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/views/front/events/eventsFeed.html b/views/front/events/eventsFeed.html
index 3f4b879..c2bb0bb 100644
--- a/views/front/events/eventsFeed.html
+++ b/views/front/events/eventsFeed.html
@@ -9,11 +9,11 @@
     <div id="feed" class="row collapse">
         {foreach $events as $event}
         <div class="small-12 text-left medium-6 large-4 columns">
-            <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/"><img src="{$mainImgUrl}{$event.image}"></a>
-            <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/"><h6>{$event.name}</h6></a>
+            <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}"></a>
+            <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}"><h6>{$event.name}</h6></a>
             <hr>
             <span>{$event.starting_timestamp|date_format:"%b %e"}</span>
-            <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/" class="read">More</a>
+            <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}" class="read">More</a>
         </div>
         {/foreach}
     </div>
diff --git a/views/front/events/eventsFrontPage.html b/views/front/events/eventsFrontPage.html
index 8f00c3f..8ff6698 100644
--- a/views/front/events/eventsFrontPage.html
+++ b/views/front/events/eventsFrontPage.html
@@ -1,4 +1,4 @@
-<div id="glm-events-frontpage-wrapper"> 
+<div id="glm-events-frontpage-wrapper">
     {foreach $eventsByDate as $date => $key}
         <div class="glm-events-frontpage-day">
             {$date|date_format:"%B %e"}
@@ -7,14 +7,14 @@
         {foreach $key as $events}
             {foreach $events as $event}
             <div class="glm-events-frontpage-event-container">
-                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?glm_event_from={$fromDate|unescape:"html"}">
+                <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?{else}?eventId={$event.id}&{/if}glm_event_from={$fromDate|unescape:"html"}">
                    {if $event.image}
-                    <div class="glm-events-frontpage-event-image" 
+                    <div class="glm-events-frontpage-event-image"
                         {if $event.image}style="background: url('{$imgUrl}{$event.image}') bottom center no-repeat;background-size: cover;"{/if}>
                     </div>
                     {/if}
                 </a>
-                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/?glm_event_from={$fromDate|unescape:"html"}">
+                <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/?{else}?eventId={$event.id}&{/if}glm_event_from={$fromDate|unescape:"html"}">
                     <div class="{if !$event.image}sidebar-full-width{/if} glm-events-frontpage-event-title">
                         {$event.name}
                     </div>
diff --git a/views/front/events/eventsHomeCurrent.html b/views/front/events/eventsHomeCurrent.html
index 0f78b2f..5d7efe1 100644
--- a/views/front/events/eventsHomeCurrent.html
+++ b/views/front/events/eventsHomeCurrent.html
@@ -12,7 +12,7 @@
             {/if}
                 <p class="post-date">{$event.dates}</p>
                 <p>{$event.intro}</p>
-                <a href="{$siteBaseUrl}event-detail/{$event.name_slug}/">find out more...</a>
+                <a href="{$siteBaseUrl}{$pageSlug}/{if !$customPage}{$event.name_slug}/{else}?eventId={$event.id}{/if}">find out more...</a>
             </div>
         </div>
     {/foreach}
-- 
2.17.1