diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 34426d61d9..2f7a0f8edd 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -41,7 +41,9 @@ gulp.task('build-common-js', function(){ config.paths.src + 'vendors/jquery-contextmenu/js/jquery.contextmenu_custom.js', config.paths.src + 'common/js/components/common.js', config.paths.src + 'common/js/components/tooltip.js', - config.paths.src + 'common/js/components/dialog.js' + config.paths.src + 'common/js/components/dialog.js', + config.paths.src + 'common/js/components/utils.js', + config.paths.src + 'common/js/components/download.js', ]; return utils.buildJsGroup(commonGroup, 'common', 'common/js', debugMode); }); 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/resources/www/common/js/components/download.js b/resources/www/common/js/components/download.js new file mode 100644 index 0000000000..4e422b109a --- /dev/null +++ b/resources/www/common/js/components/download.js @@ -0,0 +1,173 @@ +//download.js v4.2, by dandavis; 2008-2016. [CCBY2] see http://danml.com/download.html for tests/usage +// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime +// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs +// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support. 3.1 improved safari handling. +// v4 adds AMD/UMD, commonJS, and plain browser support +// v4.1 adds url download capability via solo URL argument (same domain/CORS only) +// v4.2 adds semantic variable names, long (over 2MB) dataURL support, and hidden by default temp anchors +// https://github.com/rndme/download + +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define([], factory); + } else if (typeof exports === 'object') { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else { + // Browser globals (root is window) + root.download = factory(); + } +}(this, function () { + + return function download(data, strFileName, strMimeType) { + + var self = window, // this script is only for browsers anyway... + defaultMime = "application/octet-stream", // this default mime also triggers iframe downloads + mimeType = strMimeType || defaultMime, + payload = data, + url = !strFileName && !strMimeType && payload, + anchor = document.createElement("a"), + toString = function (a) { + return String(a); + }, + myBlob = (self.Blob || self.MozBlob || self.WebKitBlob || toString), + fileName = strFileName || "download", + blob, + reader; + myBlob = myBlob.call ? myBlob.bind(self) : Blob; + + if (String(this) === "true") { //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback + payload = [payload, mimeType]; + mimeType = payload[0]; + payload = payload[1]; + } + + + if (url && url.length < 2048) { // if no filename and no mime, assume a url was passed as the only argument + fileName = url.split("/").pop().split("?")[0]; + anchor.href = url; // assign href prop to temp anchor + if (anchor.href.indexOf(url) !== -1) { // if the browser determines that it's a potentially valid url path: + var ajax = new XMLHttpRequest(); + ajax.open("GET", url, true); + ajax.responseType = 'blob'; + ajax.onload = function (e) { + download(e.target.response, fileName, defaultMime); + }; + setTimeout(function () { + ajax.send(); + }, 0); // allows setting custom ajax headers using the return: + return ajax; + } // end if valid url? + } // end if url? + + + //go ahead and download dataURLs right away + if (/^data\:[\w+\-]+\/[\w+\-]+[,;]/.test(payload)) { + + if (payload.length > (1024 * 1024 * 1.999) && myBlob !== toString) { + payload = dataUrlToBlob(payload); + mimeType = payload.type || defaultMime; + } else { + return navigator.msSaveBlob ? // IE10 can't do a[download], only Blobs: + navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : + saver(payload); // everyone else can save dataURLs un-processed + } + + }//end if dataURL passed? + + blob = payload instanceof myBlob ? + payload : + new myBlob([payload], {type: mimeType}); + + + function dataUrlToBlob(strUrl) { + var parts = strUrl.split(/[:;,]/), + type = parts[1], + decoder = parts[2] == "base64" ? atob : decodeURIComponent, + binData = decoder(parts.pop()), + mx = binData.length, + i = 0, + uiArr = new Uint8Array(mx); + + for (i; i < mx; ++i) uiArr[i] = binData.charCodeAt(i); + + return new myBlob([uiArr], {type: type}); + } + + function saver(url, winMode) { + + if ('download' in anchor) { //html5 A[download] + anchor.href = url; + anchor.setAttribute("download", fileName); + anchor.className = "download-js-link"; + anchor.innerHTML = "downloading..."; + anchor.style.display = "none"; + document.body.appendChild(anchor); + setTimeout(function () { + anchor.click(); + document.body.removeChild(anchor); + if (winMode === true) { + setTimeout(function () { + self.URL.revokeObjectURL(anchor.href); + }, 250); + } + }, 66); + return true; + } + + // handle non-a[download] safari as best we can: + if (/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent)) { + url = url.replace(/^data:([\w\/\-\+]+)/, defaultMime); + if (!window.open(url)) { // popup blocked, offer direct download: + if (confirm("Displaying New Document\n\nUse Save As... to download, then click back to return to this page.")) { + location.href = url; + } + } + return true; + } + + //do iframe dataURL download (old ch+FF): + var f = document.createElement("iframe"); + document.body.appendChild(f); + + if (!winMode) { // force a mime that will download: + url = "data:" + url.replace(/^data:([\w\/\-\+]+)/, defaultMime); + } + f.src = url; + setTimeout(function () { + document.body.removeChild(f); + }, 333); + + }//end saver + + + if (navigator.msSaveBlob) { // IE10+ : (has Blob, but not a[download] or URL) + return navigator.msSaveBlob(blob, fileName); + } + + if (self.URL) { // simple fast and modern way using Blob and URL: + saver(self.URL.createObjectURL(blob), true); + } else { + // handle non-Blob()+non-URL browsers: + if (typeof blob === "string" || blob.constructor === toString) { + try { + return saver("data:" + mimeType + ";base64," + self.btoa(blob)); + } catch (y) { + return saver("data:" + mimeType + "," + encodeURIComponent(blob)); + } + } + + // Blob but not URL support: + reader = new FileReader(); + reader.onload = function (e) { + saver(this.result); + }; + reader.readAsDataURL(blob); + } + return true; + }; + /* end download() */ +})); \ No newline at end of file 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..def9c2fede 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,113 @@ {% 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 %}