From 394448dc36bf7883c774a2a0a5443cdd8a94a971 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Tue, 21 Nov 2017 10:26:19 -0800
Subject: [PATCH] Fold booths into the schedule section of splashpage

---
 app/views/conferences/_booths.html.haml              | 4 ----
 app/views/conferences/_schedule_splashpage.html.haml | 9 ++++++---
 app/views/conferences/show.html.haml                 | 4 +---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/views/conferences/_booths.html.haml b/app/views/conferences/_booths.html.haml
index fd9db04f..5bff5a70 100644
--- a/app/views/conferences/_booths.html.haml
+++ b/app/views/conferences/_booths.html.haml
@@ -1,7 +1,3 @@
-= content_for :splash_nav do
-  %li
-    %a.smoothscroll{ href: '#booths' } Booths
-
 - cache [@conference.confirmed_booths, '#splash#booths'] do
   %section#booths
     .container
diff --git a/app/views/conferences/_schedule_splashpage.html.haml b/app/views/conferences/_schedule_splashpage.html.haml
index cccbe929..90803430 100644
--- a/app/views/conferences/_schedule_splashpage.html.haml
+++ b/app/views/conferences/_schedule_splashpage.html.haml
@@ -1,9 +1,9 @@
 = content_for :splash_nav do
   %li
-    =link_to('#program', class: 'smoothscroll') do
-      Program
+    %a.smoothscroll{ href: '#program' } Program
 
-- cache [@confererence, @conference.confirmed_tracks, '#splash#program'] do
+- cache [@confererence, @conference.confirmed_tracks,
+  @conference.confirmed_booths,'#splash#schedule'] do
   %section#program
   .container
     .row
@@ -55,3 +55,6 @@
                   %h5.text-center
                     = markdown truncate(event.abstract, length: 500, separator: ' ')
                     = link_to "Read More", conference_program_proposal_path(@conference.short_title, event)
+
+- if @conference.splashpage.include_booths && @conference.confirmed_booths.any?
+  = render 'booths'
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index e6e2fe00..95d82ca0 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -20,15 +20,13 @@
   - if @conference.splashpage.include_tickets && @conference.tickets.any? && @conference.pending?
     = render 'tickets'
 
-  // calls for content - or - program
+  // calls for content, or program
   - if @conference.splashpage.include_cfp && @conference.call_for_events.try(:open?)
     = render 'call_for_paper'
   - if @conference.splashpage.include_cfp && @conference.call_for_tracks.try(:open?)
     = render 'call_for_tracks'
   - if @conference.splashpage.include_program
     = render 'schedule_splashpage'
-  - if @conference.splashpage.include_booths && @conference.confirmed_booths.any?
-    = render 'booths'
 
   // geo
   - if @conference.splashpage.include_venue && @conference.venue