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

Refactoring Conference/Event media to new media object

Browse source 
close #420
This commit is contained in:
Chrisbr 2014-08-05 18:23:42 +02:00
parent 850beb72e1
commit 2a731e8350
31 changed files with 491 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,17 +41,16 @@
.col-md-9
.row
.col-md-12
- if @event.media_id.blank?
- if @event.commercials.empty?
%h5.text-warning
No video of the event yet, sorry!
- unless @conference.media_id.blank?
- unless @conference.commercials.empty?
Meanwhile...
- unless @conference.media_id.blank?
.flexvideo
= render partial: "shared/media_item", locals: {media_type: @conference.media_type, media_id: @conference.media_id}
- unless @conference.commercials.empty?
= render partial: 'shared/media_items', locals: { commercials: @conference.commercials }
- else
.flexvideo
= render partial: "shared/media_item", locals: {media_type: @event.media_type, media_id: @event.media_id}
%p
= render partial: 'shared/media_items', locals: { commercials: @event.commercials }
.row
.speakerinfo
.col-md-8