Merge 7abfbc7587 into 25a1c116fd

app/views/conference/show.html.haml

@@ -1,9 +1,10 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
-%div#program
-  = render 'program'
-%div#registration
-  = render 'registration'
-%div#callforpapers
-  = render 'call_for_papers'
+= content_for :splash do
+  %div#program
+    = render 'program'
+  %div#registration
+    = render 'registration'
+  %div#callforpapers
+    = render 'call_for_papers'
 

app/views/layouts/application.html.haml

@@ -21,12 +21,18 @@
     - if controller.class.name.split("::").first=="Admin"
       = render 'layouts/admin'
     -else
-      .container#messages
-        .row
-          .col-md-12
+      - if content_for :splash
+        %div#splash
+          #messages
             = render 'layouts/messages'
-      .container#content
-        = yield
+          = yield :splash
+      -else
+        .container#messages
+          .row
+            .col-md-12
+              = render 'layouts/messages'
+        .container#content
+          = yield
 
     #footer
       .container

spec/views/conference/show.html.haml_spec.rb

@@ -11,16 +11,16 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders program partial' do
-    expect(render).to include("#{@conference.description}")
-    expect(view).to render_template(partial: 'conference/_program')
+    expect(view.content_for(:splash)).to include("#{@conference.description}")
+    expect(view.content_for(:splash)).to render_template(partial: 'conference/_program')
   end
 
   it 'renders registration partial' do
-    expect(rendered).to include("#{@conference.registration_description}")
-    expect(view).to render_template(partial: 'conference/_registration')
+    expect(view.content_for(:splash)).to include("#{@conference.registration_description}")
+    expect(view.content_for(:splash)).to render_template(partial: 'conference/_registration')
   end
 
   it 'renders call_for_papers partial' do
-    expect(render).to include("#{@conference.call_for_papers.description}")
+    expect(view.content_for(:splash)).to include("#{@conference.call_for_papers.description}")
   end
 end