#501: file list updated to show thumbnail image instead of icon, if f…

…ile has it.
devbridge · Jun 27, 2013 · 5771bfc · 5771bfc
1 parent 1da8469
commit 5771bfc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/Modules/BetterCms.Module.MediaManager/Command/MediaManager/GetMediaItemsCommandBase.cs b/Modules/BetterCms.Module.MediaManager/Command/MediaManager/GetMediaItemsCommandBase.cs
@@ -278,6 +278,8 @@ protected void FillMediaViewModel(MediaViewModel model, Media media)
             model.IsArchived = media.IsArchived;
             model.ParentFolderId = media.Folder != null ? media.Folder.Id : Guid.Empty;
             model.ParentFolderName = media.Folder != null ? media.Folder.Title : MediaGlobalization.MediaList_RootFolderName;
+            model.Tooltip = media.Image != null ? media.Image.Caption : null;
+            model.ThumbnailUrl = media.Image != null ? media.Image.PublicThumbnailUrl : null;
         }
 
         /// <summary>

diff --git a/Modules/BetterCms.Module.MediaManager/Content/Styles/bcms.media.css b/Modules/BetterCms.Module.MediaManager/Content/Styles/bcms.media.css
@@ -603,6 +603,12 @@ input.bcms-grid-input:focus {
     vertical-align: middle;
 }
 
+.bcms-system-file img {
+    display: block;
+    width: 54px;
+    height: 42px;
+}
+
 .bcms-media-name {
     line-height: 16px;
     font-size: 11px;

diff --git a/Modules/BetterCms.Module.MediaManager/Scripts/bcms.media.js b/Modules/BetterCms.Module.MediaManager/Scripts/bcms.media.js
@@ -429,6 +429,16 @@ function ($, bcms, modal, siteSettings, forms, dynamicContent, messages, mediaUp
             self.parentFolderId = ko.observable(item.ParentFolderId);
             self.parentFolderName = ko.observable(item.ParentFolderName);
 
+            self.tooltip = item.Tooltip;
+            self.thumbnailUrl = ko.observable(item.ThumbnailUrl);
+
+            self.getImageUrl = function () {
+                if (!self.thumbnailUrl()) {
+                    return null;
+                }
+                return self.thumbnailUrl();
+            };
+
             self.contextMenu = new MediaItemContextMenuViewModel();
 
             self.isFile = function () {
@@ -631,16 +641,6 @@ function ($, bcms, modal, siteSettings, forms, dynamicContent, messages, mediaUp
 
             var self = this;
 
-            self.tooltip = item.Tooltip;
-            self.thumbnailUrl = ko.observable(item.ThumbnailUrl);
-
-            self.getImageUrl = function() {
-                if (!self.thumbnailUrl()) {
-                    return null;
-                }
-                return self.thumbnailUrl();
-            };
-
             self.previewImage = function () {
                 var previewUrl = self.publicUrl();
                 if (previewUrl) {

diff --git a/Modules/BetterCms.Module.MediaManager/ViewModels/MediaManager/MediaImageViewModel.cs b/Modules/BetterCms.Module.MediaManager/ViewModels/MediaManager/MediaImageViewModel.cs
@@ -8,10 +8,6 @@ namespace BetterCms.Module.MediaManager.ViewModels.MediaManager
     [Serializable]
     public class MediaImageViewModel : MediaFileViewModel
     {
-        public string ThumbnailUrl { get; set; }
-
-        public string Tooltip { get; set; }
-
         public MediaImageViewModel()
         {
             Type = MediaType.Image;

diff --git a/Modules/BetterCms.Module.MediaManager/ViewModels/MediaManager/MediaViewModel.cs b/Modules/BetterCms.Module.MediaManager/ViewModels/MediaManager/MediaViewModel.cs
@@ -30,6 +30,10 @@ public class MediaViewModel : IEditableGridItem
 
         public virtual string ParentFolderName { get; set; }
 
+        public virtual string Tooltip { get; set; }
+
+        public virtual string ThumbnailUrl { get; set; }
+
         public MediaViewModel()
         {
             ContentType = MediaContentType.File;

diff --git a/Modules/BetterCms.Module.MediaManager/Views/MediaManager/Partial/MediaManagerTemplate.cshtml b/Modules/BetterCms.Module.MediaManager/Views/MediaManager/Partial/MediaManagerTemplate.cshtml
@@ -177,7 +177,7 @@
 
                 <div class="bcms-media-items-block">
                     <div data-bind="css: iconClassNames()">
-                        <!-- ko if: isImage() -->
+                        <!-- ko if: getImageUrl() -->
                         <img data-bind="attr: { alt: tooltip, src: getImageUrl() }" />
                         <!-- /ko -->
                     </div>