Merge pull request #202 from gopesht/check_cfp

Check for cfp object before rendering partial

app/views/conference/_call_for_papers.html.haml

@@ -13,27 +13,27 @@
       - if !@conference.call_for_papers.start_date.blank? && !@conference.call_for_papers.end_date.blank?
         %p Proposals will be accepted between
         #{ date_string(@conference.call_for_papers.start_date, @conference.call_for_papers.end_date) }
-      - if @conference.cfp_open?
+    - if @conference.cfp_open?
-        - 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
-            %div.col-md-2
+          %div.col-md-2
-              %h2#hours
+            %h2#hours
-              %p Hours
+            %p Hours
-            %div.col-md-2
+          %div.col-md-2
-              %h2#minutes
+            %h2#minutes
-              %p Minutes
+            %p Minutes
-            %div.col-md-2
+          %div.col-md-2
-              %h2#seconds
+            %h2#seconds
-              %p Seconds
+            %p Seconds
-        %p
+      %p
-          = link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank'
+        = link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank'
-      -else
+    -else
-        %h3 Deadline has ended
+      %h3 Deadline has ended
 
 :javascript
   $( document ).ready(function(){

app/views/conference/show.html.haml

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