Skip to content

fix: Speaker Name Shown in Overview Mode #5305

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
merged 2 commits into from
Oct 22, 2020
Merged

fix: Speaker Name Shown in Overview Mode #5305

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f308e4
show-speaker-name-in-overview-mode
sachinchauhan2889 Oct 13, 2020
eaaeb37
Merge branch 'development' into show-speaker-name-in-overview-mode-#4815
sachinchauhan2889 Oct 20, 2020
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
20 changes: 14 additions & 6 deletions app/components/public/session-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,22 @@
{{/if}}
</div>
{{else}}
<div class="left floated ten wide column">
<div class="session-speakers">
{{#each @session.speakers as |speaker|}}
<img alt="speaker" class="ui mini avatar image" src="{{if speaker.iconImageUrl speaker.iconImageUrl (if speaker.photoUrl speaker.photoUrl '/images/placeholders/avatar.png')}}">
{{/each}}
<div class="left floated twelve wide column">
<div class="ui grid stackable">
<div class="session-speakers">
{{#each @session.speakers as |speaker|}}
<img alt="speaker" class="ui mini avatar image" src="{{if speaker.iconImageUrl speaker.iconImageUrl (if speaker.photoUrl speaker.photoUrl '/images/placeholders/avatar.png')}}">
{{/each}}
</div>
<div class="left floated nine wide column">
{{#each @session.speakers as |speaker|}}
{{speaker.name}} ({{speaker.position}}, {{speaker.organisation}})
<br>
{{/each}}
</div>
</div>
</div>
<div class="right floated six wide column">
<div class="right floated four wide column">
{{#if @session.startsAt}}
<div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
<div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt @timezone 'hh:mm a / DD-MM-YYYY (z)'}}</div>
Expand Down