diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb index 8a18f568..177b90c0 100644 --- a/app/controllers/schedule_controller.rb +++ b/app/controllers/schedule_controller.rb @@ -7,6 +7,10 @@ class ScheduleController < ApplicationController @rooms = @conference.rooms @events = @conference.events @dates = @conference.start_date..@conference.end_date + + if @dates === Date.current + @today = Date.current.strftime("%Y-%m-%d") end + end end diff --git a/app/views/schedule/index.html.erb b/app/views/schedule/index.html.erb index 12df1d14..c8a98d09 100644 --- a/app/views/schedule/index.html.erb +++ b/app/views/schedule/index.html.erb @@ -116,7 +116,7 @@ $(function() { if (activeTab.length) { activeTab.tab('show'); } else { - $('.nav-tabs a:first').tab('show'); + $('.nav-tabs a[href=#<%= j @today %>]').tab('show'); } }); });