diff --git a/bower.json b/bower.json index 5e9f407aaa..6994961fb6 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,6 @@ "bootstrap-multiselect": "v0.9", "zxcvbn": "https://github.com/lowe/zxcvbn.git", "geonames-server-jquery-plugin": "~0.2", - "swfobject": "latest", "tinymce": "~4.0", "jquery-galleria": "1.2.9", "jquery.cookie": "~1.4", diff --git a/composer.lock b/composer.lock index e06875d6f3..6c9955dc18 100644 --- a/composer.lock +++ b/composer.lock @@ -135,12 +135,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/embed-bundle.git", - "reference": "a9fc3ac5f5d2b4b8565cf6fbb2889eb9dda9bb07" + "reference": "a17304296180bafac116cf9d98674e87f5380a52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/a9fc3ac5f5d2b4b8565cf6fbb2889eb9dda9bb07", - "reference": "a9fc3ac5f5d2b4b8565cf6fbb2889eb9dda9bb07", + "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/a17304296180bafac116cf9d98674e87f5380a52", + "reference": "a17304296180bafac116cf9d98674e87f5380a52", "shasum": "" }, "require-dev": { @@ -181,7 +181,7 @@ "source": "https://github.com/alchemy-fr/embed-bundle/tree/master", "issues": "https://github.com/alchemy-fr/embed-bundle/issues" }, - "time": "2015-12-09 14:35:43" + "time": "2015-12-14 17:16:42" }, { "name": "alchemy/geonames-api-consumer", diff --git a/resources/gulp/build.js b/resources/gulp/build.js index 2ed2f1e6ad..eff1047898 100644 --- a/resources/gulp/build.js +++ b/resources/gulp/build.js @@ -49,6 +49,5 @@ gulp.task('build-vendors', [ 'build-requirejs', 'build-jquery-treeview', 'build-jquery-lazyload', - 'build-jquery-test-paths', - 'build-swfobject' + 'build-jquery-test-paths' ], function() {}); \ No newline at end of file diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 65d9093d78..7c204b0208 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -39,9 +39,7 @@ gulp.task('build-common-js', function(){ config.paths.src + 'vendors/jquery-contextmenu/js/jquery.contextmenu_custom.js', config.paths.src + 'common/js/jquery.common.js', config.paths.src + 'common/js/jquery.tooltip.js', - config.paths.src + 'common/js/jquery.Dialog.js', - config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle) - config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle) + config.paths.src + 'common/js/jquery.Dialog.js' ]; return utils.buildJsGroup(commonGroup, 'common', 'common/js', debugMode); }); diff --git a/resources/gulp/components/permaview.js b/resources/gulp/components/permaview.js index 6b78abf2a3..6fd48ee40f 100644 --- a/resources/gulp/components/permaview.js +++ b/resources/gulp/components/permaview.js @@ -18,9 +18,7 @@ gulp.task('build-permaview-js', function(){ /* var permaviewGroup = [ config.paths.src + 'vendors/jquery-mousewheel/js/jquery.mousewheel.js', - config.paths.src + 'vendors/jquery-image-enhancer/js/jquery.image_enhancer.js', - config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle) - config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle) + config.paths.src + 'vendors/jquery-image-enhancer/js/jquery.image_enhancer.js' ]; return utils.buildJsGroup(permaviewGroup, 'permaview', 'permaview/js', debugMode); */ diff --git a/resources/gulp/components/vendors/swfobject.js b/resources/gulp/components/vendors/swfobject.js deleted file mode 100644 index 66b3c1379f..0000000000 --- a/resources/gulp/components/vendors/swfobject.js +++ /dev/null @@ -1,9 +0,0 @@ -var gulp = require('gulp'); -var config = require('../../config.js'); -var utils = require('../../utils.js'); - -gulp.task('build-swfobject', function(){ - // copy all dist folder: - return gulp.src(config.paths.vendors + 'swfobject/swfobject/swfobject.js') - .pipe(gulp.dest( config.paths.build + 'vendors/swfobject')); -}); \ No newline at end of file diff --git a/resources/www/prod/js/record.editor.js b/resources/www/prod/js/record.editor.js index 35e98a02ce..7a85d317df 100644 --- a/resources/www/prod/js/record.editor.js +++ b/resources/www/prod/js/record.editor.js @@ -1569,50 +1569,6 @@ function previewEdit(r) { $('#TH_Opreview .PNB10').empty().append(p4.edit.T_records[r].preview); - // var data = p4.edit.T_records[r].preview; - - // if ((data.doctype == 'video' || data.doctype == 'audio' || data.doctype == 'flash')) { - // if(data.doctype != 'video' && data.flashcontent.url) - // { - // var flashvars = false; - // var params = { - // menu: "false", - // flashvars: data.flashcontent.flashVars, - // movie: data.flashcontent.url, - // allowFullScreen :"true", - // wmode: "transparent" - // }; - // var attributes = false; - // if (data.doctype != 'audio') { - // attributes = { - // styleclass: "PREVIEW_PIC" - // }; - // } - // swfobject.embedSWF(data.flashcontent.url, "FLASHPREVIEW", data.flashcontent.width, data.flashcontent.height, "9.0.0", false, flashvars, params, attributes); - // } - // else - // { - // flowplayer("FLASHPREVIEW", '/include/flowplayer/flowplayer-3.2.2.swf',{ - // clip: { - // autoPlay: true, - // autoBuffering:true, - // provider: 'h264streaming', - // metadata: false, - // scaling:'fit', - // url: data.flashcontent.flv - // }, - // onError:function(code,message){ - // getNewVideoToken(p4.edit.T_records[r].sbas_id, p4.edit.T_records[r].rid, this); - // }, - // plugins: { - // h264streaming: { - // url: '/include/flowplayer/flowplayer.pseudostreaming-3.2.2.swf' - // } - // } - // }); - // } - // } - if ($('img.PREVIEW_PIC.zoomable').length > 0) { $('img.PREVIEW_PIC.zoomable').draggable(); } diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index 7a9632eacc..bc71a69510 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -26,85 +26,49 @@ {% set d_width = d_height * thumbnail_width / thumbnail_height %} {% set top = ((b_height - d_height) / 2) %} {% endif %} + {% set url = app.getAuthenticator().isAuthenticated() ? thumbnail.get_url() : thumbnail.get_permalink().get_url() %} + {% set record_type = thumbnail.get_type() %} +
- {% set record_type = thumbnail.get_type() %} -
- {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} - {% set random = random(100000) %} -
- -
- {% elseif record_type == 'FLEXPAPER' %} - {% set random = random(100000) %} -
-
- - -
- - - {% elseif record_type == 'AUDIO_MP3' %} - {% set random = random(100000) %} -
-
- - -
- - {% else %} - - - - {% endif %} -
- - + {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} + + {% elseif record_type == 'FLEXPAPER' %} + + {% elseif record_type == 'AUDIO_MP3' %} + + {% else %} + + + + {% endif %} +
{% endmacro %} {% macro format100percent(thumbnail, extraclass)%} + {% set url = app.getAuthenticator().isAuthenticated() ? thumbnail.get_url() : thumbnail.get_permalink().get_url() %} {% set record_type = thumbnail.get_type() %} - {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} - {% set random = random(100000) %} -
- -
- {% elseif record_type == 'FLEXPAPER' %} - {% set random = random(100000) %} -
-
-
- - - {% elseif record_type == 'AUDIO_MP3' %} - {% set random = random(100000) %} -
-
-
- - {% else %} + {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} + + {% elseif record_type == 'FLEXPAPER' %} + + {% elseif record_type == 'AUDIO_MP3' %} + + {% else %} {% endif %} diff --git a/templates/web/common/players/audio.html.twig b/templates/web/common/players/audio.html.twig deleted file mode 100644 index 4f8438a47f..0000000000 --- a/templates/web/common/players/audio.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% macro audio_player(thumbnail, url, original_w, original_h, fit) %} - {% set random = random(100000) %} -
-
- - -
- -{% endmacro %} diff --git a/templates/web/common/players/pdf.html.twig b/templates/web/common/players/pdf.html.twig deleted file mode 100644 index 3067205704..0000000000 --- a/templates/web/common/players/pdf.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% macro pdf_player(thumbnail, url, original_w, original_h, fit) %} - {% set random = random(100000) %} -
-
- - -
- -{% endmacro %} diff --git a/templates/web/common/players/video.html.twig b/templates/web/common/players/video.html.twig deleted file mode 100644 index f6d8231bda..0000000000 --- a/templates/web/common/players/video.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% macro video_player(thumbnail, url, original_w, original_h, fit) %} - {% set random = random(100000) %} -
-
- - -
- -{% endmacro %} diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig index 923205e8a5..c5c22793ed 100644 --- a/templates/web/common/thumbnail.html.twig +++ b/templates/web/common/thumbnail.html.twig @@ -21,10 +21,6 @@ src="{{ app['request'].baseUrl }}/embed/datafiles/?url={{ url|url_encode }}&autoplay={{ autoplay|default('false') }}" frameborder="0" allowfullscreen> {% else %} - {##} - {% set original_h = thumbnail.get_height() > 0 ? thumbnail.get_height() : 120 %} {% set original_w = thumbnail.get_width() > 0 ? thumbnail.get_width() : 120 %}