Refactoring Conference/Event media to new media object

close #420

app/views/proposal/_form.html.haml

@@ -4,11 +4,34 @@
       %ul.nav.nav-tabs
         %li.active
           = link_to "Proposal", "#proposal-content", "data-toggle"=>"tab"
+        %li
+          = link_to 'Commercials', '#commercials-content', 'data-toggle'=>'tab'
         %li
           = link_to "Attachments", "#attachment-content", "data-toggle"=>"tab"
       .tab-content
         #proposal-content.tab-pane.active
           = render 'proposal/proposal_form'
+        #commercials-content.tab-pane
+          %p.text-muted
+            You can add commercials for your event. These commercials will be displayed on the event detail site.
+            If you don't add a commercial, the conference commercial will be displayed!
+            We currently support the following commercial types: YouTube, Vimeo, Instagram, Flickr, Speakerdeck and SlideShare.
+
+          - @event.commercials.each_slice(3) do |slice|
+            .row
+              - slice.each do |commercial|
+                .col-md-4
+                  .thumbnail
+                    %h3.text-center
+                      = commercial.commercial_type
+                    .flexvideo
+                      = render partial: 'shared/media_item', locals: { commercial_type: commercial.commercial_type, commercial_id: commercial.commercial_id }
+                    = link_to 'Edit', edit_conference_proposal_commercial_path(@conference.short_title, @event.id, commercial.id), class: 'btn btn-primary'
+                    = link_to 'Delete', conference_proposal_commercial_path(@conference.short_title, @event.id, commercial.id),
+                      :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
+          %hr
+          = link_to 'Add Commercial', new_conference_proposal_commercial_path(@conference.short_title, @event.id), class: 'btn btn-primary'
+
         #attachment-content.tab-pane
           = form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event), :html => { :multipart => true, :id => "fileupload"  } do |f|
             %table.table.table-striped

app/views/proposal/_proposal_form.html.haml

@@ -31,14 +31,6 @@
     %br
     %br
     = f.input :description, :input_html => {:rows => 5, :class=> "span11"}, :hint => "This will only be shown to organizers, not to attendees."
-    = f.input :media_type, :as => :select, :label => "Media Type", :collection => Conference.media_types.values, :include_blank => false
-    %p{:class => "help-block media-type", :id => "youtube-help"} Go to your YouTube video, click on "share" and copy everything behind http://youtu.be/"
-    %p{:class => "help-block media-type", :id => "slideshare-help", :style => "display:none"} Go to your SlideShare, click on "share" -> "embed" and copy the id
-    %p{:class => "help-block media-type", :id => "flickr-help", :style => "display:none"} Go to your flickr image, click on "Grab the link" -> "Show short url" and copy everything behind https://flic.kr/p/
-    %p{:class => "help-block media-type", :id => "vimeo-help", :style => "display:none"} Go to your vimeo video, click on "share" and copy everything behind http://vimeo.com/
-    %p{:class => "help-block media-type", :id => "speakerdeck-help", :style => "display:none"} Go to your SpeakerDeck, click on "share" -> "embed" and copy the data-id
-    %p{:class => "help-block media-type", :id => "instagram-help", :style => "display:none"} Go to your Instagram photo page and copy everything behind instagram.com/p/ (without trailing /# hash symbol)
-    = f.input :media_id, :label => "Media ID", :as => :string
 
   %section#information
   - if current_user.name.blank? || current_user.biography.blank?

app/views/proposal/show.html.haml

@@ -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