From f1d5ccb1e33f0f25f2e9b16ef70f50efe3a4606e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 25 Oct 2016 15:40:31 +0200
Subject: [PATCH] Fixes: U4-9039 No progress indication when uploading local
 package

---
 .../views/install-local.controller.js         |  3 ++
 .../views/packager/views/install-local.html   | 39 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
index e29df0b9ae..e5fba69a88 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.controller.js
@@ -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);
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
index 07fb21d00b..499e844588 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
@@ -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>