Splaspage: Add highlights. Fix cfp inclusion.

app/models/conference.rb

@@ -566,6 +566,18 @@ class Conference < ActiveRecord::Base
     email_settings.updated_conference_registration_dates_template
   end
 
+  def keynote_speakers
+    User.with_role(:keynote_speaker, self)
+  end
+
+  ##
+  #
+  # ====Returns
+  # * +Array+  ->  Events with attribute 'is_highlight'
+  def highlights
+    events.where(is_highlight: true)
+  end
+
   private
 
   after_create do

app/views/conference/_program.html.haml

@@ -24,31 +24,13 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
-  - if @conference.events.keynotes.any?
-    .row
-      .col-md12
-        %h3.text-center
-          Keynote Talks!
-    .row
-      .col-md-12
-        - @conference.events.keynotes.each_slice(3) do |slice|
-          .row.row-centered
-            - slice.each do |event|
-              .col-md-6.col-centered
-                .thumbnail
-                  %p.text-center
-                    %b= event.title
-                  %h5.text-center
-                    = simple_format truncate(event.abstract, length: 500, separator: ' ')
-                    = link_to "Read More", conference_proposal_path(@conference.short_title, event)
 
   %h3.text-center
     Don't miss out!
-  %br
-  - if @conference.events.highlights.any?
+  - if @conference.highlights.any?
     .row
       .col-md-12
-        - @conference.events.highlights.each_slice(2) do |slice|
+        - @conference.highlights.each_slice(2) do |slice|
           .row.row-centered
             - slice.each do |event|
               .col-md-6.col-centered.col-top.highlights

db/migrate/20141127163428_remove_column_include_cfp_in_splash_from_cfp.rb

@@ -0,0 +1,5 @@
+class RemoveColumnIncludeCfpInSplashFromCfp < ActiveRecord::Migration
+  def change
+    remove_column :call_for_papers, :include_cfp_in_splash, :boolean, default: false
+  end
+end

db/migrate/20141127163536_add_include_cfp_in_splashpages.rb

@@ -0,0 +1,5 @@
+class AddIncludeCfpInSplashpages < ActiveRecord::Migration
+  def change
+    add_column :splashpages, :include_cfp, :boolean, default: false
+  end
+end