From 1c8961fa750dd48a1bf58be46ed9820fcb75dea5 Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Tue, 25 Mar 2014 23:09:40 +0100 Subject: [PATCH] Fix mixed content issue --- app/views/proposal/show.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml index 9d085b0a..24b37e85 100644 --- a/app/views/proposal/show.html.haml +++ b/app/views/proposal/show.html.haml @@ -33,9 +33,9 @@ -if not @event.media_id.blank? .flexvideo -if @event.media_type == Event.media_types[:slideshare] - %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> request.ssl? ? "https://" : "http://" + "www.slideshare.net/slideshow/embed_code/#{@event.media_id}"} + %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> (request.ssl? ? "https://" : "http://") + "www.slideshare.net/slideshow/embed_code/#{@event.media_id}"} -elsif @event.media_type == Event.media_types[:flickr] - %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> request.ssl? ? "https://" : "http://" + "flic.kr/p/#{@event.media_id}/player/268a054da2"} + %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> (request.ssl? ? "https://" : "http://") + "flic.kr/p/#{@event.media_id}/player/268a054da2"} -elsif @event.media_type == Event.media_types[:vimeo] %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> "//player.vimeo.com/video/#{@event.media_id}"} -elsif @event.media_type == Event.media_types[:speakerdeck] @@ -43,7 +43,7 @@ -elsif @event.media_type == Event.media_types[:instagram] %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :scrolling =>"no", :allowtransparency=>"true", :src=> "//instagram.com/p/#{@event.media_id}/embed/"} -else - %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> request.ssl? ? "https://" : "http://" + "www.youtube.com/embed/#{@event.media_id}?rel=0"} + %iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=> (request.ssl? ? "https://" : "http://") + "www.youtube.com/embed/#{@event.media_id}?rel=0"} -else %div.well.well-lg="No video of the event yet, sorry! Meanwhile..." .row