yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: U4-9039 No progress indication when uploading local package

Browse Source
This commit is contained in:
Mads Rasmussen
2016-10-25 15:40:31 +02:00
parent bf67cd5acd
commit f1d5ccb1e3
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
View File

@@ -34,6 +34,9 @@
file: file
}).progress(function (evt) {
// set view state to uploading
vm.state = 'uploading';
// calculate progress in percentage
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);

39
src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
View File

@@ -37,10 +37,8 @@
- <localize key="media_orClickHereToUpload">or click here to choose files</localize>
</div>
<div class="umb-info-local-item text-error" ng-if="vm.zipFile.uploadStatus === 'error'">
{{vm.zipFile.serverErrorMessage}}
</div>
</div>
</div>
@@ -53,6 +51,41 @@
</div>
</div>
<div ng-if="vm.state === 'uploading'">
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; Upload another package</a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
<div class="umb-packages-view-wrapper">
<div class="flex items-center justify-center">
<div class="umb-info-local-items">
<div class="umb-package-icon">
<i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
</div>
<div class="umb-package-info">
<h4 class="umb-info-local-item"><strong>Uploading package</strong></h4>
<umb-progress-bar
percentage="{{vm.zipFile.uploadProgress}}">
</umb-progress-bar>
<div class="umb-info-local-item text-error mt3" ng-if="vm.zipFile.uploadStatus === 'error'">
{{ vm.zipFile.serverErrorMessage }}
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-if="vm.state === 'packageDetails'">
<umb-editor-sub-header>