diff --git a/app/models/conference.rb b/app/models/conference.rb index 7eb14759..1d0ac01d 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -20,7 +20,8 @@ class Conference < ActiveRecord::Base :include_sponsors_in_splash, :include_tracks_in_splash, :include_tickets_in_splash, :include_social_media_in_splash, :include_program_in_splash, :make_conference_public, - :photos_attributes, :banner_photo + :photos_attributes, :banner_photo, + :include_banner_in_splash has_paper_trail diff --git a/app/views/admin/conference/edit.html.haml b/app/views/admin/conference/edit.html.haml index 4bef2cfa..0b6c043f 100644 --- a/app/views/admin/conference/edit.html.haml +++ b/app/views/admin/conference/edit.html.haml @@ -10,6 +10,7 @@ = f.input :contact_email, :hint => "Contact email address for your conference. Will be used as reply-to address in emails sent out by the system." = f.input :color, :hint => "The color will be used eg for the dashboard.", :input_html => {:size => 6, :type => "color"} = f.inputs name: 'Banner for Splash' do + = f.input :include_banner_in_splash, hint: 'This enable the Banner Photo with description to be displayed on the splash' = f.input :banner_photo, hint: 'This will be the top most component of the splash.This background cover will contain start_date and end_date of the conference and the description' = f.input :description, hint: 'This description will be shown at the bottom of the banner photo of the Splash' diff --git a/db/migrate/20140620134535_add_include_banner_in_splash_to_conference.rb b/db/migrate/20140620134535_add_include_banner_in_splash_to_conference.rb new file mode 100644 index 00000000..99e72412 --- /dev/null +++ b/db/migrate/20140620134535_add_include_banner_in_splash_to_conference.rb @@ -0,0 +1,5 @@ +class AddIncludeBannerInSplashToConference < ActiveRecord::Migration + def change + add_column :conferences, :include_banner_in_splash, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 90d0777c..d140e248 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140620130306) do +ActiveRecord::Schema.define(version: 20140620134535) do create_table "answers", force: true do |t| t.string "title" @@ -99,6 +99,7 @@ ActiveRecord::Schema.define(version: 20140620130306) do t.string "banner_photo_content_type" t.integer "banner_photo_file_size" t.datetime "banner_photo_updated_at" + t.boolean "include_banner_in_splash", default: false end create_table "conferences_questions", id: false, force: true do |t|