Added registration segment to display description, period

Controller test for Conference#show

houndci fixes

Rebased with single entry for navigation branding

Conditional rendering of splash navbar

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

@@ -14,6 +14,7 @@
         = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
         = f.input :registration_start_date, :as => :string, :input_html => { :id => "conference-reg-start-datepicker", :readonly => "readonly"  }
         = f.input :registration_end_date, :as => :string, :input_html => { :id => "conference-reg-end-datepicker", :readonly => "readonly"  }
+      = f.input :registration_description, hint: 'This description will appear in registration segment of the splash'
 
       = f.inputs :name => "Media" do
         - if !@conference.logo.blank?

app/views/conference/_registration.html.haml

@@ -0,0 +1,12 @@
+= content_for :splash_nav do
+  %li
+    %a{ href: '#registration' } Registration
+%div.container.text-center
+  %div.row
+    %h2 Registration
+  - if !@conference.registration_description.blank?
+    %p
+      = @conference.registration_description
+  %h4 Registration period #{ date_string(@conference.registration_start_date, @conference.registration_end_date) }
+  - if @conference.registration_open?
+    = link_to "Register for #{@conference.short_title}", register_conference_path(@conference.short_title), :class =>"btn btn-success btn-lg", target: '_blank'

app/views/conference/show.html.haml

@@ -2,3 +2,6 @@
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
 %div#program
   = render 'program'
+%div#registration
+  = render 'registration'
+