From 05ed8e95307f6f517b995c8776c3686104e62c46 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 20 Jun 2016 13:07:16 +0100
Subject: [PATCH 1/3] Fix for U4-8612 so that Icon shows when installing a
 local package

---
 .../src/views/packager/views/install-local.html               | 4 ++--
 src/Umbraco.Web/Editors/PackageInstallController.cs           | 1 +
 src/Umbraco.Web/Models/LocalPackageInstallModel.cs            | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

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 b25facae7f..1900863cfd 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
@@ -53,8 +53,8 @@
 
             <form novalidate name="localPackageForm">
                 <div class="umb-package-icon">
-                    <i ng-if="!vm.localPackage.icon" class="icon-box"></i>
-                    <img ng-if="vm.localPackage.icon" ng-src="{{vm.localPackage.icon}}" alt="" />
+                    <i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
+                    <img ng-if="vm.localPackage.iconUrl" ng-src="{{vm.localPackage.iconUrl}}" alt="" />
                 </div>
 
 
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 41f183eb8c..0d814c8f7f 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -233,6 +233,7 @@ namespace Umbraco.Web.Editors
             model.Name = ins.Name;
             model.Author = ins.Author;
             model.AuthorUrl = ins.AuthorUrl;
+            model.IconUrl = ins.IconUrl;
             model.License = ins.License;
             model.LicenseUrl = ins.LicenseUrl;
             model.ReadMe = ins.ReadMe;
diff --git a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
index abb7c85cec..819674d3f2 100644
--- a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
+++ b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
@@ -83,5 +83,8 @@ namespace Umbraco.Web.Models
 
         [DataMember(Name = "author")]
         public string Author { get; set; }
+
+        [DataMember(Name = "iconUrl")]
+        public string IconUrl { get; set; }
     }
 }
\ No newline at end of file

From fed718efb5d8fc4e8d65bb7028efc939ba01ef1f Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 20 Jun 2016 13:17:09 +0100
Subject: [PATCH 2/3] Fix Author link in Local package installer

---
 .../src/views/packager/views/install-local.html                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1900863cfd..62768d7f78 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
@@ -63,7 +63,7 @@
 
                     <div class="umb-info-local-item">
                         <strong>Author</strong>
-                        <a href="{{ vm.localPackage.authorLink }}" target="_blank">{{ vm.localPackage.author }}</a>
+                        <a href="{{ vm.localPackage.authorUrl }}" target="_blank">{{ vm.localPackage.author }}</a>
                     </div>
 
                     <div class="umb-info-local-item">

From 53fbf04a6c3ab02bd7343717bfade94886c2a01f Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 20 Jun 2016 13:20:24 +0100
Subject: [PATCH 3/3] Add target=_blank on license url in local package
 installer so user doesn't loose their installer if they click the link

---
 .../src/views/packager/views/install-local.html                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 62768d7f78..97601d5438 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
@@ -73,7 +73,7 @@
 
                     <div class="umb-info-local-item">
                         <strong>License</strong>
-                        <a href="{{ vm.localPackage.licenseUrl }}">{{ vm.localPackage.license }}</a>
+                        <a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
                     </div>
 
                     <div class="umb-info-local-item">