From 6e4083bf813f72010cd4438b0ed42944272951ee Mon Sep 17 00:00:00 2001 From: Rodrigo Ferreira de Souza Date: Thu, 14 Apr 2016 10:53:25 -0300 Subject: [PATCH] Depend on collective.js.videojs --- CHANGES.rst | 4 +- CONTRIBUTORS.rst | 1 + buildout.cfg | 1 + setup.py | 1 + src/sc/embedder/browser/configure.zcml | 7 +- .../browser/resources/video-js/video-js.css | 505 -- .../browser/resources/video-js/video-js.png | Bin 8235 -> 0 bytes .../browser/resources/video-js/video-js.swf | Bin 9612 -> 0 bytes .../browser/resources/video-js/video.js | 4569 ----------------- .../content/templates/embeddervideojs.pt | 16 +- .../embedder/profiles/default/cssregistry.xml | 7 +- .../embedder/profiles/default/jsregistry.xml | 6 - src/sc/embedder/profiles/default/metadata.xml | 2 +- src/sc/embedder/tests/test_setup.py | 26 +- src/sc/embedder/tests/test_upgrades.py | 32 + src/sc/embedder/upgrades/configure.zcml | 1 + src/sc/embedder/upgrades/v1003/__init__.py | 18 + src/sc/embedder/upgrades/v1003/configure.zcml | 31 + 18 files changed, 102 insertions(+), 5125 deletions(-) delete mode 100644 src/sc/embedder/browser/resources/video-js/video-js.css delete mode 100644 src/sc/embedder/browser/resources/video-js/video-js.png delete mode 100644 src/sc/embedder/browser/resources/video-js/video-js.swf delete mode 100644 src/sc/embedder/browser/resources/video-js/video.js delete mode 100644 src/sc/embedder/profiles/default/jsregistry.xml create mode 100644 src/sc/embedder/upgrades/v1003/__init__.py create mode 100644 src/sc/embedder/upgrades/v1003/configure.zcml diff --git a/CHANGES.rst b/CHANGES.rst index e9df766..3263ff8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,8 @@ There's a frood who really knows where his towel is. 1.1b2 (unreleased) ^^^^^^^^^^^^^^^^^^ -- Nothing changed yet. +- Depend on collective.js.videojs (closes `#50`_). + [rodfersou] 1.1b1 (2016-03-24) @@ -136,3 +137,4 @@ There's a frood who really knows where his towel is. .. _`#32`: https://github.com/simplesconsultoria/sc.embedder/issues/32 .. _`#39`: https://github.com/simplesconsultoria/sc.embedder/issues/39 .. _`#42`: https://github.com/simplesconsultoria/sc.embedder/issues/42 +.. _`#50`: https://github.com/simplesconsultoria/sc.embedder/issues/50 diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 4c7b807..b5dc4e6 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -8,6 +8,7 @@ This package would not have been possible without the contribution of the follow - Héctor Velarde - João S. O. Bueno - Juan Pablo Giménez +- Rodrigo Ferreira de Souza - `et alii`_ Development sponsored by `Simples Consultoria`_. diff --git a/buildout.cfg b/buildout.cfg index 31cb480..3a89684 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -34,5 +34,6 @@ recipe = collective.recipe.omelette eggs = ${test:eggs} [versions] +collective.js.videojs = 5.8.8 # use latest version of coverage coverage = diff --git a/setup.py b/setup.py index 2862b06..08e89c2 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,7 @@ zip_safe=False, install_requires=[ 'collective.dexteritytextindexer', + 'collective.js.videojs', 'five.grok', 'lxml', 'plone.api', diff --git a/src/sc/embedder/browser/configure.zcml b/src/sc/embedder/browser/configure.zcml index cbc383b..4793a14 100644 --- a/src/sc/embedder/browser/configure.zcml +++ b/src/sc/embedder/browser/configure.zcml @@ -3,11 +3,6 @@ xmlns:browser="http://namespaces.zope.org/browser" i18n_domain="sc.embedder"> - - - \ No newline at end of file + diff --git a/src/sc/embedder/browser/resources/video-js/video-js.css b/src/sc/embedder/browser/resources/video-js/video-js.css deleted file mode 100644 index ae79c21..0000000 --- a/src/sc/embedder/browser/resources/video-js/video-js.css +++ /dev/null @@ -1,505 +0,0 @@ -/* -VideoJS Default Styles (http://videojs.com) -Version 3.2.0 -*/ - -/* -REQUIRED STYLES (be careful overriding) -================================================================================ */ -/* When loading the player, the video tag is replaced with a DIV, - that will hold the video tag or object tag for other playback methods. - The div contains the video playback element (Flash or HTML5) and controls, and sets the width and height of the video. - - ** If you want to add some kind of border/padding (e.g. a frame), or special positioning, use another containing element. - Otherwise you risk messing up control positioning and full window mode. ** -*/ -.video-js { - background-color: #000; position: relative; padding: 0; - - /* Start with 10px for base font size so other dimensions can be em based and easily calculable. */ - font-size: 10px; - - /* Allow poster to be vertially aligned. */ - vertical-align: middle; - /* display: table-cell; */ /*This works in Safari but not Firefox.*/ -} - -/* Playback technology elements expand to the width/height of the containing div.