From: Steve Sutton Date: Thu, 19 May 2016 14:14:32 +0000 (-0400) Subject: Event list and search form updates X-Git-Tag: v1.0.0^2~28 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=05ce03fb9c9a32b0c056d6adaa4ccf587319a723;p=WP-Plugins%2Fglm-member-db-events.git 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 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 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 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 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 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 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 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 --- 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 --- 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 --- 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 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -1,50 +1,12 @@
{include file='front/events/searchForm.html'} - {include file='front/events/shortCuts.html'}
- {foreach $eventsByDate as $date => $key}
-
+
{$date|date_format:"%b"}
@@ -53,7 +15,7 @@
-
+
{foreach $key as $events} {foreach $events as $event}
diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 7c7426e..39c2ddb 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -1,8 +1,18 @@
- +
+
+ {include file='front/events/searchForm.html'} +
+
+ Ical Feed
+
+
+ +
+

{$event.name}

@@ -112,5 +122,8 @@
+
+
+
diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html index 066e8c7..ed48245 100644 --- a/views/front/events/searchForm.html +++ b/views/front/events/searchForm.html @@ -1,18 +1,60 @@ -
-

Find An Event

+
+

Find An Event

-
- +
+ +
-
- +
+ Add an Event
-
- +
+
+
+
+ +