Commit 9b638609c960a3b38e52fdc66e95ca58617353d5
1 parent
837a8ef9
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
removed trailing whitespaces
Showing
6 changed files
with
15 additions
and
15 deletions
Show diff stats
plugins/video/lib/video_plugin/video_gallery_block.rb
| 1 | class VideoPlugin::VideoGalleryBlock < Block | 1 | class VideoPlugin::VideoGalleryBlock < Block |
| 2 | 2 | ||
| 3 | settings_items :video_gallery_id, :type => :integer | 3 | settings_items :video_gallery_id, :type => :integer |
| 4 | - attr_accessible :video_gallery_id | ||
| 5 | - | 4 | + attr_accessible :video_gallery_id |
| 5 | + | ||
| 6 | include ActionView::Helpers | 6 | include ActionView::Helpers |
| 7 | include Rails.application.routes.url_helpers | 7 | include Rails.application.routes.url_helpers |
| 8 | - | 8 | + |
| 9 | def self.description | 9 | def self.description |
| 10 | _('Display a Video Gallery') | 10 | _('Display a Video Gallery') |
| 11 | end | 11 | end |
| @@ -20,12 +20,12 @@ class VideoPlugin::VideoGalleryBlock < Block | @@ -20,12 +20,12 @@ class VideoPlugin::VideoGalleryBlock < Block | ||
| 20 | video_gallery = VideoPlugin::VideoGallery.find(video_gallery_id) | 20 | video_gallery = VideoPlugin::VideoGallery.find(video_gallery_id) |
| 21 | proc do | 21 | proc do |
| 22 | render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery} | 22 | render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery} |
| 23 | - end | 23 | + end |
| 24 | end | 24 | end |
| 25 | end | 25 | end |
| 26 | 26 | ||
| 27 | def list_my_galleries | 27 | def list_my_galleries |
| 28 | Article.owner_video_galleries(owner) | 28 | Article.owner_video_galleries(owner) |
| 29 | end | 29 | end |
| 30 | - | 30 | + |
| 31 | end | 31 | end |
plugins/video/public/javascripts/videojs/video-4.5.1.js
| 1 | -/*! Video.js v4.5.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ | 1 | +/*! Video.js v4.5.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ |
| 2 | (function() {var b=void 0,f=!0,h=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function q(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");document.createElement("track");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.va[a])return u.va[a];a=u.u(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.Player(a,c,d)} | 2 | (function() {var b=void 0,f=!0,h=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function q(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");document.createElement("track");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.va[a])return u.va[a];a=u.u(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.Player(a,c,d)} |
| 3 | var videojs=u;window.Wd=window.Xd=u;u.Rb="4.5";u.Fc="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}},notSupportedMessage:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'}; | 3 | var videojs=u;window.Wd=window.Xd=u;u.Rb="4.5";u.Fc="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}},notSupportedMessage:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'}; |
| 4 | "GENERATED_CDN_VSN"!==u.Rb&&(videojs.options.flash.swf=u.Fc+"vjs.zencdn.net/"+u.Rb+"/video-js.swf");u.va={};"function"===typeof define&&define.amd?define([],function(){return videojs}):"object"===typeof exports&&"object"===typeof module&&(module.exports=videojs);u.ka=u.CoreObject=m(); | 4 | "GENERATED_CDN_VSN"!==u.Rb&&(videojs.options.flash.swf=u.Fc+"vjs.zencdn.net/"+u.Rb+"/video-js.swf");u.va={};"function"===typeof define&&define.amd?define([],function(){return videojs}):"object"===typeof exports&&"object"===typeof module&&(module.exports=videojs);u.ka=u.CoreObject=m(); |
plugins/video/public/javascripts/videojs/video-4.8.5.js
| 1 | -/*! Video.js v4.8.5 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ | 1 | +/*! Video.js v4.8.5 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ |
| 2 | (function() {var b=void 0,f=!0,k=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function r(a){return function(){return a}}var s;document.createElement("video");document.createElement("audio");document.createElement("track");function t(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(t.Ba[a])return t.Ba[a];a=t.v(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new t.Player(a,c,d)} | 2 | (function() {var b=void 0,f=!0,k=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function r(a){return function(){return a}}var s;document.createElement("video");document.createElement("audio");document.createElement("track");function t(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(t.Ba[a])return t.Ba[a];a=t.v(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new t.Player(a,c,d)} |
| 3 | var videojs=window.videojs=t;t.Tb="4.8";t.Rc="https:"==document.location.protocol?"https://":"http://"; | 3 | var videojs=window.videojs=t;t.Tb="4.8";t.Rc="https:"==document.location.protocol?"https://":"http://"; |
| 4 | t.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,playbackRates:[],inactivityTimeout:2E3,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{},errorDisplay:{}},language:document.getElementsByTagName("html")[0].getAttribute("lang")||navigator.languages&&navigator.languages[0]||navigator.ve||navigator.language||"en",languages:{},notSupportedMessage:"No compatible source was found for this video."}; | 4 | t.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,playbackRates:[],inactivityTimeout:2E3,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{},errorDisplay:{}},language:document.getElementsByTagName("html")[0].getAttribute("lang")||navigator.languages&&navigator.languages[0]||navigator.ve||navigator.language||"en",languages:{},notSupportedMessage:"No compatible source was found for this video."}; |
plugins/video/public/javascripts/videojs/vjs.youtube.js
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | init: function(player, options, ready) { | 27 | init: function(player, options, ready) { |
| 28 | // Save this for internal usage | 28 | // Save this for internal usage |
| 29 | this.player_ = player; | 29 | this.player_ = player; |
| 30 | - | 30 | + |
| 31 | // No event is triggering this for YouTube | 31 | // No event is triggering this for YouTube |
| 32 | this['featuresProgressEvents'] = false; | 32 | this['featuresProgressEvents'] = false; |
| 33 | this['featuresTimeupdateEvents'] = false; | 33 | this['featuresTimeupdateEvents'] = false; |
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | this.isAndroid = /(Android)/g.test( navigator.userAgent ); | 40 | this.isAndroid = /(Android)/g.test( navigator.userAgent ); |
| 41 | //used to prevent play events on IOS7 and Android > 4.2 until the user has clicked the player | 41 | //used to prevent play events on IOS7 and Android > 4.2 until the user has clicked the player |
| 42 | this.playVideoIsAllowed = !(this.isIos || this.isAndroid); | 42 | this.playVideoIsAllowed = !(this.isIos || this.isAndroid); |
| 43 | - | 43 | + |
| 44 | // autoplay is disabled for mobile | 44 | // autoplay is disabled for mobile |
| 45 | if (this.isIos || this.isAndroid) { | 45 | if (this.isIos || this.isAndroid) { |
| 46 | this.player_.options()['autoplay'] = false; | 46 | this.player_.options()['autoplay'] = false; |
plugins/video/public/style.css
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | .video-gallery-thumbnail:hover div{ | 40 | .video-gallery-thumbnail:hover div{ |
| 41 | - display: inline-block; | 41 | + display: inline-block; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | .video-gallery-table-big{ | 44 | .video-gallery-table-big{ |
| @@ -56,5 +56,5 @@ | @@ -56,5 +56,5 @@ | ||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | .video-title-big{ | 58 | .video-title-big{ |
| 59 | - font-size: 2em; | 59 | + font-size: 2em; |
| 60 | } | 60 | } |
| 61 | \ No newline at end of file | 61 | \ No newline at end of file |
plugins/video/views/shared/video_list.html.erb
| @@ -6,18 +6,18 @@ | @@ -6,18 +6,18 @@ | ||
| 6 | other_videos = contents - first_video_arr %> | 6 | other_videos = contents - first_video_arr %> |
| 7 | <% if first_video.display_to?(user) %> | 7 | <% if first_video.display_to?(user) %> |
| 8 | <div class="video-gallery-table-big"> | 8 | <div class="video-gallery-table-big"> |
| 9 | - <div class="video-gallery-left-column-big"> | 9 | + <div class="video-gallery-left-column-big"> |
| 10 | <%= link_to first_video.view_url do %> | 10 | <%= link_to first_video.view_url do %> |
| 11 | <img width="320" height="320" src='<%= first_video.video_thumbnail_url %>' class="disable-zoom"/> | 11 | <img width="320" height="320" src='<%= first_video.video_thumbnail_url %>' class="disable-zoom"/> |
| 12 | <% end %> | 12 | <% end %> |
| 13 | - </div> | 13 | + </div> |
| 14 | <div class="video-gallery-right-column-big"> | 14 | <div class="video-gallery-right-column-big"> |
| 15 | - <div class="video-title-big"><%= first_video.title %></div> | 15 | + <div class="video-title-big"><%= first_video.title %></div> |
| 16 | <div class="video-author-big"> | 16 | <div class="video-author-big"> |
| 17 | <%= _("by") %> <%= first_video.author_name %> <%= _("updated at") %> <%= time_ago_as_sentence(first_video.updated_at) %> | 17 | <%= _("by") %> <%= first_video.author_name %> <%= _("updated at") %> <%= time_ago_as_sentence(first_video.updated_at) %> |
| 18 | </div> | 18 | </div> |
| 19 | </div> | 19 | </div> |
| 20 | - </div> | 20 | + </div> |
| 21 | <% end %> | 21 | <% end %> |
| 22 | <% other_videos.each do |content| %> | 22 | <% other_videos.each do |content| %> |
| 23 | <% if content.display_to?(user) %> | 23 | <% if content.display_to?(user) %> |