From 4c19ee4e8f4fb9a8abdc2bcf3953115db4a015b3 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 15 Jun 2020 15:52:57 +0400 Subject: [PATCH] PHRAS-3116 --- package.json | 2 +- .../prod/actions/Tools/videoEditor.html.twig | 62 +++++++++++++++++-- yarn.lock | 8 +-- 3 files changed, 61 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 124a33b9d7..a957eeaab1 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.224-d", + "phraseanet-production-client": "0.34.225-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index 4838303661..4d10f3d334 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -169,10 +169,12 @@
+ +

0

-
+
@@ -190,7 +192,7 @@
- +
@@ -200,8 +202,9 @@
- - + +
@@ -212,6 +215,7 @@ {% for subdef in previewHtml5 %} {% endfor %} + {{ 'No preview available' | trans }} @@ -222,8 +226,54 @@
-
- provider .... +
+ +

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+
+ +
+ + +
diff --git a/yarn.lock b/yarn.lock index 6d37f8bc82..fbd07fcf07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.224-d: - version "0.34.224-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.224-d.tgz#9034d6b9a1a9a836332ebab84d6c03a1c4e49aa1" - integrity sha512-sxZmj4X3OqbDPRkaxcGGSMmajv8HMr/gePVUoA8SLYnQUBfwN2z8dRIIZ7lsZmESIweMdH8S0z59x4aBw2Di+g== +phraseanet-production-client@0.34.225-d: + version "0.34.225-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.225-d.tgz#5695ed66e43a7e6f7d472d29bd2dbeac84153b4e" + integrity sha512-rQng1Fl2TlAHHHr+KXbCMpo0cFuIMTeGuPoUgoNG1279boxkLy6Zp2WnJNrn4W9xfuWsUh83dld91d0ANqlShQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"