Skip to content

fix: ensures sessions are listed in public/speakers by handling errors #3093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhinavk96 merged 3 commits into from
Jun 10, 2019
Merged

fix: ensures sessions are listed in public/speakers by handling errors #3093

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3a42ef
fix: ensures sessions are listed in public/speakers by handling errors
shreyanshdwivedi Jun 9, 2019
8097b35
adds css helper instead of concat
shreyanshdwivedi Jun 10, 2019
73baf38
Merge branch 'development' into speakerSessionItem
abhinavk96 Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions app/templates/components/public/speaker-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,21 @@
{{#if session.startsAt}}
{{moment-format session.startsAt 'DD MMM YY'}}
{{/if}}
<br>
<span class="session-location">
<strong>
{{session.microlocation.name}}
</strong>
</span>
{{#if session.microlocation}}
<br>
<span class="session-location">
<strong>
{{concat (t 'Microlocation - ') session.microlocation.name}}
</strong>
</span>
{{/if}}
</p>
<div class="ui fluid padded" style={{-html-safe (concat "color: " session.track.fontColor "px; background-color: " session.track.color ";")}}>
<div class="ui fluid padded" style={{css color=session.track.fontColor background-color=session.track.color}}>
<h3 class="item">
{{#if (and session.startsAt session.endsAt)}}
{{moment-format session.startsAt 'HH:mm'}} - {{moment-format session.endsAt 'hh:mm'}}
<br>
{{/if}}
<br>
&bull;&nbsp; {{session.title}}
<br>
</h3>
Expand Down