diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs index b4395e53eb..3fd89c8d0c 100644 --- a/src/Umbraco.Core/CoreBootManager.cs +++ b/src/Umbraco.Core/CoreBootManager.cs @@ -450,11 +450,7 @@ namespace Umbraco.Core CacheRefreshersResolver.Current = new CacheRefreshersResolver( ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolveCacheRefreshers()); - - MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver( - ServiceProvider, ProfilingLogger.Logger, - () => PluginManager.ResolveMacroRenderings()); - + PackageActionsResolver.Current = new PackageActionsResolver( ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolvePackageActions()); diff --git a/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs b/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs deleted file mode 100644 index 1788932c8f..0000000000 --- a/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Linq; -using Umbraco.Core.Logging; -using Umbraco.Core.ObjectResolution; -using umbraco.interfaces; - -namespace Umbraco.Core.Macros -{ - /// - /// A resolver to return all IMacroGuiRendering objects - /// - /// - /// Much of this classes methods are based on legacy code from umbraco.editorControls.macrocontainer.MacroControlFactory - /// this code should probably be reviewed and cleaned up if necessary. - /// - internal sealed class MacroFieldEditorsResolver : LazyManyObjectsResolverBase - { - /// - /// Constructor - /// - /// - /// - /// - internal MacroFieldEditorsResolver(IServiceProvider serviceProvider, ILogger logger, Func> macroEditors) - : base(serviceProvider, logger, macroEditors, ObjectLifetimeScope.Transient) - { } - - /// - /// Gets the implementations. - /// - public IEnumerable MacroFieldEditors - { - get - { - return Values; - } - } - - /// - /// Gets the value based on the type of control - /// - /// - /// - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal string GetValueFromMacroControl(Control macroControl) - { - return HttpUtility.HtmlDecode(((IMacroGuiRendering)macroControl).Value); - } - - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal List MacroControlTypes - { - get { return InstanceTypes.ToList(); } - } - - /// - /// Create an instance of a Macro control and return it. - /// Because the macro control uses inline client script whichs is not generated after postback - /// That's why we use the Page Picker instead of the content picker of the macro. - /// - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal Control GetMacroRenderControlByType(PersistableMacroProperty prop, string uniqueId) - { - var m = MacroControlTypes.FindLast(macroGuiCcontrol => macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName)); - var instance = ServiceProvider.GetService(m) as IMacroGuiRendering; - if (instance != null) - { - if (string.IsNullOrEmpty(prop.Value) == false) - { - instance.Value = HttpUtility.HtmlDecode(prop.Value); - } - var macroControl = instance as Control; - if (macroControl != null) - { - macroControl.ID = uniqueId; - return macroControl; - } - } - return null; - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs index d9d98a3ffe..4d14654103 100644 --- a/src/Umbraco.Core/PluginManager.cs +++ b/src/Umbraco.Core/PluginManager.cs @@ -504,18 +504,7 @@ namespace Umbraco.Core internal IEnumerable ResolveCacheRefreshers() { return ResolveTypes(); - } - - - - /// - /// Returns all available IMacroGuiRendering in application - /// - /// - internal IEnumerable ResolveMacroRenderings() - { - return ResolveTypes(); - } + } /// /// Returns all available IPackageAction in application diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index cf1aba5b86..97ceebd5a5 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1185,7 +1185,6 @@ - diff --git a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs index cdd65b4059..b7224db72a 100644 --- a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs +++ b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs @@ -91,12 +91,7 @@ namespace Umbraco.Tests.Macros public IEnumerable SupportedUIExtensions { get { throw new NotImplementedException(); } - } - - public Dictionary SupportedProperties - { - get { throw new NotImplementedException(); } - } + } public bool Validate(string code, string tempFileName, INode currentPage, out string errorMessage) { @@ -125,12 +120,7 @@ namespace Umbraco.Tests.Macros { get { throw new NotImplementedException(); } } - - public Dictionary SupportedProperties - { - get { throw new NotImplementedException(); } - } - + public bool Validate(string code, string tempFileName, INode currentPage, out string errorMessage) { throw new NotImplementedException(); diff --git a/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs b/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs deleted file mode 100644 index aed49fd7e9..0000000000 --- a/src/Umbraco.Tests/Resolvers/MacroFieldEditorsResolverTests.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Linq; -using System.Web.UI; -using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Core.Macros; -using Umbraco.Core.ObjectResolution; -using umbraco.interfaces; - -namespace Umbraco.Tests.Resolvers -{ - [TestFixture] - public class MacroFieldEditorsResolverTests : ResolverBaseTest - { - - [TearDown] - public void TearDown() - { - MacroFieldEditorsResolver.Reset(); - } - - // NOTE - // ManyResolverTests ensure that we'll get our actions back and MacroFieldEditorsResolver works, - // so all we're testing here is that plugin manager _does_ find our macro control types - // which should be ensured by PlugingManagerTests anyway, so this is useless? - [Test] - public void FindAllTypes() - { - MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver( - new ActivatorServiceProvider(), ProfilingLogger.Logger, - () => PluginManager.ResolveMacroRenderings()); - - Resolution.Freeze(); - - var types = MacroFieldEditorsResolver.Current.MacroControlTypes; - Assert.AreEqual(2, types.Count); - - // order is unspecified, but both must be there - bool hasType1 = types.ElementAt(0) == typeof(ControlMacroRendering) || types.ElementAt(1) == typeof(ControlMacroRendering); - bool hasType2 = types.ElementAt(0) == typeof(NonControlMacroRendering) || types.ElementAt(1) == typeof(NonControlMacroRendering); - Assert.IsTrue(hasType1); - Assert.IsTrue(hasType2); - } - - #region Classes for tests - - public class ControlMacroRendering : Control, IMacroGuiRendering - { - public string Value - { - get { throw new NotImplementedException(); } - set { throw new NotImplementedException(); } - } - - public bool ShowCaption - { - get { throw new NotImplementedException(); } - } - } - - public class NonControlMacroRendering : IMacroGuiRendering - { - public string Value - { - get { throw new NotImplementedException(); } - set { throw new NotImplementedException(); } - } - - public bool ShowCaption - { - get { throw new NotImplementedException(); } - } - } - - #endregion - } -} \ No newline at end of file diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index c61185ae74..79e6e46c11 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -509,7 +509,6 @@ - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 1a230d7f77..0efa04410d 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -441,10 +441,6 @@ ChangeDocType.aspx - - EditMacro.aspx - ASPXCodeBehind - moveOrCopy.aspx ASPXCodeBehind @@ -460,9 +456,6 @@ sort.aspx ASPXCodeBehind - - EditMacro.aspx - publish.aspx ASPXCodeBehind @@ -668,7 +661,6 @@ ASPXCodeBehind - @@ -694,8 +686,6 @@ - - diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx index 59a96e9a37..4a84e58674 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UserControlProxy.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dashboard.UserControlProxy" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %> diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs index d06b6c84e0..530e09147e 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs @@ -7,8 +7,6 @@ // //------------------------------------------------------------------------------ -using Umbraco.Web.UI.JavaScript; - namespace Umbraco.Web.UI.Umbraco.Dashboard { @@ -21,7 +19,7 @@ namespace Umbraco.Web.UI.Umbraco.Dashboard { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected UmbracoClientDependencyLoader ClientLoader; + protected global::Umbraco.Web.UI.JavaScript.UmbracoClientDependencyLoader ClientLoader; /// /// CssInclude1 control. diff --git a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs index b2909a2835..d76968cf88 100644 --- a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs +++ b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs @@ -7,8 +7,6 @@ // //------------------------------------------------------------------------------ -using Umbraco.Web.UI.JavaScript; - namespace Umbraco.Web.UI.Umbraco { @@ -30,7 +28,7 @@ namespace Umbraco.Web.UI.Umbraco { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected UmbracoClientDependencyLoader ClientLoader; + protected global::Umbraco.Web.UI.JavaScript.UmbracoClientDependencyLoader ClientLoader; /// /// CssInclude1 control. diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml index 7ee7e638dd..8fb1487713 100644 --- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml @@ -28,7 +28,6 @@ Html .RequiresCss("assets/css/umbraco.css", "Umbraco") - .RequiresCss("tree/treeicons.css", "UmbracoClient") .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco") .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco"); } diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx index 200fd9b210..8eaf286986 100644 --- a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx +++ b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx @@ -2,7 +2,6 @@ <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> <%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %> - diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs b/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs deleted file mode 100644 index 57eceee1f5..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Umbraco.Web.UI.Umbraco.Dialogs -{ - public partial class EditMacro : global::umbraco.dialogs.editMacro - { - - /// - /// Returns the number of macro properties defined on the macro found - /// - protected int CountOfMacroProperties { get; private set; } - - /// - /// Sets the macro propery count if the macro object has been loaded - /// - /// - /// - /// The macro property will only have been loaded on a post back from the first screen after selecting a macro, otherwise it will be zero. - /// - protected override void OnPreRender(EventArgs e) - { - base.OnPreRender(e); - CountOfMacroProperties = MacroObject != null - ? MacroObject.Properties.Length - : 0; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.designer.cs deleted file mode 100644 index b743b51253..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dialogs/EditMacro.aspx.designer.cs +++ /dev/null @@ -1,15 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Umbraco.Dialogs { - - - public partial class EditMacro { - } -} diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx deleted file mode 100644 index 92ba41a46b..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx +++ /dev/null @@ -1,77 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoDialog.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %> - -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - -<%@ Import Namespace="Umbraco.Core.Configuration" %> -<%@ Import Namespace="Umbraco.Web" %> -<%@ Import Namespace="Umbraco.Core" %> -<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - - - - - - - - - - - -
- -
- - - - - <%=Services.TextService.Localize("general/cancel")%> - " /> - - - - - - - - - - - - - - - - <%=Services.TextService.Localize("general/cancel")%> - - - - - - diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx index c3315841c5..aa37c9ed79 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx @@ -9,7 +9,6 @@ .gridItem{border-color: #D9D7D7;} - diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master index f1474e915c..5cb9bc4ca9 100644 --- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master +++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master @@ -5,8 +5,8 @@ <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %> +<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %> diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master index ece621ec85..afd3003624 100644 --- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master +++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master @@ -5,8 +5,8 @@ <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %> +<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %> diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx index d1002bf8eb..86cbceaad6 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx @@ -152,9 +152,9 @@
-
" - params="<%# DoesMacroHaveSettings(DataBinder.Eval(Container, "DataItem.id").ToString()) %>"> - <%# DataBinder.Eval(Container, "DataItem.macroName")%> +
" + params="<%# DoesMacroHaveSettings(Eval("id").ToString()) %>"> + <%# Eval("macroName")%>
diff --git a/src/Umbraco.Web.UI/umbraco/treeInit.aspx b/src/Umbraco.Web.UI/umbraco/treeInit.aspx index 2f6d6ca494..ec0cd330bc 100644 --- a/src/Umbraco.Web.UI/umbraco/treeInit.aspx +++ b/src/Umbraco.Web.UI/umbraco/treeInit.aspx @@ -1,7 +1,7 @@ <%@ Page Language="c#" CodeBehind="TreeInit.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.TreeInit" %> <%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %> diff --git a/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.css b/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.css deleted file mode 100644 index c4965af2e8..0000000000 --- a/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.css +++ /dev/null @@ -1,25 +0,0 @@ -/* Custom styles for EditMacro.aspx dialog */ - -.propertyItemheader -{ - width: 170px !important; -} - -.guiInputTextStandard -{ - width: 220px; -} - -.umbracoPage a { - color: blue; - cursor: pointer; -} - -select { - width: 200px; -} - -.macro-properties { - height: 420px; - overflow: auto; -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.js b/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.js deleted file mode 100644 index 4f78683a19..0000000000 --- a/src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.js +++ /dev/null @@ -1,194 +0,0 @@ -Umbraco.Sys.registerNamespace("Umbraco.Dialogs"); - -(function ($) { - - Umbraco.Dialogs.EditMacro = base2.Base.extend({ - /// Defines the EditMacro class to controll the UI interaction and code insertion for the macro syntax for the code editor - - //private methods/variables - _opts: null, - - _macroAliases: new Array(), - - _pseudoHtmlEncode: function (text) { - return text.replace(/\"/gi, "&quot;").replace(/\/gi, "&gt;"); - }, - - _saveTreepickerValue: function (appAlias, macroAlias) { - var treePicker = window.showModalDialog('treePicker.aspx?app=' + appAlias + '&treeType=' + appAlias, - 'treePicker', - 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no'); - document.forms[0][macroAlias].value = treePicker; - document.getElementById("label" + macroAlias).innerHTML = "updated with id: " + treePicker + "
"; - }, - - _getMacroParameter: function (macroAliasKeyVal) { - /// Returns a string to insert a macro parameter into the code like: MyPropertyName = "MyValue" - var paramString = ""; - - var controlId = macroAliasKeyVal[0]; - var propertyName = macroAliasKeyVal[1]; - - var control = jQuery("#" + controlId); - if (control == null || (!control.is('input') && !control.is('select') && !control.is('textarea'))) { - // hack for tree based macro parameter types - var picker = Umbraco.Controls.TreePicker.GetPickerById(controlId); - if (picker != undefined) { - paramString += propertyName + "=\"" + picker.GetValue() + "\" "; - } - } - else { - if (control.is(':checkbox')) { - if (control.is(':checked')) { - paramString += propertyName + "=\"1\" "; - } - else { - paramString += propertyName + "=\"0\" "; - } - } - else if (control[0].tagName.toLowerCase() == 'select') { - var tempValue = ''; - control.find(':selected').each(function (i, selected) { - tempValue += jQuery(this).attr('value') + ', '; - }); - /* - for (var j=0; j 2) { - tempValue = tempValue.substring(0, tempValue.length - 2); - } - - paramString += propertyName + "=\"" + tempValue + "\" "; - - } - else { - paramString += propertyName + "=\"" + this._pseudoHtmlEncode(document.forms[0][controlId].value) + "\" "; - } - } - return paramString; - }, - - _getMacroSyntaxMvc: function() { - /// Return the macro syntax to insert for MVC - - var macroString = "@Umbraco.RenderMacro(\"" + this._opts.macroAlias + "\""; - - if (this._macroAliases.length > 0) { - macroString += ", new {"; - for (var i = 0; i < this._macroAliases.length; i++) { - macroString += this._getMacroParameter(this._macroAliases[i]); - if (i < this._macroAliases.length - 1) { - macroString += ", "; - } - } - macroString += "}"; - } - - macroString += ")"; - return macroString; - }, - - _getMacroSyntaxWebForms: function () { - /// Return the macro syntax to insert for webforms - - var macroElement; - if (this._opts.useAspNetMasterPages) { - macroElement = "umbraco:Macro"; - } - else { - macroElement = "?UMBRACO_MACRO"; - } - - var macroString = '<' + macroElement + ' '; - - for (var i = 0; i < this._macroAliases.length; i++) { - macroString += this._getMacroParameter(this._macroAliases[i]); - } - - if (macroString.length > 1) - macroString = macroString.substr(0, macroString.length - 1); - - if (!this._opts.useAspNetMasterPages) { - macroString += " macroAlias=\"" + this._opts.macroAlias + "\""; - } - - if (this._opts.useAspNetMasterPages) { - macroString += " Alias=\"" + this._opts.macroAlias + "\" runat=\"server\">"; - } - else { - macroString += ">"; - } - return macroString; - }, - - // Constructor - constructor: function () { - }, - - //public methods - - init: function (opts) { - /// Initializes the class and any UI bindings - - // Merge options with default - this._opts = $.extend({ - // Default options go here - renderingEngine: "Mvc" - }, opts); - - var self = this; - - //The knockout js view model for the selected item - var koViewModel = { - cancelModal: function () { - UmbClientMgr.closeModalWindow(); - }, - updateMacro: function () { - self.updateMacro(); - } - }; - - ko.applyBindings(koViewModel); - }, - - updateMacro: function () { - - var macroSyntax = null; - - if (this._opts.renderingEngine == "Mvc") { - macroSyntax = this._getMacroSyntaxMvc(); - } - else { - macroSyntax = this._getMacroSyntaxWebForms(); - } - - UmbClientMgr.contentFrame().focus(); - UmbClientMgr.contentFrame().UmbEditor.Insert(macroSyntax, '', this._opts.codeEditorElementId); - UmbClientMgr.closeModalWindow(); - }, - - registerAlias: function (alias, pAlias) { - var macro = new Array(); - macro[0] = alias; - macro[1] = pAlias; - - this._macroAliases[this._macroAliases.length] = macro; - } - }, { - //Static members - - //private methods/variables - _instance: null, - - // Singleton accessor - getInstance: function () { - if (this._instance == null) - this._instance = new Umbraco.Dialogs.EditMacro(); - return this._instance; - } - }); - -})(jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs index 10d105883f..e6a8d0b9ef 100644 --- a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs +++ b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs @@ -79,11 +79,7 @@ namespace Umbraco.Web.Macros { get { return Enumerable.Empty(); } } - public Dictionary SupportedProperties - { - get { throw new NotSupportedException(); } - } - + public bool Validate(string code, string tempFileName, INode currentPage, out string errorMessage) { var temp = GetVirtualPathFromPhysicalPath(tempFileName); diff --git a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs index 4732895311..b85aff7c5d 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs @@ -5,7 +5,7 @@ namespace Umbraco.Web.Routing ///
/// /// This is used by library.RenderTemplate and also some of the macro rendering functionality like in - /// insertMacro.aspx and macroResultWrapper.aspx + /// macroResultWrapper.aspx /// public class ContentFinderByPageIdQuery : IContentFinder { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 9f36e8d155..e88a73631d 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1109,9 +1109,6 @@ ASPXCodeBehind - - ASPXCodeBehind - ASPXCodeBehind @@ -1243,7 +1240,6 @@ - ProgressBar.ascx ASPXCodeBehind @@ -1444,13 +1440,6 @@ importDocumenttype.aspx ASPXCodeBehind - - insertMacro.aspx - ASPXCodeBehind - - - insertMacro.aspx - notifications.aspx ASPXCodeBehind @@ -1782,9 +1771,6 @@ - - ASPXCodeBehind - ASPXCodeBehind @@ -1793,7 +1779,9 @@ ASPXCodeBehind - + + ASPXCodeBehind + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs index 65b7e100b7..b0131c6b46 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs @@ -17,7 +17,6 @@ namespace umbraco.controls.Tree /// Since we're inheriting from a UserControl and all of the ClientDependency registrations are done inline, we need /// to re-register the ClientDependencies. /// - [ClientDependency(10, ClientDependencyType.Css, "Tree/treeIcons.css", "UmbracoClient")] [ClientDependency(11, ClientDependencyType.Css, "Tree/menuIcons.css", "UmbracoClient")] [ClientDependency(12, ClientDependencyType.Css, "Tree/Themes/umbraco/style.css", "UmbracoClient")] [ClientDependency(0, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")] diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs deleted file mode 100644 index cbabf377fd..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs +++ /dev/null @@ -1,178 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Umbraco.Core.Configuration; -using Umbraco.Core.IO; -using umbraco.cms.businesslogic.macro; -using System.Reflection; -using System.Collections; - -namespace umbraco.controls -{ - [DefaultProperty("Text")] - [ToolboxData("<{0}:macroParameterControl runat=server>")] - public class macroParameterControl : WebControl - { - #region private variables - - private Macro m_macro = null; - private bool m_parameterValuesEnsured = false; - private Hashtable m_parameterValues = new Hashtable(); - #endregion - - /// - /// Gets the parameter values. - /// - /// The parameter values. - public Hashtable ParameterValues - { - get { - ensureMacroParameterList(); - return m_parameterValues; } - set { m_parameterValues = value; } - } - - [Bindable(true)] - [Category("Umbraco")] - [DefaultValue("")] - [Localizable(true)] - public string MacroAlias - { - get - { - String s = (String)ViewState["MacroAlias"]; - return ((s == null) ? String.Empty : s); - } - - set - { - ViewState["MacroAlias"] = value; - } - } - - /// - /// Updates the macro parameter. - /// - /// The alias. - /// The value. - public void UpdateParameter(string alias, string value) - { - if (!m_parameterValues.ContainsKey(alias)) - { - m_parameterValues.Add(alias, ""); - } - - m_parameterValues[alias] = value; - } - - /// - /// Gets the macro tag. - /// - /// The correct syntax for the macro including all parameters - public string GetMacroTag() { - string tag = ""; - if (UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages) - { - tag = "")); - foreach (MacroProperty mp in m_macro.Properties) - { - string macroAssembly = mp.Type.Assembly; - string macroType = mp.Type.Type; - try - { - - Assembly assembly = Assembly.LoadFrom( IOHelper.MapPath(SystemDirectories.Bin + "/" + macroAssembly + ".dll")); - - Type type = assembly.GetType(macroAssembly + "." + macroType); - var typeInstance = Activator.CreateInstance(type) as interfaces.IMacroGuiRendering; - if (typeInstance != null) - { - ((Control) typeInstance).ID = mp.Alias; - if (!Page.IsPostBack) - { - if (m_parameterValues.ContainsKey(mp.Alias)) - { - typeInstance.Value = m_parameterValues[mp.Alias].ToString(); - } - else - { - m_parameterValues.Add(mp.Alias, typeInstance.Value); - } - } - - // register alias - // Controls.Add(new LiteralControl("")); - Controls.Add(new LiteralControl("" + mp.Name + "")); - Controls.Add((Control) typeInstance); - Controls.Add(new LiteralControl("")); - } - } - catch (Exception) - { - } - } - Controls.Add(new LiteralControl("")); - } - - private void loadMacro() - { - if (m_macro == null && MacroAlias != "") - { - m_macro = Macro.GetByAlias(MacroAlias); - if (m_macro == null) - { - throw new ArgumentException(String.Format("No macro with alias '{0}' found", MacroAlias)); - } - } - } - - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs deleted file mode 100644 index a1512671b6..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs +++ /dev/null @@ -1,228 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; - -using System.Reflection; -using System.Text; -using System.IO; -using Umbraco.Core.IO; -using Umbraco.Web; -using umbraco.DataLayer; -using Umbraco.Web.UI.Pages; - - -namespace umbraco.dialogs -{ - /// - /// Summary description for insertMacro. - /// - public partial class editMacro : UmbracoEnsuredPage - { - protected Button Button1; - - protected cms.businesslogic.macro.Macro MacroObject { get; private set; } - - public string _macroAlias = ""; - - protected void renderProperties(object sender, EventArgs e) - { - if (umb_macroAlias.SelectedValue != "") - { - AskForProperties(umb_macroAlias.SelectedValue); - } - else - { - pl_insert.Visible = true; - pl_edit.Visible = false; - } - } - - private void AskForProperties(string alias) - { - pl_edit.Visible = true; - pl_insert.Visible = false; - - MacroObject = cms.businesslogic.macro.Macro.GetByAlias(alias); - - _macroAlias = MacroObject.Alias; - - - //If no properties, we will exit now... - if (MacroObject.Properties.Length == 0) - { - //var noProps = new Literal(); - //noProps.Text = ""; - //macroProperties.Controls.Add(noProps); - } - else - { - //if we have properties, we'll render the controls for them... - foreach (cms.businesslogic.macro.MacroProperty mp in MacroObject.Properties) - { - var macroAssembly = mp.Type.Assembly; - var macroType = mp.Type.Type; - try - { - - Assembly assembly = Assembly.LoadFrom(IOHelper.MapPath(SystemDirectories.Bin + "/" + macroAssembly + ".dll")); - - Type type = assembly.GetType(macroAssembly + "." + macroType); - var typeInstance = Activator.CreateInstance(type) as interfaces.IMacroGuiRendering; - if (typeInstance != null) - { - var control = Activator.CreateInstance(type) as Control; - control.ID = mp.Alias; - - if (!IsPostBack) - { - if (Request["umb_" + mp.Alias] != null) - { - if (Request["umb_" + mp.Alias] != "") - { - type.GetProperty("Value").SetValue(control, Convert.ChangeType(Request["umb_" + mp.Alias], type.GetProperty("Value").PropertyType), null); - } - } - } - - // register alias - var pp = new umbraco.uicontrols.PropertyPanel(); - pp.Text = mp.Name; - pp.Controls.Add(control); - macroProperties.Controls.Add(pp); - - pp.Controls.Add(new LiteralControl("\n")); - - - - } - else - { - Trace.Warn("umbEditContent", "Type doesn't exist or is not umbraco.interfaces.DataFieldI ('" + macroAssembly + "." + macroType + "')"); - } - - } - catch (Exception fieldException) - { - Trace.Warn("umbEditContent", "Error creating type '" + macroAssembly + "." + macroType + "'", fieldException); - } - } - } - } - protected void Page_Load(object sender, System.EventArgs e) - { - - if (!Page.IsPostBack) - { - if (!string.IsNullOrEmpty(Request["alias"])) - { - AskForProperties(Request["alias"]); - } - else - { - List macroRenderings; - if (Request.GetItemAsString("editor") != "") - macroRenderings = DatabaseContext.Database.Fetch("select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName"); - else - macroRenderings = DatabaseContext.Database.Fetch("select macroAlias, macroName from cmsMacro order by macroName"); - - umb_macroAlias.DataSource = macroRenderings; - umb_macroAlias.DataValueField = "macroAlias"; - umb_macroAlias.DataTextField = "macroName"; - umb_macroAlias.DataBind(); - } - } - - } - - /// - /// pl_edit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_edit; - - /// - /// pane_edit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_edit; - - /// - /// macroProperties control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder macroProperties; - - /// - /// pl_insert control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_insert; - - /// - /// pane_insert control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_insert; - - /// - /// pp_chooseMacro control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel pp_chooseMacro; - - /// - /// umb_macroAlias control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ListBox umb_macroAlias; - - /// - /// bt_insert control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_insert; - - /// - /// renderHolder control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder renderHolder; - - - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx deleted file mode 100644 index a064413ad2..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx +++ /dev/null @@ -1,102 +0,0 @@ -<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false" Codebehind="insertMacro.aspx.cs" AutoEventWireup="True" - Inherits="umbraco.dialogs.insertMacro" Trace="false" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - - - " /> - - <%if (Request["macroID"] != null || Request["macroAlias"] != null) {%> - - " /> - " /> - -
- - - -
-

- " onclick="updateMacro()" /> -   or   - <%=Services.TextService.Localize("general/cancel")%> -

- <%} else {%> - - - - - - -

- " /> -   or   - <%=Services.TextService.Localize("general/cancel")%> -

- - <%}%> - \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs deleted file mode 100644 index ee755a62d0..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Reflection; -using System.Security; -using Umbraco.Core.IO; -using umbraco.DataLayer; -using Umbraco.Core; -using Umbraco.Core.Services; -using Umbraco.Web; - -namespace umbraco.dialogs -{ - /// - /// Summary description for insertMacro. - /// - public partial class insertMacro : Umbraco.Web.UI.Pages.UmbracoEnsuredPage - { - protected Button Button1; - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - //this could be used for media or content so we need to at least validate that the user has access to one or the other - if (Security.ValidateUserApp(Constants.Applications.Content) == false && Security.ValidateUserApp(Constants.Applications.Media) == false) - throw new SecurityException("The current user doesn't have access to the section/app"); - } - - protected void Page_Load(object sender, EventArgs e) - { - pane_edit.Text = Services.TextService.Localize("general/edit") + " " + Services.TextService.Localize("general/macro"); - pane_insert.Text = Services.TextService.Localize("general/insert") + " " + Services.TextService.Localize("general/macro"); - - if (Request["macroID"] != null || Request["macroAlias"] != null) - { - // Put user code to initialize the page here - cms.businesslogic.macro.Macro m; - if (Request.GetItemAsString("macroID") != "") - m = new cms.businesslogic.macro.Macro(int.Parse(Request.GetItemAsString("macroID"))); - else - m = cms.businesslogic.macro.Macro.GetByAlias(Request.GetItemAsString("macroAlias")); - - foreach (var mp in m.Properties) { - - var macroAssembly = mp.Type.Assembly; - var macroType = mp.Type.Type; - try - { - - var assembly = Assembly.LoadFrom( IOHelper.MapPath(SystemDirectories.Bin + "/" + macroAssembly + ".dll")); - - Type type = assembly.GetType(macroAssembly+"."+macroType); - var typeInstance = Activator.CreateInstance(type) as interfaces.IMacroGuiRendering; - if (typeInstance != null) - { - var control = Activator.CreateInstance(type) as Control; - control.ID = mp.Alias; - if (Request[mp.Alias] != null) - { - if (Request[mp.Alias] != "") - { - type.GetProperty("Value").SetValue(control, Convert.ChangeType(Request[mp.Alias], type.GetProperty("Value").PropertyType), null); - } - } - - // register alias - var pp = new uicontrols.PropertyPanel(); - pp.Text = mp.Name; - pp.Controls.Add(control); - - macroProperties.Controls.Add(pp); - - /* - macroProperties.Controls.Add(new LiteralControl("")); - macroProperties.Controls.Add(new LiteralControl("" + mp.Name + "")); - macroProperties.Controls.Add(control); - macroProperties.Controls.Add(new LiteralControl("")); - */ - } - else - { - Trace.Warn("umbEditContent", "Type doesn't exist or is not umbraco.interfaces.DataFieldI ('" + macroAssembly + "." + macroType + "')"); - } - - } - catch (Exception fieldException) - { - Trace.Warn("umbEditContent", "Error creating type '" + macroAssembly + "." + macroType + "'", fieldException); - } - } - } - else - { - List macroRenderings; - if (Request.GetItemAsString("editor") != "") - macroRenderings = DatabaseContext.Database.Fetch("select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName"); - else - macroRenderings = DatabaseContext.Database.Fetch("select macroAlias, macroName from cmsMacro order by macroName"); - - macroAlias.DataSource = macroRenderings; - macroAlias.DataValueField = "macroAlias"; - macroAlias.DataTextField = "macroName"; - macroAlias.DataBind(); - - } - - } - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs deleted file mode 100644 index 232f192919..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs +++ /dev/null @@ -1,51 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace umbraco.dialogs { - - - public partial class insertMacro { - - /// - /// pane_edit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_edit; - - /// - /// macroProperties control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder macroProperties; - - /// - /// pane_insert control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane_insert; - - /// - /// macroAlias control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ListBox macroAlias; - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx index 8ccab8beab..ba28342018 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx @@ -9,7 +9,6 @@ .gridItem{border-color: #D9D7D7;} - diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs index 00483889d1..0a1d0f54a4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs @@ -12,15 +12,6 @@ namespace umbraco.presentation.umbraco.dialogs { public partial class viewAuditTrail { - /// - /// 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. /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index 25e0258288..77883c7312 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -195,12 +195,19 @@ namespace umbraco.cms.presentation.settings private void LoadMacros() { var macroRenderings = - DatabaseContext.Database.Fetch("select id, macroAlias, macroName from cmsMacro order by macroName"); + DatabaseContext.Database.Fetch("select id, macroAlias, macroName from cmsMacro order by macroName"); rpt_macros.DataSource = macroRenderings; rpt_macros.DataBind(); } + private class TempMacroClass + { + public int id { get; set; } + public string macroAlias { get; set; } + public string macroName { get; set; } + } + public string DoesMacroHaveSettings(string macroId) { if ( diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs index d63c9b4d9c..b6db5cdf8c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs @@ -110,12 +110,7 @@ namespace umbraco.cms.presentation.settings.scripts umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif"; umbDictionary.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", Services.TextService.Localize("template/insertDictionaryItem"), 640, 550); umbDictionary.AltText = "Insert umbraco dictionary item"; - - uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon(); - umbMacro.ImageURL = SystemDirectories.Umbraco + "/images/editor/insMacro.gif"; - umbMacro.AltText = Services.TextService.Localize("template/insertMacro"); - umbMacro.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, Services.TextService.Localize("template/insertMacro"), 470, 530); - + // Help Panel1.Menu.InsertSplitter(); diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index a720d5e715..6ce141a2b5 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -56,33 +56,13 @@ namespace umbraco.cms.businesslogic #region Private static - private static readonly string DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.UmbracoClient + "/Tree/treeIcons.css"); + private static readonly List InternalDefaultIconClasses = new List(); private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(); private static void InitializeIconClasses() { - StreamReader re = File.OpenText(DefaultIconCssFile); - string content = string.Empty; - string input = null; - while ((input = re.ReadLine()) != null) - { - content += input.Replace("\n", "") + "\n"; - } - re.Close(); - - // parse the classes - var m = Regex.Matches(content, "([^{]*){([^}]*)}", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); - - foreach (Match match in m) - { - var groups = match.Groups; - var cssClass = groups[1].Value.Replace("\n", "").Replace("\r", "").Trim().Trim(Environment.NewLine.ToCharArray()); - if (string.IsNullOrEmpty(cssClass) == false) - { - InternalDefaultIconClasses.Add(cssClass); - } - } + } private const string SqlSingle = "SELECT id, createDate, trashed, parentId, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text FROM umbracoNode WHERE id = @id"; private const string SqlDescendants = @" diff --git a/src/umbraco.interfaces/IMacroGuiRendering.cs b/src/umbraco.interfaces/IMacroGuiRendering.cs deleted file mode 100644 index a9b1bdebe2..0000000000 --- a/src/umbraco.interfaces/IMacroGuiRendering.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace umbraco.interfaces -{ - /// - /// Summary description for IMacroGuiRendering. - /// - [Obsolete("This interface is no longer used and will be removed from the codebase in future versions")] - public interface IMacroGuiRendering - { - /// - /// Gets or sets the value. - /// - /// The value. - string Value {set; get;} - /// - /// Gets a value indicating whether a caption is shown - /// - /// true if [show caption]; otherwise, false. - bool ShowCaption {get;} - } -} diff --git a/src/umbraco.interfaces/skinning/IDependencyType.cs b/src/umbraco.interfaces/skinning/IDependencyType.cs deleted file mode 100644 index 5f65126ee0..0000000000 --- a/src/umbraco.interfaces/skinning/IDependencyType.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; - -namespace umbraco.interfaces.skinning -{ - public interface IDependencyType - { - String Name { get; set; } - - List Values { get; set; } - WebControl Editor { get; set; } - } -} diff --git a/src/umbraco.interfaces/skinning/ITaskType.cs b/src/umbraco.interfaces/skinning/ITaskType.cs deleted file mode 100644 index 9210666701..0000000000 --- a/src/umbraco.interfaces/skinning/ITaskType.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; - -namespace umbraco.interfaces.skinning -{ - public interface ITaskType - { - String Name { get; set; } - String Value { get; set; } - - TaskExecutionDetails Execute(string Value); - - TaskExecutionStatus RollBack(string OriginalValue); - - string PreviewClientScript(string ControlClientId, string ClientSidePreviewEventType, string ClientSideGetValueScript); - - XmlNode ToXml(string OriginalValue, string NewValue); - } -} diff --git a/src/umbraco.interfaces/skinning/TaskExecutionDetails.cs b/src/umbraco.interfaces/skinning/TaskExecutionDetails.cs deleted file mode 100644 index 6c93e39e54..0000000000 --- a/src/umbraco.interfaces/skinning/TaskExecutionDetails.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace umbraco.interfaces.skinning -{ - public struct TaskExecutionDetails - { - public TaskExecutionStatus TaskExecutionStatus; - public string OriginalValue; - public string NewValue; - } -} \ No newline at end of file diff --git a/src/umbraco.interfaces/skinning/TaskExecutionStatus.cs b/src/umbraco.interfaces/skinning/TaskExecutionStatus.cs deleted file mode 100644 index bce9049a0a..0000000000 --- a/src/umbraco.interfaces/skinning/TaskExecutionStatus.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace umbraco.interfaces.skinning -{ - public enum TaskExecutionStatus - { - Failed, - Cancelled, - Completed - } -} \ No newline at end of file diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj index bc3f46c7b7..6d7d9cefe4 100644 --- a/src/umbraco.interfaces/umbraco.interfaces.csproj +++ b/src/umbraco.interfaces/umbraco.interfaces.csproj @@ -137,9 +137,6 @@ Code - - Code - @@ -149,10 +146,6 @@ Code - - - -