From 67e5f3435ccc6ea445043a4d064040796dcc0de5 Mon Sep 17 00:00:00 2001 From: "Matt@MBP-PC.Home" Date: Tue, 10 Jul 2012 09:29:24 -0100 Subject: [PATCH] Fixes workitem 30887. Changed default file icon to mediaFile instead of mediaMulti as the music icon could be confusing. (NB I've also created a feature request to support dynamic icons based on file extension http://issues.umbraco.org/issue/U4-107) --- src/SQLCE4Umbraco/Sql/Total.sql | 2 +- src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql | 2 +- src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql | 2 +- src/umbraco.presentation/umbraco_client/Tree/treeIcons.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SQLCE4Umbraco/Sql/Total.sql b/src/SQLCE4Umbraco/Sql/Total.sql index 4d1b0b6482..e1434ec501 100644 --- a/src/SQLCE4Umbraco/Sql/Total.sql +++ b/src/SQLCE4Umbraco/Sql/Total.sql @@ -659,7 +659,7 @@ ALTER TABLE [umbracoNode] DROP CONSTRAINT [FK_umbracoNode_umbracoNode] !!!SET IDENTITY_INSERT [cmsContentType] ON |INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (532, 1031, N'Folder', N'folder.gif') |INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (533, 1032, N'Image', N'mediaPhoto.gif') -|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (534, 1033, N'File', N'mediaMulti.gif') +|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (534, 1033, N'File', N'mediaFile.gif') |SET IDENTITY_INSERT [cmsContentType] OFF ; !!!SET IDENTITY_INSERT [umbracoUser] ON diff --git a/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql b/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql index 6b2e371fbc..d4c7f3b6ae 100644 --- a/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql +++ b/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql @@ -522,7 +522,7 @@ INSERT INTO umbracoNode (id, trashed, parentID, nodeUser, level, path, sortOrder INSERT INTO cmsContentType (pk, nodeId, alias, icon) VALUES (532, 1031, 'Folder', 'folder.gif'), (533, 1032, 'Image', 'mediaPhoto.gif'), - (534, 1033, 'File', 'mediaMulti.gif') + (534, 1033, 'File', 'mediaFile.gif') ; INSERT INTO umbracoUserType (id, userTypeAlias, userTypeName, userTypeDefaultPermissions) VALUES (1, 'admin', 'Administrators', 'CADMOSKTPIURZ5:'), diff --git a/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql b/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql index f75b7a0777..78f446a858 100644 --- a/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql +++ b/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql @@ -657,7 +657,7 @@ SET IDENTITY_INSERT [umbracoNode] OFF SET IDENTITY_INSERT [cmsContentType] ON INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (532, 1031, N'Folder', N'folder.gif') INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (533, 1032, N'Image', N'mediaPhoto.gif') -INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (534, 1033, N'File', N'mediaMulti.gif') +INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (534, 1033, N'File', N'mediaFile.gif') SET IDENTITY_INSERT [cmsContentType] OFF ; SET IDENTITY_INSERT [umbracoUser] ON diff --git a/src/umbraco.presentation/umbraco_client/Tree/treeIcons.css b/src/umbraco.presentation/umbraco_client/Tree/treeIcons.css index fa0685636f..acd1b33f4c 100644 --- a/src/umbraco.presentation/umbraco_client/Tree/treeIcons.css +++ b/src/umbraco.presentation/umbraco_client/Tree/treeIcons.css @@ -13,7 +13,7 @@ .sprTreeFolder_o {background-position: -6px -423px ! important;} .sprTreeMediaFile {background-position: -6px -455px ! important;} .sprTreeMediaMovie {background-position: -6px -487px ! important;} -.sprTreeMediaMulti {background-position: -6px -519px ! important;} +.sprTreemediaFile {background-position: -6px -519px ! important;} .sprTreeMediaPhoto {background-position: -6px -551px ! important;} .sprTreeMember {background-position: -6px -583px ! important;} .sprTreeMemberGroup {background-position: -6px -615px ! important;}