From ca62b3aedb42bc0c9a255ea157d1b47e57cef508 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 3 Dec 2012 03:21:07 +0500
Subject: [PATCH] adds umb favicon to installer and back office. This also
 ensures it doesn't get overridden by package files (some do that).

---
 src/Umbraco.Web.UI/config/splashes/noNodes.aspx | 2 +-
 src/Umbraco.Web.UI/install/default.aspx         | 6 ++++--
 src/Umbraco.Web.UI/umbraco/umbraco.aspx         | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
index 640bb0229f..49ef40210c 100644
--- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
+++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
@@ -11,7 +11,7 @@
         <%=UmbracoVersion.Current.ToString(3)%>
         - no pages found</title>
 
-
+    <link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
 
     <link media="all" rel="stylesheet" href="../../umbraco_client/installer/css/jquery-ui-1.8.6.custom.css" />
     
diff --git a/src/Umbraco.Web.UI/install/default.aspx b/src/Umbraco.Web.UI/install/default.aspx
index e34a8bab43..2d0acda187 100644
--- a/src/Umbraco.Web.UI/install/default.aspx
+++ b/src/Umbraco.Web.UI/install/default.aspx
@@ -11,10 +11,12 @@
     <meta charset="utf-8">
 
     <umb1:PageTitle runat="server" />
+    
+    <link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
 
-    <link media="all" rel="stylesheet" href="../umbraco_client/installer/css/jquery-ui-1.8.6.custom.css">
+    <link media="all" rel="stylesheet" href="../umbraco_client/installer/css/jquery-ui-1.8.6.custom.css" />
     <link media="all" type="text/css" rel="stylesheet" href="../umbraco_client/installer/css/reset.css" />
-    <link media="all" rel="stylesheet" href="../umbraco_client/installer/css/all.css">
+    <link media="all" rel="stylesheet" href="../umbraco_client/installer/css/all.css" />
     <link media="all" type="text/css" rel="stylesheet" href="../umbraco_client/installer/css/form.css" />
 
     <script src="../umbraco_client/Application/NamespaceManager.js" type="text/javascript"></script>
diff --git a/src/Umbraco.Web.UI/umbraco/umbraco.aspx b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
index 7822e7167d..3d3d911bd6 100644
--- a/src/Umbraco.Web.UI/umbraco/umbraco.aspx
+++ b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
@@ -13,6 +13,7 @@
     <title>Umbraco CMS -
         <%=Request.Url.Host.ToLower().Replace("www.", "") %></title>
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
+    <link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
     <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
     <umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />