From 05ce03fb9c9a32b0c056d6adaa4ccf587319a723 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 19 May 2016 10:14:32 -0400 Subject: [PATCH] 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. --- assets/calendar-icon-24x24.png | Bin 0 -> 1397 bytes assets/contact-icon-24x24.png | Bin 0 -> 1544 bytes assets/cost-icon-24x24.png | Bin 0 -> 1560 bytes assets/location-icon-24x24.png | Bin 0 -> 1389 bytes assets/print-icon-24x24.png | Bin 0 -> 1411 bytes assets/search-icon-24x24.png | Bin 0 -> 1511 bytes assets/time-icon-24x24.png | Bin 0 -> 1537 bytes css/front.css | 24 +++++++++++- models/front/events/detail.php | 4 ++ models/front/events/list.php | 4 +- views/front/events/agenda.html | 42 +-------------------- views/front/events/detail.html | 15 +++++++- views/front/events/searchForm.html | 58 +++++++++++++++++++++++++---- 13 files changed, 94 insertions(+), 53 deletions(-) create mode 100755 assets/calendar-icon-24x24.png create mode 100755 assets/contact-icon-24x24.png create mode 100755 assets/cost-icon-24x24.png create mode 100755 assets/location-icon-24x24.png create mode 100755 assets/print-icon-24x24.png create mode 100755 assets/search-icon-24x24.png create mode 100755 assets/time-icon-24x24.png diff --git a/assets/calendar-icon-24x24.png b/assets/calendar-icon-24x24.png new file mode 100755 index 0000000000000000000000000000000000000000..d50b0fc2b8161118463a0db82d336513b27c77ff GIT binary patch literal 1397 zcmbVMZA=?w9KTxHVpm?KTb0e1<4PthT(5V%>&uM-rPr=aD8teWwk)Q1*QfM^-j%y! zEo6z{TiBcn^9@amf?#}&LtNq(qnm~-TlT^1!^}daF4YkCNkL68S;Q+)^aI%kFS&c3 z=l}eE|M&kL@9fxLVcuniAgCe|W@6gsKFk!OG>FZRtAtiDRBUf zWY}I118j0=;0kDhAbnnl_ozM5cAA$mcD9JI=QCN24M9yU`7F!#0Tt#zuORx6U%$A3 zz(Uf8bW>4BG#dbEAv`RDuHlY2KitQAlSoT5+?1y^1sR~Sa6Z#7DsNl=Y2;lL@(;l*$V>cDB-K@$#m<3TiQ zaxz87n9znT?c_t!s+y%SESJmKb56S?_hPu$>%|-dMi8imK$Rg;W%H=0*h(50pzyMg zRRu|eiyB!@8dQCV=IMF}nQSz=saRAt5~ZaK%d=Sww>z**rWn^6T2W)*UpKZyEAgQ$ zz+ym=24!BWN6J=}m-KAK58{lAARIxQqP#dBbom1=+#hf=E{~UC{B3xN z8xa+i6?ssyEoinkxXfL-bU+5ID#>w4>MwOcXIfGvB`sy)Kwz!vaD9~J1+ge>C>Clx zZU)H0QIHJDQU+ejG%al5g`4$o98a-mk|QaUBmjwe2+oaq0Kv1sk@E0P64~G<|8E8{ z%_*$dF8^ttl1S^x;&yWww8Q2&0a2SFSsRvcerDp82(Usjg=ed#m-s*1+ z1zWg~8)>G$DgU!T!l!2Dewxq^ShtaP(z@2lQ)P$7$AU4-*!7W>vg*~^MD=CMHux*U z{F&JZr#~~>a7p*~fjO}BsZyLF-z55>N-_uyx(W*G7-a)FY^URK&q082r0sFmE+f8$cn#1#k zR@;#7uwb6MRc;+v*iU>PyJm$KgZE89+#uY1;-FOs-2N#2?kH9LV_D&WaN+II8z!r1 z((>#PW$9~TSG@B4O}4e`s`+X-DZZ;dA6Xb7y&^RnFDN?pmvJ0#fq(lZVy9E~mT6xOD z|0moWm(OZMg(3@G2^TQH6NF%m#o=Q^-%z#f${H7!T(&LPLkUAdqt# zp%q#iYV%tdFPBpxGWLq44!WY4Hn<_vLNGH#$O?EyqQDSe;tLQVBQ&a)koOTW0)e9t zsn`fTbINJU11*BcfLfIfrZEfyGYl$Bt5@UN1t5-MS_Cy97z(2pfuRJBf@2RPTNB+Z zkxwofvn8L5kXMrY1cC&EK~+$#5=0Mz84Lyl#St8bWds~3_eoR;_63wt4I~qwMb0mA zf)9*nq+CLoWQ1f-pM}8tZMNr%eSxt=$tgoZlpn!VD8loRxJJR4E#rF5{1b?IPMok61*j=Y7dm;ba+R3!IgWcz#=)-65N`gFtf-ws@!77nJq z!e=Gd_MJJtZL-N=n3xgmCJ51hDNUDI@{@m^z~^YPgS)l)b9)b(@f!o_DlKbbh3 zRDUNv`F;QX?n#d0u5TWjTiVjMG#5<4_I@DT9jE{Xjy5a|fA%yn_Da@FHm=1~6&5`u z9ajyBgDKU^>QlcypeX(0$i|slUmrOf>s@yrpgXH#E;N*zU3~n22eURPGp@fk`?69f zYlgWqA8wCP-Z%_EXD?n$9@!XMN#&heGR&FI={xUrCO8kJoy7mP|HX%6g#PK8-9zIl z>+AN=bEfC*Z1{oFuDVK3Y*IJJ_Vy=rKG=8a`)i8aokUMjSWy&LSz39Y**drN=Fq1< z?mcn8HDy;ZQdkA>9cjGncJI-)_G_&*rsA5u1vAPTV?(9+ug?0Sa7tI5s^Q2JebdUR zEgS5G#l)lAD~f)-OqGvo3?~k*AKWp=-`4lIs&CJ%l&1F7HHn!QOP6$?HVYcf%|BPx zzJ)w7-QDutZpGk*OX)L%NwtKqAKd#iMgd&eeCVM64a4}zzuB6-l>91d)%t$`;b1t_ literal 0 HcmV?d00001 diff --git a/assets/cost-icon-24x24.png b/assets/cost-icon-24x24.png new file mode 100755 index 0000000000000000000000000000000000000000..877dde37d508f68a1fa33537e5387a5c7c0e69a6 GIT binary patch literal 1560 zcmbVMdrT8|94{DAP#$yjfuK20hd8<3qrEx^^~r37B6D`Y$FR$Q1UW#dhcm*D&t8Bb zkJAV*BrTZ5X9jN1+zJ6KsIc1Eie;?93D2GdWd9~Pr9 zGzgKF8R6$n6!T!o=tZ#b?&v?%3+f8BT~TC}h5 z0W=?oe7V5N^>9s%kmcOH+E5rMdqd3^JaSQ(GMZ=0y?~Q)X(KG(sGJ@rg^_BlL8nzC zYK=yZXdDEII0zSxxPV&gayeY2o?#<;UdGSHX)QruCY&S23;LH(tFEp5G%JUL0bd28NU`YmXIy5ArA%F(a6Am4s2L#Ii%%x}58hD8B z{J$AQWv9?^yZonpA|kmb!`m0bARk_g6X4_-669g|v3+>GLJ_UarA_w0FMD_7<)xaE z*81rxQ*7D@F)1-8wy|){9Hnxs@|?5nQvJvn)0CM@YNz*(O-h`Y*x5PEcxcO}#L(52 z;@hT$n`=foGVk7=ncg{L^>C8N*xg;2GHYo?FnH)}MR4ifEe9^$>AktpRliQxll6g$ z8L_%KKV#gl{UwA*lk5>Qu;MwDZ3GVU3FTZ&&<7CH`+M6BSExoB-CmWlOw9iRSZ5ns(`1&vG*QON} zR~J@a9)MowzA6sY!pF7sJ+U{_=}F3qnU9jI=Q9J_y6x3n&1sJtALx3|mF!B{F-cR{ zX*k?E!a4qF_nyD8zJq`}sINbkUR3|2H8UkAdS&oN-|h{_yzXcRmT+put<4+tp=0T* z-bm%E{v=n{eVTZ_XZqU8RKwjhQOfN5DWmU9J5bs;`dG}zbydeJ|4<~{{YDciYU=T) zH+^6H6nS{-$i7XL?Ml&lKJ8SJ)tdBqOnbY=a;7eAeAlY22Z|@wjcySy-ilv-)NMO` z<1{*TRL$b5hk=>SWYWPg zwTtu{)^~@tKdPAgFlv9oYx{Pb2vzRf6N<|S7IEd`*0_(9o2FcBSzz1=S6)-JUf4CS zPPsoe@9FBrZP$HOSq;DaP~&}f)RnTD3vu6ZACmj>8ma?*KYcd&$%fxg-CMFYN@2Nr Vc)RVB)?oNwottf?8?#E*{R7-%My~(> literal 0 HcmV?d00001 diff --git a/assets/location-icon-24x24.png b/assets/location-icon-24x24.png new file mode 100755 index 0000000000000000000000000000000000000000..b7f44fc9928ccc84a47c7d8bea2331d1859f656d GIT binary patch literal 1389 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#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv zYUb!{X6Wc_?qX(P>Ehz(WC+vinO9trn3tRivpW-LH&m|~UcFY%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%@uC<((XJBCL_H=O!skk*Kc%v7yqrlzZiyaT#GgN0NW$7k8 zXV=hj5?K3gpQGYWmWS&sI>MA(1cGj9XmoTqDI`gK5Gp!G~e~0owwmEsHdMo%{WB&HhR~CZ6?*bD1um zl0APw%VSp@i-cYKaqonnsmHB1@JwPCbeyE}*u!?&A8w0fpCc2vC5-Fp8CNAr)D<)d zb}y1W{Xtb@kLf!#*Ih;)%Nk-IH1JDr5?Hf&S1RB2#$S9dJHF=L`j)OdBfa$g#^3H? z*O#z}hK0+r{HY1?`f%)(RoT7_xq!WAf5qjpZ1dj77}gUN|Ae(|+r;?|k_l%&z1uqF z!34n<63gm~1D9M9ohur%M!V$y&JKq85BP&FPhQ~pzEkE!M)i&t!TW`TD|X!|Ua4O+ zVfTxvJnt{f)y!uK+8Xb4!6DvEfYG%*WY?AQQ{Tcp99~H^ubOUAuv1{AxS&N$#}#kc v0`a7;Nlee2*4#Vp_)h6-;QGhm4U7zjC$+UZyjY|PDgZrQ{an^LB{Ts5N2}?* literal 0 HcmV?d00001 diff --git a/assets/print-icon-24x24.png b/assets/print-icon-24x24.png new file mode 100755 index 0000000000000000000000000000000000000000..3cc022c3b58c5fc97b8e739eeeea3c9641bbf85a GIT binary patch literal 1411 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#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvvGYd->7e^;Um|oAk;*!L?a}t%N=+=uFAB-e&w-_a zfQATTyL!_|ndlmrnwXdwrCJ&pB>{Z_(Vs$Y2Y1ng`57MZnDB=5yme0|VniPZ!6Kid$=@?e{+HAaZ=N)Y=6>qDQn=u!@U& zvpc4<3d)p-{b}q@a4!_yZOP4O-rejJTXOlo!}74Xb6mvT*EVTr{i-a`R8;Z3e7f2H zy@lTW>)-F)_4YZOx-GZdc#lNyZN{8upMUOOz#DepmubvZ!FSE75v?rsK6C!K6&4(1 z-tG8`) z?D8_Jw_03X`BusK)F+)&q4L+S>?{7Ra(cN%sxN!crs`%0cTUAxL9pB!%&8poJ z*)!vF&*O%jFEdV`SMJ&HV~yYBb$6X+XU*X+;x}_Ra(UL?6NVRGgwJ{{wsJ>`kq3)r zCrh4*Y)Xjs`cu1ig{5S!x2Wt^WD?}FbuE6yt=#47TKUpnYs=gC21bTkQ*&m;uq~DX O6^ov(elF{r5}E+=z3u$~ literal 0 HcmV?d00001 diff --git a/assets/search-icon-24x24.png b/assets/search-icon-24x24.png new file mode 100755 index 0000000000000000000000000000000000000000..e4580aa148a70dd53807ac5bb0a7d9cf1118df49 GIT binary patch literal 1511 zcmbVMdrT8|9KWC_5EpjW^dRMLoZ2>hY zIQPIAU6@-8N^oY$HW2s780s+K+??X@wKy^rWxCA=DtqB%k1J5NKa79ulDpsU_x*i7 z-}m=kF38V~k4uRI03beZ746X0`QbNami8U;TgS9zftu}93uQs|GYSu6anjDVM6D|i)j@orJFLU#}KK%mH3 zp%(}{YWLdsa&c9y!WY)&7qPV!teJx{R)CfOr77_6Dgy>Qm6DGNSfL5Ml(r9x5eS@s zs1;Ud(kZ9C0JO;p4-$G3W-$x{O=dktq#JNz8Hl48fuLptLtzx7FqFbkaO#0HYYHb& z4mxMbmUgm2<*MqX5XA5I>-`43thf=(Y&Ih(j^H?~Az)unQkeiO`4&br(7caTM6W8! z5*XIVxa4Zp3Td8BhT!qq?bC`S-&CTslpz7ei(q;b@p!^Y94Kcv>QDqauiA!NVADFzy_l+ z9X7gf0(Rj71`E7_6a<$*q%&+p&m;L+Sw>ry*@zKF8pE>5OdE-1+DtT=Zl>wXEG)v! zlYA;8v3$g~7`8phH9VF}*%Y2pWu-`#DIsI zZyVDpHf||Ne){3L#=6*DtH;`IJy_{}3&-45*obGi zqjzU)M$@{sTY}}O;_qI%eNDRMc%|ife}4DOvw|hr@1Of1ROikTcdhJg$_RY?ZLY7y zy9Z+Tr$qmibN-Li4W?mkTh!uHzb5QD`f%XW*Z9htb2l7sT)QDE+VENSwV&Qh*?zUP zbn}H3#m^5B_2&*QS_UZ=*NxGt6$3(-ygj|R?sO>~Qu{v<_HF9x)UBVl`KCcR@Z?Be zbfHby{MChDDnC4Vt+X+}VNrXi{z&e^l&djO4ON5H2_t6Rs|ROS46L;uJJ5N&ziYQQ z{&b`C_fBi*oqHt*?(_^Vm~-*^=zF?s@k0Axhl&4&ELmRRk~S)owGS#n65yv~ZeF_YwPpVv4dFSDggyHvotBrhc}3X_v}Fo4BP z6*D%5a#p>5o-rsC<9%$QU9wx3>S^Asq#_ul&+U=f3WXuv=b`8_Mgkm6G0Pdj!LHLF zz&efKD$I&lJ!Yna&8Zfcg6d_3baff6bAsuM0E162D{wOs1^C?MoT&F1!BM?>c^?tO zATSD%%8cM6r|i~zz|0E_fGKf^Mo|>d>Xax(s8!gDfC@n|7}3Ef0wJg#Mf55J7<)k3 zn&5QlZDiJ%E%{^wOC-sohheYRtMsasyig3II-L$iRIo|~$p}cS;v~ukabikT1IdWA zz=YWVt%E4DiMo{+jQ3!62)%sX5CypgbP8sZ@JTR(6V7EIG*C<+)Y|P(oJP|Dx zR(TlM#)y1{K+E-Tr9{bc?*7|Q1Sor>&l6a=C{#Jg(-m%plPshWly8(y)~QD@HLla* zYDlfo5Rk^9!XSsrg+eYyjk{b97e-KYRL_(6nJ9^?R0xh@m<~lVag!NGO=c~L6FQPK zWuQ^6g%c%;qnW5}R<>LhLdMVkcZ{-0%M~>F>bDfG!^=K z&$XP*O))*aet{dzBI73*`=5=U=HEqn&Zmq_TBzGJFJ{fk@Vs3U^14b%!|_Ynq3Ppl zhu1arU98s{a~7xEdvyq#nyhYq=2C6zu5jVQ?^fJjRbewVtXTLS8`tBn-ICCGvNZOn zzb+rz)}vjXv_Iy@w7BjJ({1`h+*g;+46JC6?dWaadhD&hlEgQs%#PXa-|v|py52JL z<~wc3c^B+If$KJh7Wa20;v;NYYU$begGt*BW%r6pE*hQ+sE_O$Uj5+I9pd=b)3L?= zh6Ua0>*o3o)MWoLZ;|@Ip(ArVr?M9Z@AUt^w0`p|w&K0RTb2fH?Wu3f>^$c^G#;;+ z(A^)p+&QBrw6ZU7W;U_c-uL#)!PfK(!CtUv;*HANA={OKK$UiFeN$z(mh~SWNNrQh zuW6||IB~FYB6jZZECAyJSZwkZ`@|enR7vI&S7# z!rt@o@Xywv{fD3bqD~AOSKZuJ^jqtnM}KNnj927+_|31u!|&%te#(~2W#qw(*J}R) D6X8Oj literal 0 HcmV?d00001 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
-
- +
+
+
+
+ + -- 2.17.1