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

Merge pull request #202 from gopesht/check_cfp

Browse source 
Check for cfp object before rendering partial
This commit is contained in:
James Mason 2014-06-12 10:14:06 -07:00
commit ee655e09e8
2 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conference/_call_for_papers.html.haml
View file

@ -17,7 +17,7 @@
- if @conference.call_for_papers.end_date.to_time < Time.now - if @conference.call_for_papers.end_date.to_time < Time.now
%p Today is the last day. Hurry Up! %p Today is the last day. Hurry Up!
- else - else
%div.row.col-md-12.col-md-offset-2 %div.row.col-md-6.col-md-offset-4
%div.col-md-2 %div.col-md-2
%h2#days %h2#days
%p Days %p Days

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

@ -4,6 +4,7 @@
= render 'program' = render 'program'
%div#registration %div#registration
= render 'registration' = render 'registration'
%div#callforpapers -unless @conference.call_for_papers.blank?
%div#callforpapers
= render 'call_for_papers' = render 'call_for_papers'