diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index bf7d391..31be013 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -3,6 +3,7 @@ include ApplicationHelper class PagesController < ApplicationController def home + @conferences = Conference.all @conference = Conference.find(:first, :order => "start_date DESC") end diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml index baf1fae..cbecde5 100644 --- a/app/views/pages/home.html.haml +++ b/app/views/pages/home.html.haml @@ -1,8 +1,12 @@ - title 'Bike!Bike!' - has_no_content - this_is_the_front_page -- if @conference - = render 'conferences/header' +/ + = @conference.to_json.to_s +/ + = @conferences.to_json.to_s +-# if @conference +-# = render 'conferences/header' -#%section -# .row diff --git a/lib/tasks/regenerate.rake b/lib/tasks/regenerate.rake index 2add483..f351a30 100644 --- a/lib/tasks/regenerate.rake +++ b/lib/tasks/regenerate.rake @@ -3,7 +3,7 @@ namespace :regenerate do task conference_posters: :environment do Conference.all.each {|m| m.poster.recreate_versions!} - puts Conference.all.to_json.to_s + #puts Conference.all.to_json.to_s end task organization_avatars: :environment do