Updating form and detail page.

Bring in the correct search form for beerweek using template attr from
shortcode.

diff --git a/models/front/events/detail.php b/models/front/events/detail.php
index 861aea3..6ca9e6b 100644 (file)
--- 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 (file)
--- 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 (file)
index 0000000..5652e1b
--- /dev/null
+++ b/views/front/events/beerWeekDetail.html
@@ -0,0 +1,173 @@
+<div id="glm-event-wrapper" class="event-detail text-left"><!-- #glm-event-wrapper -->
+    <a id="glm-event-detail-takeback-mini" class="glm-member-db-takeback-mini button glm-member-button" href="javascript:history.go(-1)"><span>Back To Search</span></a>
+    <div class="row">
+        <div class="small-12 large-8 small-centered column detail-search-form">
+            <div class="row">
+                {include file='front/events/searchFormBeerweek.html'}
+            </div>
+        </div>
+    </div>
+    {if $event}
+    <div class="row collapse"><!-- .row #1 -->
+        <div class="small-12 large-9 large-centered column"><!-- .small-12 .large-9 .large-centered .columns -->
+            <span id="eventShare" class="st_sharethis" st_title="{$event.name}" st_url="{$permalink}">+ Share</span>
+            <div class="row"><!-- .row #2 -->
+                <div class="small-12 column eventTitle">
+                    <h1>{$event.name}</h1>
+                </div>
+                {if $event.image}
+                <div class="small-12 column">
+                    <img style="margin: 15px;" src="{$mainImgUrl}{$event.image}">
+                </div>
+                {/if}
+                <div class="small-12 column"><!-- .small-12 .column -->
+                    <div class="row"><!-- .row #3 -->
+                        {if $event.locations}
+                            <div class="small-10 small-centered medium-5 medium-uncentered columns">
+                                {if $event.locations.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.locations.lat}"></div>
+                                    <div id="event-lon" rel="{$event.locations.lon}"></div>
+                                    <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
+                                        <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">
+                                <div><strong>{$event.dates}</strong>{if $expired} <span style="color:red;">(Expired)</span>{/if}</div>
+                                {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}
+                            </div>
+                            {if $event.hide_address.name == 'No'}
+                                {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)}
+                                    <div id="glm-event-detail-location">
+                                    {if $event.locations.name}{$event.locations.name}<br>{/if}
+                                    {if $event.locations.address} {$event.locations.address}<br> {/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}
+                                    </div>
+                                {elseif $event.use_member_location.value || $event.other_ref_dest}
+                                    <div id="glm-event-detail-location">
+                                    {if $event.member.member} {$event.member.member}<br> {/if}
+                                    {if $event.member.addr1} {$event.member.addr1}<br> {/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}
+                                    </div>
+                                {/if}
+                            {/if}
+                            {if $event.cost && !$event.free.value}
+                            <div id="glm-event-detail-cost"><strong>Cost: </strong>{$event.cost}</div>
+                            {/if}
+                            {if $event.free.value}
+                            <div id="glm-event-detail-cost"><strong>Cost: </strong>FREE</div>
+                            {/if}
+
+                            <div id="glm-event-detail-contact"><strong>Contact & More Info</strong><br>
+                                {if $event.url}<a href="{$event.url}" target="_blank">{$event.url}</a><br>{/if}
+                                {if $event.contact_name}Contact: {$event.contact_name}<br>{/if}
+                                {if $event.contact_email}Email: <a href="mailto: {$event.contact_email}">{$event.contact_email}</a><br>{/if}
+                                {if $event.contact_phone}<span class="glm-event-detail-contact-phone"><span class="glm-field-title">Phone: </span><span class="glm-field-value">{$event.contact_phone}</span></span><br>{/if}
+                                {if $event.file1}
+                                <div>File:
+                                    <a href="{$filePathUrl}{$event.file1}">{if $event.file1_descr}{$event.file1_descr}{else}{$event.file1}{/if}</a>
+                                </div>
+                            {/if}
+                            {if $event.file2}
+                                <div>File 2:
+                                    <a href="{$filePathUrl}{$event.file2}">{if $event.file2_descr}{$event.file2_descr}{else}{$event.file2}{/if}</a>
+                                </div>
+                            {/if}
+                            {if $event.file3}
+                                <div>File 3:
+                                    <a href="{$filePathUrl}{$event.file3}">{if $event.file3_descr}{$event.file3_descr}{else}{$event.file3}{/if}</a>
+                                </div>
+                            {/if}
+                            </div>
+                            <div class="beer-types-container">
+                                <span class="beer-types-agenda">
+                                    {if !empty($event.amenities)}
+                                        <span class="agenda-label"> {$settings.term_event_amenities_plural}: </span>
+                                       {foreach from=$event.amenities key=key item=beer name=array}
+                                            {$beer.name} {if not $smarty.foreach.array.last} , {/if}
+                                       {/foreach}
+                                   {/if}
+                                </span>
+                            </div>
+                            <div class="event-types-container">
+                                <span class="event-types-agenda">
+                                    {if !empty($event.categories)}
+                                        <span class="agenda-label"> Event Type: </span>
+                                       {foreach from=$event.categories key=key item=type name=array}
+                                           {$type.name} {if not $smarty.foreach.array.last} , {/if}
+                                       {/foreach}
+                                   {/if}
+                                </span>
+                            </div>
+                            <div class="event-location-container">
+                                <span class="event-location-agenda">
+
+                                    {if $event.use_member_location.value === '1'}
+                                    <span class="agenda-label">  Event Venue: </span> {$event.ref_dest}
+                                    {else if $event.other_ref_dest}
+                                        <span class="agenda-label">  Event Venue: </span>  {$event.other_ref_dest}
+                                    {/if}
+                                </span>
+                            </div>
+                        </div>
+                    </div><!-- /.row #3 -->
+                </div><!-- /.small-12 .column -->
+                <div class="small-12 column">
+                    <p>{$event.descr|nl2br}</p>
+                </div>
+            </div><!-- /.row #2 -->
+        </div><!-- /.small-12 .large-9 .large-centered -->
+    </div><!-- /.row .collapse #1 -->
+    {else}
+    <div>Sorry, No results.</div>
+    {/if}
+</div><!-- /#glm-event-wrapper -->
+<script type="text/javascript">
+    jQuery(document).ready( function ($){
+        var view_select = $("#glm-event-view-select");
+        view_select.hide();
+
+        // Replace the phone separation character with whatever is set in the management
+        {if $settings.phone_infix}
+            var processedPhone = $('.glm-event-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}');
+            $('.glm-event-detail-contact-phone .glm-field-value').text(processedPhone);
+        {/if}
+    });
+</script>
+

diff --git a/views/front/events/beerweek.html b/views/front/events/beerweek.html
index 459563a..c7590e1 100644 (file)
--- a/views/front/events/beerweek.html
+++ b/views/front/events/beerweek.html
@@ -70,7 +70,7 @@
                                         <div class="event-types-container">
                                             <span class="event-types-agenda">
                                                 {if !empty($event.categories)}
-                                                    <span class="agenda-label"> Event Types: </span>
+                                                    <span class="agenda-label"> Event Type: </span>
                                                    {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 (file)
--- a/views/front/events/searchFormBeerweek.html
+++ b/views/front/events/searchFormBeerweek.html
@@ -7,37 +7,28 @@
         <input type="hidden" name="search" value="1">
          <input type="hidden" name="override_default" value="yes">
         <div class="row">
-            <div class="small-6 medium-3 column">
-                <label class="event-types-label">Event Types</label>
+            {if $settings.use_venue_locations}
+            <div class="small-6 medium-4 column">
+                <label class="brewery-label">Events By Day</label>
+                <select id="glmEventDay" name="event_day">
+                    <option>-- Choose Day --</option>
+                    {foreach $eventDays as $day}
+                    <option value="{$day.event_date|date_format:"%m/%d/%Y"}"{if $eventDay == $day.event_date|date_format:"%m/%d/%Y"} selected{/if}>{$day.event_date|date_format:"%A, %b %e, %Y"}</option>
+                    {/foreach}
+                </select>
+            </div>
+            {/if}
+            <div class="small-6 medium-4 column">
+                <label class="event-types-label">Event Type</label>
                 <select id="glm-event-type" name="category">
-                    <option value="">-- All Event Types --</option>
+                    <option value="">-- All Event Type --</option>
                     {foreach $categories as $cat}
                     <option value="{$cat.id}"{if $categoryId == $cat.id} selected{/if}>{$cat.name}</option>
                     {/foreach}
                 </select>
             </div>
-            {if $settings.use_event_amenities}
-                <div class="small-6 medium-3 column">
-                    <label class="beer-types-label">{$settings.term_event_amenities_plural}</label>
-                    <select id="glm-event-beer-type" name="amenity">
-                        <option value="">-- All {$settings.term_event_amenities_plural} --</option>
-                        {foreach $amenities as $amm}
-                        <option value="{$amm.id}"{if $amenityId == $amm.id} selected{/if}>{$amm.name}</option>
-                        {/foreach}
-                    </select>
-                </div>
-            {/if}
             {if $settings.use_venue_locations}
-                <div class="small-6 medium-3 column">
-                    <label class="venues-label">Venues</label>
-                    <select id="glm-event-venue" name="venue">
-                        <option value="">-- All Venues --</option>
-                        {foreach $venues as $venue}
-                        <option value="{$venue.id}"{if $venueId == $venue.id} selected{/if}>{$venue.name}</option>
-                        {/foreach}
-                    </select>
-                </div>
-                <div class="small-6 medium-3 column">
+                <div class="small-6 medium-4 column">
                     <label class="brewery-label">Brewery</label>
                     <select id="glm-event-member" name="member">
                         <option value="">-- All Breweries --</option>
@@ -47,20 +38,27 @@
                     </select>
                 </div>
             {/if}
-        </div>
-        <div class="row">
-            {if $settings.use_venue_locations}
-            <div class="small-6 medium-3 column">
-                <label class="brewery-label">Events By Day</label>
-                <select id="glmEventDay" name="event_day">
-                    <option>-- Choose Day --</option>
-                    {foreach $eventDays as $day}
-                    <option value="{$day.event_date|date_format:"%m/%d/%Y"}"{if $eventDay == $day.event_date|date_format:"%m/%d/%Y"} selected{/if}>{$day.event_date|date_format:"%A, %b %e, %Y"}</option>
-                    {/foreach}
-                </select>
+            <div class="small-6 medium-4 column">
+                <div class="row collapse prefix-radius">
+                    <div class="small-3 columns">
+                        <span class="prefix">From</span>
+                    </div>
+                    <div class="small-9 columns">
+                        <input id="glm-event-from" name="glm_event_from" value="{$fromDate}">
+                    </div>
+                </div>
             </div>
-            {/if}
-            <div class="small-12 medium-6 column">
+            <div class="small-6 medium-4 column">
+                <div class="row collapse prefix-radius">
+                    <div class="small-3 columns">
+                        <span class="prefix">To</span>
+                    </div>
+                    <div class="small-9 columns">
+                        <input id="glm-event-to" name="glm_event_to" value="{$toDate}">
+                    </div>
+                </div>
+            </div>
+            <div class="small-12 medium-4 column">
 
                 {if !$eventId}
                 <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">