From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 19 May 2016 17:16:00 +0000 (-0400)
Subject: Add ical and rss feed icons to the list and detail for events
X-Git-Tag: v1.0.0^2~26
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8d202aca917df7f79138ed49463346d1bbd8cdf7;p=WP-Plugins%2Fglm-member-db-events.git

Add ical and rss feed icons to the list and detail for events
---

diff --git a/assets/rss-icon-24x24.png b/assets/rss-icon-24x24.png
new file mode 100755
index 0000000..6de194a
Binary files /dev/null and b/assets/rss-icon-24x24.png differ
diff --git a/css/front.css b/css/front.css
index ad186a7..49636c1 100644
--- a/css/front.css
+++ b/css/front.css
@@ -120,6 +120,11 @@ input[name='contact_fname'], input[name='contact_lname']{
 #glm-event-category {
     width: 85%;
 }
+#glm-event-pdf-submit,
+#glm-event-rss-feed, 
+#glm-event-ical-feed {
+    margin: 5px 5px;
+}
 @media only screen and (max-width: 40em) {
     #glm-event-add-event {
         margin-top: 20px !important;
diff --git a/models/front/events/icalFeed.php b/models/front/events/icalFeed.php
index b873abc..18c459d 100644
--- a/models/front/events/icalFeed.php
+++ b/models/front/events/icalFeed.php
@@ -37,9 +37,7 @@ class GlmMembersFront_events_icalFeed extends GlmMembersFront_events_baseAction
 
         if ( isset($_REQUEST['eventId']) && $eventId = filter_var($_REQUEST['eventId'], FILTER_VALIDATE_INT)) {
             $search = true;
-            if ($ical = filter_var($_REQUEST['ical'], FILTER_VALIDATE_BOOLEAN)) {
-                $action = 'event-ical';
-            }
+            $action = 'event-ical';
         } 
 
         if ( !isset($eventId) || !$eventId ) {
diff --git a/models/front/events/rssFeed.php b/models/front/events/rssFeed.php
index 4f287ff..c279366 100644
--- a/models/front/events/rssFeed.php
+++ b/models/front/events/rssFeed.php
@@ -37,9 +37,7 @@ class GlmMembersFront_events_rssFeed extends GlmMembersFront_events_baseAction
 
         if ( isset($_REQUEST['eventId']) && $eventId = filter_var($_REQUEST['eventId'], FILTER_VALIDATE_INT)) {
             $search = true;
-            if ($ical = filter_var($_REQUEST['ical'], FILTER_VALIDATE_BOOLEAN)) {
-                $action = 'event-rss';
-            }
+            $action = 'event-rss';
         } 
 
         if ( !isset($eventId) || !$eventId ) {
diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html
index 25ab46b..20e328a 100644
--- a/views/front/events/searchForm.html
+++ b/views/front/events/searchForm.html
@@ -54,10 +54,15 @@
                 </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">
+                    <input class="right" type="image" title="Print PDF" id="glm-event-pdf-submit" src="{$assetsUrl}print-icon-24x24.png">
                     {else}
-                    &nbsp;
                     {/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>
         </form>