Fold call for papers & call for tracks into one splashpage section

Gemfile.lock

@@ -293,7 +293,7 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.4.9)
+    mysql2 (0.4.10)
     nenv (0.3.0)
     netrc (0.11.0)
     nio4r (2.1.0)

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

@@ -8,7 +8,7 @@
       = f.inputs name: 'Components' do
         = f.input :include_tracks, label: 'Display tracks', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_tracks) }
         = f.input :include_program, label: 'Display program', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_program) }
-        = f.input :include_cfp, label: 'Display call for papers information on splashpage, while cfp is open', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_cfp) }
+        = f.input :include_cfp, label: 'Display call for papers and call for tracks information on splashpage, while open', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_cfp) }
         = f.input :include_venue, label: 'Display venue', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_venue) }
         = f.input :include_registrations, label: 'Display the registration period', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_registrations) }
         = f.input :include_tickets, label: 'Display tickets', input_html: { checked: params[:action] == 'new' || @splashpage.try(:include_tickets) }

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

@@ -25,7 +25,7 @@
           - else
             No
         %dt
-          Include CFP:
+          Include Calls for Content:
         %dd
           - if @splashpage.include_cfp
             Yes

app/views/conferences/_call_for_content.haml

@@ -0,0 +1,14 @@
+= content_for :splash_nav do
+  %li
+    %a.smoothscroll{ href: '#call' } Call For Content
+
+%section#call
+  .container
+    .row
+      - if @conference.call_for_events.try(:open?) ^ @conference.call_for_tracks.try(:open?)
+        .col-md-3.col-sm-3.hidden-xs  
+      - if @conference.call_for_events.try(:open?)
+        = render 'call_for_paper'
+      .col-md-2.col-sm-2  
+      - if @conference.call_for_tracks.try(:open?)
+        = render 'call_for_tracks'

app/views/conferences/_call_for_paper.html.haml

@@ -1,48 +1,37 @@
-= content_for :splash_nav do
-  %li
-    %a.smoothscroll{ href: '#callforpapers' } Call For Papers
-
 - cache [@conference, @conference.call_for_events, @conference.confirmed_tracks,
   '#splash#callforpapers'] do
-  %section#callforpapers
+  .col-md-5.col-sm-5.text-center
-    .container
+    %h2
-  .row
+      Call for Papers
-    .col-md-12.text-center
+    %p.lead
-      %h2
+      We are ready to accept your proposals for sessions!
-        Call for Papers
+    %p
-      %p.lead
+      - if @conference.event_types.any?
-        We are ready to accept your proposals for sessions!
+        You can submit proposals for
-  .row
+        %span.notranslate
-    .col-md-6.col-md-offset-3.col-sm-10.col-sm-offset-1
+          = "#{event_types(@conference)}."
-      %p
+      - if @conference.confirmed_tracks.any?
-        - if @conference.event_types.any?
+        Proposals should fit in one of the
-          You can submit proposals for
+        %span.notranslate
-          %span.notranslate
+          = "#{pluralize(@conference.confirmed_tracks.length, 'track')}:"
-            = "#{event_types(@conference)}."
+          = "#{tracks(@conference)}."
-        - if @conference.confirmed_tracks.any?
+      - if @conference.call_for_events.try(:open?)
-          Proposals should fit in one of the
+        The submission period is open
-          %span.notranslate
+        %em.notranslate
-            = "#{pluralize(@conference.confirmed_tracks.length, 'track')}:"
+          = "#{date_string(@conference.call_for_events.start_date,
-            = "#{tracks(@conference)}."
+            @conference.call_for_events.end_date)}."
-        - if @conference.call_for_events.try(:open?)
+        %b
-          The submission period is open
+          You have
-          %em.notranslate
+          = pluralize(@conference.call_for_events.remaining_days, 'day')
-            = "#{date_string(@conference.call_for_events.start_date,
+          left!
-              @conference.call_for_events.end_date)}."
+        Remember
-          %b
+        %span.notranslate
-            You have
+          = @conference.title
-            = pluralize(@conference.call_for_events.remaining_days, 'day')
+        will only be as good as the sessions you present.
-            left!
+        Submit early, submit often!
-          Remember
+      - else
-          %span.notranslate
+        The submission period is closed.
-            = @conference.title
+    %p.cta-button
-          will only be as good as the sessions you present.
+      = link_to "Submit your paper now",
-          Submit early, submit often!
+        conference_program_proposals_path(@conference.short_title),
-        - else
+        class: 'btn btn-success btn-lg text-center'
-          The submission period is closed.
-  .row
-    .col-md-12.text-center
-      %p.cta-button
-        = link_to "Submit your paper now",
-          conference_program_proposals_path(@conference.short_title),
-          class: 'btn btn-success btn-lg text-center'

app/views/conferences/_call_for_tracks.html.haml

@@ -1,30 +1,19 @@
-= content_for :splash_nav do
-  %li
-    %a.smoothscroll{ href: '#callfortracks' } Call For Tracks
-
 - cache [@conference, @conference.call_for_tracks, '#splash#callfortracks'] do
-  %section#callfortracks
+  .col-md-5.col-sm-5.text-center
-    .container
+    %h2
-      .row
+      Call for Tracks
-        .col-md-12.text-center
+    %p.lead
-          %h2
+      We are ready to accept requests for tracks!
-            Call for Tracks
+    %p
-          %p.lead
+      The submission period for track requests is open
-            We are ready to accept requests for tracks!
+      %em.notranslate
-      .row
+        = "#{date_string(@conference.call_for_tracks.start_date,
-        .col-md-6.col-md-offset-3.col-sm-10.col-sm-offset-1
+          @conference.call_for_tracks.end_date)}."
-          %p
+      %b
-            The submission period for track requests is open
+        You have
-            %em.notranslate
+        = pluralize(@conference.call_for_tracks.remaining_days, 'day')
-              = "#{date_string(@conference.call_for_tracks.start_date,
+        left!
-                @conference.call_for_tracks.end_date)}."
+    %p.cta-button
-            %b
+      = link_to("Submit your request for track",
-              You have
+        conference_program_tracks_path(@conference.short_title),
-              = pluralize(@conference.call_for_tracks.remaining_days, 'day')
+        class: 'btn btn-success btn-lg text-center')
-              left!
-      .row
-        .col-md-12.text-center
-          %p.cta-button
-            = link_to("Submit your request for track",
-              conference_program_tracks_path(@conference.short_title),
-              class: 'btn btn-success btn-lg text-center')

app/views/conferences/show.html.haml

@@ -21,10 +21,8 @@
     = render 'tickets'
 
   // calls for content, or program
-  - if @conference.splashpage.include_cfp && @conference.call_for_events.try(:open?)
+  - if @conference.splashpage.include_cfp
-    = render 'call_for_paper'
+    = render 'call_for_content'
-  - if @conference.splashpage.include_cfp && @conference.call_for_tracks.try(:open?)
-    = render 'call_for_tracks'
   - if @conference.splashpage.include_program
     = render 'schedule_splashpage'
 

spec/features/versions_spec.rb

@@ -237,7 +237,7 @@ feature 'Version' do
 
     click_link 'Edit'
     uncheck('Display program')
-    uncheck('Display call for papers information on splashpage, while cfp is open')
+    uncheck('Display call for papers and call for tracks information on splashpage, while open')
     uncheck('Display venue')
     uncheck('Display tickets')
     uncheck('Display the lodgings')