From 4f211aaf48daa789aac2d692e4550f4aa5a0b7d0 Mon Sep 17 00:00:00 2001
From: ricardo abreu <rj.abreu@outlook.com>
Date: Thu, 3 Nov 2016 17:13:27 +0000
Subject: [PATCH 1/2] added finish button so page only reloads after user
 input. also added localization for en/en_us

---
 .../packager/views/install-local.controller.js   | 16 ++++++++++++----
 .../src/views/packager/views/install-local.html  | 13 +++++++++++++
 .../src/views/packager/views/repo.controller.js  | 14 ++++++++++----
 .../src/views/packager/views/repo.html           | 10 ++++++++++
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml    |  2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml |  1 +
 6 files changed, 47 insertions(+), 9 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 e5fba69a88..e34bc48ecd 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
@@ -12,6 +12,7 @@
             status: "",
             progress:0
         };
+        vm.installCompleted = false;
         vm.zipFile = {
             uploadStatus: "idle",
             uploadProgress: 0,
@@ -137,10 +138,10 @@
                             localStorageService.set("packageInstallUri", "installed");
                         }
 
-                        //reload on next digest (after cookie)
-                        $timeout(function () {
-                            $window.location.reload(true);
-                        });
+                        vm.installState.status = localizationService.localize("packager_installStateCompleted");
+                        vm.installCompleted = true;
+                        
+                        
 
                     },
                     installError);
@@ -150,6 +151,13 @@
             //This will return a rejection meaning that the promise change above will stop
             return $q.reject();
         }
+
+        vm.reloadPage = function() {
+            //reload on next digest (after cookie)
+            $timeout(function () {
+                $window.location.reload(true);
+            });
+        }
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController", PackagesInstallLocalController);
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 499e844588..6bb7c6fb14 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
@@ -159,6 +159,19 @@
                                 <p>{{vm.installState.status}}</p>
                             </div>
 
+
+
+                            <div class="umb-info-local-item text-info"
+                                 ng-show="vm.installCompleted">
+                              
+                                <button type="button"
+                                       
+                                        class="btn btn-success flex-inline mt3"
+                                        ng-click="vm.reloadPage()">
+                                    Finish
+                                </button>
+                            </div>
+
                         </div>
                     </form>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
index e4afb661e3..fd9e7aaa02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
@@ -30,6 +30,7 @@
         vm.openLightbox = openLightbox;
         vm.closeLightbox = closeLightbox;
         vm.search = search;
+        vm.installCompleted = false;
 
         var currSort = "Latest";
         //used to cancel any request in progress if another one needs to take it's place
@@ -215,10 +216,8 @@
                             localStorageService.set("packageInstallUri", result.postInstallationPath);
                         }
 
-                        //reload on next digest (after cookie)
-                        $timeout(function() {
-                            window.location.reload(true);
-                        });
+                        vm.installState.status = localizationService.localize("packager_installStateCompleted");
+                        vm.installCompleted = true;
 
                     },
                     error);
@@ -277,6 +276,13 @@
             searchDebounced();
         }
 
+        vm.reloadPage = function () {
+            //reload on next digest (after cookie)
+            $timeout(function () {
+                $window.location.reload(true);
+            });
+        }
+
         init();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
index 3975dc96d9..e7b14182ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
@@ -340,6 +340,16 @@
                                 <p>{{vm.installState.status}}</p>
                             </div>
 
+                            <div class="umb-info-local-item text-info"
+                                 ng-show="vm.installCompleted">
+
+                                <button type="button"
+                                        class="btn btn-success flex-inline mt3"
+                                        ng-click="vm.reloadPage()">
+                                    Finish
+                                </button>
+                            </div>
+
                         </div>
                     </form>
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index f710e54215..50511bd61c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -825,7 +825,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installStateInstalling">Installing...</key>
     <key alias="installStateRestarting">Restarting, please wait...</key>
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-
+    <key alias="installStateCompleted">Please click finish to complete installation and reload page.</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 80c6faf07b..bb4016dded 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -825,6 +825,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="installStateInstalling">Installing...</key>
     <key alias="installStateRestarting">Restarting, please wait...</key>
     <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
+    <key alias="installStateCompleted">Please click finish to complete installation and reload page.</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Paste with full formatting (Not recommended)</key>

From 7085f198a90eb18d63bdef9de671950ce14c6daa Mon Sep 17 00:00:00 2001
From: ricardo abreu <rj.abreu@outlook.com>
Date: Thu, 3 Nov 2016 17:29:46 +0000
Subject: [PATCH 2/2] changed reloadPage function ($window to window)

---
 .../src/views/packager/views/repo.controller.js                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
index fd9e7aaa02..5ae1d4bf2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
@@ -279,7 +279,7 @@
         vm.reloadPage = function () {
             //reload on next digest (after cookie)
             $timeout(function () {
-                $window.location.reload(true);
+                window.location.reload(true);
             });
         }