Splaspage: Add highlights. Fix cfp inclusion.

app/models/conference.rb

@@ -562,6 +562,14 @@ class Conference < ActiveRecord::Base
     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/models/splashpage.rb

@@ -1,7 +1,7 @@
 class Splashpage < ActiveRecord::Base
   belongs_to :conference
   attr_accessible :public,
-                  :include_tracks, :include_program,
+                  :include_tracks, :include_program, :include_cfp,
                   :include_venue, :include_registrations,
                   :include_tickets, :include_lodgings,
                   :include_sponsors, :include_social_media

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

@@ -7,7 +7,6 @@
     = semantic_form_for(@call_for_paper, :url => admin_conference_call_for_paper_path(@conference.short_title),:html => {:multipart => true}) do |f|
       = 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.input :include_cfp_in_splash, label: "Show Call for Papers on the splash page"
       = f.input :schedule_public, label: "Show Schedule on the home and splash page"
       = f.input :schedule_changes, label: "Allow submitters to change their event after it is scheduled"
       = f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals. Enter 0 if you do not want to vote on proposals."

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

@@ -29,13 +29,6 @@
           Tracks:
         %dd
           = tracks(@conference)
-        %dt
-          Public
-        %dd#cfp_in_splash
-          - if @call_for_paper.include_cfp_in_splash
-            True
-          - else
-            False
         %dt
           Public Schedule
         %dd#schedule_public

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

@@ -8,6 +8,7 @@
       = f.inputs name: 'Components' do
         = f.input :include_tracks, label: 'Display tracks on the splashpage?'
         = f.input :include_program, label: 'Display program on the splashpage?'
+        = f.input :include_cfp, label: 'Display CfP information on splashpage, while cfp is open?'
         = f.input :include_venue, label: 'Display venue on the splashpage?'
         = f.input :include_registrations, label: 'Display the registration period on the splashpage?'
         = f.input :include_tickets, label: 'Display tickets on the splashpage?'

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

@@ -3,7 +3,7 @@
     .page-header
       %h1 Splashpage
       %p.text-muted
-        Build a 
+        Build a
         = link_to "splash page", conference_path(@conference.short_title)
         with all the information for your conference
 - if @splashpage
@@ -45,6 +45,13 @@
             Yes
           - else
             No
+        %dt
+          Include CFP:
+        %dd
+          - if @splashpage.include_cfp
+            Yes
+          - else
+            No
         %dt
           Include Social Media:
         %dd

app/views/conference/_program.html.haml

@@ -24,9 +24,22 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
-  - #FIXME: Display keynotes https://github.com/openSUSE/osem/issues/544 
-  - #FIXME: Display schedule highlights https://github.com/openSUSE/osem/issues/545
+  - #FIXME: Display keynotes https://github.com/openSUSE/osem/issues/544
 
+  %h3.text-center
+    Don't miss out!
+  - if @conference.highlights.any?
+    .row
+      .col-md-12
+        - @conference.highlights.each_slice(2) do |slice|
+          .row.row-centered
+            - slice.each do |event|
+              .col-md-6.col-centered.col-top.highlights
+                %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)
 
   = content_for :splash_nav do
     %li

app/views/conference/show.html.haml

@@ -33,7 +33,7 @@
       %section#program
         = render 'program'
 
-    - if @conference.cfp_open? and @conference.call_for_paper.include_cfp_in_splash?
+    - if @conference.cfp_open? and @conference.splashpage.include_cfp
       %section#callforpapers
         = render 'call_for_paper'
 
@@ -53,7 +53,7 @@
       %section#sponsors
         = render 'sponsors'
 
-    - if @conference.splashpage.include_social_media and @conference.contact.has_social_media?
+    - if @conference.contact.has_social_media? and @conference.splashpage.include_social_media
       %section#social-media
         = render 'social_media'