From c6d4de7d4bedb02dffb0085f7e818740a46147df Mon Sep 17 00:00:00 2001 From: Shandem Date: Tue, 11 Aug 2009 16:32:55 +0000 Subject: [PATCH] DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB Fixes 24275,24274,23548,22533 (sprite icon fixes, file cleanup) [TFS Changeset #57960] --- umbraco/cms/businesslogic/CMSNode.cs | 2 +- .../presentation/umbraco.presentation.csproj | 7 +- .../controls/ContentTypeControlNew.ascx.cs | 8 +- .../umbraco/controls/TreeControl.ascx | 4 +- .../controls/TreeControl.ascx.designer.cs | 18 ++ .../presentation/umbraco/css/treeIcons.css | 48 --- .../umbraco/developer/Packages/Boost.aspx | 2 +- .../developer/Packages/Boost.aspx.designer.cs | 2 +- .../umbraco/dialogs/viewAuditTrail.aspx | 4 +- .../umbraco/dialogs/viewAuditTrail.aspx.cs | 2 +- .../dialogs/viewAuditTrail.aspx.designer.cs | 20 +- .../JQuery/jquery.accordian.js} | 0 .../Tree/Themes/umbraco/style.css | 306 +----------------- .../umbraco_client/Tree/menuIcons.css | 112 +++++++ .../umbraco_client/Tree/treeIcons.css | 38 +++ .../umbraco_client/ui/default.css | 19 +- umbraco/umbraco.Legacy/umbraco.Legacy.csproj | 2 + .../umbraco/css/cbback.gif | Bin .../umbraco/css/umbContext_background.gif | Bin 19 files changed, 226 insertions(+), 368 deletions(-) delete mode 100644 umbraco/presentation/umbraco/css/treeIcons.css rename umbraco/presentation/umbraco_client/{ui/accordian.js => Application/JQuery/jquery.accordian.js} (100%) create mode 100644 umbraco/presentation/umbraco_client/Tree/menuIcons.css create mode 100644 umbraco/presentation/umbraco_client/Tree/treeIcons.css rename umbraco/{presentation => umbraco.Legacy}/umbraco/css/cbback.gif (100%) rename umbraco/{presentation => umbraco.Legacy}/umbraco/css/umbContext_background.gif (100%) diff --git a/umbraco/cms/businesslogic/CMSNode.cs b/umbraco/cms/businesslogic/CMSNode.cs index 4938e513fb..735f2b0750 100644 --- a/umbraco/cms/businesslogic/CMSNode.cs +++ b/umbraco/cms/businesslogic/CMSNode.cs @@ -38,7 +38,7 @@ namespace umbraco.cms.businesslogic { private DateTime _createDate; private bool _hasChildrenInitialized; private string m_image = "default.png"; - private static readonly string m_DefaultIconCssFile = GlobalSettings.FullpathToRoot + GlobalSettings.Path + System.IO.Path.DirectorySeparatorChar + "css" + System.IO.Path.DirectorySeparatorChar + "treeIcons.css"; + private static readonly string m_DefaultIconCssFile = GlobalSettings.FullpathToRoot + GlobalSettings.ClientPath + System.IO.Path.DirectorySeparatorChar + "Tree" + System.IO.Path.DirectorySeparatorChar + "treeIcons.css"; private static List m_DefaultIconClasses = new List(); /// diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index 60a3dc9301..6cead08543 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -1494,6 +1494,7 @@ + @@ -1544,7 +1545,7 @@ - + @@ -1955,10 +1956,8 @@ UserControl - - @@ -3335,7 +3334,7 @@ - + diff --git a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs index 77e4885597..87c7763b69 100644 --- a/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs +++ b/umbraco/presentation/umbraco/controls/ContentTypeControlNew.ascx.cs @@ -15,9 +15,11 @@ namespace umbraco.controls /// TODO: REmove the dependencies on prototype and scriptaculous!! /// doesn't work when combining scripts which is why DoNotOptimize is flagged. /// + //[ClientDependency(501, ClientDependencyType.Javascript, "js/scriptaculous/scriptaculous.js?load=effects,dragdrop", "UmbracoRoot", InvokeJavascriptMethodOnLoad = "Position.includeScrollOffsets = true;", DoNotOptimize = true)] [ClientDependency(500, ClientDependencyType.Javascript, "js/prototype.js", "UmbracoRoot", DoNotOptimize = true)] - [ClientDependency(501, ClientDependencyType.Javascript, "js/scriptaculous/scriptaculous.js?load=effects,dragdrop", "UmbracoRoot", - InvokeJavascriptMethodOnLoad = "Position.includeScrollOffsets = true;", DoNotOptimize = true)] + [ClientDependency(501, ClientDependencyType.Javascript, "js/scriptaculous/scriptaculous.js?load=effects,dragdrop", "UmbracoRoot", DoNotOptimize = true)] + [ClientDependency(ClientDependencyType.Css, "Tree/treeIcons.css", "UmbracoClient")] + [ClientDependency(ClientDependencyType.Css, "Tree/Themes/umbraco/styles.css", "UmbracoClient")] public partial class ContentTypeControlNew : System.Web.UI.UserControl { public uicontrols.TabPage InfoTabPage; @@ -111,7 +113,7 @@ namespace umbraco.controls foreach (string iconClass in cms.businesslogic.CMSNode.DefaultIconClasses) { ListItem li = new ListItem(helper.SpaceCamelCasing((iconClass.Substring(1, iconClass.Length - 1))).Replace("Spr Tree", ""), iconClass); - li.Attributes.Add("class", "spriteBackground " + iconClass.Trim('.')); + li.Attributes.Add("class", "spriteBackground sprTree " + iconClass.Trim('.')); if (!this.Page.IsPostBack && li.Value == cType.IconUrl) li.Selected = true; ddlIcons.Items.Add(li); diff --git a/umbraco/presentation/umbraco/controls/TreeControl.ascx b/umbraco/presentation/umbraco/controls/TreeControl.ascx index 6d246ec3fa..03affa95e3 100644 --- a/umbraco/presentation/umbraco/controls/TreeControl.ascx +++ b/umbraco/presentation/umbraco/controls/TreeControl.ascx @@ -1,7 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="TreeControl.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.TreeControl" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - + + + diff --git a/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs b/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs index cb2b5e9a3d..a1003a5848 100644 --- a/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs +++ b/umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs @@ -22,6 +22,24 @@ namespace umbraco.presentation.umbraco.controls { /// protected global::ClientDependency.Core.Controls.CssInclude CssInclude1; + /// + /// CssInclude2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude2; + + /// + /// CssInclude3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::ClientDependency.Core.Controls.CssInclude CssInclude3; + /// /// JsInclude1 control. /// diff --git a/umbraco/presentation/umbraco/css/treeIcons.css b/umbraco/presentation/umbraco/css/treeIcons.css deleted file mode 100644 index d36851b183..0000000000 --- a/umbraco/presentation/umbraco/css/treeIcons.css +++ /dev/null @@ -1,48 +0,0 @@ -.sprTree { - background-color: #fff; - background-image: url(../images/umbraco/sprites.png); - display: inline; - padding-bottom: 2px; -} - -.sprTree img{width: 16px; height: 18px; padding-right: 7px;} - -.sprTreeDeveloperCacheItem {background-position: -8px -8px;} -.sprTreeDeveloperCacheTypes {background-position: -8px -40px;} -.sprTreeDeveloperMacro {background-position: -8px -72px;} -.sprTreeDeveloperPython {background-position: -8px -104px; width: 15px; height: 15px} -.sprTreeDeveloperRegistry {background-position: -8px -135px;} -.sprTreeDeveloperRegistryItem {background-position: -8px -167px;} -.sprTreeDeveloperXslt {background-position: -8px -199px;} - -.sprTreeDoc {background-position: -8px -231px;} -.sprTreeDoc2 {background-position: -8px -263px;} -.sprTreeDoc3 {background-position: -8px -295px;} -.sprTreeDoc4 {background-position: -8px -327px;} -.sprTreeDoc5 {background-position: -8px -359px;} -.sprTreeDocPic {background-position: -8px -391px;} -.sprTreeFolder {background-position: -8px -423px;} -.sprTreeFolder_o {background-position: -8px -455px;} -.sprTreeMediaFile {background-position: -8px -487px;} -.sprTreeMediaMovie {background-position: -8px -519px;} -.sprTreeMediaMulti {background-position: -8px -551px;} -.sprTreeMediaPhoto {background-position: -8px -583px;} -.sprTreeMember {background-position: -8px -615px;} -.sprTreeMemberGroup {background-position: -8px -647px;} -.sprTreeMemberType {background-position: -8px -679px;} -.sprTreeNewsletter {background-position: -8px -711px;} -.sprTreePackage {background-position: -8px -743px;} -.sprTreeRepository {background-position: -8px -775px;} -.sprTreeSettingAgent {background-position: -8px -807px;} -.sprTreeSettingCss {background-position: -8px -839px;} -.sprTreeSettingCssItem {background-position: -8px -871px;} -.sprTreeSettingDataType {background-position: -8px -903px;} -.sprTreeSettingDataTypeChild {background-position: -8px -935px;} -.sprTreeSettingDomain {background-position: -8px -967px;} -.sprTreeSettingLanguage {background-position: -8px -999px;} -.sprTreeSettingScript {background-position: -8px -1031px;} -.sprTreeSettingTemplate {background-position: -8px -1063px;} -.sprTreeSettingXml {background-position: -8px -1095px;} -.sprTreeStatistik {background-position: -8px -1127px;} -.sprTreeUser {background-position: -8px -1159px;} -.sprTreeUserGroup {background-position: -8px -1191px;} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx index 90b6546b9d..f844141725 100644 --- a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx +++ b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx @@ -5,7 +5,7 @@ - +