Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

Also fixes casing of folder names
This commit is contained in:
Sebastiaan Janssen
2013-07-15 16:31:19 +02:00
parent 1e129bcc4d
commit 60867af1a7
13 changed files with 15 additions and 7 deletions

View File

@@ -552,6 +552,14 @@
</Compile>
<Content Include="Config\Splashes\booting.aspx" />
<Content Include="Config\Splashes\noNodes.aspx" />
<Content Include="Umbraco\Images\PinnedIcons\task_content.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_default.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_developer.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_media.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_member.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_settings.ico" />
<Content Include="Umbraco\Images\PinnedIcons\task_users.ico" />
<Content Include="Umbraco\Images\PinnedIcons\umb.ico" />
<Content Include="Umbraco\Xslt\Web.config">
<SubType>
</SubType>

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -9,7 +9,7 @@
<meta charset="utf-8">
<title>Umbraco - no pages found</title>
<link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
<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" />

View File

@@ -12,7 +12,7 @@
<umb1:PageTitle runat="server" />
<link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
<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" type="text/css" rel="stylesheet" href="../umbraco_client/installer/css/reset.css" />

View File

@@ -108,7 +108,7 @@ namespace Umbraco.Web.UI.Umbraco
<meta name='msapplication-tooltip' content='Umbraco CMS - {1}' />
<meta name='msapplication-navbutton-color' content='#f36f21' />
<meta name='msapplication-starturl' content='./umbraco.aspx' />",
IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/pinnedIcons/umb.ico"),
IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/Images/PinnedIcons/umb.ico"),
HttpContext.Current.Request.Url.Host.ToLower().Replace("www.", ""));
var user = UmbracoUser;
@@ -123,9 +123,9 @@ namespace Umbraco.Web.UI.Umbraco
File.Exists(
IOHelper.MapPath(
IOHelper.ResolveUrl(
string.Format("{0}/images/pinnedIcons/task_{1}.ico", SystemDirectories.Umbraco, app.alias))))
? "/umbraco/images/pinnedIcons/task_" + app.alias + ".ico"
: "/umbraco/images/pinnedIcons/task_default.ico");
string.Format("{0}/Images/PinnedIcons/task_{1}.ico", SystemDirectories.Umbraco, app.alias))))
? "/umbraco/Images/PinnedIcons/task_" + app.alias + ".ico"
: "/umbraco/Images/PinnedIcons/task_default.ico");
}
}

View File

@@ -16,7 +16,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" %>" />
<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" />