gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Link to inyourtime.zone in all the sensible places

Browse source
This commit is contained in:
Michael Ball 2020-07-23 04:16:35 -07:00
parent f86c474002
commit 440ba3511e
4 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/proposals/show.html.haml
View file

@ -76,7 +76,9 @@
%dl#proposal-info
.col-md-12
%dt Date:
%dd= @event_schedule.start_time.strftime("%Y %B %e - %H:%M") if @event_schedule
%dd
= inyourtz(@event_schedule.start_time, @conference.timezone) do
= @event_schedule.start_time.strftime("%Y %B %e - %H:%M") if @event_schedule
.col-md-12
%dt Duration:
%dd= show_time(@event.event_type.length)
@ -121,7 +123,9 @@
%dl
%dt Start Time:
%dd
= event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %H:%M")
- event_schedule = event.program.selected_event_schedules.find { |es| es.event == event }
= inyourtz(event_schedule.start_time, @conference.timezone) do
= event_schedule.start_time.strftime("%Y %B %e %H:%M")
%br
%dt Room:
%dd

13
app/views/schedules/_event.html.haml
View file

@ -24,12 +24,13 @@
-# TODO: More informative text or aria-label.
= link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400
- if event_schedule.present?
%span.track
%span.fa.fa-clock-o
%span.label{ style: "background-color: grey" }
= event_schedule.start_time.strftime('%H:%M')
\-
= event_schedule.end_time.strftime('%H:%M')
= inyourtz(event_schedule.start_time, @conference.timezone) do
%span.track
%span.fa.fa-clock-o
%span.label{ style: "background-color: grey" }
= event_schedule.start_time.strftime('%H:%M')
\-
= event_schedule.end_time.strftime('%H:%M')
%span.track
%span.fa.fa-map-marker
%span.label{ style: "background-color: grey" }

6
app/views/schedules/events.html.haml
View file

@ -27,13 +27,15 @@
.col-xs-12.col-md-12
.date-content
%span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" }
= date = event_schedule.start_time.strftime('%Y-%m-%d')
= inyourtz(event_schedule.start_time, @conference.timezone) do
= date = event_schedule.start_time.strftime('%Y-%m-%d')
%a{ title: "Go up", class: "pull-right", href: "#program" }
%i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
- unless event_schedule.start_time.strftime('%H:%M').eql?(time)
.col-xs-12.col-md-1
.start-time
= time = event_schedule.start_time.strftime('%H:%M')
= inyourtz(event_schedule.start_time, @conference.timezone) do
= time = event_schedule.start_time.strftime('%H:%M')
.col-xs-12.col-md-11
.new-time-event
= render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }