gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added yield to application layout for conditional rendering of splash

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-06-03 14:07:28 +05:30
parent 84a26b8d02
commit 4c1b693fcb
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/conference/show.html.haml
View file

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

1
app/views/layouts/application.html.haml
View file

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