From 8f5fb09b81b47e4feb73d1e1194bdc094e8a67ca Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 4 Mar 2016 16:55:52 -0500
Subject: [PATCH] Add form to detail page

uses referrer to go back to list for searches from detail page
---
 models/front/events/detail.php     | 2 ++
 models/front/events/list.php       | 5 +++--
 views/front/events/detail.html     | 4 ++++
 views/front/events/searchForm.html | 6 +++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/models/front/events/detail.php b/models/front/events/detail.php
index 26b4d38..6779e16 100644
--- a/models/front/events/detail.php
+++ b/models/front/events/detail.php
@@ -110,10 +110,12 @@ class GLmMembersFront_events_detail extends GlmDataEvents
         // Compile template data
         $templateData = array(
             'siteBaseUrl' => GLM_MEMBERS_EVENTS_SITE_BASE_URL,
+            'currentUrl'  => $_SERVER['HTTP_REFERER'],
             'categories'  => $categories,
             'event'       => $event
         );
 
+        error_reporting(E_ALL ^ E_NOTICE);
         return array(
             'status'           => $status,
             'menuItemRedirect' => false,
diff --git a/models/front/events/list.php b/models/front/events/list.php
index 422ba1b..0aca1d9 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -83,7 +83,7 @@ class GlmMembersFront_events_list extends GlmDataEvents
     {
         $status = $categoryId = null;
         $action = '';
-        $settings = $events = $event = array();
+        $settings = $events = $event = $categoryEvents = array();
         if (isset($_REQUEST['eventId']) && $eventId = filter_var($_REQUEST['eventId'], FILTER_VALIDATE_INT)) {
             $search = true;
             $action = 'event-detail';
@@ -134,7 +134,6 @@ class GlmMembersFront_events_list extends GlmDataEvents
             // filter out the events
             $events = $this->getModelEventsData();
             $view = 'dashboard.html';
-            $categoryEvents = array();
             foreach ( $categories as $cat ) {
                 $catEvents = array_filter( $events, function($data) use($cat) {
                     return ($data['category'] == $cat['id']) ? 1 : 0;
@@ -164,6 +163,7 @@ class GlmMembersFront_events_list extends GlmDataEvents
         // Compile template data
         $templateData = array(
             'siteBaseUrl'=> GLM_MEMBERS_EVENTS_SITE_BASE_URL,
+            'currentUrl' => GLM_MEMBERS_EVENTS_PLUGIN_CURRENT_URL,
             'categoryId' => $categoryId,
             'categories' => $categories,
             'events'     => $events,
@@ -174,6 +174,7 @@ class GlmMembersFront_events_list extends GlmDataEvents
             'eventName'  => $eventNameSearch
         );
 
+        error_reporting(E_ALL ^ E_NOTICE);
         return array(
             'status'           => $status,
             'menuItemRedirect' => false,
diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index 2775eb3..a96f985 100644
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -1,3 +1,7 @@
+<div class="row">
+        {include file='front/events/searchForm.html'}
+        {include file='front/events/shortCuts.html'}
+</div>
 <div class="row">
     <div class="small-12 column">
         <img style="margin: 15px;" src="http://placehold.it/730x280">
diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html
index da4a81d..1c810b7 100644
--- a/views/front/events/searchForm.html
+++ b/views/front/events/searchForm.html
@@ -1,6 +1,6 @@
     <div class="small-12 medium-6 columns">
         <h3 class="text-center">Find An Event</h3>
-        <form action="">
+        <form action="{$currentUrl}">
             <input type="hidden" name="search" value="1">
             <div class="row">
                 <div class="small-12 medium-6 text-right columns">
@@ -14,7 +14,7 @@
                 </div>
             </div>
         </form>
-        <form action="">
+        <form action="{$currentUrl}">
             <input type="hidden" name="search" value="1">
             <div class="row">
                 <div class="small-12 medium-6 text-right columns">
@@ -34,7 +34,7 @@
                 </div>
                 <div class="small-12 medium-6 columns">
                     <select id="glm-event-category" name="category">
-                        <option value="">-- Select --</option>
+                        <option value="">-- All Categories --</option>
                         {foreach $categories as $cat}
                         <option value="{$cat.id}"{if $categoryId == $cat.id} selected{/if}>{$cat.name}</option>
                         {/foreach}
-- 
2.17.1