From 839634e5697ff1833c19e75eb14ed04f2d35652d Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Fri, 31 Jul 2020 10:16:21 -0700 Subject: [PATCH] Happening now is broken --- app/helpers/events_helper.rb | 11 +++++------ app/views/schedules/happening_now.haml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index af956bfe..cb1d1652 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -181,14 +181,13 @@ module EventsHelper if current_user.roles.where(id: conference.roles).any? # 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') elsif current_user.registered_to_event?(conference) - if is_now - link_to('Join Live Event', event.url, target: '_blank') - else - link_to('Live Event Link Coming Soon', '#') - end + link_to('Join Live Event', event.url, target: '_blank') + # else + # link_to('Live Event Link Coming Soon', '#') + # end end end diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml index 0f01fb1c..b7ec73fa 100644 --- a/app/views/schedules/happening_now.haml +++ b/app/views/schedules/happening_now.haml @@ -22,7 +22,7 @@ #{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes. %h3 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)')} %p P.S. This page is in beta, and if it doesn't make sense, we're sorry.