From 871f82458212dc40514d90bffd50d5dae89ab694 Mon Sep 17 00:00:00 2001 From: jofrysutanto Date: Sat, 8 Aug 2015 22:52:21 +1000 Subject: [PATCH] Show mediamanager sidebar preview when "Go up" is selected. Show more informative sidebar information when "Go up' is selected, instead of blank file information with 'null' public url. --- .../widgets/mediamanager/assets/css/mediamanager.css | 2 +- .../assets/js/mediamanager-browser-min.js | 6 ++++-- .../widgets/mediamanager/assets/js/mediamanager.js | 11 ++++++++--- .../mediamanager/assets/less/mediamanager.less | 2 +- .../mediamanager/partials/_item-sidebar-preview.htm | 9 +++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/modules/cms/widgets/mediamanager/assets/css/mediamanager.css b/modules/cms/widgets/mediamanager/assets/css/mediamanager.css index 1786fc0d5..b5192d8ae 100644 --- a/modules/cms/widgets/mediamanager/assets/css/mediamanager.css +++ b/modules/cms/widgets/mediamanager/assets/css/mediamanager.css @@ -54,7 +54,7 @@ div[data-control="media-manager"] .sidebar-image-placeholder-container{display:t div[data-control="media-manager"] .sidebar-image-placeholder{display:table-cell;height:225px;position:relative;vertical-align:middle;text-align:center;border-bottom:1px solid #ecf0f1} div[data-control="media-manager"] .sidebar-image-placeholder[data-loading]{background:#ecf0f1} div[data-control="media-manager"] .sidebar-image-placeholder[data-loading]:after{background-image:url('../../../../../../modules/system/assets/ui/images/loader-transparent.svg');background-position:50% 50%;content:' ';-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite;background-size:62px 62px;position:absolute;width:62px;height:62px;top:50%;left:50%;margin-top:-31px;margin-left:-31px} -div[data-control="media-manager"] .sidebar-image-placeholder i.icon-chain-broken,div[data-control="media-manager"] .sidebar-image-placeholder i.icon-crop,div[data-control="media-manager"] .sidebar-image-placeholder i.icon-asterisk{color:#bdc3c7;font-size:55px} +div[data-control="media-manager"] .sidebar-image-placeholder i.icon-chain-broken,div[data-control="media-manager"] .sidebar-image-placeholder i.icon-crop,div[data-control="media-manager"] .sidebar-image-placeholder i.icon-asterisk,div[data-control="media-manager"] .sidebar-image-placeholder i.icon-level-up{color:#bdc3c7;font-size:55px} div[data-control="media-manager"] .sidebar-image-placeholder.no-border{border-bottom:none} div[data-control="media-manager"] .sidebar-image-placeholder p{font-size:12px;margin:10px;line-height:160%;color:#bdc3c7;margin-top:25px} div[data-control="media-manager"] .list-container{position:relative;z-index:100} diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js index b560c485b..49be8ccc6 100644 --- a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js +++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js @@ -185,7 +185,7 @@ this.$form.request(this.options.alias+'::onSetSidebarVisible',{data:{visible:(is MediaManager.prototype.updateSidebarMediaPreview=function(items){var previewPanel=this.sidebarPreviewElement,previewContainer=previewPanel.querySelector('[data-control="media-preview-container"]'),template='' for(var i=0,len=previewContainer.children.length;i + + \ No newline at end of file