diff --git a/App_LocalResources/Settings.ascx.resx b/App_LocalResources/Settings.ascx.resx index a3c57aa..787fae2 100644 --- a/App_LocalResources/Settings.ascx.resx +++ b/App_LocalResources/Settings.ascx.resx @@ -315,4 +315,22 @@ Show Icon: + + Check to allow image preview. This features can consume CPU resources when a lot of visitors use it, because the image is resized on the fly. + + + Image Preview: + + + Max height in pixel of the thumbnail when image preview is enabled. + + + Thumbnail Height: + + + Max width in pixel of the thumbnail when image preview is enabled. + + + Thumbnail Width: + \ No newline at end of file diff --git a/App_LocalResources/SharedResources.resx b/App_LocalResources/SharedResources.resx index 5d88247..d39a2fa 100644 --- a/App_LocalResources/SharedResources.resx +++ b/App_LocalResources/SharedResources.resx @@ -267,4 +267,13 @@ Select all + + Preview + + + Close + + + Image preview + \ No newline at end of file diff --git a/Common/Options.cs b/Common/Options.cs index ea63ca8..516fbc2 100644 --- a/Common/Options.cs +++ b/Common/Options.cs @@ -12,5 +12,6 @@ public sealed class Options public bool SynchronizeFolder { get; set; } public bool FileManagement { get; set; } public bool OpenOnDblclick { get; set; } + public bool ImagePreview { get; set; } } } \ No newline at end of file diff --git a/Components/ServicesController.cs b/Components/ServicesController.cs index e0184fc..f9f2954 100644 --- a/Components/ServicesController.cs +++ b/Components/ServicesController.cs @@ -60,7 +60,8 @@ public HttpResponseMessage Options() Columns = GetColumns(settings), SynchronizeFolder = IsAdmin, FileManagement = settings.FileManagement, - OpenOnDblclick = settings.OpenOnDblclick + OpenOnDblclick = settings.OpenOnDblclick, + ImagePreview = settings.ImagePreview }; return Request.CreateResponse(HttpStatusCode.OK, options, GetFormatter()); @@ -164,7 +165,48 @@ public HttpResponseMessage DownloadURL([FromUri] ItemCommand itemCommand) string url = Globals.LinkClick(string.Format("FileID={0}", file.FileId), -1, -1, false, forceDownload); return Request.CreateResponse(HttpStatusCode.OK, url); + } + + return Request.CreateResponse(HttpStatusCode.NotFound, filePath); + } + catch + { + return Request.CreateErrorResponse(HttpStatusCode.BadRequest, LocalizeString("UnattentedError")); + } + } + /// + /// Get image thumbnail. + /// + /// Options + [HttpGet] + [ValidateAntiForgeryToken] + [SupportedModules("TidyModules.DocumentExplorer")] + [DnnAuthorize] + public HttpResponseMessage Thumbnail([FromUri] ItemCommand itemCommand) + { + try + { + string folderPath = PathUtils.Instance.FormatFolderPath(itemCommand.Path); + string filePath = folderPath + itemCommand.Files[0]; + IFileInfo file = FileManager.Instance.GetFile(PortalSettings.PortalId, filePath); + + if (file != null) + { + DocumentSettings settings = new DocumentSettings(ActiveModule); + int height = settings.ThumbnailHeight; + int width = settings.ThumbnailWidth; + string extension = "." + file.Extension; + + using (Stream content = FileManager.Instance.GetFileContent(file)) + { + using (Stream thumbnail = ImageUtils.CreateImage(content, height, width, extension)) + { + string img64 = string.Format("data:{0};base64,{1}", file.ContentType, ReadFullyAsBase64(thumbnail)); + + return Request.CreateResponse(HttpStatusCode.OK, img64); + } + } } return Request.CreateResponse(HttpStatusCode.NotFound, filePath); @@ -522,8 +564,10 @@ private Dictionary GetResources() resources.Add("renameFolderTitle", LocalizeString("RenameFolderTitle")); resources.Add("renameFileTitle", LocalizeString("RenameFileTitle")); resources.Add("packNameTitle", LocalizeString("PackNameTitle")); + resources.Add("imagePreviewTitle", LocalizeString("ImagePreviewTitle")); resources.Add("dialogOk", LocalizeString("DialogOk")); resources.Add("dialogCancel", LocalizeString("DialogCancel")); + resources.Add("dialogClose", LocalizeString("DialogClose")); resources.Add("deleteFolderMessage", LocalizeString("DeleteFolderMessage")); resources.Add("deleteFilesMessage", LocalizeString("DeleteFilesMessage")); resources.Add("itemSelectAll", LocalizeString("ItemSelectAll")); @@ -534,6 +578,7 @@ private Dictionary GetResources() resources.Add("cantPaste", LocalizeString("CantPaste")); resources.Add("itemRename", LocalizeString("ItemRename")); resources.Add("itemDelete", LocalizeString("ItemDelete")); + resources.Add("imagePreview", LocalizeString("ImagePreview")); resources.Add("fileOpen", LocalizeString("FileOpen")); resources.Add("fileDownload", LocalizeString("FileDownload")); resources.Add("fileClipboard", LocalizeString("FileClipboard")); @@ -833,6 +878,22 @@ private string ZipFiles(IEnumerable zipFileList, IFolderInfo folder, str return error; } + /// + /// Convert content from a stream to a base 64 string. + /// + /// Stream + /// Base 64 string + private string ReadFullyAsBase64(Stream input) + { + using (MemoryStream ms = new MemoryStream()) + { + input.Position = 0; + input.CopyTo(ms); + + return Convert.ToBase64String(ms.ToArray()); + } + } + #endregion } } \ No newline at end of file diff --git a/DocumentExplorer.csproj b/DocumentExplorer.csproj index 3b68ef7..15a16e2 100644 --- a/DocumentExplorer.csproj +++ b/DocumentExplorer.csproj @@ -187,9 +187,6 @@ - - - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/DocumentSettings.cs b/DocumentSettings.cs index f3187ae..0c167c9 100644 --- a/DocumentSettings.cs +++ b/DocumentSettings.cs @@ -100,6 +100,15 @@ public DocumentSettings(ModuleInfo module) : base(module) [ModuleSetting("OpenOnDblclick", "false")] public bool OpenOnDblclick { get; set; } + [ModuleSetting("ImagePreview", "true")] + public bool ImagePreview { get; set; } + + [ModuleSetting("ThumbnailWidth", "450")] + public int ThumbnailWidth { get; set; } + + [ModuleSetting("ThumbnailHeight", "300")] + public int ThumbnailHeight { get; set; } + #endregion } } \ No newline at end of file diff --git a/Package/TidyModules.DocumentExplorer_00.01.00_Install.zip b/Package/TidyModules.DocumentExplorer_00.01.00_Install.zip deleted file mode 100644 index 2e58709..0000000 Binary files a/Package/TidyModules.DocumentExplorer_00.01.00_Install.zip and /dev/null differ diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f760bd4..c755b77 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] +[assembly: AssemblyVersion("0.1.1.0")] +[assembly: AssemblyFileVersion("0.1.1.0")] diff --git a/Scripts/explorer.js b/Scripts/explorer.js index 055e7e3..d839a0b 100644 --- a/Scripts/explorer.js +++ b/Scripts/explorer.js @@ -5,7 +5,8 @@ locale = null, sizes = null, showIcon = false, - fileManagement = false, + fileManagement = false + imagePreview = false, hasFilter = false, resetFilters = false, dlgWindow = null, @@ -282,6 +283,10 @@ options.push(itemTmpl.format("cmfDelete", "fa-trash", locale["itemDelete"])); } + if (imagePreview) { + options.push(itemTmpl.format("cmfPreview", "fa-eye", locale["imagePreview"])); + } + options.push(itemTmpl.format("cmfOpen", "fa-external-link", locale["fileOpen"])); options.push(itemTmpl.format("cmfDownload", "fa-download", locale["fileDownload"])); options.push(itemTmpl.format("cmfClipboard", "fa-link", locale["fileClipboard"])); @@ -328,6 +333,14 @@ }); } + // Check if the file is an image + function isImage(extension) { + if (extension == "bmp" || extension == "jpg" || extension == "png" || extension == "gif") + return true; + + return false; + } + // Build full url from relative path function buildURL(relativePath) { if (relativePath.length > 0 & relativePath[0] != "/") { @@ -426,6 +439,39 @@ }); }); break; + case "cmfPreview": + var file = deFiles.puidatatable("getContextMenuSelection"); + var cmd = new ItemCommand(folder.path, getFileNames(file)); + + $.ajax({ + type: "GET", + url: services.format("Thumbnail"), + data: cmd, + beforeSend: sf.setModuleHeaders + }).done(function (result, status, xhr) { + var html = "
"; + + $(html).dialog({ + modal: true, + width: "auto", + title: locale["imagePreviewTitle"], + dialogClass: "dnnFormPopup", + buttons: [ + { + text: locale["dialogClose"], + click: function () { + $(this).dialog("close"); + } + } + ], + close: function () { + $(this).dialog("destroy").remove(); + } + }); + }).fail(function (xhr, result, status) { + showError(status, xhr.responseText); + }); + break; case "cmfOpen": var file = deFiles.puidatatable("getContextMenuSelection"); var cmd = new ItemCommand(folder.path, getFileNames(file)); @@ -683,9 +729,12 @@ if (counter > 1) { cmFiles.find("#cmfRename").addClass("ui-state-disabled"); + cmFiles.find("#cmfPreview").addClass("ui-state-disabled"); cmFiles.find("#cmfOpen").addClass("ui-state-disabled"); cmFiles.find("#cmfDownload").addClass("ui-state-disabled"); cmFiles.find("#cmfClipboard").addClass("ui-state-disabled"); + } else if (!isImage(data.extension)) { + cmFiles.find("#cmfPreview").addClass("ui-state-disabled"); } } @@ -696,6 +745,7 @@ sizes = locale["sizes"].split(","); showIcon = options.showIcon; fileManagement = options.fileManagement; + imagePreview = options.imagePreview; resetFilters = options.resetFilters; // Init dialog windows diff --git a/Scripts/explorer.min.js b/Scripts/explorer.min.js index d34a0fb..0a84b1d 100644 --- a/Scripts/explorer.min.js +++ b/Scripts/explorer.min.js @@ -1,25 +1,27 @@ -(function(K,d,L){function g(a,c,b,d){this.path=a;this.files=null!=c?c instanceof Array?c:[c]:[];this.flag="boolean"===typeof b?b:!1;this.toPath=d}function q(a){var c=[];if(a instanceof Array)for(var b=0;b