diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx index ac18284a34..44b2991ada 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx @@ -148,10 +148,37 @@ - -
-

<%= umbraco.ui.Text("packager", "packageUninstalledText") %>

+ + +
+ Package uninstall in progress, please wait while the browser is reloaded...
+ + + +
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx index 27ccf1cd63..a7fe23357d 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx @@ -294,6 +294,14 @@ + + + +

<%= umbraco.ui.Text("packager", "packageUninstalledText") %>

+ +
+
+ diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx index 2547040969..aa565cde1d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx @@ -31,9 +31,6 @@ - - - @@ -145,12 +142,39 @@

- + -
-

<%= umbraco.ui.Text("packager", "packageUninstalledText") %>

+ +
+ Please wait while the browser is reloaded...
+ + + + - + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs index 51d7fd3007..99b054affb 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs @@ -275,6 +275,9 @@ namespace umbraco.presentation.developer.packages case "finished": PerformFinishedAction(packageId, dir, Request.GetItemAsString("customUrl")); break; + case "uninstalled": + PerformUninstalledAction(); + break; default: break; } @@ -303,6 +306,13 @@ namespace umbraco.presentation.developer.packages PerformPostInstallCleanup(packageId, dir); } + private void PerformUninstalledAction() + { + HideAllPanes(); + Panel1.Text = "Package has been uninstalled"; + pane_uninstalled.Visible = true; + } + /// /// Perform the 'Refresh' action of the installer /// @@ -744,6 +754,9 @@ namespace umbraco.presentation.developer.packages /// protected global::umbraco.uicontrols.Pane pane_installing; + protected global::umbraco.uicontrols.Pane pane_uninstalled; + + /// /// progBar2 control. ///