Skip to content

Commit

Permalink
TMS-974: Recurring event layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@eebbi
eebbi committed Nov 10, 2023
1 parent 3851411 commit f9a4577
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 46 deletions.
34 changes: 17 additions & 17 deletions partials/views/page-events-calendar/page-events-calendar-item-grid.dust
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<div class="events__item has-height-100 {item_classes.grid.item|s}">
<div class="events__item has-height-100 {item_classes.grid.item|attr}">
{?image}
<div class="image is-relative is-4by3" aria-hidden="true">
<a href="{url}" aria-hidden="true" tabindex="-1">
<img src="{image}" alt="" class="objectfit-image">
<a href="{url|url}" aria-hidden="true" tabindex="-1">
<img src="{image|attr}" alt="" class="objectfit-image">
</a>

{?primary_keyword}
<span class="pill is-absolute has-bottom-2 has-left-2 is-bordered is-secondary">
{primary_keyword|s}
{primary_keyword|html}
</span>
{/primary_keyword}

</div>
{/image}

<div class="events__item-inner pt-5 pb-6 {item_classes.grid.item_inner|s}">
<div class="events__item-inner pt-5 pb-6 {item_classes.grid.item_inner|attr}">
<h3 class="h5 mt-0 mb-5">
<a href="{url}">
{name|s}
<a href="{url|url}">
{name|html}
</a>
</h3>

<p class="has-text-small">
{short_description|s}
{short_description|kses}
</p>

<div class="events__meta is-flex is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.date|s}">
{>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
<span class="is-flex" aria-label="{Strings.s.event.date|attr}">
{>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
</span>

{date|s}
{date|html}
</div>

<div class="events__meta is-flex is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.time|s}">
{>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
<span class="is-flex" aria-label="{Strings.s.event.time|attr}">
{>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
</span>

{time|s}
{time|html}
</div>

{?location.name}
<div class="events__meta is-flex is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.location|s}">
{>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
<span class="is-flex" aria-label="{Strings.s.event.location|attr}">
{>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
</span>

{location.name|s}
{location.name|html}
</div>
{/location.name}
</div>
Expand Down
73 changes: 44 additions & 29 deletions partials/views/single-dynamic-event/single-dynamic-event-info.dust
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,62 @@
{?event.normalized.date}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|s}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /}
{?event.normalized.recurring}
{?event.normalized.date}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /}

<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{event.normalized.date|s}
<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{#event.normalized.dates}
<div>
{date|html}
</div>
{/event.normalized.dates}
</div>
</div>
</div>
{/event.normalized.date}
{/event.normalized.date}
{:else}
{?event.normalized.date}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /}

{?event.normalized.time}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|s}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.time_title template_classes=template_classes.info_group_title icon="time" /}
<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{event.normalized.date|html}
</div>
</div>
{/event.normalized.date}
{?event.normalized.time}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.time_title template_classes=template_classes.info_group_title icon="time" /}

<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{event.normalized.time|s}
<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{event.normalized.time|html}
</div>
</div>
</div>
{/event.normalized.time}
{/event.normalized.time}
{/event.normalized.recurring}

{?event.normalized.location}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|s}">
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.location_title template_classes=template_classes.info_group_title icon="location" /}

<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
<div>{event.normalized.location.name|s}</div>
<div>{event.normalized.location.description|s}</div>
<div>{event.normalized.location.extra_info|s}</div>
<div>{event.normalized.location.name|html}</div>
<div>{event.normalized.location.description|html}</div>
<div>{event.normalized.location.extra_info|html}</div>
{>"ui/link" link=event.normalized.location.info_url classes="is-inline-block mt-2" /}
</div>
</div>
{/event.normalized.location}

{?event.normalized.price}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|s}">
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.price_title template_classes=template_classes.info_group_title icon="euro" /}

<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
{#event.normalized.price}
<div>
{price|s}
{price|html}
</div>
<div>
{description|s}
{description|kses}
</div>
{>"ui/link" link=info_url /}
{/event.normalized.price}
Expand All @@ -50,33 +65,33 @@
{/event.normalized.price}

{?event.normalized.provider}
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|s}">
<div class="info-group mb-5 has-border-gray has-border-1 {template_classes.info_group|attr}">
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.provider_title template_classes=template_classes.info_group_title icon="bullhorn" /}

<div class="info-group__description has-text-small has-text-small pt-1 pr-8 pb-4 pl-9">
<div>{event.normalized.provider.name|s}</div>
<div>{event.normalized.provider.name|html}</div>

{?event.normalized.provider.email}
<div>
<a href="mailto:{event.normalized.provider.email}">
{event.normalized.provider.email|s}
<a href="mailto:{event.normalized.provider.email|attr}">
{event.normalized.provider.email|html}
</a>
</div>
{/event.normalized.provider.email}

{?event.normalized.provider.phone}
<div>
<a href="tel:{event.normalized.provider.phone}">
{event.normalized.provider.phone|s}
<a href="tel:{event.normalized.provider.phone|attr}">
{event.normalized.provider.phone|html}
</a>
</div>
{/event.normalized.provider.phone}
</div>
</div>

{>"ui/button-link" link=event.normalized.provider.link classes="is-primary mt-3 {template_classes.info_button|s}" icon="chevron-right" icon_classes="icon--medium" /}
{>"ui/button-link" link=event.normalized.provider.link classes="is-primary mt-3 {template_classes.info_button|attr}" icon="chevron-right" icon_classes="icon--medium" /}
{/event.normalized.provider}

{?event.normalized.virtual_event_link}
{>"ui/button-link" link=event.normalized.virtual_event_link classes="is-primary mt-3 {template_classes.info_button|s}" icon="chevron-right" icon_classes="icon--medium" /}
{>"ui/button-link" link=event.normalized.virtual_event_link classes="is-primary mt-3 {template_classes.info_button|attr}" icon="chevron-right" icon_classes="icon--medium" /}
{/event.normalized.virtual_event_link}

0 comments on commit f9a4577

Please sign in to comment.