From e3c1e875fbce808d42298ff8655b0aeb52487a53 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 8 Jun 2020 19:55:55 +0400 Subject: [PATCH 01/15] PHRAS-3116 : video tools : add tab video subtitle --- .../prod/actions/Tools/videoEditor.html.twig | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index 0c70c7c7ba..aec20b3f52 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -29,6 +29,11 @@ {{ "video range extractor" | trans }} +
  • + + {{ "prod:videoeditor:subtitletab:: title" | trans }} + +
    • @@ -158,6 +163,41 @@
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +

    {{ "prod:videoeditor:subtitletab:: left block title" | trans }}

    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    {% endif %} {% endfor %} {% endif %} From a758b1efe6a8bedac6de974fa06182797776943b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 9 Jun 2020 11:11:30 +0400 Subject: [PATCH 02/15] PHRAS-3116 add production-client --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 758af630cc..2225abb52f 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.220-d", + "phraseanet-production-client": "0.34.222-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 714926c5ce..0c682e6af7 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.220-d: - version "0.34.220-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.220-d.tgz#5046bff7f86e26e3d239fa97a7f3618e27cbacfb" - integrity sha512-cPEFyCRkgf36wS8axGtIhkLHXdq4Rg9yRZozPm3BA93R8tD9fFWSMc6y1z6Ux10qUcyEXhtje6+a8tSqpKUPyw== +phraseanet-production-client@0.34.222-d: + version "0.34.222-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.222-d.tgz#6c2b503e57bfe45cd002a04c7025ec9e0380ef97" + integrity sha512-umXponvYP3TfFhEleMTb1sRT/u+HRrBiEO4tL3tbmfTitc7eql5VGyTbZyjHEEZVgrbAs1jFbpe6gbstA5UcUg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 5ad9a1a1837b88605d32d9ae3552ab28bb9791b6 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 11 Jun 2020 19:32:43 +0400 Subject: [PATCH 03/15] PHRAS-3116 --- package.json | 2 +- .../prod/actions/Tools/videoEditor.html.twig | 74 ++++++++++++++----- yarn.lock | 8 +- 3 files changed, 62 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 2225abb52f..124a33b9d7 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.222-d", + "phraseanet-production-client": "0.34.224-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 aec20b3f52..4838303661 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -31,7 +31,12 @@
  • - {{ "prod:videoeditor:subtitletab:: title" | trans }} + {{ "prod:videoeditor:subtitleTab:: title" | trans }} + +
    • +
  • + + {{ "prod:videoeditor:subtitleRequestTab:: title" | trans }}
    • @@ -164,27 +169,62 @@
    -
    -
    - -
    +
    +
    +
    +
    + +
    + +
    + + - - -
    -
    -
    -
    -

    {{ "prod:videoeditor:subtitletab:: left block title" | trans }}

    -
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    - +
    +
    +
    +
    +
    +
    + provider .... +
    @@ -194,7 +234,7 @@ {% endfor %} {{ 'No preview available' | trans }} -
    +
    diff --git a/yarn.lock b/yarn.lock index 0c682e6af7..6d37f8bc82 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.222-d: - version "0.34.222-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.222-d.tgz#6c2b503e57bfe45cd002a04c7025ec9e0380ef97" - integrity sha512-umXponvYP3TfFhEleMTb1sRT/u+HRrBiEO4tL3tbmfTitc7eql5VGyTbZyjHEEZVgrbAs1jFbpe6gbstA5UcUg== +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== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 4c19ee4e8f4fb9a8abdc2bcf3953115db4a015b3 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 15 Jun 2020 15:52:57 +0400 Subject: [PATCH 04/15] 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" From 6a626886e07e6d796c6c60bedad80bcdc053482e Mon Sep 17 00:00:00 2001 From: aynsix Date: Mon, 15 Jun 2020 19:00:16 +0300 Subject: [PATCH 05/15] get videotexttrack field --- .../Controller/Prod/ToolsController.php | 28 +++++++++++++++++++ .../Phrasea/ControllerProvider/Prod/Tools.php | 1 + 2 files changed, 29 insertions(+) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php index fa3fbac84a..86adee6158 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php @@ -456,6 +456,34 @@ class ToolsController extends Controller return $this->app->json(['success' => true, 'errorMessage' => '']); } + /** + * @param Request $request + * @return \Symfony\Component\HttpFoundation\JsonResponse + */ + public function getVideoTextTrackField(Request $request) + { + $records = RecordsRequest::fromRequest($this->app, $request, false); + $videoTextTrackField = []; + + if (count($records) == 1) { + /** @var \record_adapter $record */ + $record = $records->first(); + $databox = $record->getDatabox(); + + + foreach ($databox->get_meta_structure() as $meta) { + if (preg_match('/^VideoTextTrack(.*)$/iu', $meta->get_name(), $matches) && !empty($matches[1]) && strlen($matches[1]) == 2 ) { + $field['label'] = $matches[1]; + $field['meta_struct_id'] = $meta->get_id(); + $videoTextTrackField[] = $field; + unset($field); + } + } + } + + return $this->app->json($videoTextTrackField); + } + public function videoEditorAction(Request $request) { $records = RecordsRequest::fromRequest($this->app, $request, false); diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Tools.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Tools.php index 8d6932aecf..b3def8e65f 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Tools.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Tools.php @@ -73,6 +73,7 @@ class Tools implements ControllerProviderInterface, ServiceProviderInterface ->bind('prod_tools_metadata_save'); $controllers->get('/videoEditor', 'controller.prod.tools:videoEditorAction'); + $controllers->get('/videoTextTrack/field', 'controller.prod.tools:getVideoTextTrackField'); return $controllers; } From 18ba8b746dc3960b9c494b6157c2e44f8fc7d786 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 15 Jun 2020 22:19:43 +0400 Subject: [PATCH 06/15] PHRAS-3116 Add language list --- package.json | 2 +- .../prod/actions/Tools/videoEditor.html.twig | 20 +++---------------- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index a957eeaab1..8bb7fe4937 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.225-d", + "phraseanet-production-client": "0.34.226-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 4d10f3d334..bf7fd3855f 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -175,8 +175,8 @@

    0

    -
    -
    +
    +
    @@ -184,9 +184,6 @@
    @@ -230,20 +227,9 @@

    -

    -

    - - -

    +

    - - - + + +
    From 5c5078c36fc9f8ff807d2e7b4746b634b5d6961a Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 16 Jun 2020 12:09:38 +0400 Subject: [PATCH 08/15] PHRAs-3116 : save video caption field --- lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php | 2 ++ templates/web/prod/actions/Tools/videoEditor.html.twig | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index 254e3e9835..52e28e2db8 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -155,6 +155,8 @@ class LanguageController 'description notice' => $translator->trans('prod:mapboxgl: description notice'), 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), 'create new user' => $translator->trans('prod:push: create new user'), + 'prod:videoeditor:subtitletab:messsage:: error' => $translator->trans('prod:videoeditor:subtitletab:messsage:: error'), + 'prod:videoeditor:subtitletab:messsage:: success' => $translator->trans('prod:videoeditor:subtitletab:messsage:: success'), ]); } } diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index c745b255b2..fd9e86f6a8 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -183,7 +183,7 @@
    - {% for videoTextTrackField in videoTextTrackFields %} {% endfor %} @@ -192,7 +192,6 @@
    -
    From 1f6166dfab6b40530dc43fa357ab9ef9297af627 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 16 Jun 2020 18:34:50 +0400 Subject: [PATCH 09/15] PHRAS-3116 --- .../Phrasea/Controller/Prod/ToolsController.php | 6 ++++++ package.json | 2 +- .../web/prod/actions/Tools/videoEditor.html.twig | 13 +++++++++++-- yarn.lock | 8 ++++---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php index 7672ff9190..3343a05438 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php @@ -485,6 +485,12 @@ class ToolsController extends Controller if (preg_match('/^VideoTextTrack(.*)$/iu', $meta->get_name(), $matches) && !empty($matches[1]) && strlen($matches[1]) == 2 ) { $field['label'] = $matches[1]; $field['meta_struct_id'] = $meta->get_id(); + $field['value'] = ''; + if ($record->get_caption()->has_field($meta->get_name())) { + $fieldValues = $record->get_caption()->get_field($meta->get_name())->get_values(); + $fieldValue = array_pop($fieldValues); + $field['value'] = $fieldValue->getValue(); + } $videoTextTrackFields[] = $field; unset($field); } diff --git a/package.json b/package.json index 8bb7fe4937..f75570979b 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.226-d", + "phraseanet-production-client": "0.34.228-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 fd9e86f6a8..97f1bfe6f3 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -176,7 +176,7 @@
    -
    +
    @@ -189,7 +189,11 @@ {% endfor %} + {% for videoTextTrackField in videoTextTrackFields %} + + {% endfor %}
    + @@ -291,7 +295,12 @@ >
    - + diff --git a/yarn.lock b/yarn.lock index 6093cdb250..1a926aab2a 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.229-d: - version "0.34.229-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.229-d.tgz#7e118da378b7240b5796370d2c08cb70ee10c7b2" - integrity sha512-+uvOQ9x+wICsEwb+uORFJhRcsOVnIWhU29vm5FQjLSFk2rJlsqExZ+X5Md7SJ27ZrpJsLumkgpaYuezKIN5a4A== +phraseanet-production-client@0.34.231-d: + version "0.34.231-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.231-d.tgz#7633568ce7bf0ac76306cca6c15e577ab4e0584c" + integrity sha512-AamwJNtpWL5nbxlqXhKCU4UpJIXAeBmY0gK0A5D5RrPqpc7ifH8osTrtMnvo54wXKX9nb6rrAR4vvZ7Z80bSrQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 0726e57187904b1a175e3dbf620d438e752f9cf2 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 18 Jun 2020 16:55:18 +0400 Subject: [PATCH 13/15] PHRAS-3116 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0b30fc33b2..1f0ab6ced2 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.231-d", + "phraseanet-production-client": "0.34.232-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 1a926aab2a..aa1c553564 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.231-d: - version "0.34.231-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.231-d.tgz#7633568ce7bf0ac76306cca6c15e577ab4e0584c" - integrity sha512-AamwJNtpWL5nbxlqXhKCU4UpJIXAeBmY0gK0A5D5RrPqpc7ifH8osTrtMnvo54wXKX9nb6rrAR4vvZ7Z80bSrQ== +phraseanet-production-client@0.34.232-d: + version "0.34.232-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.232-d.tgz#cb642ba78e85dbc1b32c9b2785b63ecf7c671fab" + integrity sha512-1z448ebd+Clql852Ai8wrsALxeAJ4OlQ0prG/T/sJNunNp1nxhVePZs6AuYTm5l/v6XkW27Em1o6FKn9XK3hfA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 130912f6f9c337eefb553d87a47d1696b677dee8 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 18 Jun 2020 19:27:38 +0400 Subject: [PATCH 14/15] PHRAS-3116 Fix on duration display --- package.json | 2 +- templates/web/prod/actions/Tools/videoEditor.html.twig | 8 ++++++++ yarn.lock | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1f0ab6ced2..b55af2ae0a 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.232-d", + "phraseanet-production-client": "0.34.234-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 d96eb24bb0..2e086514a9 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -289,6 +289,14 @@ >
    +