Update event results when doing a site search.

Hide the search form.

diff --git a/glm-member-db-events/views/front/events/agenda.html b/glm-member-db-events/views/front/events/agenda.html
index ef1423d..d9a1233 100644 (file)
--- a/glm-member-db-events/views/front/events/agenda.html
+++ b/glm-member-db-events/views/front/events/agenda.html
@@ -1,8 +1,13 @@
 <div id="glm-event-wrapper">
         <div class="row">
+        {if $smarty.request.s}
+        <hr>
+        <h1>Related events for: {$smarty.request.s}</h1>
+        {else}
             {include file='front/events/searchForm.html'}
+        {/if}
         </div>
-    
+
         <div id="glm-event-agenda-view" class="row">
             <div class="small-12 columns">
                 {foreach $eventsByDate as $date => $key}
@@ -39,12 +44,12 @@
                                                                 {else}
                                                                     {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|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} 
+                                                            ( {if $event.times|@count > 1} Occurring {/if}
                                                             {$rec.from_date.date} <span class="agenda-event-recur-dates">
                                                               {if $rec.from_date.date != $rec.to_date.date}
                                                                 - {$rec.to_date.date}
@@ -52,7 +57,7 @@
                                                                 - {$rec.specific_dates|@end|date_format:"%m/%d/%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
@@ -63,7 +68,7 @@
                                                                     <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
                                                                  {/if}
                                                              {/foreach}
-    
+
                                                         </span>
                                                         {/if}
                                                          )
@@ -89,7 +94,7 @@
                                             {/if}
                                             {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
                                             {$event.intro}
-                
+
                                         </div>
                                     </div>
                                 </div>
@@ -98,7 +103,7 @@
                         </div>
                     </div>
                 {/foreach}
-    
+
             </div>
         </div>
         {assign var="current_year" value=$smarty.now|date_format:"%Y"}
@@ -125,12 +130,12 @@
             </div>
         </div>
     </div>
-    
-    
-    
+
+
+
     <script type="text/javascript">
         jQuery(document).ready(function($) {
-    
+
             var fullCalendarLoaded  = false;
             var recurrencesInited   = false;
             var locationsInited     = false;
@@ -152,18 +157,18 @@
             var custom_page         = '{$customPage}';
             var page_slug           = '{$pageSlug}';
             var retain_date;
-            
+
             if(!member_id){
                 member_id = null;
             }
-    
+
             // add 7 days to ensure we always get the current month and not any other month view that may
             // be visible (last few days of previous month or first few days of next month)
             function get_current_view(){
                 var retain_date;
                 var calCurrDate = $('#eventCalendar').fullCalendar('getView').start;
                 var d = moment(calCurrDate).add(7, 'days').format('YYYY-MM-01');
-                
+
                 return retain_date = d;
             }
             function in_mobile(){
@@ -173,30 +178,30 @@
                     return false;
                 }
             }
-            
+
             $('#glm-event-from').on("change", function(){
                 var from_date = $(this).val();
                 $('#glm-event-to').val(from_date);
-    
+
             });
-    
+
             months = JSON.parse(months);
-    
+
             event_search.on('click', function(){
                 sessionStorage.override = 'yes';
             });
-            
+
             if( sessionStorage.view && sessionStorage.override === 'no' && !in_mobile()){
                 view = sessionStorage.view;
             } else if( sessionStorage.override === 'yes' || in_mobile()){
                 view = 'agenda';
-            } 
-    
+            }
+
             // AJAX FUNCTION ************************************************
             // Get calendar month via AJAX
             function eventsCalMonthAJAX(month) {
                 var dat = {
-    
+
                     action: 'glm_members_admin_ajax',
                     glm_action: 'eventsCalMonthAJAX',
                     month: month,
@@ -206,7 +211,7 @@
                     page_slug: page_slug
                 };
                 $('.fc-event').remove();
-    
+
                  jQuery.ajax({
                     type: 'POST',
                     url: '{$ajaxUrl}',
@@ -269,16 +274,16 @@
                 handleWindowResize: true,
                 lazyFetching: true,
                 eventClick : function (event){
-                    
+
                     sessionStorage.current_calendar_view = get_current_view();
-                
-                
+
+
                     if(custom_page !== ''){
                         location.href = event.url + '&glm_event_from=' + event.start.format();
                     } else {
                         location.href = event.url + '?glm_event_from=' + event.start.format();
                     }
-                    
+
                     return false;
                 },
                 eventLimit: true,
@@ -294,13 +299,13 @@
                     }
                 }
             });
-    
+
             if(view === "calendar"){
                 eventsCalMonthAJAX(month_obj);
                 main_content.removeClass("small-8").addClass("small-12");
                 calendar.show();
                 view_select.val('calendar');
-    
+
             } else if ( view === "agenda"){
                 calendar.hide();
                 agenda.css("display", "block");
@@ -314,14 +319,14 @@
                     agenda.css("display","none");
                     calendar.fadeIn('slow', function(){});
                     calendar.fullCalendar('render');
-    
+
                 } else if ( $("#glm-event-view-select option:selected").val() === "agenda"){
                     agenda.css("display", "block");
                     calendar.fadeOut('slow', function(){});
                 }
             });
             $(window).on("load", function(){
-                
+
                 if(sessionStorage.current_calendar_view){
                     $('#event-date-toggle option').each(function(){
                         if( $(this).val() === sessionStorage.current_calendar_view){
@@ -329,12 +334,12 @@
                         }
                     });
                 }
-    
+
                 $('#event-date-toggle-container').insertAfter( $('.fc-left')).fadeTo('slow', 1);
-                
+
                 $('#event-date-toggle').on("change", function(){
                     var selected_date = $(this).val();
-                
+
                     $('#eventCalendar').fullCalendar('gotoDate', selected_date);
                      eventsCalMonthAJAX(month_obj);
                      if(sessionStorage.current_calendar_view){
@@ -351,10 +356,10 @@
                 if(sessionStorage.current_calendar_view){
                     sessionStorage.current_calendar_view = '';
                 }
-            
+
                 eventsCalMonthAJAX(month_obj);
             });
-    
+
            $('#eventCalendar').find('.fc-today-button').on("click", function(){
                eventsCalMonthAJAX(month_obj);
                var current_view = get_current_view();
@@ -364,7 +369,7 @@
                     }
                 });
            });
-           
+
             var dates = $(".agenda-event-recur-dates");
             dates.each( function (){
                if( $(this).text().indexOf('-') < 0 ){
@@ -377,7 +382,7 @@
                 window.location = $(this).data('url');
             });
 
-    
+
         });
     </script>
-    
\ No newline at end of file
+

diff --git a/glm-member-db-events/views/front/events/searchForm.html b/glm-member-db-events/views/front/events/searchForm.html
index a0a941c..94282d6 100644 (file)
--- a/glm-member-db-events/views/front/events/searchForm.html
+++ b/glm-member-db-events/views/front/events/searchForm.html
@@ -6,9 +6,6 @@
         <h1>Find An Event</h1>
         <form action="{$currentUrl}">
             <input type="hidden" name="search" value="1">
-                {if $smarty.request.s}
-                <input type="hidden" name="s" value="{$smarty.request.s|escape}">
-                {/if}
             <div class="row">
                 <div class="small-12 medium-12 large-5 columns">
                     <input class="glm-search-icon right" type="image" alt="Search" src="{$assetsUrl}search-icon-24x24.png">