Merge pull request #258 from gopesht/change_splash_layout

Changed splash layout

app/views/conference/show.html.haml

@@ -1,6 +1,6 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
-
+= content_for :splash do
   - unless @conference.description.blank?
     %p= @conference.description
 

app/views/layouts/application.html.haml

@@ -25,6 +25,10 @@
         .row
           .col-md-12
             = render 'layouts/messages'
+      - if content_for :splash
+        #content
+          = yield :splash
+      -else
         .container#content
           = yield
 

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

@@ -31,49 +31,49 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders program partial' do
-    expect(render).to include("#{@conference.description}")
+    expect(view.content_for(:splash)).to include("#{@conference.description}")
     expect(view).to render_template(partial: 'conference/_program')
   end
 
   it 'renders registration partial' do
-    expect(rendered).to include("#{@conference.registration_description}")
+    expect(view.content_for(:splash)).to include("#{@conference.registration_description}")
     expect(view).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
 
   it 'renders sponsors partial' do
     expect(view).to render_template(partial: 'conference/_sponsor')
-    expect(rendered).to include('Lorem Ipsum Dolor')
+    expect(view.content_for(:splash)).to include('Lorem Ipsum Dolor')
-    expect(rendered).to include('example@example.com')
+    expect(view.content_for(:splash)).to include('example@example.com')
-    expect(rendered).to include('Platin')
+    expect(view.content_for(:splash)).to include('Platin')
-    expect(rendered).to include('Example sponsor')
+    expect(view.content_for(:splash)).to include('Example sponsor')
-    expect(rendered).to include('http://www.example.com')
+    expect(view.content_for(:splash)).to include('http://www.example.com')
-    expect(rendered).to include('Lorem Ipsum Dolor')
+    expect(view.content_for(:splash)).to include('Lorem Ipsum Dolor')
-    expect(rendered).to include('rails.jpg')
+    expect(view.content_for(:splash)).to include('rails.jpg')
   end
 
   it 'renders social media partial' do
     expect(view).to render_template('conference/_social_media')
-    expect(rendered).to include('http://www.fbexample.com')
+    expect(view.content_for(:splash)).to include('http://www.fbexample.com')
-    expect(rendered).to include('http://www.google-example.com')
+    expect(view.content_for(:splash)).to include('http://www.google-example.com')
-    expect(rendered).to include('http://youtu.be/rtyutut')
+    expect(view.content_for(:splash)).to include('http://youtu.be/rtyutut')
   end
 
   it 'renders location partial' do
     expect(view).to render_template(partial: 'conference/_location')
-    expect(rendered).to include('Suse Office')
+    expect(view.content_for(:splash)).to include('Suse Office')
-    expect(rendered).to include('Maxfeldstrasse 5 \n90409 Nuremberg')
+    expect(view.content_for(:splash)).to include('Maxfeldstrasse 5 \n90409 Nuremberg')
-    expect(rendered).to include('www.opensuse.org')
+    expect(view.content_for(:splash)).to include('www.opensuse.org')
-    expect(rendered).to include('Lorem Ipsum Dolor')
+    expect(view.content_for(:splash)).to include('Lorem Ipsum Dolor')
   end
 
   it 'renders lodging partial' do
     expect(view).to render_template(partial: 'conference/_lodging')
-    expect(rendered).to include('Example Hotel')
+    expect(view.content_for(:splash)).to include('Example Hotel')
-    expect(rendered).to include('Lorem Ipsum Dolor')
+    expect(view.content_for(:splash)).to include('Lorem Ipsum Dolor')
-    expect(rendered).to include('http://www.example.com')
+    expect(view.content_for(:splash)).to include('http://www.example.com')
   end
 end