diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js index 989b00db..19700d67 100644 --- a/app/assets/javascripts/osem.js +++ b/app/assets/javascripts/osem.js @@ -1,7 +1,7 @@ $(function() { $("#event_video_type").change(function () { $(".media-type").hide(); - $('#' + $(this).val() + '-help').show(); + $('#' + $(this).val().toLowerCase() + '-help').show(); }); $('.dropdown-toggle').dropdown(); diff --git a/app/models/event.rb b/app/models/event.rb index 9abc4521..48db7b98 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -3,6 +3,10 @@ class Event < ActiveRecord::Base has_paper_trail attr_accessible :title, :subtitle, :abstract, :description, :event_type_id, :people_attributes, :person, :proposal_additional_speakers, :track_id, :video_id, :video_type, :require_registration, :difficulty_level_id + VIDEO_TYPE = [YOUTUBE = 'YouTube', SLIDE_SHARE = 'SlideShare'] + + validates :video_type, inclusion: {in: VIDEO_TYPE} + acts_as_commentable has_many :event_people, :dependent => :destroy diff --git a/app/views/proposal/_proposal_form.html.haml b/app/views/proposal/_proposal_form.html.haml index 6e6379cb..bbfcf713 100644 --- a/app/views/proposal/_proposal_form.html.haml +++ b/app/views/proposal/_proposal_form.html.haml @@ -31,9 +31,9 @@ %br %br = f.input :description, :input_html => {:rows => 5, :class=> "span11"}, :hint => "This will only be shown to organizers, not to attendees." - = f.input :video_type, :as => :select, :label => "Media Type", :collection => [['YoubTube', 'youtube'], ['SlideShare', 'slideshare']], :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 + = f.input :video_type, :as => :select, :label => "Media Type", :collection => Event::VIDEO_TYPE, :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 = f.input :video_id, :label => "Media ID", :as => :string %section#information diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml index 2d91454f..cc3f9d4f 100644 --- a/app/views/proposal/show.html.haml +++ b/app/views/proposal/show.html.haml @@ -31,9 +31,9 @@ .row-fluid .span12.flexvideo -if @event.video_id - -if @event.video_type == "youtube" + -if @event.video_type == Event::YOUTUBE %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> request.ssl? ? "https://" : "http://" + "www.youtube.com/embed/#{@event.video_id}?rel=0"} - -if @event.video_type == "slideshare" + -if @event.video_type == Event::SLIDE_SHARE %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> request.ssl? ? "https://" : "http://" + "www.slideshare.net/slideshow/embed_code/#{@event.video_id}"} -else %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>request.ssl? ? "https://" : "http://" + "www.youtube.com/embed/Eiv4e5ZxTmg?rel=0"}