kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix progress bar styling in FileManager

Browse Source
This commit is contained in:
sbwalker 2023-06-29 11:54:05 -04:00
parent ba18cd505b
commit 0a9cbfd0e5
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -55,7 +55,7 @@
</div> </div>
<div class="col mt-2 text-end"> <div class="col mt-2 text-end">
<button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button> <button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button>
@if (ShowFiles && GetFileId() != -1) @if (GetFileId() != -1)
{ {
<button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button> <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
} }
@ -63,7 +63,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div> <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
<div class="col text-center mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div> <div class="col mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
</div> </div>
} }
</div> </div>
@ -382,38 +382,41 @@
} }
StateHasChanged(); StateHasChanged();
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "File Upload Failed {Error}", ex.Message); await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
_message = Localizer["Error.File.Upload"]; _message = Localizer["Error.File.Upload"];
_messagetype = MessageType.Error; _messagetype = MessageType.Error;
} }
} }
else else
{ {
_message = string.Format(Localizer["Message.File.Restricted"], restricted); _message = string.Format(Localizer["Message.File.Restricted"], restricted);
_messagetype = MessageType.Warning; _messagetype = MessageType.Warning;
} }
} }
else else
{ {
_message = Localizer["Message.File.NotSelected"]; _message = Localizer["Message.File.NotSelected"];
_messagetype = MessageType.Warning; _messagetype = MessageType.Warning;
} }
} }
private async Task DeleteFile() private async Task DeleteFile()
{ {
_message = string.Empty; _message = string.Empty;
try try
{ {
await FileService.DeleteFileAsync(FileId); await FileService.DeleteFileAsync(FileId);
await logger.LogInformation("File Deleted {File}", FileId); await logger.LogInformation("File Deleted {File}", FileId);
await OnDelete.InvokeAsync(FileId); await OnDelete.InvokeAsync(FileId);
_message = Localizer["Success.File.Delete"]; if (ShowSuccess)
_messagetype = MessageType.Success; {
_message = Localizer["Success.File.Delete"];
_messagetype = MessageType.Success;
}
await GetFiles(); await GetFiles();
FileId = -1; FileId = -1;

2
Oqtane.Server/wwwroot/js/interop.js
View File

@ -291,7 +291,7 @@ Oqtane.Interop = {
var progressbar = document.getElementById('ProgressBar_' + id); var progressbar = document.getElementById('ProgressBar_' + id);
progressinfo.setAttribute("style", "display: inline;"); progressinfo.setAttribute("style", "display: inline;");
progressbar.setAttribute("style", "width: 200px; display: inline;"); progressbar.setAttribute("style", "width: 100%; display: inline;");
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
var FileChunk = []; var FileChunk = [];