Merge e3192a9547 into 0b6550d060

app/views/schedules/_event.html.haml

@@ -4,6 +4,11 @@
       = image_tag speaker.gravatar_url, :class => "img-circle pull-right all-speaker-pic", |
                                         :alt => speaker.name, |
                                         :title => speaker.name |
+
+    %p
+      = canceled_replacement_event_label(event, event_schedule)
+      = replacement_event_notice(event_schedule)
+
     %span.h3
       = event.title
       %br

app/views/schedules/_schedule_item.html.haml

@@ -5,10 +5,7 @@
     %div{ class: "elipsis break-words event-title", |
           style: "-webkit-line-clamp: #{ event_lines(@rooms) }; height: #{ event_height(@rooms) }px;"} |
 
-      - if event.state == 'canceled' || event.state == 'withdrawn'
-        %span.label.label-danger.schedule-label CANCELED
-      - elsif event.state == 'confirmed' && (!event_schedule.intersecting_events.canceled.empty? || !event_schedule.intersecting_events.withdrawn.empty?)
-        %span.label.label-info.schedule-label REPLACEMENT
+      = canceled_replacement_event_label(event, event_schedule, 'schedule-label')
 
       = event.title