E-notice fix Ical display

diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php
index f7f7e9386df1d442e320953f607f88f98f5d309b..9464ebacce93b568c91ac9f7206e8656e2a9c05f 100644 (file)
--- a/CRM/Event/Form/Registration/ThankYou.php
+++ b/CRM/Event/Form/Registration/ThankYou.php
@@ -177,6 +177,7 @@ class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration {
     }
 
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks($this->_eventId));
+    $this->assign('isShowICalIconsInline', TRUE);
 
     $this->freeze();
 

diff --git a/CRM/Event/Page/DashBoard.php b/CRM/Event/Page/DashBoard.php
index 9f86809e13c49c2731e46e1454a5993e965f85e0..bc4af9c32a363ace4a582ff96d9ff4c72cfb1887 100644 (file)
--- a/CRM/Event/Page/DashBoard.php
+++ b/CRM/Event/Page/DashBoard.php
@@ -42,6 +42,7 @@ class CRM_Event_Page_DashBoard extends CRM_Core_Page {
     $this->assign('actionColumn', $actionColumn);
     $this->assign('eventSummary', $eventSummary);
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks());
+    $this->assign('isShowICalIconsInline', FALSE);
   }
 
   /**

diff --git a/CRM/Event/Page/EventInfo.php b/CRM/Event/Page/EventInfo.php
index 8790c171bf5ea142626f31cea31cdef9e3bda408..c279ea153b8ea6e76d73235d03cd837c5e8bd00c 100644 (file)
--- a/CRM/Event/Page/EventInfo.php
+++ b/CRM/Event/Page/EventInfo.php
@@ -47,6 +47,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
     $this->assign('context', $context);
 
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks($this->_id));
+    $this->assign('isShowICalIconsInline', TRUE);
 
     // Sometimes we want to suppress the Event Full msg
     $noFullMsg = CRM_Utils_Request::retrieve('noFullMsg', 'String', $this, FALSE, 'false');

diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 657b1d037ac50c883c6f6703cf353513d9de14f1..c981862362ef5963652b48c437ef6e06d1b30e59 100644 (file)
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -227,6 +227,7 @@ class CRM_Event_Page_ManageEvent extends CRM_Core_Page {
     // assign vars to templates
     $this->assign('action', $action);
     $this->assign('iCal', CRM_Event_BAO_Event::getICalLinks());
+    $this->assign('isShowICalIconsInline', FALSE);
     $id = CRM_Utils_Request::retrieve('id', 'Positive',
       $this, FALSE, 0, 'REQUEST'
     );

diff --git a/templates/CRM/Event/Page/iCalLinks.tpl b/templates/CRM/Event/Page/iCalLinks.tpl
index 2f6a31556762d912b51d2076a2159935bb772dbb..932666e217b8087cb20e6000bb0f39d03601e80a 100644 (file)
--- a/templates/CRM/Event/Page/iCalLinks.tpl
+++ b/templates/CRM/Event/Page/iCalLinks.tpl
@@ -9,7 +9,7 @@
 *}
 {* Display icons / links for ical download and feed for EventInfo.tpl, ThankYou.tpl, DashBoard.tpl, and ManageEvent.tpl *}
   {foreach from=$iCal item="iCalItem"}
-  <a href="{$iCalItem.url}" {if !empty($event)} class="crm-event-feed-link"{/if}>
+  <a href="{$iCalItem.url}" {if $isShowICalIconsInline} class="crm-event-feed-link"{/if}>
     <span class="fa-stack" aria-hidden="true"><i class="crm-i fa-calendar-o fa-stack-2x"></i><i style="top: 15%;" class="crm-i {$iCalItem.icon} fa-stack-1x"></i></span>
     <span class="label">{$iCalItem.text}</span>
   </a>