Event list and search form updates

Updating the search form to screenshot that Collins has created for the
event search.

Adding the search form to the event detail page. minus the print pdf
button.

diff --git a/assets/calendar-icon-24x24.png b/assets/calendar-icon-24x24.png
new file mode 100755 (executable)
index 0000000..d50b0fc
Binary files /dev/null and b/assets/calendar-icon-24x24.png differ

diff --git a/assets/contact-icon-24x24.png b/assets/contact-icon-24x24.png
new file mode 100755 (executable)
index 0000000..6cf4326
Binary files /dev/null and b/assets/contact-icon-24x24.png differ

diff --git a/assets/cost-icon-24x24.png b/assets/cost-icon-24x24.png
new file mode 100755 (executable)
index 0000000..877dde3
Binary files /dev/null and b/assets/cost-icon-24x24.png differ

diff --git a/assets/location-icon-24x24.png b/assets/location-icon-24x24.png
new file mode 100755 (executable)
index 0000000..b7f44fc
Binary files /dev/null and b/assets/location-icon-24x24.png differ

diff --git a/assets/print-icon-24x24.png b/assets/print-icon-24x24.png
new file mode 100755 (executable)
index 0000000..3cc022c
Binary files /dev/null and b/assets/print-icon-24x24.png differ

diff --git a/assets/search-icon-24x24.png b/assets/search-icon-24x24.png
new file mode 100755 (executable)
index 0000000..e4580aa
Binary files /dev/null and b/assets/search-icon-24x24.png differ

diff --git a/assets/time-icon-24x24.png b/assets/time-icon-24x24.png
new file mode 100755 (executable)
index 0000000..c9076fb
Binary files /dev/null and b/assets/time-icon-24x24.png differ

diff --git a/css/front.css b/css/front.css
index 4b93744..ad186a7 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -1,8 +1,11 @@
 #glm-event-agenda-view {
-    margin-top: 40px;
+    margin-top: 0px;
+}
+#glm-member-event-search {
+    margin-top: 20px;
 }
 #glm-event-wrapper.event-detail {
-    max-width: 650px;
+    /* max-width: 650px; */
     margin: 0 auto;
 }
 .glm-event-day-row {
@@ -105,3 +108,20 @@ input[name='contact_fname'], input[name='contact_lname']{
     margin-top: 20px !important;
     margin-bottom: 50px !important;
 }
+#glm-events-search-form h1 {
+    padding: 0px;
+}
+.glm-search-icon {
+    margin: 5px 0;
+}
+#glm-event-name {
+    width: 87%;
+}
+#glm-event-category {
+    width: 85%;
+}
+@media only screen and (max-width: 40em) {
+    #glm-event-add-event {
+        margin-top: 20px !important;
+    }
+}

diff --git a/models/front/events/detail.php b/models/front/events/detail.php
index 1e5fae3..a9b91cc 100644 (file)
--- a/models/front/events/detail.php
+++ b/models/front/events/detail.php
@@ -102,11 +102,15 @@ class GlmMembersFront_events_detail extends GlmMembersFront_events_baseAction
         $title = get_the_title();
         
         // Compile template data
+        $toDate = date('m/d/Y', strtotime( '+ 2 weeks' ));
         $templateData = array(
+            'assetsUrl'   => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/',
             'siteBaseUrl' => GLM_MEMBERS_EVENTS_SITE_BASE_URL,
             'currentUrl'  => $_SERVER['HTTP_REFERER'],
             'categories'  => $categories,
             'fromDate'    => $fromDate,
+            'toDate'      => $toDate,
+            'eventId'     => $eventId,
             'event'       => $event,
             'permalink'   => $permalink,
             'title'       => $title,

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 01e7f06..9c54133 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -514,13 +514,13 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 
         // Compile template data
         $templateData = array(
+            'assetsUrl'    => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/',
             'siteBaseUrl'  => GLM_MEMBERS_EVENTS_SITE_BASE_URL,
             'currentUrl'   => GLM_MEMBERS_EVENTS_PLUGIN_CURRENT_URL,
+            'eventId'      => false,
             'categoryId'   => $categoryId,
             'categories'   => $categories,
-            //'events'       => $events,
             'eventsByDate' => $eventsByDate,
-            //'event'       => $event,
             'catEvents'    => $categoryEvents,
             'fromDate'     => $fromDate,
             'toDate'       => $toDate,

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 4865a37..f6dd292 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -1,50 +1,12 @@
 <div id="glm-event-wrapper"> 
     <div class="row">
         {include file='front/events/searchForm.html'}
-        {include file='front/events/shortCuts.html'}
     </div>
     <div id="glm-event-agenda-view" class="row">
         <div class="small-12 column">
-            <form id="glm-member-event-search" action="{$currentUrl}" method="post">
-                <input type="hidden" name="search" value="1">
-                <div class="row">
-                    <div class="small-12 medium-6 large-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>
-                    <div class="small-12 medium-6 large-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>
-                    <div class="small-12 medium-6 large-3 column">
-                        <select id="glm-event-category" name="category">
-                            <option value="">-- All Categories --</option>
-                            {foreach $categories as $cat}
-                            <option value="{$cat.id}"{if $categoryId == $cat.id} selected{/if}>{$cat.name}</option>
-                            {/foreach}
-                        </select>
-                    </div>
-                    <div class="small-12 medium-6 large-3 column">
-                        <input type="submit" class="button tiny radius" value="Search">
-                        <input type="submit" class="button tiny radius" id="glm-event-pdf-submit" value="Print">
-                    </div>
-                </div>
-            </form>
             {foreach $eventsByDate as $date => $key}
                 <div class="row glm-event-day-row">
-                    <div class="small-4 medium-3 large-2 columns">
+                    <div class="small-12 medium-2 columns">
                         <div class="glm-event-cal">
                             <div class="glm-event-cal-month">{$date|date_format:"%b"}</div>
                             <div class="glm-event-cal-day-container">
@@ -53,7 +15,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="small-8 medium-9 large-10 columns">
+                    <div class="small-12 medium-10 columns">
                         {foreach $key as $events}
                             {foreach $events as $event}
                             <div class="row glm-event-day-event">

diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index 7c7426e..39c2ddb 100644 (file)
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -1,8 +1,18 @@
 <div id="glm-event-wrapper" class="event-detail text-left"> 
     <div class="row">
-        <button id="glm-event-detail-backtosearch">Back To Search</button>
+        <div class="small-12 large-8 small-centered column">
+    <div class="row">
+        {include file='front/events/searchForm.html'}
+    </div>
+    <div class="row">
+        <button id="glm-event-detail-backtosearch">Back</button>
         <a style="float:right;" href="../../wp-admin/admin-ajax.php?action=glm_members_admin_ajax&glm_action=icalFeed&eventId={$event.id}&ical=1">Ical Feed</a>
     </div>
+    </div>
+    </div>
+
+    <div class="row">
+        <div class="small-12 large-8 large-centered column">
     <div class="row">
         <div class="small-12 column eventTitle">
             <h1>{$event.name}</h1>
@@ -112,5 +122,8 @@
             </div>
         </div>
     </div>
+        </div>
+    </div>
+
 </div>
 

diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html
index 066e8c7..ed48245 100644 (file)
--- a/views/front/events/searchForm.html
+++ b/views/front/events/searchForm.html
@@ -1,18 +1,60 @@
-    <div id="glm-events-search-form" class="small-12 medium-6 columns">
-        <h1 class="text-center">Find An Event</h1>
+    <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-6 text-right columns">
-                    <label for="glm-event-name">Event Name </label>
+                <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 medium-6 columns">
-                    <input id="glm-event-name" name="event_name" value="{$eventName}">
+                <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>
             </div>
             <div class="row">
-                <div class="small-12 small-text-center columns">
-                    <input type="submit" class="button radius" value="Search">
+                <div class="small-12 columns">
+                    <hr />
+                </div>
+            </div>
+        </form>
+        <form id="glm-member-event-search" action="{$currentUrl}" method="post">
+            <input type="hidden" name="search" value="1">
+            <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>
+                <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>
+                <div class="small-8 medium-4 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="">-- All Categories --</option>
+                        {foreach $categories as $cat}
+                        <option value="{$cat.id}"{if $categoryId == $cat.id} selected{/if}>{$cat.name}</option>
+                        {/foreach}
+                    </select>
+                </div>
+                <div class="small-4 medium-2 column">
+                    {if !$eventId}
+                    <input class="right" type="image" alt="Search" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
+                    {else}
+                    &nbsp;
+                    {/if}
                 </div>
             </div>
         </form>