diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.scss index adfa7fdea59..d88dc3aa353 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.scss +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.scss @@ -1,18 +1,34 @@ :host { display: block; + margin-right: 1em; } table{ + width: 100%; + border-collapse: collapse; thead{ font-weight: bold; + tr{ + border-bottom: 2px solid lightgray; + } } tbody{ - td{ - &:first-child{ - img{ - height: 2.5em; - display: block; - margin: 0 auto; + tr{ + border-bottom: 1px solid lightgray; + td{ + &:first-child{ + img{ + height: 2.5em; + display: block; + margin: 0 auto; + } + } + .date{ + display: flex; + flex-direction: column; + } + &.size{ + text-align: right; } } } diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx index 916d10b53d8..2377599e3db 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-items-listview/dnn-rm-items-listview.tsx @@ -8,6 +8,30 @@ import state from "../../store/store"; }) export class DnnRmItemsListview { + private getLocalDateString(dateString: string) { + const date = new Date(dateString); + return
+ {date.toLocaleDateString()} + {date.toLocaleTimeString()} +
+ } + + private getFileSize(fileSize: number) { + if (fileSize == undefined || fileSize == undefined){ + return ""; + } + + if (fileSize < 1024){ + return fileSize.toString() + " B"; + } + + if (fileSize < 1048576 ){ + return Math.round(fileSize / 1024).toString() + " KB"; + } + + return Math.round(fileSize / 3221225472).toString() + " MB"; + } + render() { return ( @@ -17,6 +41,9 @@ export class DnnRmItemsListview { {state.localization?.Name} + {state.localization?.Created} + {state.localization?.LastModified} + {state.localization?.Size} @@ -24,7 +51,10 @@ export class DnnRmItemsListview { {item.itemName} - + {this.getLocalDateString(item.createdOn)} + {this.getLocalDateString(item.modifiedOn)} + {this.getFileSize(item.fileSize)} + )} @@ -32,5 +62,4 @@ export class DnnRmItemsListview { ); } - } diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts index 55dc9813ff5..83af1404c7a 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/services/ItemsClient.ts @@ -98,4 +98,10 @@ export interface Item{ thumbnailAvailable?: boolean | undefined; /** The relative url to the item thumbnail. */ thumbnailUrl?: string; + /** And ISO 8601 string representing the created date of the item. */ + createdOn: string; + /** And ISO 8601 string representing the last modified date of the item. */ + modifiedOn: string; + /** The size of the file (only available for file Items) */ + fileSize?: number, } \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs b/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs index 5065dc51a1c..1247afc47d9 100644 --- a/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs +++ b/DNN Platform/Modules/ResourceManager/Services/ItemsController.cs @@ -560,7 +560,9 @@ private object GetItemViewModel(object item) isFolder = true, itemId = folder.FolderID, itemName = folder.FolderName, - iconUrl = GetFolderIconUrl(this.PortalSettings.PortalId, folder.FolderMappingID), + iconUrl = GetFolderIconUrl(this.PortalSettings.PortalId, folder.FolderMappingID), + createdOn = folder.CreatedOnDate, + modifiedOn = folder.LastModifiedOnDate, }; } @@ -574,7 +576,10 @@ private object GetItemViewModel(object item) path = FileManager.Instance.GetUrl(file), iconUrl = GetFileIconUrl(file.Extension), thumbnailAvailable = thumbnailsManager.ThumbnailAvailable(file.FileName), - thumbnailUrl = thumbnailsManager.ThumbnailUrl(this.ActiveModule.ModuleID, file.FileId, 110, 110), + thumbnailUrl = thumbnailsManager.ThumbnailUrl(this.ActiveModule.ModuleID, file.FileId, 110, 110), + createdOn = file.CreatedOnDate, + modifiedOn = file.LastModifiedOnDate, + fileSize = file.Size, }; }