From df59f78c8d1bf71457b0bfa1d9b60c4514c782e9 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sat, 18 Feb 2023 16:30:00 +1300 Subject: [PATCH] E-notice fix Ical display --- CRM/Event/Form/Registration/ThankYou.php | 1 + CRM/Event/Page/DashBoard.php | 1 + CRM/Event/Page/EventInfo.php | 1 + CRM/Event/Page/ManageEvent.php | 1 + templates/CRM/Event/Page/iCalLinks.tpl | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Event/Form/Registration/ThankYou.php b/CRM/Event/Form/Registration/ThankYou.php index f7f7e9386d..9464ebacce 100644 --- 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 9f86809e13..bc4af9c32a 100644 --- 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 8790c171bf..c279ea153b 100644 --- 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 657b1d037a..c981862362 100644 --- 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 2f6a315567..932666e217 100644 --- 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"} - + {$iCalItem.text} -- 2.25.1