Skip to content

fix: Removing microlocation from speaker item #4077

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 1 commit into from
Feb 13, 2020
Merged

fix: Removing microlocation from speaker item #4077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/templates/components/public/session-item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<br>
<div class="ui grid stackable">
{{#if hideImage}}
<div class="left floated five wide column">
<div class="left floated twelve wide column">
{{#if session.startsAt}}
<div class=""><i class="marker icon"></i>{{session.microlocation.name}}</div>
<div class="small text"><i class="wait icon"></i>{{moment-format session.startsAt 'hh:mm a / DD-MM-YYYY'}}</div>
<div class="small text"><i class="wait icon"></i>{{general-date session.startsAt}} - {{general-date session.endsAt}}</div>
{{/if}}
</div>
{{else}}
Expand Down
13 changes: 4 additions & 9 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 @@ -47,15 +47,9 @@
{{#if (or (eq session.state 'confirmed') (eq session.state 'accepted'))}}
<p>
{{#if session.startsAt}}
{{moment-format session.startsAt 'DD MMM YY'}}
{{/if}}
{{#if session.microlocation}}
<br>
<span class="session-location">
<strong>
{{concat (t 'Microlocation - ') session.microlocation.name}}
</strong>
</span>
<strong>
{{moment-format session.startsAt 'DD MMM YY'}}
</strong>
{{/if}}
</p>
<div class="ui fluid padded" style={{css color=session.track.fontColor background-color=session.track.color}}>
Expand All @@ -68,6 +62,7 @@
<br>
</h3>
</div>
<br>
{{/if}}
{{/each}}
</div>
Expand Down