From 8d202aca917df7f79138ed49463346d1bbd8cdf7 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 19 May 2016 13:16:00 -0400
Subject: [PATCH] Add ical and rss feed icons to the list and detail for events

---
 assets/rss-icon-24x24.png          | Bin 0 -> 1583 bytes
 css/front.css                      |   5 +++++
 models/front/events/icalFeed.php   |   4 +---
 models/front/events/rssFeed.php    |   4 +---
 views/front/events/searchForm.html |   9 +++++++--
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100755 assets/rss-icon-24x24.png

diff --git a/assets/rss-icon-24x24.png b/assets/rss-icon-24x24.png
new file mode 100755
index 0000000000000000000000000000000000000000..6de194af1a8cfd137d2f70b0529e449cb708298b
GIT binary patch
literal 1583
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m@6_vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T
z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9
zlv<o$T9gcok2GbNW?<Oiw+N&V=o%~kqD)|<B<8r}Czs}?=9PH5*eU^K^incYtPD(z
z%`DB$jCGAoOe}Owl8j7slZ?^~b<<Lf&C=46(o8K9lVRpy({JHuY-nL-Zf0m|VrgjT
zYUb!{X6Wc_?qX(P>Ehz(WC+vinO9trn3tRivpW-LH&m}FUcFY%MX8A;`9&f5`8lvu
z5Rj2yl3$#WU!dUZ432dL4d2A%%sh~wCMcpH{&q<%$}CGwaVyHtRRD*yRVEf!q#0YJ
zn5HBq>n2*H80wk;N!=v#G!tC|Qxg+2qf|>Hqa>g&Ao^3t4MBaNqx3<^1u6N!gn(%h
z#Dr%CAP1hEQuBa$s0f%@Y8uX5Wnf_P^>lFzskn7!s;@_=qsa01)t=g>N5$G&Y8AF^
zFnZxAKS9t%e$k}aMbn$OYq@)GZOI6{u<b;}>Lpv6lsFV8i$rH+L`F8*DQYlnb#08d
zog^gkS9TWr<-~WpZNue$6wa7g{LH@i`I$QbI%3riEAM%}U$1-E#^<28L>ps;bg$d=
zJ*E*HjdnGW4tHcq4#>8&T@vK@pB|%k<)F0K7dgKr$`cwmf290LayVD_!fgrrHugHD
zaP>~s9YGdMp#g6u?`Pnx*~Xs9X~B|u)i;1yT1L_Qfsm7Sw$O%_vWHO*b|n9hyP~{l
z&FU9YcJliUaqtLz(QfU~StXZu*ln+Hkv`khl~=0QM+UaX|D9aUah=sNYsIuV+d@)j
zF)n}586qY;*L3y2<1?OYjf`;O-FoAyXbFGWq2vm`pnc9MBISH<4xep`-sZqOr*ZYO
z$cRFYxozbgZ^}AO1Q!RFh6_~Rh;-!<c{FR`#lnuu1wEd}L;Td<ZPuK&<mAuL_Mi}N
z!F95Hs}w6alvVx*d_0?_9<(mH=6nNZimUs>iBh+?*4ll4(0_Frcch%rtDvl>8#sT>
zthp04lf}-|zb$v_k<wMMB{M&J-TG@VSMc*U`zaC~vrkXI)0y+trY4vvTxNI0(p%L}
zgzvW6%<Va0=j~GGG(FVkNS~qEx?8th794pl@om+%JMHgR`PXlgyn2q)I%KlhGQQY(
zJ?UD{8nX0v)meO6J}dO^^_d@<oxd#3dLQui?5e-U&7Du$PE8JAyt%CFk=^bpPVqJ0
q@=fhl9uvN|%lx``_U%;+%na^l4-3zH+~y7{!aZI6T-G@yGywpg1x9=T

literal 0
HcmV?d00001

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>
-- 
2.17.1