Extracted Splashpage from Conference

#418

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'