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

Happening now is broken

Browse source
This commit is contained in:
Michael Ball 2020-07-31 10:16:21 -07:00
parent 0c15d6091a
commit 839634e569
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/helpers/events_helper.rb
View file

@ -181,14 +181,13 @@ module EventsHelper
if current_user.roles.where(id: conference.roles).any? if current_user.roles.where(id: conference.roles).any?
# Show Pre-Event links for any memeber of the conference team. # Show Pre-Event links for any memeber of the conference team.
link_to("Join Live Event #{'(Pre-Event)' unless is_now}", link_to("Join Live Event",
event.url, target: '_blank') event.url, target: '_blank')
elsif current_user.registered_to_event?(conference) elsif current_user.registered_to_event?(conference)
if is_now
link_to('Join Live Event', event.url, target: '_blank') link_to('Join Live Event', event.url, target: '_blank')
else # else
link_to('Live Event Link Coming Soon', '#') # link_to('Live Event Link Coming Soon', '#')
end # end
end end
end end

2
app/views/schedules/happening_now.haml
View file

@ -22,7 +22,7 @@
#{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes. #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
%h3 %h3
This page was loaded at This page was loaded at
= inyourtz(Time.now, @conference.timezone) = inyourtz(Time.now, @conference.timezone) do
#{Time.now.strftime('%a %b %d at %I:%M %P (%z)')} #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')}
%p %p
P.S. This page is in beta, and if it doesn't make sense, we're sorry. P.S. This page is in beta, and if it doesn't make sense, we're sorry.