diff --git a/resources/www/common/images/icons/add-new-range-hover.png b/resources/www/common/images/icons/add-new-range-hover.png new file mode 100644 index 0000000000..5432662f9f Binary files /dev/null and b/resources/www/common/images/icons/add-new-range-hover.png differ diff --git a/resources/www/common/images/icons/add-new-range.png b/resources/www/common/images/icons/add-new-range.png new file mode 100644 index 0000000000..e977cbfa24 Binary files /dev/null and b/resources/www/common/images/icons/add-new-range.png differ diff --git a/resources/www/common/images/icons/icon-photography-hover.png b/resources/www/common/images/icons/icon-photography-hover.png new file mode 100644 index 0000000000..62a3268680 Binary files /dev/null and b/resources/www/common/images/icons/icon-photography-hover.png differ diff --git a/resources/www/common/images/icons/icon-photography.png b/resources/www/common/images/icons/icon-photography.png new file mode 100644 index 0000000000..9ff9d335c2 Binary files /dev/null and b/resources/www/common/images/icons/icon-photography.png differ diff --git a/resources/www/common/images/icons/picto-add-new-range-white.png b/resources/www/common/images/icons/picto-add-new-range-white.png new file mode 100644 index 0000000000..20b66cfe8c Binary files /dev/null and b/resources/www/common/images/icons/picto-add-new-range-white.png differ diff --git a/resources/www/common/images/icons/picto-close-window-selected.png b/resources/www/common/images/icons/picto-close-window-selected.png new file mode 100644 index 0000000000..be4dcea278 Binary files /dev/null and b/resources/www/common/images/icons/picto-close-window-selected.png differ diff --git a/resources/www/common/images/icons/picto-close-window.png b/resources/www/common/images/icons/picto-close-window.png new file mode 100644 index 0000000000..512d5b1f63 Binary files /dev/null and b/resources/www/common/images/icons/picto-close-window.png differ diff --git a/resources/www/common/images/icons/picto-delete-hover.png b/resources/www/common/images/icons/picto-delete-hover.png new file mode 100644 index 0000000000..5c4c95d90e Binary files /dev/null and b/resources/www/common/images/icons/picto-delete-hover.png differ diff --git a/resources/www/common/images/icons/picto-delete.png b/resources/www/common/images/icons/picto-delete.png new file mode 100644 index 0000000000..f317fd0954 Binary files /dev/null and b/resources/www/common/images/icons/picto-delete.png differ diff --git a/resources/www/common/images/icons/picto-export-thumbnail-hover.png b/resources/www/common/images/icons/picto-export-thumbnail-hover.png new file mode 100644 index 0000000000..e1bcc59bd6 Binary files /dev/null and b/resources/www/common/images/icons/picto-export-thumbnail-hover.png differ diff --git a/resources/www/common/images/icons/picto-export-thumbnail.png b/resources/www/common/images/icons/picto-export-thumbnail.png new file mode 100644 index 0000000000..a278bf7177 Binary files /dev/null and b/resources/www/common/images/icons/picto-export-thumbnail.png differ diff --git a/resources/www/common/images/icons/picto-information-shortcut-key.png b/resources/www/common/images/icons/picto-information-shortcut-key.png new file mode 100644 index 0000000000..ca61bd3a6f Binary files /dev/null and b/resources/www/common/images/icons/picto-information-shortcut-key.png differ diff --git a/resources/www/common/images/icons/picto-save-chapter-white.png b/resources/www/common/images/icons/picto-save-chapter-white.png new file mode 100644 index 0000000000..fd6ffebe9f Binary files /dev/null and b/resources/www/common/images/icons/picto-save-chapter-white.png differ diff --git a/resources/www/common/images/icons/save-chapter-hover.png b/resources/www/common/images/icons/save-chapter-hover.png new file mode 100644 index 0000000000..a0b1e2abdf Binary files /dev/null and b/resources/www/common/images/icons/save-chapter-hover.png differ diff --git a/resources/www/common/images/icons/save-chapter.png b/resources/www/common/images/icons/save-chapter.png new file mode 100644 index 0000000000..c7e4172c74 Binary files /dev/null and b/resources/www/common/images/icons/save-chapter.png differ diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig index d68774695d..64a98240e6 100644 --- a/templates/web/common/index_bootstrap.html.twig +++ b/templates/web/common/index_bootstrap.html.twig @@ -29,8 +29,9 @@ {% block rss %}{% endblock %} - {% block javascript %}{% endblock %} - + {% block javascript %} + + {% endblock %}
diff --git a/templates/web/prod/actions/Tools/confirm.html.twig b/templates/web/prod/actions/Tools/confirm.html.twig index d48dd2551b..44e6dca450 100644 --- a/templates/web/prod/actions/Tools/confirm.html.twig +++ b/templates/web/prod/actions/Tools/confirm.html.twig @@ -1,25 +1,10 @@
- - - - - - - - - - - - - -
- - - -
- {{ 'you are about to change the representation thumbnail of your video' | trans }} : {{video_title}} -
- {{ 'do you want to validate' | trans }} -
- + +
+ {{ 'you are about to change the representation thumbnail of your video' | trans }} : {{ video_title }} +
+
+ {{ 'do you want to validate' | trans }} +
diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index d01700d4f5..7341b843ed 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -10,10 +10,10 @@ {% endfor %} {% endif %} -
+
{# jquery Tabs #} -
+
{# jquery menu #}
    @@ -33,108 +33,110 @@ {% if selectionLength == 1 %} {% for record in records %} {% if record.get_type() == 'video' %} -
    -
    - - {{ "screenshot video" | trans }} -
    -
    -
    +
    -
    - {% set outputFormats = record.getSubdfefByDeviceAndMime(null, ['image/jpeg', 'image/png']) %} - {% set previewHtml5 = record.getSubdfefByDeviceAndMime(constant('\\databox_subdef::DEVICE_SCREEN'), ['video/ogg', 'video/mp4', 'video/webm']) %} - {% set dataW = constant('media_subdef::TC_DATA_WIDTH') %} - {% set dataH = constant('media_subdef::TC_DATA_HEIGHT') %} +
    +
    + {% set outputFormats = record.getSubdfefByDeviceAndMime(null, ['image/jpeg', 'image/png']) %} + {% set previewHtml5 = record.getSubdfefByDeviceAndMime(constant('\\databox_subdef::DEVICE_SCREEN'), ['video/ogg', 'video/mp4', 'video/webm']) %} + {% set dataW = constant('media_subdef::TC_DATA_WIDTH') %} + {% set dataH = constant('media_subdef::TC_DATA_HEIGHT') %} - {% set technical_info = record.get_technical_infos %} - {% set width = technical_info[dataW].value %} - {% set height = technical_info[dataH].value %} + {% set technical_info = record.get_technical_infos %} + {% set width = technical_info[dataW].value %} + {% set height = technical_info[dataH].value %} - {% if width and height %} - {% set rawRatio = (width / height)|number_format(3, '.') %} - {% set rawRatioLength = rawRatio|length %} - {% set ratio = rawRatio|slice(0,rawRatioLength-1) %} - {% else %} - {% set ratio = '' %} - {% endif %} + {% if width and height %} + {% set rawRatio = (width / height)|number_format(3, '.') %} + {% set rawRatioLength = rawRatio|length %} + {% set ratio = rawRatio|slice(0,rawRatioLength-1) %} + {% else %} + {% set ratio = '' %} + {% endif %} - -
    - -
    -
    - -
    - {{ 'take a screenshot' | trans }} -
    - -
    -
    - -
    -
    - +
    -

    {{ 'To take a screenshot click on camera' | trans }}

    - - -
    -
    +
    +
    +

    {{ "screenshot video" | trans }}

    + +
    +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    +
    + + + +
    -
    -
    - - -
    +
    -
    - - {{ "video range extractor" | trans }} +
    +
    + {{ "prod:edit: chapters" | trans }} +
    +
    -
    -
    -
    Ratio
    -
    {{ ratio }}
    -
    Type
    -
    {{ record.get_mime() }}
    - {% if record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] is defined %} -
    {{ 'Images par secondes' | trans }}
    -
    {{ record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] | round(2) }}ips -
    - {% endif %} - {% if record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] is defined %} -
    {{ 'Codec Audio' | trans }}
    -
    {{ record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] }}
    - {% endif %} -
    {{ 'Size' | trans }}
    -
    {% set width = record.exif[constant('media_subdef::TC_DATA_WIDTH')]|default - (null) %} - {% set height = record.exif[constant('media_subdef::TC_DATA_HEIGHT')]|default(null) %} - {% if width is not none and height is not none %} - {{ width ~ " x " ~ height }} - {% endif %}
    -
    -
    {% endif %} {% endfor %}