Merge pull request #235 from differentreality/conference_show

Conference show

app/views/conference/_program.html.haml

@@ -6,13 +6,12 @@
   %div.row
     %div.col-md-12
       %h1 Program
-      - if !@conference.description.blank?
-        %p
-          = @conference.description
       - if @conference.call_for_papers and @conference.call_for_papers.schedule_public
-        %span You can find the complete schedule in our
+        %span You can check out our
         %span
-          = link_to 'Master Schedule', conference_schedule_path(@conference.short_title), target: '_blank'
-  -if !@conference.tracks.blank?
+          = link_to 'Schedule', conference_schedule_path(@conference.short_title), target: '_blank'
+      - else
+        %span The schedule is not ready yet. Stay tuned!
+  -unless @conference.tracks.blank?
     = render 'tracks'
 

app/views/conference/show.html.haml

@@ -1,5 +1,8 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
+
+- unless @conference.description.blank?
+  %p= @conference.description
 %div#program
   = render 'program'
 %div#registration
@@ -10,4 +13,4 @@
 %div#sponsors
   = render 'sponsor'
 %div#social-media
-  = render 'social_media'
+  = render 'social_media'

app/views/schedule/index.html.erb

@@ -56,7 +56,7 @@
                     <h5>
                       <span class="glyphicon glyphicon-comment"></span>
                       <%= event[0].title %>
-                      <% unless event[0].subtitle.empty? %>
+                      <% unless event[0].subtitle.blank? %>
 			<span class="schedule-subtitle">
 			  <%= event[0].subtitle %>
                         <span>