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 2777303aa0..94f02ed9c6 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
@@ -7,7 +7,6 @@
vm.state = "upload";
vm.localPackage = {};
- vm.loadPackage = loadPackage;
vm.installPackage = installPackage;
vm.installState = {
status: ""
@@ -57,6 +56,7 @@
// set done status on file
vm.zipFile.uploadStatus = "done";
+ loadPackage();
vm.localPackage = data;
}
@@ -102,7 +102,7 @@
packageResource
.installFiles(vm.localPackage)
.then(function(pack) {
- vm.installState.status = "Restarting, please hold...";
+ vm.installState.status = "Restarting, please wait...";
return packageResource.installData(pack);
},
installError)
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 c1ff80bad6..042aa61c70 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
@@ -47,14 +47,7 @@
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam
-
-
-
+
@@ -78,13 +71,13 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
index 1912d0a347..279ebd3bb2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
@@ -5,7 +5,13 @@
var vm = this;
+ vm.confirmUninstall = confirmUninstall;
vm.uninstallPackage = uninstallPackage;
+ vm.state = "list";
+ vm.installState = {
+ status: ""
+ };
+ vm.package = {};
function init() {
packageResource.getInstalled()
@@ -14,10 +20,17 @@
});
}
+ function confirmUninstall(pck) {
+ vm.state = "packageDetails";
+ vm.package = pck;
+ }
+
function uninstallPackage(installedPackage) {
+ vm.installState.status = "Uninstalling package...";
packageResource.uninstall(installedPackage.id)
.then(function() {
- init();
+ var url = window.location.href + "?uninstalled=" + vm.package.packageGuid;
+ window.location.reload(true);
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
index 70c7a4f42f..7cd49c638e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
@@ -1,29 +1,89 @@
+
+
+
+
Installed packages
-
Installed packages
+
-
+
-
-
-
-
-
![]()
-
-
-
-
{{ installedPackage.name }}
-
- {{ installedPackage.version }} |
{{ installedPackage.url }}| {{ installedPackage.author }}
+
+
+
+
+
+
{{ installedPackage.name }}
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index f4bf33eb5f..b31e87edb4 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -216,7 +216,9 @@ namespace Umbraco.Web.Editors
Id = pack.Id,
Author = pack.Author,
Version = pack.Version,
- Url = pack.Url
+ Url = pack.Url,
+ License = pack.License,
+ LicenseUrl = pack.LicenseUrl
}).ToList();
}
diff --git a/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs
index 67cdd28180..0bf6986e47 100644
--- a/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/InstalledPackageModel.cs
@@ -23,5 +23,11 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "url")]
public string Url { get; set; }
+
+ [DataMember(Name = "license")]
+ public string License { get; set; }
+
+ [DataMember(Name = "licenseUrl")]
+ public string LicenseUrl { get; set; }
}
}
\ No newline at end of file