From f6f6da2f2121f368b1def90ac6cedce1dd2deb94 Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 3 Sep 2013 14:24:51 +0200 Subject: [PATCH] Tree icons update --- .../umbraco/Trees/BaseTree.cs | 4 +- .../umbraco/Trees/loadDataTypes.cs | 4 +- .../umbraco/Trees/loadMacros.cs | 4 +- .../umbraco/Trees/loadNodeTypes.cs | 8 ++-- .../umbraco/Trees/loadPackager.cs | 14 +++---- .../umbraco/Trees/loadPackages.cs | 37 ++++++++++--------- .../umbraco/Trees/loadRelationTypes.cs | 2 +- .../umbraco/Trees/loadScripts.cs | 4 +- .../umbraco/Trees/loadStylesheetProperty.cs | 4 +- .../umbraco/Trees/loadStylesheets.cs | 4 +- .../umbraco/Trees/loadTemplates.cs | 32 ++++++++-------- .../umbraco/Trees/loadXslt.cs | 4 +- 12 files changed, 61 insertions(+), 60 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs index 08038f0421..4202ba0d74 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs @@ -26,8 +26,8 @@ namespace umbraco.cms.presentation.Trees this.app = application; } - protected const string FolderIcon = ".sprTreeFolder"; - protected const string FolderIconOpen = ".sprTreeFolder_o"; + protected const string FolderIcon = "icon-folder"; + protected const string FolderIconOpen = "icon-folder"; /// /// Returns the node definition of the root node for this tree diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs index 9d833bbd4d..edafcb3ee1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDataTypes.cs @@ -65,8 +65,8 @@ function openDataType(id) { xNode.NodeID = dt.Id.ToString(); xNode.Text = dt.Text; xNode.Action = "javascript:openDataType(" + dt.Id + ");"; - xNode.Icon = "developerDatatype.gif"; - xNode.OpenIcon = "developerDatatype.gif"; + xNode.Icon = "icon-autofill"; + xNode.OpenIcon = "icon-autofill"; OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); if (xNode != null) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs index dc04615d80..8d5e347390 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs @@ -79,8 +79,8 @@ function openMacro(id) { xNode.NodeID = macros.GetInt("id").ToString(); xNode.Text = macros.GetString("macroName"); xNode.Action = "javascript:openMacro(" + macros.GetInt("id") + ");"; - xNode.Icon = "developerMacro.gif"; - xNode.OpenIcon = "developerMacro.gif"; + xNode.Icon = " icon-settings-alt"; + xNode.OpenIcon = "icon-settings-alt"; OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); if (xNode != null) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs index ae82b25b71..72b4546f1c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs @@ -69,14 +69,14 @@ function openNodeType(id) { xNode.NodeID = docType.Id.ToString(CultureInfo.InvariantCulture); xNode.Text = docType.Name; xNode.Action = "javascript:openNodeType(" + docType.Id + ");"; - xNode.Icon = "settingDataType.gif"; - xNode.OpenIcon = "settingDataType.gif"; + xNode.Icon = "icon-item-arrangement"; + xNode.OpenIcon = "icon-item-arrangement"; xNode.Source = GetTreeServiceUrl(docType.Id); xNode.HasChildren = hasChildren; if (hasChildren) { - xNode.Icon = "settingMasterDataType.gif"; - xNode.OpenIcon = "settingMasterDataType.gif"; + xNode.Icon = "icon-item-arrangement"; + xNode.OpenIcon = "icon-item-arrangement"; } OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index a45cd08d23..c25e446fa3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -84,7 +84,7 @@ namespace umbraco XmlElement treeElement = Tree.CreateElement("tree"); treeElement.SetAttribute("nodeID", "-1"); treeElement.SetAttribute("text", items[i, 1]); - treeElement.SetAttribute("icon", "folder.gif"); + treeElement.SetAttribute("icon", "icon-folder"); treeElement.SetAttribute("openIcon", "folder_o.gif"); //Make sure the different sections load the correct childnodes. @@ -132,8 +132,8 @@ namespace umbraco treeElement.SetAttribute("nodeType", "packagesRepository"); treeElement.SetAttribute("menu", "L"); treeElement.SetAttribute("action", "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repos[0].Guid + "');"); - treeElement.SetAttribute("icon", "repository.gif"); - treeElement.SetAttribute("openIcon", "repository.gif"); + treeElement.SetAttribute("icon", "icon-server-alt"); + treeElement.SetAttribute("openIcon", "icon-server-alt"); treeElement.SetAttribute("hasChildren", "true"); } @@ -158,8 +158,8 @@ namespace umbraco treeElement.SetAttribute("src", ""); treeElement.SetAttribute("nodeType", "uploadPackage"); //treeElement.SetAttribute("menu", ""); - treeElement.SetAttribute("icon", "uploadpackage.gif"); - treeElement.SetAttribute("openIcon", "uploadpackage.gif"); + treeElement.SetAttribute("icon", "icon-page-up"); + treeElement.SetAttribute("openIcon", "icon-page-up"); treeElement.SetAttribute("action", "javascript:openPackageCategory('" + items[i, 0] + "');"); treeElement.SetAttribute("text", ui.Text("treeHeaders", "localPackage")); break; @@ -169,8 +169,8 @@ namespace umbraco treeElement.SetAttribute("nodeType", "starterKits"); //treeElement.SetAttribute("menu", "L"); treeElement.SetAttribute("action", "javascript:openPackageCategory('" + items[i, 0] + "');"); - treeElement.SetAttribute("icon", "nitros.gif"); - treeElement.SetAttribute("openIcon", "nitros.gif"); + treeElement.SetAttribute("icon", "icon-flash"); + treeElement.SetAttribute("openIcon", "icon-flash"); treeElement.SetAttribute("text", ui.Text("treeHeaders", "installStarterKit")); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs index cbdc3f0a90..dc42af8820 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs @@ -22,6 +22,7 @@ namespace umbraco protected override void CreateRootNode(ref XmlTreeNode rootNode) { + } private int m_id; @@ -62,8 +63,8 @@ namespace umbraco xNode.NodeID = string.Concat(PACKAGE_TREE_PREFIX, p.Data.Id); xNode.Text = p.Data.Name; xNode.Action = string.Format("javascript:openInstalledPackage('{0}');", p.Data.Id); - xNode.Icon = "package.gif"; - xNode.OpenIcon = "package.gif"; + xNode.Icon = "icon-box"; + xNode.OpenIcon = "icon-box"; xNode.NodeType = "createdPackageInstance"; xNode.Menu = null; tree.Add(xNode); @@ -78,8 +79,8 @@ namespace umbraco xNode.NodeID = PACKAGE_TREE_PREFIX + p.Data.Id.ToString(); xNode.Text = p.Data.Name; xNode.Action = "javascript:openCreatedPackage('" + p.Data.Id.ToString() + "');"; - xNode.Icon = "package.gif"; - xNode.OpenIcon = "package.gif"; + xNode.Icon = "icon-box"; + xNode.OpenIcon = "icon-box"; xNode.NodeType = "createdPackageInstance"; // xNode.Menu.Add( umbraco.BusinessLogic.Actions.ActionDelete.Instance ); @@ -95,8 +96,8 @@ namespace umbraco XmlTreeNode xNode = XmlTreeNode.Create(this); xNode.Text = repo.Name; xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repo.Guid + "');"; - xNode.Icon = "repository.gif"; - xNode.OpenIcon = "repository.gif"; + xNode.Icon = "icon-server-alt"; + xNode.OpenIcon = "icon-server-alt"; xNode.NodeType = "packagesRepo" + repo.Guid; xNode.Menu.Add( umbraco.BusinessLogic.Actions.ActionRefresh.Instance ); xNode.Source = "tree.aspx?app=" + this.m_app + "&id=" + this.m_id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repo.Guid + "&rnd=" + Guid.NewGuid(); @@ -106,8 +107,8 @@ namespace umbraco catElement.SetAttribute("text", repo.Name); catElement.SetAttribute("menu", "L"); - catElement.SetAttribute("icon", "repository.gif"); - catElement.SetAttribute("openIcon", "repository.gif"); + catElement.SetAttribute("icon", "icon-server-alt"); + catElement.SetAttribute("openIcon", "icon-server-alt"); catElement.SetAttribute("nodeType", "packagesRepo" + repo.Guid); catElement.SetAttribute("src", "tree.aspx?app=" + this.m_app + "&id=" + this.m_id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repo.Guid + "&rnd=" + Guid.NewGuid()); @@ -130,8 +131,8 @@ namespace umbraco XmlTreeNode xNode = XmlTreeNode.Create(this); xNode.Text = cat.Text; xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?category=" + cat.Id + "&repoGuid=" + currentRepo.Guid + "');"; - xNode.Icon = "folder.gif"; - xNode.OpenIcon = "folder.gif"; + xNode.Icon = "icon-folder"; + xNode.OpenIcon = "icon-folder"; xNode.NodeType = "packagesCategory" + cat.Id; tree.Add(xNode); /* @@ -187,8 +188,8 @@ namespace umbraco treeElement.SetAttribute("action", "javascript:openInstalledPackage('" + p.Data.Id.ToString() + "');"); treeElement.SetAttribute("menu", ""); //treeElement.SetAttribute("src", ""); - treeElement.SetAttribute("icon", "package.gif"); - treeElement.SetAttribute("openIcon", "package.gif"); + treeElement.SetAttribute("icon", "icon-box"); + treeElement.SetAttribute("openIcon", "icon-box"); treeElement.SetAttribute("nodeType", "createdPackageInstance"); root.AppendChild(treeElement); } @@ -203,8 +204,8 @@ namespace umbraco treeElement.SetAttribute("action", "javascript:openCreatedPackage('" + p.Data.Id.ToString() + "');"); treeElement.SetAttribute("menu", "D"); treeElement.SetAttribute("src", ""); - treeElement.SetAttribute("icon", "package.gif"); - treeElement.SetAttribute("openIcon", "package.gif"); + treeElement.SetAttribute("icon", "icon-box"); + treeElement.SetAttribute("openIcon", "icon-box"); treeElement.SetAttribute("nodeType", "createdPackageInstance"); root.AppendChild(treeElement); } @@ -219,8 +220,8 @@ namespace umbraco catElement.SetAttribute("text", repo.Name); catElement.SetAttribute("menu", "L"); - catElement.SetAttribute("icon", "repository.gif"); - catElement.SetAttribute("openIcon", "repository.gif"); + catElement.SetAttribute("icon", "icon-server-alt"); + catElement.SetAttribute("openIcon", "icon-server-alt"); catElement.SetAttribute("nodeType", "packagesRepo" + repo.Guid); catElement.SetAttribute("src", "tree.aspx?app=" + this.m_app + "&id=" + this.m_id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repo.Guid + "&rnd=" + Guid.NewGuid()); @@ -241,8 +242,8 @@ namespace umbraco XmlElement catElement = Tree.CreateElement("tree"); catElement.SetAttribute("text", cat.Text); //catElement.SetAttribute("menu", ""); - catElement.SetAttribute("icon", "folder.gif"); - catElement.SetAttribute("openIcon", "folder_o.gif"); + catElement.SetAttribute("icon", "icon-folder"); + catElement.SetAttribute("openIcon", "icon-folder"); catElement.SetAttribute("nodeType", "packagesCategory" + cat.Id); catElement.SetAttribute("action", "javascript:openPackageCategory('BrowseRepository.aspx?category=" + cat.Id + "&repoGuid=" + currentRepo.Guid + "');"); root.AppendChild(catElement); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs index 9f558e65ba..d94ff6942e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs @@ -54,7 +54,7 @@ namespace umbraco node = XmlTreeNode.Create(this); node.NodeID = relationType.Id.ToString(); node.Text = relationType.Name; - node.Icon = "settingAgent.gif"; + node.Icon = "icon-trafic"; node.Action = string.Concat("javascript:openRelationType('", node.NodeID, "');"); tree.Add(node); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 2dca3d3fba..e5df6d330f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -75,8 +75,8 @@ namespace umbraco protected override void OnRenderFileNode(ref XmlTreeNode xNode) { xNode.Action = xNode.Action.Replace("openFile", "openScriptEditor"); - xNode.Icon = "settingsScript.gif"; - xNode.OpenIcon = "settingsScript.gif"; + xNode.Icon = "icon-code"; + xNode.OpenIcon = "icon.code"; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs index 31c5c804c5..e9aec0ee15 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheetProperty.cs @@ -59,8 +59,8 @@ namespace umbraco xNode.NodeID = n.Id.ToString(); xNode.Text = n.Text; xNode.Action = "javascript:openStylesheetProperty(" + n.Id + ");"; - xNode.Icon = "settingCssItem.gif"; - xNode.OpenIcon = "settingCssItem.gif"; + xNode.Icon = "icon-brackets"; + xNode.OpenIcon = "icon-brackets"; OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); if (xNode != null) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs index 95001fafb5..4fe41fe6ea 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs @@ -69,8 +69,8 @@ namespace umbraco loadStylesheetProperty styleSheetPropertyTree = new loadStylesheetProperty(this.app); xNode.Source = styleSheetPropertyTree.GetTreeServiceUrl(n.Id); xNode.HasChildren = n.HasChildren; - xNode.Icon = "settingCss.gif"; - xNode.OpenIcon = "settingCss.gif"; + xNode.Icon = " icon-brackets"; + xNode.OpenIcon = "icon-brackets"; xNode.NodeType = "stylesheet"; //this shouldn't be like this, it should be this.TreeAlias but the ui.config file points to this name. OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index 7d3c23c7fd..e953313c28 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -95,8 +95,8 @@ namespace umbraco xNode.NodeID = "-1"; xNode.Text = directoryInfo.Name; xNode.HasChildren = true; - xNode.Icon = "folder.gif"; - xNode.OpenIcon = "folder_o.gif"; + xNode.Icon = "icon-folder"; + xNode.OpenIcon = "icon-folder"; xNode.Source = GetTreeServiceUrl(directoryInfo.Name) + "&folder=" + folder + "&folderPath=" + folderPath + "/" + directoryInfo.Name; tree.Add(xNode); } @@ -120,21 +120,21 @@ namespace umbraco switch (ext) { case "master": - xNode.Icon = "settingTemplate.gif"; - xNode.OpenIcon = "settingTemplate.gif"; + xNode.Icon = "icon-newspaper-alt"; + xNode.OpenIcon = "icon-newspaper-alt"; tree.Add(xNode); break; case "css": case "js": - xNode.Icon = "settingsScript.gif"; - xNode.OpenIcon = "settingsScript.gif"; + xNode.Icon = "icon-brackets"; + xNode.OpenIcon = "icon-brackets"; tree.Add(xNode); break; case "xml": if (xNode.Text == "skin.xml") { - xNode.Icon = "settingXml.gif"; - xNode.OpenIcon = "settingXml.gif"; + xNode.Icon = "icon-code"; + xNode.OpenIcon = "icon-code"; tree.Add(xNode); } break; @@ -161,8 +161,8 @@ namespace umbraco XmlTreeNode xNode = XmlTreeNode.Create(this); xNode.NodeID = _s; xNode.Text = _s; - xNode.Icon = "folder.gif"; - xNode.OpenIcon = "folder_o.gif"; + xNode.Icon = "icon-folder"; + xNode.OpenIcon = "icon-folder"; xNode.Source = GetTreeServiceUrl(_s) + "&folder=" + _s; xNode.HasChildren = true; xNode.Menu.Clear(); @@ -197,20 +197,20 @@ namespace umbraco if (Umbraco.Core.Configuration.LegacyUmbracoSettings.DefaultRenderingEngine == RenderingEngine.Mvc && ViewHelper.ViewExists(t)) { xNode.Action = "javascript:openView(" + t.Id + ");"; - xNode.Icon = "settingView.gif"; - xNode.OpenIcon = "settingView.gif"; + xNode.Icon = "icon-newspaper-alt"; + xNode.OpenIcon = "icon-newspaper-alt"; } else { xNode.Action = "javascript:openTemplate(" + t.Id + ");"; - xNode.Icon = "settingTemplate.gif"; - xNode.OpenIcon = "settingTemplate.gif"; + xNode.Icon = "icon-newspaper-alt"; + xNode.OpenIcon = "icon-newspaper-alt"; } if (t.HasChildren) { - xNode.Icon = "settingMasterTemplate.gif"; - xNode.OpenIcon = "settingMasterTemplate.gif"; + xNode.Icon = "icon-newspaper"; + xNode.OpenIcon = "icon-newspaper"; } OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs index b2a71a7ace..812083da84 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs @@ -71,8 +71,8 @@ function openXslt(id) { protected override void OnRenderFileNode(ref XmlTreeNode xNode) { xNode.Action = xNode.Action.Replace("openFile", "openXslt"); - xNode.Icon = "developerXslt.gif"; - xNode.OpenIcon = "developerXslt.gif"; + xNode.Icon = "icon-code"; + xNode.OpenIcon = "icon-code"; } protected override void OnRenderFolderNode(ref XmlTreeNode xNode)