Skip to content
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

feat: Schedule: Show date and time in left column #5772

Merged
merged 4 commits into from
Nov 27, 2020
Merged

feat: Schedule: Show date and time in left column #5772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
149b98d
Moved Date-time to left
Nov 26, 2020
0a3f4f7
Merge branch 'development' into date-time-5762
Nov 26, 2020
bb58a01
Improved styling
Nov 26, 2020
d3718c8
Merge branch 'date-time-5762' of https://github.com/daretobedifferent…
Nov 26, 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
4 changes: 4 additions & 0 deletions app/styles/partials/utils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
padding-top: 0 !important;
}

.pt-4 {
padding-top: 1rem !important;
}

.mt-4 {
margin-top: 1rem !important;
}
Expand Down
27 changes: 24 additions & 3 deletions app/templates/public/sessions.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,32 @@
{{/if}}

<div class="mt-8">
{{#each this.model.session as |session|}}
<Public::SessionItem @session={{session}} @event={{this.model.event}} @timezone={{this.timezone}} />
{{#if this.model.session}}
<table class="ui very basic table">
<thead class="full-width">
<tr>
<th class="two wide" style="border: none;"></th>
<th style="border: none;"></th>
</tr>
</thead>
<tbody>
{{#each this.model.session as |session|}}
<tr>
<td class="top aligned {{unless this.device.isMobile 'centered text'}}" style="border-top: none;">
<h4 class="ui header {{unless this.device.isMobile 'pt-4'}}" style="color: rgba(0, 0, 0, 0.7);">
{{general-date session.startsAt this.timezone 'h:mm A (z)'}}
</h4>
</td>
<td style="border-top: none; border-left: 1px solid lightgrey">
<Public::SessionItem @session={{session}} @event={{this.model.event}} @timezone={{this.timezone}} />
</td>
</tr>
{{/each}}
</tbody>
</table>
{{else}}
<div class="ui disabled header">{{t 'No Sessions exist for this time period'}}</div>
{{/each}}
{{/if}}
<InfinityLoader @infinityModel={{this.model.session}} @triggerOffset={{300}} @eventDebounce={{50}}>
<div class="center aligned five wide column">
<div class="ui loading very padded basic segment">
Expand Down