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

Move conference description in conference show, instead of program partial.

Browse source
This commit is contained in:
Stella Rouzi 2014-06-12 22:13:12 +03:00
parent dab9e1da51
commit 9c0af1faf0
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/conference/_program.html.haml
View file

@ -6,9 +6,6 @@
%div.row %div.row
%div.col-md-12 %div.col-md-12
%h1 Program %h1 Program
- unless @conference.description.blank?
%p
= @conference.description
- if @conference.call_for_papers and @conference.call_for_papers.schedule_public - if @conference.call_for_papers and @conference.call_for_papers.schedule_public
%span You can check out our %span You can check out our
%span %span

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

@ -1,5 +1,8 @@
= 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'
- unless @conference.description.blank?
%p= @conference.description
%div#program %div#program
= render 'program' = render 'program'
%div#registration %div#registration