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

Merge pull request #2547 from mike-esokia/PHRAS-1936_video_editor_chapters

Browse Source 
PHRAS-1936 save overlapChapters in video editor in preferences
This commit is contained in:
Nicolas Maillat
2018-04-13 11:46:09 +02:00
committed by GitHub
parent eb8514904a 0b80150f01
commit d86aaa4f9e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ class LanguageController
'Move down range' => $translator->trans('Move down range'),
'error video editor' => $translator->trans('prod:edit: only a media of type video can be edited'),
'Chapters' => $translator->trans('prod:edit: chapters'),
'No hover to chapter' => $translator->trans('prod:edit: no hover to chapters')
'No hover to chapter' => $translator->trans('prod:edit: no overlaps for chapters')
]);
}
}

7
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -10,6 +10,8 @@
{% endfor %}
{% endif %}
{% set overlapChapters = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'overlapChapters') %}
<div id='prod-tool-box' class="PNB10 video-edit">
{# jquery Tabs #}
@@ -204,7 +206,10 @@
{% endif %}
}{% if not loop.last %},{% endif %}
{% endfor %}
]
],
preferences: {
overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %},
}
};
</script>