From 427157ceb462671e4c2f3ad0fcc7ddb99202d7e0 Mon Sep 17 00:00:00 2001 From: fvmartin Date: Thu, 8 Apr 2021 15:53:46 +0200 Subject: [PATCH 1/4] Media browser - fv_player_media_browser_item filter, job-status-... CSS classes --- css/s3-browser.css | 10 ++++++++++ js/media-library-browser-base.js | 11 ++++++++++- models/digitalocean-spaces-browser.class.php | 2 ++ models/media-browser-s3.php | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/css/s3-browser.css b/css/s3-browser.css index a8ebb19cd..d31a70901 100644 --- a/css/s3-browser.css +++ b/css/s3-browser.css @@ -346,4 +346,14 @@ right: 0; bottom: 0; z-index: 10; +} + +.job-status-completed .attachment-preview { + background: #ccf0cc; +} +.job-status-error .attachment-preview { + background: #fda5a5; +} +.job-status-processing .attachment-preview { + background: #eee69d; } \ No newline at end of file diff --git a/js/media-library-browser-base.js b/js/media-library-browser-base.js index 71222fd80..e5481d4de 100644 --- a/js/media-library-browser-base.js +++ b/js/media-library-browser-base.js @@ -162,7 +162,16 @@ function fv_flowplayer_browser_browse(data, options) { } } - file.append('
' + var css_class = 'attachment-preview js--select-attachment type-video subtype-mp4 landscape'; + if( options && options.extraAttachmentClass ) { + css_class += ' ' + options.extraAttachmentClass; + } + + if( f.job_status ) { + css_class += ' job-status-'+f.job_status; + } + + file.append('
' + '
' + icon + '
' diff --git a/models/digitalocean-spaces-browser.class.php b/models/digitalocean-spaces-browser.class.php index ccd355d24..b92019daf 100644 --- a/models/digitalocean-spaces-browser.class.php +++ b/models/digitalocean-spaces-browser.class.php @@ -122,6 +122,8 @@ function get_formatted_assets_data() { $item['items'] = array(); } + $item = apply_filters( 'fv_player_media_browser_item', $item, 'dos' ); + $output['items'][] = $item; if (strtolower(substr($item['name'], strrpos($item['name'], '.') + 1)) === 'ts') { diff --git a/models/media-browser-s3.php b/models/media-browser-s3.php index 4240a5929..bc82aeaab 100644 --- a/models/media-browser-s3.php +++ b/models/media-browser-s3.php @@ -220,6 +220,8 @@ function get_formatted_assets_data() { $item['type'] = 'folder'; $item['items'] = array(); } + + $item = apply_filters( 'fv_player_media_browser_item', $item, 's3' ); $output['items'][] = $item; From 26a77254114d28dc8749f79eea1c4aed9e39a548 Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 9 Apr 2021 15:08:03 +0200 Subject: [PATCH 2/4] dos: show status in media details --- js/media-library-browser-base.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/media-library-browser-base.js b/js/media-library-browser-base.js index e5481d4de..0e2498941 100644 --- a/js/media-library-browser-base.js +++ b/js/media-library-browser-base.js @@ -175,7 +175,7 @@ function fv_flowplayer_browser_browse(data, options) { + '
' + icon + '
' - + '
' + name + '
' + + '
' + name + '
' + '
' + '
' + '
' + @@ -611,9 +611,10 @@ jQuery( function($) { '\t\t\t
\n' + '\t\t\t
\n' + '\t\t\t\t
' + $filenameDiv.text() + '
\n' + - '\t\t\t\t
' + ($filenameDiv.data('modified') != 'undefined' ? $filenameDiv.data('modified') : fSize) + '
\n' + + '\t\t\t\t
' + ( $filenameDiv.data('modified') != 'undefined' ? $filenameDiv.data('modified') : fSize ) + '
\n' + '\n' + - '\t\t\t\t
' + (!fSizeTextual ? (fSize > -1 ? fSize + ' ' + sizeSuffix : fDuration) : '') + '
\n' + + '\t\t\t\t
' + ( !fSizeTextual ? (fSize > -1 ? fSize + ' ' + sizeSuffix : fDuration) : '' ) + '
\n' + + '\t\t\t\t
' + ( $filenameDiv.data('status') != 'undefined' ? $filenameDiv.data('status') : '' ) + '
\n' + '\t\t\t
\n' + (splashValue ? '
Found matching splash screen image
' : '') + '\t\t
\n' + From a073439f1d956f6083b91cf4e2f210bdd645b16c Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 9 Apr 2021 15:41:35 +0200 Subject: [PATCH 3/4] dos: status js --- js/media-library-browser-base.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/media-library-browser-base.js b/js/media-library-browser-base.js index 0e2498941..6d6d7c772 100644 --- a/js/media-library-browser-base.js +++ b/js/media-library-browser-base.js @@ -167,8 +167,8 @@ function fv_flowplayer_browser_browse(data, options) { css_class += ' ' + options.extraAttachmentClass; } - if( f.job_status ) { - css_class += ' job-status-'+f.job_status; + if( f.status ) { + css_class += ' job-status-'+f.status; } file.append('
' From 4757ec0c9e021d5768e2fcf3f44c33ee69eb6ad6 Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 9 Apr 2021 15:51:21 +0200 Subject: [PATCH 4/4] dos: css fix --- css/s3-browser.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/s3-browser.css b/css/s3-browser.css index d31a70901..6d4e89e69 100644 --- a/css/s3-browser.css +++ b/css/s3-browser.css @@ -348,12 +348,12 @@ z-index: 10; } -.job-status-completed .attachment-preview { +.job-status-completed.attachment-preview { background: #ccf0cc; } -.job-status-error .attachment-preview { +.job-status-error.attachment-preview { background: #fda5a5; } -.job-status-processing .attachment-preview { +.job-status-processing.attachment-preview { background: #eee69d; } \ No newline at end of file