From 49d538e777e30e7cf3fa4b9aaca1fbb6dac9029e Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 9 Nov 2016 15:06:00 -0500 Subject: [PATCH] Updating form and detail page. Bring in the correct search form for beerweek using template attr from shortcode. --- models/front/events/detail.php | 25 +++ setup/shortcodes.php | 3 +- views/front/events/beerWeekDetail.html | 173 +++++++++++++++++++++ views/front/events/beerweek.html | 2 +- views/front/events/searchFormBeerweek.html | 72 +++++---- 5 files changed, 236 insertions(+), 39 deletions(-) create mode 100644 views/front/events/beerWeekDetail.html diff --git a/models/front/events/detail.php b/models/front/events/detail.php index 861aea3..6ca9e6b 100644 --- a/models/front/events/detail.php +++ b/models/front/events/detail.php @@ -36,6 +36,14 @@ class GlmMembersFront_events_detail extends GlmMembersFront_events_baseAction $settings = $event = array(); $event = null; $categories = array(); + $amenityId = null; + $amenities = array(); + $memberId = null; + $members = array(); + $venues = array(); + $venueId = null; + $eventDays = array(); + $eventDay = null; $fromDate = null; $toDate = null; $eventId = null; @@ -99,6 +107,12 @@ class GlmMembersFront_events_detail extends GlmMembersFront_events_baseAction ); wp_enqueue_style('jquery-style', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css'); + // get venues only if use_venue_locations is turned on + if ( $this->config['settings']['use_venue_locations'] ) { + $members = $this->getMembers(); + $venues = $this->getVenues(); + $eventDays = $this->getEventDayList(); + } switch ($action) { case 'event-detail': @@ -119,12 +133,23 @@ class GlmMembersFront_events_detail extends GlmMembersFront_events_baseAction $categoryEvents = array(); break; } + if ( isset ( $actionData['request']['template'] ) ) { + $view = $actionData['request']['template']; + } $permalink = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; $title = get_the_title(); // Compile template data $toDate = date('m/d/Y', strtotime( '+ 2 weeks' )); $templateData = array( + 'eventDays' => $eventDays, + 'eventDay' => $eventDay, + 'amenityId' => $amenityId, + 'amenities' => $amenities, + 'memberId' => $memberId, + 'members' => $members, + 'venues' => $venues, + 'venueId' => $venueId, 'assetsUrl' => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/', 'siteBaseUrl' => GLM_MEMBERS_EVENTS_SITE_BASE_URL, 'currentUrl' => $_SERVER['HTTP_REFERER'], diff --git a/setup/shortcodes.php b/setup/shortcodes.php index e48f8a2..d209d5e 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -114,7 +114,8 @@ $glmMembersEventsShortcodes = array( 'action' => 'detail', 'table' => false, 'attributes' => array( - 'id' => false, + 'id' => false, + 'template' => false, ) ), diff --git a/views/front/events/beerWeekDetail.html b/views/front/events/beerWeekDetail.html new file mode 100644 index 0000000..5652e1b --- /dev/null +++ b/views/front/events/beerWeekDetail.html @@ -0,0 +1,173 @@ +
+ Back To Search +
+
+
+ {include file='front/events/searchFormBeerweek.html'} +
+
+
+ {if $event} +
+
+ + Share +
+
+

{$event.name}

+
+ {if $event.image} +
+ +
+ {/if} +
+
+ {if $event.locations} +
+ {if $event.locations.lat} +
+
map...
+
Loading...
+
+
+
+
+ + + + +
+ {/if} +
+ {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) } +
+ {if $event.member.lat} +
+
map...
+
Loading...
+
+
+
+
+ + + + +
+ {/if} +
+ {/if} +
+
+
{$event.dates}{if $expired} (Expired){/if}
+ {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.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} {$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 $event.member.phone} {$event.member.phone} {/if} +
+ {/if} + {/if} + {if $event.cost && !$event.free.value} +
Cost: {$event.cost}
+ {/if} + {if $event.free.value} +
Cost: FREE
+ {/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: {$event.contact_phone}
{/if} + {if $event.file1} + + {/if} + {if $event.file2} + + {/if} + {if $event.file3} + + {/if} +
+
+ + {if !empty($event.amenities)} + {$settings.term_event_amenities_plural}: + {foreach from=$event.amenities key=key item=beer name=array} + {$beer.name} {if not $smarty.foreach.array.last} , {/if} + {/foreach} + {/if} + +
+
+ + {if !empty($event.categories)} + Event Type: + {foreach from=$event.categories key=key item=type name=array} + {$type.name} {if not $smarty.foreach.array.last} , {/if} + {/foreach} + {/if} + +
+
+ + + {if $event.use_member_location.value === '1'} + Event Venue: {$event.ref_dest} + {else if $event.other_ref_dest} + Event Venue: {$event.other_ref_dest} + {/if} + +
+
+
+
+
+

{$event.descr|nl2br}

+
+
+
+
+ {else} +
Sorry, No results.
+ {/if} +
+ + diff --git a/views/front/events/beerweek.html b/views/front/events/beerweek.html index 459563a..c7590e1 100644 --- a/views/front/events/beerweek.html +++ b/views/front/events/beerweek.html @@ -70,7 +70,7 @@
{if !empty($event.categories)} - Event Types: + Event Type: {foreach from=$event.categories key=key item=type name=array} {$type.name} {if not $smarty.foreach.array.last} , {/if} {/foreach} diff --git a/views/front/events/searchFormBeerweek.html b/views/front/events/searchFormBeerweek.html index 185500b..20e1414 100644 --- a/views/front/events/searchFormBeerweek.html +++ b/views/front/events/searchFormBeerweek.html @@ -7,37 +7,28 @@
-
- + {if $settings.use_venue_locations} +
+ + +
+ {/if} +
+
- {if $settings.use_event_amenities} -
- - -
- {/if} {if $settings.use_venue_locations} -
- - -
-
+
{/if} -
-
- {if $settings.use_venue_locations} -
- - +
+
+
+ From +
+
+ +
+
- {/if} -
+
+
+
+ To +
+
+ +
+
+
+
{if !$eventId} -- 2.17.1