Extracted Splashpage from Conference

#418

app/controllers/admin/splashpages_controller.rb

@@ -0,0 +1,49 @@
+module Admin
+  class SplashpagesController < Admin::BaseController
+    load_and_authorize_resource :conference, find_by: :short_title
+    load_and_authorize_resource through: :conference, singleton: true
+
+    def show; end
+
+    def new
+      @splashpage = @conference.build_splashpage
+    end
+
+    def edit; end
+
+    def create
+      @splashpage = @conference.build_splashpage(splashpage_params)
+
+      if @splashpage.save
+        redirect_to admin_conference_splashpage_path,
+                    notice: 'Splashpage successfully created.'
+      else
+        render :new
+      end
+    end
+
+    def update
+      if @splashpage.update_attributes(splashpage_params)
+        redirect_to admin_conference_splashpage_path,
+                    notice: 'Splashpage successfully updated.'
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      if @splashpage.destroy
+        redirect_to admin_conference_splashpage_path, notice: 'Splashpage was successfully destroyed.'
+      else
+        redirect_to admin_conference_splashpage_path, alert: "A error prohibited this Splashpage from being destroyed: "\
+        "#{@splashpage.errors.full_messages.join('. ')}."
+      end
+    end
+
+    private
+
+    def splashpage_params
+      params[:splashpage]
+    end
+  end
+end

app/controllers/commercials_controller.rb

@@ -1,7 +1,7 @@
 class CommercialsController < ApplicationController
-  load_and_authorize_resource :conference, find_by: :short_title
+  load_resource :conference, find_by: :short_title
   before_action :set_event
-  load_and_authorize_resource through: @event, except: [:new, :create]
+  load_and_authorize_resource through: :event
 
   def new
     @commercial = @event.commercials.build

app/models/ability.rb

@@ -107,12 +107,13 @@ class Ability
     can :manage, Campaign, conference_id: conf_ids_for_organizer
     can :manage, Photo, conference_id: conf_ids_for_organizer
     can :manage, RegistrationPeriod, conference_id: conf_ids_for_organizer
+    can :manage, Splashpage, conference_id: conf_ids_for_organizer
   end
 
   def guest
     ## Abilities for everyone, even guests (not logged in users)
     can [:show, :gallery_photos], Conference do |conference|
-      conference.make_conference_public == true
+      conference.splashpage && conference.splashpage.public == true
     end
 
     # see commercials too

app/models/conference.rb

@@ -14,20 +14,15 @@ class Conference < ActiveRecord::Base
                   :question_ids, :answers_attributes, :answer_ids, :difficulty_levels_attributes,
                   :use_difficulty_levels, :use_vpositions, :use_vdays, :vdays_attributes,
                   :vpositions_attributes, :use_volunteers, :color,
-                  :description, :ticket_description,
                   :sponsorship_levels_attributes, :sponsors_attributes,
-                  :sponsor_description, :sponsor_email, :lodging_description,
-                  :include_registrations_in_splash, :include_sponsors_in_splash,
-                  :include_tracks_in_splash, :include_tickets_in_splash,
-                  :include_program_in_splash,
-                  :make_conference_public, :photos_attributes, :banner_photo,
-                  :include_banner_in_splash, :targets, :targets_attributes, :campaigns,
-                  :campaigns_attributes
+                  :sponsor_email, :photos_attributes, :targets, :targets_attributes,
+                  :campaigns, :campaigns_attributes
 
   has_paper_trail
 
   has_many :questions
 
+  has_one :splashpage, dependent: :destroy
   has_one :contact, dependent: :destroy
   has_one :registration_period, dependent: :destroy
   has_one :email_settings, dependent: :destroy
@@ -94,12 +89,6 @@ class Conference < ActiveRecord::Base
                                     content_type: [/jpg/, /jpeg/, /png/, /gif/],
                                     size: { in: 0..500.kilobytes }
 
-  has_attached_file :banner_photo,
-                    styles: { thumb: '100x100>', large: '1300x700>' }
-
-  validates_attachment_content_type :banner_photo,
-                                    content_type: [/jpg/, /jpeg/, /png/, /gif/],
-                                    size: { in: 0..500.kilobytes }
   validates_presence_of :title,
                         :short_title,
                         :start_date,
@@ -325,7 +314,7 @@ class Conference < ActiveRecord::Base
     result['tracks'] = tracks_set?
     result['event_types'] = event_types_set?
     result['difficulty_levels'] = difficulty_levels_set?
-    result['make_conference_public'] = make_conference_public?
+    result['splashpage'] = splashpage && splashpage.public?
     result['process'] = calculate_setup_progress(result)
     result['short_title'] = short_title
     result

app/models/splashpage.rb

@@ -0,0 +1,15 @@
+class Splashpage < ActiveRecord::Base
+  belongs_to :conference
+
+  attr_accessible :banner_description, :ticket_description, :sponsor_description, :lodging_description,
+                  :registration_description, :include_registrations, :include_sponsors,
+                  :include_tracks, :include_tickets, :include_program, :public, :banner_photo, :include_banner,
+                  :include_social_media, :include_lodgings, :include_venue, :lodging_description
+
+  has_attached_file :banner_photo,
+                    styles: { thumb: '100x100>', large: '1300x700>' }
+
+  validates_attachment_content_type :banner_photo,
+                                    content_type: [/jpg/, /jpeg/, /png/, /gif/],
+                                    size: { in: 0..500.kilobytes }
+end

app/views/admin/conference/_edit_form.html.haml

@@ -1,27 +1,15 @@
 .row
   .col-md-8
     = semantic_form_for(@conference, :url => admin_conference_path(@conference.short_title),:html => {:multipart => true}) do |f|
-      = f.input :make_conference_public, hint: 'This will enable the visitors to view the splash page(the "View Conference" button will be visible now on the home page), it is recommended to enable this after you have finished setting up all the components for display'
-      = f.input :include_program_in_splash, hint: 'On setting this true you will enable the program component to be displayed on the splash page.This component includes tracks, keynote speakers and the schedule'
       = f.input :title, :hint => "The full name of the conference, such as 'openSUSE Conference 2013'"
       = f.input :short_title, :hint => "A short title, such as 'osc2013', to be used in URLs"
       = f.input :color, :hint => "The color will be used eg for the dashboard.", :input_html => {:size => 6, :type => "color"}
       - if !@conference.logo.blank?
         = image_tag @conference.logo(:thumb)
       = f.input :logo, :label => "Conference Logo", :hint => "This will be displayed on the front page."
-      = 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: markdown_hint("This description will be shown at the bottom of the banner photo of the Splash."), input_html: { rows: 5, data: { provide: "markdown-editable" } }
-
       = f.inputs :name => "Scheduling" do
         = f.input :timezone, :as => :time_zone, :hint => "The conference time zone"
         = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
         = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
-      = f.inputs name: 'Registration' do
-        = f.input :include_registrations_in_splash, hint: 'On setting this true you will enable the registrations to be displayed on the splash page'
-      = f.input :ticket_description, hint: markdown_hint("This will appear in the Tickets segment of the splash."), input_html: { rows: 5, data: { provide: "markdown-editable" } }
-      = f.input :sponsor_description, hint: markdown_hint("This will appear in the sponsor segment of the splash."), input_html: { rows: 5, data: { provide: "markdown-editable" } }
       = f.input :sponsor_email, hint: 'This will appear in the sponsor segment of the splash for the sponsors to contact to the organizers'
-      = f.input :lodging_description, hint: markdown_hint("This will appear in the lodging segment of the splash."), input_html: { rows: 5, data: { provide: "markdown-editable" } }
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/conference/_edit_show.html.haml

@@ -9,13 +9,6 @@
         Short Title
       %dd
         = @conference.short_title
-      %dt
-        Description
-      %dd
-        - unless @conference.description.blank?
-          = markdown(@conference.description)
-        - else
-          Not set!
       %dt
         Date
       %dd
@@ -42,20 +35,3 @@
       -else
         %h4.text-center
           Not set!
-  .col-md-4
-    .thumbnail.flex-col
-      %h3.text-center
-        Conference Banner
-      - if @conference.banner_photo?
-        = image_tag(@conference.banner_photo(:large), class: 'img-responsive')
-        .caption.flex-grow
-        .caption
-          %p
-            %dl.dl-horizontal
-              %dt
-                Filename
-              %dd
-                = @conference.banner_photo_file_name
-      - else
-        %h4.text-center
-          Not set!

app/views/admin/conference/_todo_list.html.haml

@@ -48,9 +48,9 @@
       = link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
     - else
       Add difficulty levels
-  %li{class: class_for_todo(conference_progress['make_conference_public'])}
-    %span{'class'=>icon_for_todo(conference_progress['make_conference_public'])}
+  %li{class: class_for_todo(conference_progress['splashpage'])}
+    %span{'class'=>icon_for_todo(conference_progress['splashpage'])}
     - if can? :update, @conference
-      = link_to 'Make Splash Page Public for Visitors', edit_admin_conference_path(conference_progress['short_title'])
+      = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title'])
     - else
-      Make Splash Page Public for Visitors
+      Set up a Splashpage

app/views/admin/conference/edit.html.haml

@@ -7,6 +7,7 @@
       %li
         %a{'href'=> '#edit', 'role'=>'tab', 'data-toggle'=>'tab'}
           Edit
+%br
 .row
   .col-md-12
     .tab-content

app/views/admin/contacts/_form.html.haml

@@ -9,5 +9,4 @@
         = f.input :googleplus, label: 'Google+ Url', hint: 'This will appear in the social media section as the link to the Google+ Page of your Conference'
         = f.input :twitter, hint: 'This will appear in the social media section as the link to the Twitter Page of your Conference'
         = f.input :instagram, hint: 'This will appear in the social media section as the link to the Instagram Page of your Conference'
-        = f.input :public, hint: 'On setting this true you will enable the social media links to be displayed on the splash page'
       = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/contacts/show.html.haml

@@ -1,26 +0,0 @@
-%p#notice= notice
-
-%p
-  %b Social tag:
-  = @contact.social_tag
-%p
-  %b Email:
-  = @contact.email
-%p
-  %b Facebook:
-  = @contact.facebook
-%p
-  %b Googleplus:
-  = @contact.googleplus
-%p
-  %b Twitter:
-  = @contact.twitter
-%p
-  %b Instagram:
-  = @contact.instagram
-%p
-  %b Public:
-  = @contact.public
-
-= link_to 'Edit', edit_admin_conference_contact_path
-

app/views/admin/emails/_help.html.haml

@@ -51,7 +51,7 @@
       -if @conference.call_for_papers.schedule_public
         %td {schedule_link}
         %td The link to complete schedule of the conference
-    - if @conference.make_conference_public
+    - if @conference.splashpage && @conference.splashpage.public
       %tr
         %td {conference_splash_link}
         %td The link to conference splash page

app/views/admin/lodgings/index.html.haml

@@ -1,6 +1,5 @@
 .row
   .col-md-8
     = semantic_form_for(@venue, :url => admin_conference_lodging_path(@conference.short_title, @conference.venue.lodgings), :html => {:multipart => true}) do |f|
-      = f.input :include_lodgings_in_splash, hint: 'On setting this true you will enable the lodgings to be displayed on the splash page'
       = dynamic_association :lodgings, "Lodgings", f
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/registration_periods/_form.html.haml

@@ -4,5 +4,4 @@
     = semantic_form_for(@registration_period, url: admin_conference_registration_period_path(@conference.short_title)) do |f|
       = f.input :start_date, as: :string, input_html: { id: 'registration-period-start-datepicker', readonly: 'readonly'  }
       = f.input :end_date, as: :string, input_html: { id: 'registration-period-end-datepicker', readonly: 'readonly'  }
-      = f.input :description, hint: markdown_hint('This will appear in the Tickets segment of the splash.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.submit 'Save Registration Period', class: 'btn btn-primary'

app/views/admin/registration_periods/show.html.haml

@@ -11,11 +11,6 @@
           End Date
         %dd
           = @registration_period.end_date
-        %dt
-          Description
-        %dd
-          - if !@conference.registration_period.description.blank?
-            = markdown(@conference.registration_period.description)
 
   - if can? :update, @registration_period
     = link_to 'Edit', edit_admin_conference_registration_period_path, class: 'btn btn-primary'

app/views/admin/splashpages/_form.html.haml

@@ -0,0 +1,27 @@
+%h1 Splashpage
+.row
+  .col-md-8
+    = semantic_form_for(@splashpage, url: admin_conference_splashpage_path(@conference.short_title)) do |f|
+      = f.inputs name: 'Banner' do
+        = 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 :banner_description, hint: markdown_hint('This description will be shown at the bottom of the banner photo of the Splashpage.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
+        = f.input :include_banner, label: 'Display banner on the splashpage?'
+      = f.inputs name: 'Components' do
+        = f.input :ticket_description, hint: markdown_hint('This will appear in the Tickets segment of the splash.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
+        = f.input :include_tickets, label: 'Display tickets on the splashpage?'
+        %br
+        = f.input :sponsor_description, hint: markdown_hint('This will appear in the Sponsors segment of the splash.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
+        = f.input :include_sponsors, label: 'Display sponsors on the splashpage?'
+        %br
+        = f.input :registration_description, hint: markdown_hint(''), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
+        = f.input :include_registrations, label: 'Display the registration period on the splashpage?'
+        %br
+        = f.input :lodging_description, hint: markdown_hint('This will appear in the Lodgings segment of the splash.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
+        = f.input :include_lodgings, label: 'Display the lodgings on the splashpage?'
+        %br
+        = f.input :include_tracks, label: 'Display tracks on the splashpage?'
+        = f.input :include_program, label: 'Display program on the splashpage?'
+        = f.input :include_social_media, label: 'Display social media on the splashpage?'
+        = f.input :include_venue, label: 'Display venue on the splashpage?'
+      = f.input :public, label: 'Make splash page public! (Attention: Please do this only after you have finished the configuration of the conference!)'
+      = f.submit 'Save Splashpage', class: 'btn btn-primary'

app/views/admin/splashpages/show.html.haml

@@ -0,0 +1,113 @@
+%h1 Splashpage
+%br
+- if @splashpage
+  .row
+    .col-md-8
+      %dl.dl-horizontal
+        %dt
+          Ticket:
+        %dd
+          - unless @splashpage.ticket_description.blank?
+            = markdown(@splashpage.ticket_description)
+        %dt
+          Include Tickets:
+        %dd
+          - if @splashpage.include_tickets
+            Yes
+          - else
+            No
+        %dt
+          Sponsor:
+        %dd
+          - unless @splashpage.sponsor_description.blank?
+            = markdown(@splashpage.sponsor_description)
+        %dt
+          Include Sponsors:
+        %dd
+          - if @splashpage.include_sponsors
+            Yes
+          - else
+            No
+        %dt
+          Registration:
+        %dd
+          - unless @splashpage.registration_description.blank?
+            = markdown(@splashpage.registration_description)
+        %dt
+          Include Registrations:
+        %dd
+          - if @splashpage.include_registrations
+            Yes
+          - else
+            No
+        %dt
+          Lodging:
+        %dd
+          - unless @splashpage.lodging_description.blank?
+            = markdown(@splashpage.lodging_description)
+        %dt
+          Include Tracks:
+        %dd
+          - if @splashpage.include_tracks
+            Yes
+          - else
+            No
+        %dt
+          Include Program:
+        %dd
+          - if @splashpage.include_program
+            Yes
+          - else
+            No
+        %dt
+          Include Social Media:
+        %dd
+          - if @splashpage.include_social_media
+            Yes
+          - else
+            No
+        %dt
+          Public
+        %dd
+          - if @splashpage.public
+            Yes
+          - else
+            No
+
+  .row.row-flex.row-flex-wrap
+    .col-md-4
+      .thumbnail.flex-col
+        %h3.text-center
+          Conference Banner
+        - if @splashpage.banner_photo?
+          = image_tag(@splashpage.banner_photo(:large), class: 'img-responsive')
+          .caption.flex-grow
+          .caption
+            %p
+              %dl.dl-horizontal
+                %dt
+                  Filename
+                %dd
+                  = @splashpage.banner_photo_file_name
+                %dt Description
+                %dd
+                  - unless @splashpage.banner_description.blank?
+                    = markdown(@splashpage.banner_description)
+                %dt Included
+                %dd
+                  - if @splashpage.include_banner
+                    Yes
+                  - else
+                    No
+        - else
+          %h4.text-center
+            Not set!
+  %br
+  - if can? :update, @splashpage
+    = link_to 'Edit', edit_admin_conference_splashpage_path, class: 'btn btn-primary'
+  - if can? :destroy, @splashpage
+    = link_to 'Delete', admin_conference_splashpage_path,
+                        method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger'
+- else
+  - if can? :create, @conference
+    = link_to 'Create Splashpage', new_admin_conference_splashpage_path, class: 'btn btn-primary'

app/views/admin/sponsors/index.html.haml

@@ -1,6 +1,5 @@
 .row
   .col-md-8
     = semantic_form_for(@conference, :url => admin_conference_sponsor_path(@conference.short_title, @conference.sponsors)) do |f|
-      = f.input :include_sponsors_in_splash, hint: 'On setting this true you will enable the sponsors to be displayed on the splash page'
       = dynamic_association :sponsors, "Sponsors", f
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/tracks/index.html.haml

@@ -1,6 +1,5 @@
 .row
   .col-md-8
     = semantic_form_for(@conference, :url => admin_conference_track_path(@conference.short_title, @conference.tracks)) do |f|
-      = f.input :include_tracks_in_splash, hint: 'On setting this true you will enable the tracks to be displayed on the splash page'
       = dynamic_association :tracks, "Tracks", f
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/venue/venue_info.html.haml

@@ -1,7 +1,6 @@
 .row
   .col-md-8
     = semantic_form_for(@venue, :url => admin_conference_venue_update_path(@conference.short_title),:html => {:multipart => true}) do |f|
-      = f.input :include_venue_in_splash, hint: 'On setting this true you will enable the venue to be displayed on the splash page'
       = f.input :name, :input_html => {:rows => 1}
       = f.input :address, :input_html => {:rows => 1}
       = f.input :website

app/views/conference/_lodging.html.haml

@@ -1,8 +1,8 @@
 %div.container.text-center
   %h2 Lodgings
-  -unless @conference.lodging_description.blank?
+  -unless @conference.splashpage.lodging_description.blank?
     .lead
-      = markdown(@conference.lodging_description)
+      = markdown(@conference.splashpage.lodging_description)
 
   %div.row.text-center
     - @conference.venue.lodgings.each do |r|

app/views/conference/_program.html.haml

@@ -13,6 +13,6 @@
       - else
         %span The schedule is not ready yet. Stay tuned!
   -unless @conference.tracks.blank?
-    - if @conference.include_tracks_in_splash?
+    - if @conference.splashpage.include_tracks
       = render 'tracks'
 

app/views/conference/_registration.html.haml

@@ -4,9 +4,9 @@
 %div.container.text-center
   %div.row
     %h1 Registration
-  - if @conference.registration_period && !@conference.registration_period.description.blank?
+  - if !@conference.splashpage.registration_description.blank?
     .lead
-      = markdown(@conference.registration_period.description)
+      = markdown(@conference.splashpage.registration_description)
   - if @conference.registration_dates_given?
     -if @conference.registration_period.end_date >= Date.today
       %h4 Registration period #{ date_string(@conference.registration_period.start_date, @conference.registration_period.end_date) }
@@ -18,5 +18,5 @@
     - else
       = link_to "Register for #{@conference.short_title}", new_conference_conference_registrations_path(@conference.short_title), class: "btn btn-success btn-lg", target: '_blank'
   - if @conference.tickets.any?
-    - if @conference.include_tickets_in_splash?
+    - if @conference.splashpage.include_tickets
       = render 'tickets'

app/views/conference/_sponsor.html.haml

@@ -5,9 +5,9 @@
   %div.row
     %div.col-md-12
       %h2 Sponsors
-      -if !@conference.sponsor_description.blank?
+      -if !@conference.splashpage.sponsor_description.blank?
         .lead
-        = markdown(@conference.sponsor_description)
+        = markdown(@conference.splashpage.sponsor_description)
       -if !@conference.sponsor_email.blank?
         %h3= mail_to "#{ @conference.sponsor_email }", 'Become a Sponsor'
   - if !@conference.sponsorship_levels.blank?

app/views/conference/_tickets.html.haml

@@ -1,9 +1,9 @@
 %div.row
   %h3 Tickets
-  -if @conference.ticket_description.present?
+  -if @conference.splashpage.ticket_description.present?
     .lead
-      = markdown(@conference.ticket_description)
-    - @conference.tickets.each do |ticket|
+      = markdown(@conference.splashpage.ticket_description)
+    - @conference.tickets.each do |s|
       %div.col-md-6
         - if ticket.title.present?
           %h4 #{ ticket.title }

app/views/conference/show.html.haml

@@ -1,59 +1,60 @@
 = content_for :splash do
-  .splash
-    - if @conference.include_banner_in_splash?
-      %section{ id: 'splash-banner' }
-        %div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-background' unless @conference.banner_photo.blank?) }
-          %div.container.text-center.banner-text
-            .row
-              %h1
-                = @conference.title
-            - if @conference.start_date && @conference.end_date
+  - if @conference.splashpage
+    .splash
+      - if @conference.splashpage.include_banner?
+        %section{ id: 'splash-banner' }
+          %div.banner-disp{ style: ("background-image: url(#{@conference.splashpage.banner_photo})" unless @conference.splashpage.banner_photo.blank?), class:('with-background' unless @conference.splashpage.banner_photo.blank?) }
+            %div.container.text-center.banner-text
               .row
-                %h3
-                  = date_string(@conference.start_date, @conference.end_date)
+                %h1
+                  = @conference.title
+              - if @conference.start_date && @conference.end_date
+                .row
+                  %h3
+                    = date_string(@conference.start_date, @conference.end_date)
 
-            - unless @conference.description.blank?
-              .row-fluid
-                .col-md-12.lead
-                  .lead
-                    = markdown(@conference.description)
-            -unless @conference.photos.blank?
-              = link_to 'Gallery', gallery_photos_conference_path(@conference.short_title), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
-              = render 'gallery'
-    - if @conference.include_program_in_splash?
-      %section{ id: 'program' }
-        .pad
-          = render 'program'
-
-    - if @conference.include_registrations_in_splash?
-      %section{ id: 'registration' }
-        .pad
-          = render 'registration'
-
-
-    -unless @conference.call_for_papers.blank?
-      - if @conference.call_for_papers.include_cfp_in_splash?
-        %section{ id:'callforpapers' }
+              - unless @conference.splashpage.banner_description.blank?
+                .row-fluid
+                  .col-md-12.lead
+                    .lead
+                      = markdown(@conference.splashpage.banner_description)
+              -unless @conference.photos.blank?
+                = link_to 'Gallery', gallery_photos_conference_path(@conference.short_title), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
+                = render 'gallery'
+      - if @conference.splashpage.include_program
+        %section{ id: 'program' }
           .pad
-            = render 'call_for_papers'
+            = render 'program'
 
-    -unless @conference.venue.blank?
-      - if @conference.venue.include_venue_in_splash?
-        %section{ id: 'location' }
+      - if @conference.splashpage.include_registrations
+        %section{ id: 'registration' }
           .pad
-            = render 'location'
-        - unless @conference.venue.lodgings.empty?
-          - if @conference.venue.include_lodgings_in_splash?
-            = render 'lodging'
+            = render 'registration'
 
-    - if @conference.include_sponsors_in_splash?
-      %section{ id: 'sponsors' }
-        .pad
-          = render 'sponsor'
 
-    - if @conference.contact.public?
-      %section{ id: 'social-media' }
-        .pad
-          = render 'social_media'
+      -unless @conference.call_for_papers.blank?
+        - if @conference.call_for_papers.include_cfp_in_splash?
+          %section{ id:'callforpapers' }
+            .pad
+              = render 'call_for_papers'
 
-    = render 'footer'
+      -unless @conference.venue.blank?
+        - if @conference.splashpage.include_venue
+          %section{ id: 'location' }
+            .pad
+              = render 'location'
+          - unless @conference.venue.lodgings.empty?
+            - if @conference.splashpage.include_lodgings
+              = render 'lodging'
+
+      - if @conference.splashpage.include_sponsors
+        %section{ id: 'sponsors' }
+          .pad
+            = render 'sponsor'
+
+      - if @conference.splashpage.include_social_media
+        %section{ id: 'social-media' }
+          .pad
+            = render 'social_media'
+
+      = render 'footer'

app/views/home/_conference_details.html.haml

@@ -27,7 +27,7 @@
                 = link_to "Subscribe", subscription_conference_path(conference.short_title), method: "PATCH", class: "btn btn-info btn-group-vertical"
 
             - if !@conference || @conference != conference
-              - if conference.make_conference_public?
+              - if conference.splashpage && conference.splashpage.public
                 = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
@@ -40,4 +40,4 @@
             - elsif conference.cfp_open?
               = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
             - if !current_user.nil? && conference.tickets.any?
-              = link_to 'Support', conference_tickets_path(conference.short_title), class: 'btn btn-default'
+              = link_to 'Support', conference_tickets_path(conference.short_title), class: 'btn btn-default'

app/views/layouts/_admin_sidebar.html.haml

@@ -53,6 +53,11 @@
       = link_to( admin_conference_registration_period_path (@conference.short_title)) do
         %span.fa.fa-male
         Registration Period
+  - if can? :update, @conference
+    %li{:class=> active_nav_li( admin_conference_splashpage_path (@conference.short_title))}
+      = link_to( admin_conference_splashpage_path (@conference.short_title)) do
+        %span.fa.fa-globe
+        Splashpage
   - if can? :update, @conference.events.build
     %li{:class=> active_nav_li(admin_conference_events_path(@conference.short_title))}
       = link_to(admin_conference_events_path(@conference.short_title)) do