Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

[YGO-24] Carnation theme fixes for event page #1985

Merged
merged 5 commits into from Apr 6, 2020
Merged

[YGO-24] Carnation theme fixes for event page #1985

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
560936f
[YGO-24] Fix deprecated function and constants
anprok Apr 2, 2020
d86f563
[YGO-24] Change event date format in Carnation theme
anprok Apr 2, 2020
bc9cf97
[YGO-24] Fix comment
anprok Apr 2, 2020
1eb25fe
[YGO-24] Update event contact information template
anprok Apr 2, 2020
a952311
Merge branch '8.x-2.x' into YGO-24
podarok Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions modules/openy_features/openy_node/modules/openy_node_event/openy_node_event.module
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
*/

use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
use Drupal\node\Entity\Node;
use Drupal\Core\Link;
use Drupal\Core\Url;
Expand Down Expand Up @@ -55,10 +56,10 @@ function openy_node_event_preprocess_field__node__field_event_location__event(&$
if (empty($datesField[0])) {
return;
}
$timezone = drupal_get_user_timezone();
$startDt = DrupalDateTime::createFromFormat(DATETIME_DATETIME_STORAGE_FORMAT, $datesField[0]['value'], DATETIME_STORAGE_TIMEZONE);
$timezone = date_default_timezone_get();
$startDt = DrupalDateTime::createFromFormat(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $datesField[0]['value'], DateTimeItemInterface::STORAGE_TIMEZONE);
$startDt->setTimezone(timezone_open($timezone));
$endDt = DrupalDateTime::createFromFormat(DATETIME_DATETIME_STORAGE_FORMAT, $datesField[0]['end_value'], DATETIME_STORAGE_TIMEZONE);
$endDt = DrupalDateTime::createFromFormat(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $datesField[0]['end_value'], DateTimeItemInterface::STORAGE_TIMEZONE);
$endDt->setTimezone(timezone_open($timezone));
$datesInfo = [
'date_start' => $startDt,
Expand Down Expand Up @@ -150,11 +151,11 @@ function openy_node_event_preprocess_node(&$variables) {
if ($variables['view_mode'] == 'teaser' && $variables['node']->getType() == 'event') {
// Get dates.
$datesField = $variables['node']->get('field_event_dates')->getValue();
$timezone = drupal_get_user_timezone();
$startDt = DrupalDateTime::createFromFormat(DATETIME_DATETIME_STORAGE_FORMAT, $datesField[0]['value'], DATETIME_STORAGE_TIMEZONE);
$timezone = date_default_timezone_get();
$startDt = DrupalDateTime::createFromFormat(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $datesField[0]['value'], DateTimeItemInterface::STORAGE_TIMEZONE);
$startDt->setTimezone(timezone_open($timezone));
$endDt = DrupalDateTime::createFromFormat(DATETIME_DATETIME_STORAGE_FORMAT, $datesField[0]['end_value'], DATETIME_STORAGE_TIMEZONE);
$endDt->setTimezone(timezone_open($timezone));
$endDt = DrupalDateTime::createFromFormat(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $datesField[0]['end_value'], DateTimeItemInterface::STORAGE_TIMEZONE);
$endDt->setTimezone(timezone_open($timezone));
$variables['content']['event_converted_dates'] = [
'date_start' => $startDt->format('g:i a'),
'date_end' => $endDt->format('g:i a'),
Expand Down
4 changes: 2 additions & 2 deletions ...es/openy_features/openy_node/modules/openy_node_event/templates/event-date-info.html.twig
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@
*
* Available variables:
* - info: The info array with access to event date info.
* - info.date_start will return formated "j M g:i a" event start date.
* - info.date_end will return formated "g:i a" event end date.
* - info.date_start will return event start date.
* - info.date_end will return event end date.
* - atc: The atc array of additional calendar info.
* - atc_date_start will return formated "Y-m-d H:i:s" event start date.
* - atc_date_end will return formated "Y-m-d H:i:s" event end date.
Expand Down
2 changes: 1 addition & 1 deletion themes/openy_themes/openy_carnation/templates/node/event/event-contact-info.html.twig
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
#}
<div class="d-inline-block w-100">
<h5><i class="far fa-question-circle text-gray-300"></i>{{ 'Contact Information'|t }}</h5>
<h5><i class="far fa-question-circle text-gray-300"></i> {{ 'Contact Information'|t }}</h5>

{% if info.phone is not empty %}
<div class="contact-phone"><i class="fa fa-phone text-gray-300"></i> {{ info.phone }}</div>
Expand Down
6 changes: 3 additions & 3 deletions themes/openy_themes/openy_carnation/templates/node/event/event-date-info.html.twig
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@
*
* Available variables:
* - info: The info array with access to event date info.
* - info.date_start will return formated "j M g:i a" event start date.
* - info.date_end will return formated "g:i a" event end date.
* - info.date_start will return event start date.
* - info.date_end will return event end date.
* - atc: The atc array of additional calendar info.
* - atc_date_start will return formated "Y-m-d H:i:s" event start date.
* - atc_date_end will return formated "Y-m-d H:i:s" event end date.
Expand All @@ -23,7 +23,7 @@
#}
<div class="d-inline-block w-100 pb-4 mb-4 border-light border-bottom">
<h5><i class="far fa-clock text-gray-300"></i> {{ 'Event Details'|t }}</h5>
<div class="date-start">{{ info.date_start }} - {{ info.date_end }}</div>
<div class="date-start">{{ info.date_start|date('M j, g:i a') }} - {{ info.date_end|date('M j, g:i a') }}</div>
<div class="addtocalendar atc-style-blue mt-2">
<var class="atc_event">
<var class="atc_date_start">{{ atc.atc_date_start }}</var>
Expand Down