From 48c54bba478c0b90db954df51ed734b544b3966b Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 29 Aug 2018 16:43:49 -0400 Subject: [PATCH] Created new viewfiles for glmgrid - removed malfunctioning glmgrid markup from viewfiles used on live sites --- index.php | 6 +- views/front/events/agenda.html | 18 +- views/front/events/confirmation.html | 4 +- views/front/events/detail.html | 38 +- views/front/events/eventsHomeCurrent.html | 6 +- views/front/events/glmgrid-agenda.html | 376 ++++++++++++++++++ views/front/events/glmgrid-confirmation.html | 16 + views/front/events/glmgrid-detail.html | 274 +++++++++++++ .../events/glmgrid-eventsHomeCurrent.html | 19 + .../events/glmgrid-listForMemberDetail.html | 46 +++ views/front/events/glmgrid-searchForm.html | 100 +++++ views/front/events/listForMemberDetail.html | 10 +- views/front/events/searchForm.html | 44 +- 13 files changed, 894 insertions(+), 63 deletions(-) create mode 100644 views/front/events/glmgrid-agenda.html create mode 100644 views/front/events/glmgrid-confirmation.html create mode 100755 views/front/events/glmgrid-detail.html create mode 100644 views/front/events/glmgrid-eventsHomeCurrent.html create mode 100644 views/front/events/glmgrid-listForMemberDetail.html create mode 100644 views/front/events/glmgrid-searchForm.html diff --git a/index.php b/index.php index c06c9a0..8846c90 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Associate - Events Add-On * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.6.97 + * Version: 1.6.98 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -19,7 +19,7 @@ * @package glmMembersDatabaseEventsAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.6.97 + * @version 1.6.98 */ // Check that we're being called by WordPress. @@ -43,7 +43,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.97'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.98'); define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.6'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index a4dabd0..d01533d 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -1,13 +1,13 @@
-
+
{include file='front/events/searchForm.html'}
-
-
+
+
{foreach $eventsByDate as $date => $key} -
-
+
+
{$date|date_format:"%b"}
@@ -16,12 +16,12 @@
-
+
{foreach $key as $events} {foreach $events as $event} {$showTime = true} -
-
+
+

{$event.name}

{$eventDateTime = $event.starting_date|date_format:"%I:%M %P"} {foreach $event.recurrences as $rec} @@ -297,7 +297,7 @@ if(view === "calendar"){ eventsCalMonthAJAX(month_obj); - main_content.removeClass("glmgrid-small-8").addClass("glmgrid-small-12"); + main_content.removeClass("small-8").addClass("small-12"); calendar.show(); view_select.val('calendar'); diff --git a/views/front/events/confirmation.html b/views/front/events/confirmation.html index 28fb342..8abda08 100644 --- a/views/front/events/confirmation.html +++ b/views/front/events/confirmation.html @@ -1,7 +1,7 @@ -
-
+
+

Processing Form....

diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 99a2911..34da7ef 100755 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -1,29 +1,29 @@
Back To Search -
-
-
+
+
+
{include file='front/events/searchForm.html'}
{if $event} -
-
+
+
+ Share -
-
+
+

{$event.name}

{if $event.image} -
+
{/if} -
-
+
+
{if $event.locations} -
+
{if $event.locations.lat && $event.locations.address}
map...
@@ -40,7 +40,7 @@ {/if}
{elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) } -
+
{if $event.member.lat}
map...
@@ -57,7 +57,7 @@ {/if}
{/if} -
+
{$lastDate = ''} {foreach $event.recurrences as $rec} @@ -177,14 +177,14 @@ {/if}
-
-
-
+
+
+
{$event.descr}
-
-
-
+
+
+
{else}
Sorry, No results.
{/if} diff --git a/views/front/events/eventsHomeCurrent.html b/views/front/events/eventsHomeCurrent.html index fe4933f..c4050a7 100644 --- a/views/front/events/eventsHomeCurrent.html +++ b/views/front/events/eventsHomeCurrent.html @@ -3,12 +3,12 @@
{$event.name}
{if $event.image} -
+
-
+
{else} -
+
{/if}

{$event.dates}

{$event.intro}

diff --git a/views/front/events/glmgrid-agenda.html b/views/front/events/glmgrid-agenda.html new file mode 100644 index 0000000..a4dabd0 --- /dev/null +++ b/views/front/events/glmgrid-agenda.html @@ -0,0 +1,376 @@ +
+
+ {include file='front/events/searchForm.html'} +
+ +
+
+ {foreach $eventsByDate as $date => $key} +
+
+
+
{$date|date_format:"%b"}
+
+ {$date|date_format:"%e"} + {$date|date_format:"%a"} +
+
+
+
+ {foreach $key as $events} + {foreach $events as $event} + {$showTime = true} +
+
+

{$event.name}

+ {$eventDateTime = $event.starting_date|date_format:"%I:%M %P"} + {foreach $event.recurrences as $rec} + {$start_time = $rec.start_time.time} + {if $start_time == $eventDateTime} + {if ($rec.from_date.timestamp == $rec.to_date.timestamp && $rec.from_date.timestamp == $date) + or ($date <= $rec.to_date.timestamp && $date >= $rec.from_date.timestamp )} +
+ {if !$event.all_day} + {$showTime = false} + {$event_start_time = $event.starting_date|date_format:"%m/%d/%Y"} + {$event_start_time = $event_start_time|cat:' '} + {$event_start_time = $event_start_time|cat:$rec.start_time.time} + {$event_end_time = $event.starting_date|date_format:"%m/%d/%Y"} + {$event_end_time = $event_end_time|cat:' '} + {$event_end_time = $event_end_time|cat:$rec.end_time.time} + {if $event_start_time|date_format:"%l:%M %P" == $event_end_time|date_format:"%l:%M %P"} + {$event_start_time|date_format:"%l:%M %P"} + {else} + {$event_start_time|date_format:"%l:%M %P"} - {$event_end_time|date_format:"%l:%M %P"} + {/if} + + {/if} + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} + ( {if $event.times|@count > 1} Occurring {/if} + {$rec.from_date.date} + {if $rec.from_date.date != $rec.to_date.date} + - {$rec.to_date.date} + {else if $rec.specific_dates} + - {$rec.specific_dates|@end|date_format:"%m/%d/%Y"} + {/if} + + + {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 } + + on + {foreach $rec.day_of_week.names as $day} + {if $day == "Thursday"} + {$day|substr:0:4} + {else} + {$day|substr:0:3} + {/if} + {/foreach} + + + {/if} + ) +
+ {/if} + {/if} + {/foreach} +
+ {if !$event.all_day && $showTime} + {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} +
{$event.starting_date|date_format:"%l:%M %P"}
+ {else} +
{$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
+ {/if} + {/if} +
+
+ {if $event.image}{/if} + {$event.intro} +
+ Read More +
+
+
+
+ {/foreach} + {/foreach} +
+
+ {/foreach} + +
+
+ {assign var="current_year" value=$smarty.now|date_format:"%Y"} + {assign var="current_month" value=$smarty.now|date_format:"%m"} +
+
+ +
+
+
+
+
+
+ + + + diff --git a/views/front/events/glmgrid-confirmation.html b/views/front/events/glmgrid-confirmation.html new file mode 100644 index 0000000..28fb342 --- /dev/null +++ b/views/front/events/glmgrid-confirmation.html @@ -0,0 +1,16 @@ + + +
+
+

Processing Form....

+
+
+ + + + diff --git a/views/front/events/glmgrid-detail.html b/views/front/events/glmgrid-detail.html new file mode 100755 index 0000000..99a2911 --- /dev/null +++ b/views/front/events/glmgrid-detail.html @@ -0,0 +1,274 @@ +
+ Back To Search +
+
+
+ {include file='front/events/searchForm.html'} +
+
+
+ {if $event} +
+
+ + Share +
+
+

{$event.name}

+
+ {if $event.image} +
+ +
+ {/if} +
+
+ {if $event.locations} +
+ {if $event.locations.lat && $event.locations.address} +
+
map...
+
Loading...
+
+
+
+
+ + + + +
+ {/if} +
+ {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) } +
+ {if $event.member.lat} +
+
map...
+
Loading...
+
+
+
+
+ + + + +
+ {/if} +
+ {/if} +
+
+ {$lastDate = ''} + {foreach $event.recurrences as $rec} + + {$eDate = $rec.from_date.timestamp|date_format:"%A, %B %e, %Y"} + {if $eDate != $lastDate} + {$lastDate = $eDate} +
+ + + {if $event.recurrences.0.recurring.value == 1} Occurring {/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} + + + + {if $rec.day_of_week.names|@count < 7 && $rec.day_of_week.names|@count > 0 } + + on + {foreach $rec.day_of_week.names as $day} + {if $day == "Thursday"} + {$day|substr:0:4} + {else} + {$day|substr:0:3} + {/if} + {/foreach} + + + {/if} + +
+ {/if} + {if !$event.all_day} +
+ + + {if $rec.start_time.time == $rec.end_time.time || $rec.start_time_only.value} + {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} + {else} + {$rec.start_time.time|strtotime|date_format:"%l:%M %P"} - {$rec.end_time.time|strtotime|date_format:"%l:%M %P"} + {/if} + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} + {if $expired} (Expired) {/if} + +
+ {else} + {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } + {$rec.name} + {/if} + + {if $expired} (Expired) {/if} + {/if} + {/foreach} +
+ {if $event.hide_address.name == 'No'} + {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)} +
+ {if $event.locations.name}{$event.locations.name}
{/if} + {if $event.locations.address} {$event.locations.address}
{/if} + {if $event.locations.city.name}{$event.locations.city.name}{/if}{if $event.locations.state.value}, {$event.locations.state.value} {/if} + {if $event.locations.zip} {$event.locations.zip} {/if} + {if $event.locations.phone} {apply_filters('glm_associate_phone_filter', $event.locations.phone)} {/if} +
+ {elseif $event.use_member_location.value || $event.other_ref_dest} +
+ {if $event.member.member} {$event.member.member}
{/if} + {if $event.member.addr1} {$event.member.addr1}
{/if} + {if $event.member.city}{$event.member.city}{/if}{if $event.member.state.value}, {$event.member.state.value}{/if} + {if $event.member.zip} {$event.member.zip} {/if} +
+ {/if} + {/if} + {if $event.cost && !$event.free.value} +
Cost: {$event.cost}
+ {/if} + {if $event.free.value} +
Cost: FREE
+ {/if} + {if $event.ticket_url} + + {/if} + {if $event.registration_url} + + {/if} + +
Contact & More Info
+ {if $event.url}{$event.url}
{/if} + {if $event.contact_name}Contact: {$event.contact_name}
{/if} + {if $event.contact_email}Email: {$event.contact_email}
{/if} + {if $event.contact_phone} + + Phone: + {apply_filters('glm_associate_phone_filter', $event.contact_phone)} +
+ {/if} + {if $event.file1} + + {/if} + {if $event.file2} + + {/if} + {if $event.file3} + + {/if} +
+
+
+
+
+ {$event.descr} +
+
+
+
+ {else} +
Sorry, No results.
+ {/if} +
+ + diff --git a/views/front/events/glmgrid-eventsHomeCurrent.html b/views/front/events/glmgrid-eventsHomeCurrent.html new file mode 100644 index 0000000..fe4933f --- /dev/null +++ b/views/front/events/glmgrid-eventsHomeCurrent.html @@ -0,0 +1,19 @@ +{if $events} + {foreach $events as $event} +
+
{$event.name}
+ {if $event.image} +
+ +
+
+ {else} +
+ {/if} +

{$event.dates}

+

{$event.intro}

+ find out more... +
+
+ {/foreach} +{/if} diff --git a/views/front/events/glmgrid-listForMemberDetail.html b/views/front/events/glmgrid-listForMemberDetail.html new file mode 100644 index 0000000..8776a02 --- /dev/null +++ b/views/front/events/glmgrid-listForMemberDetail.html @@ -0,0 +1,46 @@ +{if $settings.detail_show_events && $eventsByDate} +
Events
+
+ +
+ {foreach $eventsByDate as $date => $key} +
+
+
+
{$date|date_format:"%b"}
+
+ {$date|date_format:"%e"} + {$date|date_format:"%a"} +
+
+
+
+ {foreach $key as $events} + {foreach $events as $event} +
+
+

{$event.name}

+ {if !$event.all_day} + {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} + {$event.starting_date|date_format:"%l:%M %P"} + {else} + {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"} + {/if} + {/if} +
+ {if $event.image}{/if} + {$event.intro} +
+ Read More +
+
+
+
+ {/foreach} + {/foreach} +
+
+ {/foreach} +
+
+{/if} diff --git a/views/front/events/glmgrid-searchForm.html b/views/front/events/glmgrid-searchForm.html new file mode 100644 index 0000000..04cbf6f --- /dev/null +++ b/views/front/events/glmgrid-searchForm.html @@ -0,0 +1,100 @@ + +{if !$eventId} +
+

Find An Event

+
+ +
+
+ + +
+ +
+ Add an Event +
+
+
+
+
+
+
+
+ +
+{else} + +
+ {if !$eventId} + + {else} + {/if} + + + + + + +
+{/if} +
+ +
+ diff --git a/views/front/events/listForMemberDetail.html b/views/front/events/listForMemberDetail.html index 8776a02..d0cff62 100644 --- a/views/front/events/listForMemberDetail.html +++ b/views/front/events/listForMemberDetail.html @@ -4,8 +4,8 @@
{foreach $eventsByDate as $date => $key} -
-
+
+
{$date|date_format:"%b"}
@@ -14,11 +14,11 @@
-
+
{foreach $key as $events} {foreach $events as $event} -
-
+
+

{$event.name}

{if !$event.all_day} {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html index 04cbf6f..9d76c3d 100644 --- a/views/front/events/searchForm.html +++ b/views/front/events/searchForm.html @@ -2,22 +2,22 @@ var ajaxUrl = '{$ajaxUrl}'; {if !$eventId} -
+

Find An Event

-
-
+
+
-
+
Add an Event
-
-
+
+
@@ -25,28 +25,28 @@ -
-
-
-
- From +
+
+
+
+ From
-
+
-
-
-
- To +
+
+
+ To
-
+
-
+
-
+
{if !$eventId} {else} @@ -71,8 +71,8 @@
{else} - -
+ +
{if !$eventId} {else} @@ -85,7 +85,7 @@
{/if} -
+