diff --git a/plugins/video/lib/video_plugin/video_gallery_block.rb b/plugins/video/lib/video_plugin/video_gallery_block.rb index 60a21ab..41e6219 100644 --- a/plugins/video/lib/video_plugin/video_gallery_block.rb +++ b/plugins/video/lib/video_plugin/video_gallery_block.rb @@ -1,11 +1,11 @@ class VideoPlugin::VideoGalleryBlock < Block settings_items :video_gallery_id, :type => :integer - attr_accessible :video_gallery_id - + attr_accessible :video_gallery_id + include ActionView::Helpers include Rails.application.routes.url_helpers - + def self.description _('Display a Video Gallery') end @@ -20,12 +20,12 @@ class VideoPlugin::VideoGalleryBlock < Block video_gallery = VideoPlugin::VideoGallery.find(video_gallery_id) proc do render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery} - end + end end end def list_my_galleries Article.owner_video_galleries(owner) end - + end diff --git a/plugins/video/public/javascripts/videojs/video-4.5.1.js b/plugins/video/public/javascripts/videojs/video-4.5.1.js index 39a675e..ed7b916 100644 --- a/plugins/video/public/javascripts/videojs/video-4.5.1.js +++ b/plugins/video/public/javascripts/videojs/video-4.5.1.js @@ -1,4 +1,4 @@ -/*! Video.js v4.5.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ +/*! Video.js v4.5.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ (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)} 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 Chrome or download the latest Adobe Flash Player.'}; "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(); diff --git a/plugins/video/public/javascripts/videojs/video-4.8.5.js b/plugins/video/public/javascripts/videojs/video-4.8.5.js index 27d931a..820df20 100644 --- a/plugins/video/public/javascripts/videojs/video-4.8.5.js +++ b/plugins/video/public/javascripts/videojs/video-4.8.5.js @@ -1,4 +1,4 @@ -/*! Video.js v4.8.5 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ +/*! Video.js v4.8.5 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ (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)} var videojs=window.videojs=t;t.Tb="4.8";t.Rc="https:"==document.location.protocol?"https://":"http://"; 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."}; diff --git a/plugins/video/public/javascripts/videojs/vjs.youtube.js b/plugins/video/public/javascripts/videojs/vjs.youtube.js index 80ab81f..c16c393 100644 --- a/plugins/video/public/javascripts/videojs/vjs.youtube.js +++ b/plugins/video/public/javascripts/videojs/vjs.youtube.js @@ -27,7 +27,7 @@ init: function(player, options, ready) { // Save this for internal usage this.player_ = player; - + // No event is triggering this for YouTube this['featuresProgressEvents'] = false; this['featuresTimeupdateEvents'] = false; @@ -40,7 +40,7 @@ this.isAndroid = /(Android)/g.test( navigator.userAgent ); //used to prevent play events on IOS7 and Android > 4.2 until the user has clicked the player this.playVideoIsAllowed = !(this.isIos || this.isAndroid); - + // autoplay is disabled for mobile if (this.isIos || this.isAndroid) { this.player_.options()['autoplay'] = false; diff --git a/plugins/video/public/style.css b/plugins/video/public/style.css index 5fd2e3c..ba00c31 100644 --- a/plugins/video/public/style.css +++ b/plugins/video/public/style.css @@ -38,7 +38,7 @@ } .video-gallery-thumbnail:hover div{ - display: inline-block; + display: inline-block; } .video-gallery-table-big{ @@ -56,5 +56,5 @@ } .video-title-big{ - font-size: 2em; + font-size: 2em; } \ No newline at end of file diff --git a/plugins/video/views/shared/video_list.html.erb b/plugins/video/views/shared/video_list.html.erb index 061dd29..4a04aa5 100644 --- a/plugins/video/views/shared/video_list.html.erb +++ b/plugins/video/views/shared/video_list.html.erb @@ -6,18 +6,18 @@ other_videos = contents - first_video_arr %> <% if first_video.display_to?(user) %>
-
+
<%= link_to first_video.view_url do %> <% end %> -
+
-
<%= first_video.title %>
+
<%= first_video.title %>
<%= _("by") %> <%= first_video.author_name %> <%= _("updated at") %> <%= time_ago_as_sentence(first_video.updated_at) %>
-
+ <% end %> <% other_videos.each do |content| %> <% if content.display_to?(user) %> -- libgit2 0.21.2