hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Phraseanet Production Client

Browse Source 
update video tools features
- add range reordering via drag n drop
- add configurable rewind/forward steps
This commit is contained in:
Florian BLOUET
2016-06-29 15:05:22 +02:00
parent 964fe8d483
commit 7534e26661
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php
View File

@@ -95,10 +95,12 @@ class ToolsController extends Controller
} }
} }
} }
$conf = $this->getConf();
return $this->render('prod/actions/Tools/index.html.twig', [ return $this->render('prod/actions/Tools/index.html.twig', [
'records' => $records, 'records' => $records,
'record' => $record, 'record' => $record,
'videoEditorConfig' => $conf->get(['video-editor']),
'recordSubdefs' => $recordAccessibleSubdefs, 'recordSubdefs' => $recordAccessibleSubdefs,
'metadatas' => $metadata, 'metadatas' => $metadata,
]); ]);

3
lib/conf.d/configuration.yml
View File

@@ -232,3 +232,6 @@ geocoding-providers:
# - # -
# name: Latitude # name: Latitude
# type: lat # type: lat
video-editor:
seekBackwardStep: 1000 # in ms
seekForwardStep: 1000 # in ms

1
package.json
View File

@@ -38,3 +38,4 @@
"phraseanet-production-client": "~0.20.0" "phraseanet-production-client": "~0.20.0"
} }
} }

1
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -392,6 +392,7 @@
processing: '{{ "processing" | trans }}', processing: '{{ "processing" | trans }}',
thumbnailTitle: '{{ 'thumbnail validation' | trans }}' thumbnailTitle: '{{ 'thumbnail validation' | trans }}'
}, },
videoEditorConfig: {% if videoEditorConfig is not null %}{{ videoEditorConfig|json_encode()|raw }}{% else %}{}{% endif %},
records: [ records: [
{% for record in records %} {% for record in records %}