Replace Flowplayer with the open source Video.js library
This commit is contained in:
@@ -1032,6 +1032,43 @@ section.node-preview
|
||||
&.video
|
||||
background-color: black
|
||||
|
||||
.video-dummy
|
||||
min-height: 250px
|
||||
img
|
||||
display: block
|
||||
margin: 0 auto
|
||||
position: absolute
|
||||
z-index: 1
|
||||
opacity: .6
|
||||
|
||||
display: flex
|
||||
width: 100%
|
||||
align-items: center
|
||||
justify-content: center
|
||||
color: white
|
||||
|
||||
&-content
|
||||
position: relative
|
||||
z-index: 2
|
||||
display: flex
|
||||
align-items: center
|
||||
|
||||
&-icon
|
||||
font-size: 4em
|
||||
|
||||
&-text
|
||||
font-size: 1.6em
|
||||
span
|
||||
display: block
|
||||
a
|
||||
display: inline-block
|
||||
color: white
|
||||
font-size: .8em
|
||||
|
||||
em
|
||||
font-style: normal
|
||||
color: $color-warning
|
||||
|
||||
&.group, &.project
|
||||
background-color: $color-background
|
||||
@include overlay(rgba($color-background, .3), 0%, transparent, 100%)
|
||||
@@ -2637,7 +2674,7 @@ section.node-children
|
||||
.toggle
|
||||
margin: 0 20px
|
||||
|
||||
@import plugins/_flowplayer
|
||||
@import plugins/_videoplayer
|
||||
|
||||
|
||||
/* Edit Project specific classes*/
|
||||
|
File diff suppressed because it is too large
Load Diff
1273
src/styles/plugins/_videoplayer.sass
Normal file
1273
src/styles/plugins/_videoplayer.sass
Normal file
File diff suppressed because one or more lines are too long
@@ -4,17 +4,32 @@
|
||||
#node-overlay
|
||||
|
||||
section.node-preview.video
|
||||
#flowplayer_container.is-splash.play-button(
|
||||
style="{% if node.picture %}background-image:url({{node.picture.thumbnail('l', api=api)}}); background-repeat:no-repeat; {% endif %}")
|
||||
.fp-startscreen.fp-toggle
|
||||
a.big-play-button
|
||||
i.pi-play
|
||||
.fp-endscreen
|
||||
a.watch-again.fp-toggle
|
||||
i.pi-replay
|
||||
| Watch again
|
||||
.fp-waiting
|
||||
i.pi-spin.spin
|
||||
| {% if node.video_sources %}
|
||||
video.video-js.vjs-fluid(
|
||||
controls,
|
||||
data-setup="{}",
|
||||
preload="auto",
|
||||
poster="{% if node.picture %}{{ node.picture.thumbnail('l', api=api) }}{% endif %}")
|
||||
| {% for source in node.video_sources %}
|
||||
source(
|
||||
src="{{ source.src }}",
|
||||
type="{{ source.type }}")
|
||||
| {% endfor %}
|
||||
p.vjs-no-js.
|
||||
To view this video please enable JavaScript, and consider upgrading to a web browser that
|
||||
<a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
|
||||
| {% else %}
|
||||
.video-dummy.sorry(
|
||||
style="{% if node.picture %}height: {{ node.picture.height }}px{% endif %}")
|
||||
| {% if node.picture %}
|
||||
img.video-dummy-thumbnail(src="{{ node.picture.thumbnail('l', api=api) }}")
|
||||
| {% endif %}
|
||||
.video-dummy-content
|
||||
i.pi-lock.video-dummy-content-icon
|
||||
.video-dummy-content-text
|
||||
span Only available to Blender Cloud subscribers.
|
||||
a(href="{{ url_for('main.join') }}") Support Blender and get awesome stuff. <em>Subscribe now!</em>
|
||||
| {% endif %}
|
||||
|
||||
|
||||
section.node-details-container.video
|
||||
@@ -131,23 +146,8 @@ script(type="text/javascript").
|
||||
var content_type = $("li.node-details-meta-list-item.type").text();
|
||||
$("li.node-details-meta-list-item.type").text(content_type.substring(content_type.indexOf("/") + 1));
|
||||
|
||||
var container = document.getElementById("flowplayer_container");
|
||||
|
||||
flowplayer(container, {
|
||||
key: "{{config.FLOWPLAYER_KEY}}",
|
||||
embed: false,
|
||||
splash: true,
|
||||
{% if node.video_sources %}
|
||||
clip: {
|
||||
sources: {{ node.video_sources | safe }}
|
||||
}
|
||||
{% else %}
|
||||
disabled: true
|
||||
{% endif %}
|
||||
});
|
||||
|
||||
{% if not node.video_sources %}
|
||||
$('#flowplayer_container, .sorry').click(function() {
|
||||
$('.sorry').click(function() {
|
||||
$.get('/403', function(data) {
|
||||
$('#node-overlay').html(data).addClass('active');
|
||||
})
|
||||
|
@@ -235,7 +235,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v
|
||||
|
||||
| {% block footer_scripts %}
|
||||
script(src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.1/jstree.min.js")
|
||||
script(src="//releases.flowplayer.org/6.0.5/flowplayer.min.js")
|
||||
script(src="//vjs.zencdn.net/5.8.8/video.js")
|
||||
|
||||
| {% if project.has_method('PUT') %}
|
||||
| {# JS containing the Edit, Add, Featured, and Move functions #}
|
||||
|
Reference in New Issue
Block a user