From b31dc30878ff90636017a8fe1fafc5ccf675e3fb Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 20 Jun 2023 08:58:28 +0200 Subject: [PATCH] Make file management UI more useful (#5081) * Make file management UI more useful * Simplify markup * Move file info to top --------- Co-authored-by: Dennis Reimann --- BTCPayServer/Views/UIServer/Files.cshtml | 131 +++++++++++++---------- 1 file changed, 76 insertions(+), 55 deletions(-) diff --git a/BTCPayServer/Views/UIServer/Files.cshtml b/BTCPayServer/Views/UIServer/Files.cshtml index 979732f01..1574cfa14 100644 --- a/BTCPayServer/Views/UIServer/Files.cshtml +++ b/BTCPayServer/Views/UIServer/Files.cshtml @@ -8,11 +8,11 @@

@ViewData["Title"]

- + Settings
- + @if (!Model.StorageConfigured) {

@@ -42,66 +42,87 @@ } + @if (Model.DirectUrlByFiles is { Count: > 0 }) + { + foreach (var fileUrlPair in Model.DirectUrlByFiles) + { + var fileId = fileUrlPair.Key; + var file = Model.Files.Single(storedFile => storedFile.Id.Equals(fileId, StringComparison.InvariantCultureIgnoreCase)); + var url = Url.Action("GetFile", "UIStorage", new { fileId }, Context.Request.Scheme, Context.Request.Host.ToString()); +

+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+ } + } + @if (Model.Files.Any()) { - - - - - - - - - - - @foreach (var file in Model.Files) - { +
+
NameTimestampUserActions
+ - - - - + + + + - } - -
@file.FileName@file.Timestamp.ToBrowserDate()@file.ApplicationUser.UserName - Get Link - - Remove - NameTimestampUserActions
+ + + @foreach (var file in Model.Files) + { + + + @file.FileName + + @file.Timestamp.ToBrowserDate() + @file.ApplicationUser.UserName + + Get Link + - Remove + + + } + + + } else { -

- There are no files yet. -

- } - } - - @if (Model.DirectUrlByFiles != null && Model.DirectUrlByFiles.Count > 0) - { - foreach (KeyValuePair fileUrlPair in Model.DirectUrlByFiles) - { - var fileId = fileUrlPair.Key; - var file = Model.Files.Single(storedFile => storedFile.Id.Equals(fileId, StringComparison.InvariantCultureIgnoreCase)); - - +

There are no files yet.

} }