Merge 8264cee099 into 55943db57f

app/views/conferences/index.html.haml

@@ -5,6 +5,8 @@
         %h2 Upcoming Conferences
   - @current.each do |conference|
     = render '/conferences/conference_details', conference: conference
+  - if @current.empty? 
+    %h4 No Upcoming Conference Scheduled
   - if @antiquated and @antiquated.any? 
     .row
       .col-md-12
@@ -18,6 +20,7 @@
     #antiquated.collapse
       - @antiquated.each do |conference|
         = render '/conferences/conference_details', conference: conference
+  - if !@current.empty?
     %p
       Add the events to your calendar:
       %span.btn-group