From afadaafa476ec409c3aac90e0118893bace02fe9 Mon Sep 17 00:00:00 2001
From: Francis Whittle <francis@agileware.com.au>
Date: Thu, 29 Apr 2021 15:07:25 +1000
Subject: [PATCH] CIVICRM-1749 Add time elements and timezone to Event Info
 output.

---
 CRM/Event/Page/EventInfo.php           |  9 ++++++++
 templates/CRM/Event/Page/EventInfo.tpl | 31 +++++++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/CRM/Event/Page/EventInfo.php b/CRM/Event/Page/EventInfo.php
index 8f141a2a85..cd4ffafdcc 100644
--- a/CRM/Event/Page/EventInfo.php
+++ b/CRM/Event/Page/EventInfo.php
@@ -79,6 +79,15 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
 
     $this->assign('isShowLocation', CRM_Utils_Array::value('is_show_location', $values['event']));
 
+    // Reset event time zone info
+    $values['event']['event_start_date_utc'] = CRM_Utils_Date::convertTimeZone($values['event']['event_start_date'], 'UTC');
+    $values['event']['event_start_date'] = CRM_Utils_Date::convertTimeZone($values['event']['event_start_date'], $values['event']['event_tz']);
+    $values['event']['event_end_date_utc'] = CRM_Utils_Date::convertTimeZone($values['event']['event_end_date'], 'UTC');
+    $values['event']['event_end_date'] = CRM_Utils_Date::convertTimeZone($values['event']['event_end_date'], $values['event']['event_tz']);
+
+
+    $values['event']['event_tz'] = CRM_Core_SelectValues::timezone()[$values['event']['event_tz']];
+
     // show event fees.
     if ($this->_id && !empty($values['event']['is_monetary'])) {
       CRM_Contribute_BAO_Contribution_Utils::overrideDefaultCurrency($values['event']);
diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl
index 36bb493ccc..5d33dca43d 100644
--- a/templates/CRM/Event/Page/EventInfo.tpl
+++ b/templates/CRM/Event/Page/EventInfo.tpl
@@ -99,20 +99,25 @@
   {/if}
   <div class="clear"></div>
   <div class="crm-section event_date_time-section">
-      <div class="label">{ts}When{/ts}</div>
+      <div class="label">{ts}Event Start{/ts}</div>
       <div class="content">
-        {strip}
-            {$event.event_start_date|crmDate}
-            {if $event.event_end_date}
-                &nbsp;{ts}through{/ts}&nbsp;
-                {* Only show end time if end date = start date *}
-                {if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}
-                    {$event.event_end_date|crmDate:0:1}
-                {else}
-                    {$event.event_end_date|crmDate}
-                {/if}
-            {/if}
-        {/strip}
+          <time datetime="{$event.event_start_date_utc|date_format:"%Y-%m-%dT%H:%M:%S"}Z">{$event.event_start_date|crmDate}<span class="timezone"> {$event.event_tz}</span></time>
+      </div>
+    <div class="clear"></div>
+  </div>
+  {if $event.event_end_date}
+  <div class="crm-section event_date_time-section">
+      <div class="label">{ts}Event End{/ts}</div>
+      <div class="content">
+          <time datetime="{$event.event_end_date_utc|date_format:"%Y-%m-%dT%H:%M:%S"}Z">{strip}
+          {* Only show end time if end date = start date *}
+          {if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}
+              {$event.event_end_date|crmDate:0:1}
+          {else}
+              {$event.event_end_date|crmDate}
+          {/if}
+          {/strip}<span class="timezone"> {$event.event_tz}</span></time>
+      {/if}
       </div>
     <div class="clear"></div>
   </div>
-- 
2.25.1