From 49ab41d4dc9817aa9c6cdb3a6c8fd9aecbf03ee0 Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Mon, 12 Oct 2015 14:15:50 -0400 Subject: [PATCH 1/5] Fixes issue #5936 - page count = infinity Sets defaults to 200 if any dimension = 0 --- .../Modules/Orchard.MediaLibrary/Scripts/media-library.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js index 049d75e38..0c9fc083c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js @@ -73,6 +73,8 @@ $(function () { var listHeight = $('#media-library-main-list').height(); var itemWidth = $('.thumbnail').first().width(); var itemHeight = $('.thumbnail').first().height(); + if (itemHeight == 0) itemHeight = 200; + if (itemWidth == 0) itemWidth = 200; var draftText = $("#media-library").data("draft-text"); var itemsPerRow = Math.floor(listWidth / itemWidth); From 042c47cc3ff3e354ccfd39c9ace0582b619b11c9 Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Mon, 12 Oct 2015 15:05:39 -0400 Subject: [PATCH 2/5] Media Library - Fixes issue #5941 Sets the opacity of the list items in the media library to .3 when new items are loading. --- .../Styles/orchard-medialibrary-admin.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css index 12a2c78ae..9ec1e5d02 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css @@ -1,4 +1,4 @@ -.zone-content, #content, #main, #layout-content, #layout-main { +.zone-content, #content, #main, #layout-content, #layout-main { height: 100%; display: block; min-height: 400px; @@ -155,6 +155,10 @@ background-position: center; } + #media-library-main-list.pending li { + opacity:.3; + } + /* Remove the space for the editor, and the scrollbar in the import page */ #media-library-import #media-library-main-list { overflow-y: hidden; @@ -499,4 +503,4 @@ padding-right: 16px; .dir-rtl .media-library-main-list-overlay p { padding-right:inherit; padding-left:5px; -} \ No newline at end of file +} From 63ca6ee2d856ef399da593f8df57a096d32119ed Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Mon, 12 Oct 2015 15:07:57 -0400 Subject: [PATCH 3/5] Media Library Recents - Fixes issue #5938 The Recents link doesn't work when rootMediaFolder is null. --- .../Controllers/AdminController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs index c9158d4f7..8031b2dea 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs @@ -156,10 +156,10 @@ namespace Orchard.MediaLibrary.Controllers { if (!Services.Authorizer.Authorize(Permissions.ManageOwnMedia, T("Cannot view media"))) return new HttpUnauthorizedResult(); - var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder().MediaPath; - - var mediaParts = _mediaLibraryService.GetMediaContentItems(rootMediaFolder, skip, count, order, mediaType); - var mediaPartsCount = _mediaLibraryService.GetMediaContentItemsCount(rootMediaFolder, mediaType); + var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder(); + var rootMediaFolderPath = rootMediaFolder == null ? null : rootMediaFolder.MediaPath; + var mediaParts = _mediaLibraryService.GetMediaContentItems(rootMediaFolderPath, skip, count, order, mediaType); + var mediaPartsCount = _mediaLibraryService.GetMediaContentItemsCount(rootMediaFolderPath, mediaType); var mediaItems = mediaParts.Select(x => new MediaManagerMediaItemViewModel { @@ -256,4 +256,4 @@ namespace Orchard.MediaLibrary.Controllers { return new FolderHierarchy(root) {Children = _mediaLibraryService.GetMediaFolders(root.MediaPath).Select(GetFolderHierarchy)}; } } -} \ No newline at end of file +} From 99695f07cc558b756d1d8ac11871957e2a38ff8d Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Tue, 13 Oct 2015 07:26:13 -0400 Subject: [PATCH 4/5] Update media-library.js Adjusted for default dimention based on window width (css media query) fixed class lookup as .thumbnail has 0 height on load. --- .../Orchard.MediaLibrary/Scripts/media-library.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js index 0c9fc083c..ee11689b5 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js @@ -71,10 +71,11 @@ $(function () { var listWidth = $('#media-library-main-list').width(); var listHeight = $('#media-library-main-list').height(); - var itemWidth = $('.thumbnail').first().width(); - var itemHeight = $('.thumbnail').first().height(); - if (itemHeight == 0) itemHeight = 200; - if (itemWidth == 0) itemWidth = 200; + var itemWidth = $('#media-library-main-list li').first().width(); + var itemHeight = $('#media-library-main-list li').first().height(); + var defaultDimension = $(window).width() < 1420 ? 120 : 200; + if (itemHeight == 0 || itemHeight == null) itemHeight = defaultDimension; + if (itemWidth == 0 || itemHeight == null) itemWidth = defaultDimension; var draftText = $("#media-library").data("draft-text"); var itemsPerRow = Math.floor(listWidth / itemWidth); From a37e548b2577bbc188b874394f70635eb1f7a404 Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Tue, 13 Oct 2015 07:26:52 -0400 Subject: [PATCH 5/5] Update media-library.js Fixed typo --- .../Modules/Orchard.MediaLibrary/Scripts/media-library.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js index ee11689b5..d4674868e 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js @@ -75,7 +75,7 @@ $(function () { var itemHeight = $('#media-library-main-list li').first().height(); var defaultDimension = $(window).width() < 1420 ? 120 : 200; if (itemHeight == 0 || itemHeight == null) itemHeight = defaultDimension; - if (itemWidth == 0 || itemHeight == null) itemWidth = defaultDimension; + if (itemWidth == 0 || itemWidth == null) itemWidth = defaultDimension; var draftText = $("#media-library").data("draft-text"); var itemsPerRow = Math.floor(listWidth / itemWidth);