adding custom events search form

adding custom events list search form

diff --git a/glm-member-db-events/views/front/events/searchForm.html b/glm-member-db-events/views/front/events/searchForm.html
index db1d8ea..812bc35 100644 (file)
--- a/glm-member-db-events/views/front/events/searchForm.html
+++ b/glm-member-db-events/views/front/events/searchForm.html
@@ -1,103 +1,113 @@
 <script>
-        var ajaxUrl = '{$ajaxUrl}';
-    </script>
-    {if !$eventId}
-        <div id="glm-events-search-form" class="small-12 columns">
-            <h1>Find An Event</h1>
-            <form action="{$currentUrl}">
-                <input type="hidden" name="search" value="1">
-                <div class="row">
-                    <div class="small-12 medium-5 columns">
-                        <input class="glm-search-icon right" type="image" alt="Search" src="{$assetsUrl}search-icon-24x24.png">
-                        <input id="glm-event-name" name="event_name" placeholder="Event Name" value="{$eventName}">
-                    </div>
-                    
-                    <div class="small-12 small-text-center medium-7 medium-text-right columns">
-                        <a id="glm-event-add-event" href="{$siteBaseUrl}add-event/" class="tiny button success">Add an Event</a>
-                    </div>
+    var ajaxUrl = '{$ajaxUrl}';
+</script>
+{if !$eventId}
+    <div id="glm-events-search-form" class="small-12 columns">
+        <h1>Find An Event</h1>
+        <form action="{$currentUrl}">
+            <input type="hidden" name="search" value="1">
+            <div class="row">
+                <div class="small-12 medium-5 columns">
+                    <input class="glm-search-icon right" type="image" alt="Search" src="{$assetsUrl}search-icon-24x24.png">
+                    <input id="glm-event-name" name="event_name" placeholder="Event Name" value="{$eventName}">
                 </div>
-                <div class="row">
-                    <div class="small-12 columns">
-                        <hr />
-                    </div>
+                
+                <div class="small-12 small-text-center medium-7 medium-text-right columns">
+                    <a id="glm-event-add-event" href="{$siteBaseUrl}add-event/" class="tiny button success">Add an Event</a>
                 </div>
-            </form>
-            <form id="glm-member-event-search" action="{$currentUrl}" method="get">
-                <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">
-                        <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 class="row">
+                <div class="small-12 columns">
+                    <hr />
+                </div>
+            </div>
+        </form>
+        <form id="glm-member-event-search" action="{$currentUrl}" method="get">
+            <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">
+                    <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 class="small-6 medium-3 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 class="small-6 medium-3 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 class="small-8 medium-3 column">
-                        <input class="glm-search-icon right" type="image" alt="Search" src="{$assetsUrl}search-icon-24x24.png">
-                        <select id="glm-event-category" name="category">
-                            <option value="0">-- All Categories --</option>
-                            {foreach $categories as $cat}
-                                <option value="{$cat.id}"{if $cat.default == 1} selected{/if}>{$cat.name}</option>
+                </div>
+                <div class="small-8 medium-3 column glm-event-city-search">
+                        <select id="glm-event-city" name="category">
+                            <option value="0">-- All Cities --</option>
+                            {foreach $cities as $city}
+                                {if $city.name !== '' && !empty($city.name)}
+                                    <option value="{$city.id}"{if $city.default == 1} selected{/if}>{$city.name}</option>
+                                {/if}
                             {/foreach}
                         </select>
                     </div>
-                    
-                    <div class="small-4 medium-2 column">
-                        {if !$eventId}
-                        <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
-                        {else}
-                        {/if}
-                        <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=rssFeed{if $eventId}&eventId={$eventId}{/if}">
-                        <img class="right" title="RSS Feed" id="glm-event-rss-feed" src="{$assetsUrl}rss-icon-24x24.png" />
-                        </a>
-                        <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=icalFeed&ical=1{if $eventId}&eventId={$eventId}{/if}">
-                        <img class="right" title="iCal Feed" id="glm-event-ical-feed" src="{$assetsUrl}calendar-icon-24x24.png" />
-                        </a>
-                    </div>
+                <div class="small-8 medium-3 column">
+                    <input class="glm-search-icon right" type="image" alt="Search" src="{$assetsUrl}search-icon-24x24.png">
+                    <select id="glm-event-category" name="category">
+                        <option value="0">-- All Categories --</option>
+                        {foreach $categories as $cat}
+                            <option value="{$cat.id}"{if $cat.default == 1} selected{/if}>{$cat.name}</option>
+                        {/foreach}
+                    </select>
                 </div>
-                 
-            </form>
-            <div class="small-7 medium-3 columns view-select">
-                <select id="glm-event-view-select">
-                    <option id="agenda-view-option" value="agenda"> Agenda View </option>
-                    <option id="calendar-view-option" value="calendar"> Calendar View </option>
-                </select>
+                
+                <div class="small-4 medium-4 column">
+                    {if !$eventId}
+                    <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
+                    {else}
+                    {/if}
+                    <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=rssFeed{if $eventId}&eventId={$eventId}{/if}">
+                    <img class="right" title="RSS Feed" id="glm-event-rss-feed" src="{$assetsUrl}rss-icon-24x24.png" />
+                    </a>
+                    <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=icalFeed&ical=1{if $eventId}&eventId={$eventId}{/if}">
+                    <img class="right" title="iCal Feed" id="glm-event-ical-feed" src="{$assetsUrl}calendar-icon-24x24.png" />
+                    </a>
+                </div>
+                <div class="small-7 medium-3 columns view-select">
+                        <select id="glm-event-view-select">
+                            <option id="agenda-view-option" value="agenda"> Agenda View </option>
+                            <option id="calendar-view-option" value="calendar"> Calendar View </option>
+                        </select>
+                    </div>
             </div>
-        </div>
-    {else}
-        <div class="small-4 small-offset-8 medium-2 medium-offset-10 column">
-            {if !$eventId}
-            <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
-            {else}
-            {/if}
-            <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=rssFeed{if $eventId}&eventId={$eventId}{/if}">
-            <img class="right" title="RSS Feed" id="glm-event-rss-feed" src="{$assetsUrl}rss-icon-24x24.png" />
-            </a>
-            <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=icalFeed&ical=1{if $eventId}&eventId={$eventId}{/if}">
-            <img class="right" title="iCal Feed" id="glm-event-ical-feed" src="{$assetsUrl}calendar-icon-24x24.png" />
-            </a>
-        </div>
-    {/if}
-    
-    <script type="text/javascript">
-        jQuery(document).ready(function($){
-            jQuery('#glm-event-pdf-submit').click(function(){
-                jQuery('#glm-member-event-search').attr('method', 'post');
-            });
+             
+        </form>
+        
+    </div>
+{else}
+    <div class="small-4 small-offset-8 medium-2 medium-offset-10 column">
+        {if !$eventId}
+        <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
+        {else}
+        {/if}
+        <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=rssFeed{if $eventId}&eventId={$eventId}{/if}">
+        <img class="right" title="RSS Feed" id="glm-event-rss-feed" src="{$assetsUrl}rss-icon-24x24.png" />
+        </a>
+        <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=icalFeed&ical=1{if $eventId}&eventId={$eventId}{/if}">
+        <img class="right" title="iCal Feed" id="glm-event-ical-feed" src="{$assetsUrl}calendar-icon-24x24.png" />
+        </a>
+    </div>
+{/if}
+
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+        jQuery('#glm-event-pdf-submit').click(function(){
+            jQuery('#glm-member-event-search').attr('method', 'post');
         });
-    </script>
-    
\ No newline at end of file
+    });
+</script>