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

Merge e3192a9547 into 0b6550d060

Browse source
This commit is contained in:
Nishanth Vijayan 2016-10-03 11:37:04 +00:00 • committed by GitHub
commit 910047dec3
5 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/proposal/show.html.haml
View file

@ -15,11 +15,6 @@
- if can? :schedule, @conference
= link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success"
- if @event.state == 'canceled' || @event.state == 'withdrawn'
%span.label.label-danger CANCELED
- elsif @event.state == 'confirmed' && @event_schedule.present? && (!@event_schedule.intersecting_events.canceled.empty? || !@event_schedule.intersecting_events.withdrawn.empty?)
%span.label.label-info REPLACEMENT
.row
.col-md-3
.speakerinfo
@ -40,16 +35,9 @@
.col-md-9
.row
.col-md-12
-if @event_schedule.present?
.lead
- if @event.state == 'confirmed' && !@event_schedule.intersecting_events.withdrawn.empty?
= "Please note that this talk replaces"
= link_to @event_schedule.intersecting_events.withdrawn.first.event.title,
conference_program_proposal_path(@conference.short_title, @event_schedule.intersecting_events.withdrawn.first.event.id)
- elsif @event.state == 'confirmed' && !@event_schedule.intersecting_events.canceled.empty?
= "Please note that this talk replaces"
= link_to @event_schedule.intersecting_events.canceled.first.title,
conference_program_proposal_path(@conference.short_title, @event_schedule.intersecting_events.canceled.first.event.id)
.lead
= canceled_replacement_event_label(@event, @event_schedule)
= replacement_event_notice(@event_schedule)
- if @event.commercials.empty?
%h5.text-warning