From a939c14de96f79175a9cfbc21675772c28677b68 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 25 Sep 2013 17:57:44 +1000 Subject: [PATCH] Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support --- .../Configuration/GlobalSettings.cs | 10 - src/Umbraco.Core/IO/SystemFiles.cs | 8 - src/Umbraco.Core/PluginManager.cs | 4 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 41 -- .../steps/Skinning/loadStarterKitDesigns.ascx | 69 ---- .../Skinning/loadStarterKitDesigns.ascx.cs | 162 -------- .../loadStarterKitDesigns.ascx.designer.cs | 42 -- .../install/steps/StarterKits.ascx.cs | 20 +- .../install/steps/TheEnd.ascx.cs | 5 +- .../install/steps/TheEnd.ascx.designer.cs | 9 - src/Umbraco.Web.UI/install/steps/theend.ascx | 3 +- .../LiveEditing/Controls/Communicator.js | 33 -- .../Controls/LiveEditingToolbar.js | 99 ----- .../umbraco/LiveEditing/Css/LiveEditing.css | 370 ----------------- .../umbraco/LiveEditing/Images/canvas.gif | Bin 1009 -> 0 bytes .../LiveEditing/Images/dialog_background.png | Bin 13247 -> 0 bytes .../umbraco/LiveEditing/LiveEditing.cd | 65 --- .../Modules/CreateModule/CreateModule.js | 5 - .../Modules/CreateModule/create.png | Bin 3764 -> 0 bytes .../Modules/DeleteModule/DeleteModule.js | 5 - .../Modules/DeleteModule/delete.png | Bin 3604 -> 0 bytes .../Modules/ItemEditing/ItemEditing.js | 341 ---------------- .../Modules/ItemEditing/ItemEditingInvoke.js | 3 - .../Modules/MacroModule/MacroModule.js | 21 - .../Modules/SkinModule/CssParser.aspx | 1 - .../Modules/SkinModule/ImageUploader.aspx | 193 --------- .../ModuleInjectionMacroRenderer.aspx | 1 - .../Modules/SkinModule/ModuleInjector.aspx | 141 ------- .../Modules/SkinModule/ModuleInstaller.aspx | 1 - .../Modules/SkinModule/ModuleSelector.ascx | 55 --- .../Modules/SkinModule/SkinCustomizer.ascx | 125 ------ .../Modules/SkinModule/SkinModule.js | 1 - .../Modules/SkinModule/images/loader.gif | Bin 1737 -> 0 bytes .../Modules/SkinModule/images/module.gif | Bin 610 -> 0 bytes .../Modules/SkinModule/images/skin.gif | Bin 1684 -> 0 bytes .../Modules/SkinModule/js/ModuleInjection.js | 130 ------ .../SkinModule/js/SkinModuleShowOnStartup.js | 1 - .../js/disableInstallButtonsOnClick.js | 8 - .../Modules/SkinModule/js/initcolorpicker.js | 22 -- .../Modules/SkinModule/js/initslider.js | 19 - .../LiveEditing/Modules/SkinModule/skin.png | Bin 3764 -> 0 bytes .../UnpublishModule/UnpublishModule.js | 5 - .../Modules/UnpublishModule/unpublish.png | Bin 3564 -> 0 bytes src/Umbraco.Web.UI/umbraco/canvas.aspx | 16 - .../umbraco/css/umbLiveEditing.css | 14 - .../developer/Packages/StarterKits.aspx.cs | 30 +- .../umbraco/dialogs/TemplateSkinning.aspx | 57 --- .../Application/UmbracoApplicationActions.js | 6 - .../themes/umbraco/editor_template_src.js | 23 +- src/Umbraco.Web/Security/WebSecurity.cs | 2 +- .../Trees/LegacyTreeDataConverter.cs | 8 +- src/Umbraco.Web/Umbraco.Web.csproj | 16 - .../umbraco/Trees/loadPackager.cs | 3 - .../umbraco/Trees/loadTemplates.cs | 2 +- .../umbraco/dashboard/Settings/Applyskin.ascx | 9 - .../dashboard/Settings/Applyskin.ascx.cs | 41 -- .../Settings/Applyskin.ascx.designer.cs | 42 -- .../umbraco/dialogs/TemplateSkinning.aspx | 57 --- .../umbraco/dialogs/TemplateSkinning.aspx.cs | 190 --------- .../dialogs/TemplateSkinning.aspx.designer.cs | 105 ----- .../umbraco/settings/editTemplate.aspx.cs | 2 +- .../umbraco/templateControls/Item.cs | 56 +-- .../BasePages/BasePage.cs | 2 +- src/umbraco.businesslogic/GlobalSettings.cs | 7 +- src/umbraco.businesslogic/IO/SystemFiles.cs | 4 - .../datatype/ClientDependencyAttribute.cs | 102 ----- .../businesslogic/skinning/CssVariable.cs | 29 -- .../skinning/CssVariableProperty.cs | 19 - .../businesslogic/skinning/Dependency.cs | 136 ------- .../businesslogic/skinning/DependencyType.cs | 53 --- .../businesslogic/skinning/EmbeddedCss.cs | 44 --- .../businesslogic/skinning/Skin.cs | 344 ---------------- .../businesslogic/skinning/Skinning.cs | 374 ------------------ .../businesslogic/skinning/Task.cs | 92 ----- .../businesslogic/skinning/TaskType.cs | 68 ---- .../skinning/controls/ColorPicker.cs | 26 -- .../skinning/controls/ImageUploader.cs | 28 -- .../skinning/controls/SliderControl.cs | 35 -- .../skinning/dependencies/Color.cs | 60 --- .../skinning/dependencies/Image.cs | 80 ---- .../skinning/dependencies/Option.cs | 71 ---- .../skinning/dependencies/Slider.cs | 88 ----- .../skinning/dependencies/Text.cs | 60 --- .../skinning/tasks/AddStyleSheetToTemplate.cs | 114 ------ .../businesslogic/skinning/tasks/ModifyCss.cs | 93 ----- .../skinning/tasks/ModifyPageProperty.cs | 77 ---- .../skinning/tasks/ModifyTemplate.cs | 111 ------ src/umbraco.cms/umbraco.cms.csproj | 22 -- .../AbstractPrevalueEditor.cs | 1 + .../MultiNodeTreePicker/MNTP_DataEditor.cs | 4 +- .../MNTP_PrevalueEditor.cs | 3 +- .../MultipleTextstringControl.cs | 1 + .../ResourceExtensions.cs | 1 + .../macrocontainer/Editor.cs | 16 +- .../tinyMCE3/TinyMCE.cs | 30 +- .../tinyMCE3/webcontrol/TinyMCEWebControl.cs | 78 +--- .../tinymce/tinyMCEPreValueConfigurator.cs | 2 +- .../ILiveEditingDataEditor.cs | 18 - .../umbraco.interfaces.csproj | 1 - 99 files changed, 49 insertions(+), 4942 deletions(-) delete mode 100644 src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx delete mode 100644 src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.cs delete mode 100644 src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/LiveEditing.cd delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/DeleteModule/delete.png delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditing.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/images/module.gif delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/images/skin.gif delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.js delete mode 100644 src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/UnpublishModule/unpublish.png delete mode 100644 src/Umbraco.Web.UI/umbraco/canvas.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css delete mode 100644 src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs delete mode 100644 src/umbraco.cms/businesslogic/datatype/ClientDependencyAttribute.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/CssVariable.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/CssVariableProperty.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/Dependency.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/DependencyType.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/EmbeddedCss.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/Skin.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/Skinning.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/Task.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/TaskType.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/controls/ColorPicker.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/controls/ImageUploader.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/controls/SliderControl.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/dependencies/Color.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/dependencies/Image.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/dependencies/Option.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/dependencies/Slider.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/dependencies/Text.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs delete mode 100644 src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs delete mode 100644 src/umbraco.interfaces/ILiveEditingDataEditor.cs diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 24fe959b61..406aa169b6 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -597,21 +597,11 @@ namespace Umbraco.Core.Configuration return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1; } - public static bool RequestIsLiveEditRedirector(HttpContext context) - { - return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1; - } - public static bool RequestIsInUmbracoApplication(HttpContextBase context) { return context.Request.Path.ToLower().IndexOf(IOHelper.ResolveUrl(SystemDirectories.Umbraco).ToLower()) > -1; } - public static bool RequestIsLiveEditRedirector(HttpContextBase context) - { - return context.Request.Path.ToLower().IndexOf(SystemDirectories.Umbraco.ToLower() + "/liveediting.aspx") > -1; - } - /// /// Gets a value indicating whether umbraco should force a secure (https) connection to the backoffice. /// diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs index 9dfde1e442..766ecc5562 100644 --- a/src/Umbraco.Core/IO/SystemFiles.cs +++ b/src/Umbraco.Core/IO/SystemFiles.cs @@ -51,14 +51,6 @@ namespace Umbraco.Core.IO return SystemDirectories.Config + "/dashboard.config"; } } - - public static string SkinningXml - { - get - { - return SystemDirectories.Data + "/skinning.config"; - } - } public static string NotFoundhandlersConfig { diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs index e24573e4d4..b9f6b75172 100644 --- a/src/Umbraco.Core/PluginManager.cs +++ b/src/Umbraco.Core/PluginManager.cs @@ -497,9 +497,7 @@ namespace Umbraco.Core /// internal IEnumerable ResolveDataTypes() { - //ensure we ignore types that should not be loaded - return ResolveTypes() - .Except(new[] {Type.GetType("umbraco.presentation.LiveEditing.Modules.ItemEditing.PageElementEditor,umbraco")}); + return ResolveTypes(); } /// diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 70c86231b9..64f99def36 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -352,9 +352,6 @@ RenderingEngine.ascx - - loadStarterKitDesigns.ascx - loadStarterKits.ascx ASPXCodeBehind @@ -369,10 +366,6 @@ StarterKits.ascx - - loadStarterKitDesigns.ascx - ASPXCodeBehind - ASPXCodeBehind @@ -735,8 +728,6 @@ - - @@ -1725,7 +1716,6 @@ - @@ -1750,7 +1740,6 @@ - @@ -1760,20 +1749,6 @@ - - - - - - - - - - - - - - @@ -1804,7 +1779,6 @@ - @@ -1947,7 +1921,6 @@ - @@ -2120,18 +2093,6 @@ - - - - - - - - - - - - @@ -2205,7 +2166,6 @@ Designer - @@ -2234,7 +2194,6 @@ - diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx deleted file mode 100644 index 864aeb5082..0000000000 --- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx +++ /dev/null @@ -1,69 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="LoadStarterKitDesigns.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Skinning.LoadStarterKitDesigns" %> -<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> - - - -

Starter kit and skin have been installed

- - - -
- - - -
- prev - next - -
-
- -
-
    - - - - -
  • -
    - " alt="image description" width="152" height="129"> - " alt="image description" width="201" height="178"> - -
    - <%# ((Skin)Container.DataItem).Text %> -
    - Preview - Install - - -
    -
    - -
    -
    • -     - -
-
- - -
-
-
- Pages: - -
-
-
- -
- - -
- - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.cs deleted file mode 100644 index b45e00e586..0000000000 --- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI.WebControls; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; -using Umbraco.Web.Install; -using umbraco; -using GlobalSettings = global::Umbraco.Core.Configuration.GlobalSettings; - -namespace Umbraco.Web.UI.Install.Steps.Skinning -{ - public delegate void StarterKitDesignInstalledEventHandler(); - - public partial class LoadStarterKitDesigns : StepUserControl - { - - public event StarterKitDesignInstalledEventHandler StarterKitDesignInstalled; - - protected virtual void OnStarterKitDesignInstalled() - { - if (StarterKitDesignInstalled != null) - StarterKitDesignInstalled(); - } - - public Guid StarterKitGuid { get; set; } - - private readonly global::umbraco.cms.businesslogic.packager.repositories.Repository _repo; - private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66"; - - public LoadStarterKitDesigns() - { - _repo = global::umbraco.cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid); - } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - if (_repo == null) - { - throw new InvalidOperationException("Could not find repository with id " + RepoGuid); - } - - if (_repo.HasConnection()) - { - try - { - //clear progress bar cache - InstallHelper.ClearProgress(); - - var skinsCollection = _repo.Webservice.Skins(StarterKitGuid.ToString()); - - var numberOfSkins = skinsCollection.Length; - this.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "skinCounter", "var numberOfSkins = " + numberOfSkins, true); - - rep_starterKitDesigns.DataSource = skinsCollection; - rep_starterKitDesigns.DataBind(); - } - catch (Exception ex) - { - LogHelper.Error("An error occurred initializing", ex); - - ShowConnectionError(); - } - } - else - { - ShowConnectionError(); - } - } - - private void ShowConnectionError() - { - - var fb = new global::umbraco.uicontrols.Feedback - { - type = global::umbraco.uicontrols.Feedback.feedbacktype.error, - Text = "No connection to repository. Starter Kits Designs could not be fetched from the repository as there was no connection to: '" + _repo.RepositoryUrl + "'" - }; - - pl_loadStarterKitDesigns.Controls.Clear(); - pl_loadStarterKitDesigns.Controls.Add(fb); - } - - protected void SelectStarterKitDesign(object sender, EventArgs e) - { - InstallHelper.ClearProgress(); - - var kitGuid = new Guid(((LinkButton)sender).CommandArgument); - - if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsSkinInstalled(kitGuid)) - { - - InstallHelper.SetProgress(5, "Fetching starting kit from the repository", ""); - - var installer = new global::umbraco.cms.businesslogic.packager.Installer(); - - if (_repo.HasConnection()) - { - var p = new global::umbraco.cms.businesslogic.packager.Installer(); - - InstallHelper.SetProgress(15, "Connected to repository", ""); - - string tempFile = p.Import(_repo.fetch(kitGuid.ToString())); - p.LoadConfig(tempFile); - int pID = p.CreateManifest(tempFile, kitGuid.ToString(), RepoGuid); - - InstallHelper.SetProgress(30, "Installing skin files", ""); - p.InstallFiles(pID, tempFile); - - InstallHelper.SetProgress(50, "Installing skin system objects", ""); - p.InstallBusinessLogic(pID, tempFile); - - InstallHelper.SetProgress(60, "Finishing skin installation", ""); - p.InstallCleanUp(pID, tempFile); - - library.RefreshContent(); - - InstallHelper.SetProgress(80, "Activating skin", ""); - if (global::umbraco.cms.businesslogic.skinning.Skinning.GetAllSkins().Count > 0) - { - global::umbraco.cms.businesslogic.skinning.Skinning.ActivateAsCurrentSkin( - global::umbraco.cms.businesslogic.skinning.Skinning.GetAllSkins()[0]); - } - - - InstallHelper.SetProgress(100, "Skin installation has been completed", ""); - - try - { - - - if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)) - { - GlobalSettings.ConfigurationStatus = UmbracoVersion.Current.ToString(3); - } - } - catch - { - - } - - try - { - InstallHelper.RedirectToNextStep(Page, GetCurrentStep()); - } - catch - { - OnStarterKitDesignInstalled(); - } - } - else - { - ShowConnectionError(); - } - - } - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs deleted file mode 100644 index 7ee546bdd2..0000000000 --- a/src/Umbraco.Web.UI/install/steps/Skinning/loadStarterKitDesigns.ascx.designer.cs +++ /dev/null @@ -1,42 +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.Install.Steps.Skinning { - - - public partial class LoadStarterKitDesigns { - - /// - /// pl_loadStarterKitDesigns control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder pl_loadStarterKitDesigns; - - /// - /// pl_CustomizeSkin control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pl_CustomizeSkin; - - /// - /// rep_starterKitDesigns control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Repeater rep_starterKitDesigns; - } -} diff --git a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs index ffb4ad8e39..579f8b7413 100644 --- a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs +++ b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx.cs @@ -10,10 +10,7 @@ namespace Umbraco.Web.UI.Install.Steps protected void Page_Load(object sender, EventArgs e) { - if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) - ShowStarterKits(); - else - ShowStarterKitDesigns((Guid)global::umbraco.cms.businesslogic.skinning.Skinning.StarterKitGuid()); + ShowStarterKits(); } @@ -26,19 +23,6 @@ namespace Umbraco.Web.UI.Install.Steps } - - private void ShowStarterKitDesigns(Guid starterKitGuid) - { - var ctrl = (LoadStarterKitDesigns)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx"); - ctrl.ID = "StarterKitDesigns"; - - ctrl.StarterKitGuid = starterKitGuid; - ph_starterKitDesigns.Controls.Add(ctrl); - - pl_starterKit.Visible = false; - pl_starterKitDesign.Visible = true; - } - - + } } \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs index 8b824027f1..4053f0c782 100644 --- a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs +++ b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.cs @@ -20,10 +20,7 @@ namespace Umbraco.Web.UI.Install.Steps // Update ClientDependency version var clientDependencyConfig = new ClientDependencyConfiguration(); var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber(); - - if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) - customizeSite.Visible = false; - + } } diff --git a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs index 3d8ea899fc..2c7c5fe114 100644 --- a/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs +++ b/src/Umbraco.Web.UI/install/steps/TheEnd.ascx.designer.cs @@ -11,14 +11,5 @@ namespace Umbraco.Web.UI.Install.Steps { public partial class TheEnd { - - /// - /// customizeSite control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl customizeSite; } } diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx index 2df9c738ca..11404d8608 100644 --- a/src/Umbraco.Web.UI/install/steps/theend.ascx +++ b/src/Umbraco.Web.UI/install/steps/theend.ascx @@ -31,8 +31,7 @@ jQuery(document).ready(function () { source .NET CMS.
If you installed a starter kit you can start by configuring your new site, just click "Preview your new website" and follow the instructions. Or to start adding content right away click "Set up your new website"

-
    -
  • &umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Set up your new website
    • + diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js deleted file mode 100644 index 734bb0933d..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/Communicator.js +++ /dev/null @@ -1,33 +0,0 @@ -// Umbraco Live Editing: Communicator - -/********************* Communicator Constructor *********************/ - - function UmbracoCommunicator() { } - - - -/********************* Communicator Methods *********************/ - - // Sends a message to the client using the communicator. - UmbracoCommunicator.prototype.SendClientMessage = function(type, message) { - // find the communicator - var divs = document.getElementsByTagName("div"); - var communicator = null; - for (var i = 0; i < divs.length && communicator == null; i++) - if (divs[i].className == "communicator") - communicator = divs[i]; - Sys.Debug.assert(communicator != null, "LiveEditing: Communicator not found."); - - // send the message - var typeBox = communicator.childNodes[0].childNodes[0]; - var messageBox = communicator.childNodes[0].childNodes[1]; - var submit = communicator.childNodes[0].childNodes[2]; - typeBox.value = type; - messageBox.value = message; - submit.click(); - } - - -/********************* Communicator Instance *********************/ - - var UmbracoCommunicator = new UmbracoCommunicator(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js deleted file mode 100644 index ac5e9457f0..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Controls/LiveEditingToolbar.js +++ /dev/null @@ -1,99 +0,0 @@ -Type.registerNamespace("umbraco.presentation.LiveEditing.Controls"); - -/************************************ Toolbar class ***********************************/ - -// Constructor. -umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar = function() { - umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.initializeBase(this); - this._inited = false; - - // init toolbar on application load - var liveEditingToolbar = this; - Sys.Application.add_load(function() { liveEditingToolbar._init(); }); -} - -umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.prototype = { - // Initialize the toolbar. - _init: function() { - if (!this._inited) { - var liveEditingToolbar = this; - Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function(sender, args) { liveEditingToolbar._handleError(sender, args); }); - this._inited = true; - } - }, - - // Fires the Save event. - _save: function() { - var handler = this.get_events().getHandler("save"); - var args = new Sys.EventArgs(); - args.cancel = false; - if (handler) - handler(this, args); - - if (!args.cancel) { - this.setDirty(false); - UmbSpeechBubble.ShowMessage("Info", "Saving", "Save in progress..."); - } - return !args.cancel; - - }, - - // Adds a listener for the Save event. - add_save: function(handler) { - this.get_events().addHandler("save", handler); - }, - - // Removes a listener for the Save event. - remove_save: function(handler) { - this.get_events().removeHandler("save", handler); - }, - - // Fires the Save and Publish event. - _saveAndPublish: function() { - var handler = this.get_events().getHandler("saveAndPublish"); - var args = new Sys.EventArgs(); - args.cancel = false; - if (handler) - handler(this, args); - - if (!args.cancel) { - this.setDirty(false); - UmbSpeechBubble.ShowMessage("Info", "Publishing", "Save and publish in progress..."); - } - return !args.cancel; - }, - - // Adds a listener for the Save and Publish event. - add_saveAndPublish: function(handler) { - this.get_events().addHandler("saveAndPublish", handler); - }, - - // Removes a listener for the Save and Publish event. - remove_saveAndPublish: function(handler) { - this.get_events().removeHandler("saveAndPublish", handler); - }, - - // Sets whether the pages has unsaved changes. - setDirty: function(isDirty) { - window.onbeforeunload = isDirty ? function() { return "You have unsaved changes."; } : null; - }, - - // Global error handler. Displays a tooltip with the error message. - _handleError: function(sender, args) { - if (args.get_error() != undefined) { - var errorMessage; - if (args.get_response().get_statusCode() == '200') { - errorMessage = args.get_error().message; - } - else { - errorMessage = "An unspecified error occurred."; - } - args.set_errorHandled(true); - UmbSpeechBubble.ShowMessage("info", "Error", errorMessage); - } - } -} - -// Register the class and create a global instance. -umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar.registerClass("umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar", Sys.Component); -var LiveEditingToolbar = new umbraco.presentation.LiveEditing.Controls.LiveEditingToolbar(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css b/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css deleted file mode 100644 index f2dc632e6d..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Css/LiveEditing.css +++ /dev/null @@ -1,370 +0,0 @@ -/***************************************************************** - - Live Editing placeholders - -/****************************************************************/ - -umbraco\:iteminfo { - cursor: pointer; - border: 1px dashed #bbb; - padding: 5px; -} - -.liveEditingForceBlockMode { - display: block; -} - -umbraco\:iteminfo:hover -{ - border: 2px dashed #f36f21; - padding: 5px; -} - -/***************************************************************** - - General Toolbar CSS - -/****************************************************************/ - -html { - margin-top: 30px !important; -} - -#LiveEditingToolbar -{ - font-family:"Trebuchet MS",verdana,arial; - background: url(../../../umbraco_client/tabView/images/background.gif) !important; - position: fixed !important; - width: 100% !important; - height: 34px !important; - top: 0 !important; - left: 0 !important; - text-align: left !important; - border-bottom: 1px solid #B0B0B0 !important; -} - -#LiveEditingToolbar div { - padding: 4px !important; -} - -#LiveEditingToolbar div div { - padding: inherit !important; -} - -#LiveEditingToolbar div.ExtraMenuItems { - display: inline !important; -} - -#LiveEditingToolbar div { - /*background: url(/umbraco/LiveEditing/Images/Canvas.gif) no-repeat right 4px; */ - width: 100%; -} - -#LiveEditingToolbar * div { - background: none; - width: auto; -} - -#LiveEditingToolbar input.button { - cursor: hand !important; - width: 22px !important; - height: 23px !important; - background: none !important; - border: none !important; -} - -#LiveEditingToolbar input.button:hover, #LiveEditingClientToolbar a.mceButtonEnabled:hover { - background-image: url(../../../umbraco_client/menuicon/images/buttonbg.gif) !important; - border: none !important; -} - -#LiveEditingToolbar input.close { - position: absolute !important; - right: 7px !important; - top: 6px !important; - /*border: none !Important; - background: none !Important; */ - color: #000; - width: 150px; -} - -#LiveEditingToolbar input.close:hover { - opacity: 1 !important; -} - -#LiveEditingToolbar img.about { - margin: 0 5px 5px 5px !important; -} - -#LiveEditingClientToolbar, #LiveEditingClientToolbar div { - display: inline !important; -} - -#LiveEditingToolbar span.separator { - padding-right: 7px !important; -} - -#LiveEditingToolbar span.separator span { - border-left: 1px solid #999999 !important; - border-right: 1px solid #EEEEEE !important; - position: absolute !important; - top: 7px !important; - width: 0px !important; - overflow: hidden !important; -} - -#LiveEditingToolbar .umbLabelButton -{ - cursor: hand !important; - float: left; - margin: 1px 5px 1px 1px; - padding: 0 !important; -} - -#LiveEditingToolbar .umbLabelButton:hover -{ - background: #EAEAEA; - border: 1px solid #CAC9C9 !Important; - margin: 0px 4px 0px 0px; -} - -#LiveEditingToolbar .umbLabelButton a -{ - text-decoration: none; - font-size: 80%; - margin-right: 3px; - padding: 5px 0; -} - - -#LiveEditingToolbar .umbLabelButton input.button { - width: 22px !important; - height: 23px !important; - margin-right: 3px; - background: none !important; - border: none !important; - vertical-align: middle; -} - -#LiveEditingToolbar .umbLabelButton input.button:hover { - background-image: none !important; - border: none !important; -} - -/***************************************************************** - - TinyMCE extra CSS - -/****************************************************************/ - -/* hide the temporary TinyMCE container */ -.tinymceContainer { - position: absolute !important; - left: -1000px !important; -} - -#LiveEditingClientToolbar .mceToolbarExternal table { - display: inline !important; - background: none !important; - margin: 0 !important; -} - -#LiveEditingClientToolbar .mceToolbarExternal { - position: absolute !important; - top: 0 !important; -} - -#LiveEditingClientToolbar a.mceButtonEnabled { - width: 22px !important; - height: 23px !important; -} - -/***************************************************************** - - Datatypes extra CSS - -/****************************************************************/ - -.relatedlinksdatatype -{ - background-color: #fff !important; - border: 1px solid #999 !important; -} - -/***************************************************************** - - Modal dialogs - -/****************************************************************/ - -.umbModalBox h1 -{ - font-size: larger !important; -} - -.umbModalBox h2 -{ - font-size: medium !important; -} - -.umbModalBox label -{ - padding-bottom: 2px !Important; - display: block !Important; - color: #666 !Important; - font-family:Trebuchet MS,Lucida Grande,verdana,arial ! important; -} - -.umbModalBox p -{ - font-size: 12px !important; - font-family:Trebuchet MS,Lucida Grande,verdana,arial ! important; - color:Black ! important; - margin-bottom:5px; -} - -.umbModalBox p select -{ - margin-bottom:10px ! important; -} - -.umbModalBox p{font-size: 11px !Important} - - -#skins ul{list-style: none; padding: 0px; display: block; clear: both; height: 200px;} -#skins ul li{margin-right: 12px; float: left; border: 1px solid #efefef; padding: 5px; width: 120px; text-align: center; font-weight: normal;} - - -/***************************************************************** - - Umbraco UI Components - -/****************************************************************/ - -.propertypane { - position: relative; - display: block; - line-height: 1.1; - background: #fff url('/umbraco_client/propertypane/images/propertyBackground.gif') top repeat-x !Important; - background-image:url(/umbraco_client/propertypane/images/propertyBackground.gif) !Important; - padding: 5px; - margin:7px 0px 0px 0px; - border: 1px solid #d9d7d7; - text-align:left; - clear: both; - float: none; - color: black; - font-size: 11px !Important; - } - - .propertypane th - { - vertical-align: top; - text-align:left; - font-weight:bold; - font-family: Trebuchet MS, Lucida Grande, verdana, arial; - font-size:12px; - width: 16%; - } - - .propertypane,.propertypane td - { - font-family: Trebuchet MS, Lucida Grande, verdana, arial; - font-size:12px; - } - - - .propertypane small - { - font-weight: normal; - color: #666; - } - - .propertypane div.propertyItem{ - padding-bottom: 5px; - clear: both; - font-family: Trebuchet MS, Lucida Grande, verdana, arial; - font-size:12px; - } - - .propertypane div.propertyItem .propertyItemheader{ - width: 16%; - padding-right: 1%; - padding-bottom: 10px; - float: left; - clear: left; - font-weight:bold; - } - - .propertypane div.propertyItem .propertyItemContent{ - float: left; - padding-bottom: 5px; - clear: right; - } - - h2.propertypaneTitel{font-size: 14px; color: #999;margin: 7px 0px 0px 0px; padding-bottom: 0px; line-height: 14px;} - - div.propertyPaneFooter{clear: both; height: 1px; overflow: hidden; color: #fff;} - -#LiveEditingToolbar .ModuleSelector -{ - background-color:#FFF !important; - position:absolute; - top:36px; - left:270px; - color:#000; - border-left:5px solid #A3A3A3; - border-right:5px solid #A3A3A3; - border-bottom:5px solid #A3A3A3; - z-index:100; -} - -#LiveEditingToolbar #moduleSelectorContainer -{ - padding:10px; -} - -.umbModuleContainerSelector -{ - cursor:pointer; -} - -p#installingModule img -{ - float:none; - margin:0; - padding:0; -} - -#LiveEditingToolbar #modules ul -{ - list-style-type:none; - margin-left:0px; - margin-right:0px; -} - -#LiveEditingToolbar #modules ul li -{ - display:block; - padding-bottom:5px; - padding-top:5px; - border-bottom:1px solid #c3c3c3; -} - - #LiveEditingToolbar .umbLabelButton a, #LiveEditingToolbar .umbLabelButton a:hover -{ - color:Black !important; -} - -.umbModalBox a, .umbModalBox a:hover -{ - color:#888 !important; -} - -/* skin customize dialog */ -#costumizeSkin #dependencies .propertypane -{ - height:205px; - overflow:scroll; - overflow-x: hidden; -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif b/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/canvas.gif deleted file mode 100644 index cdc7bd0793a91a93a3d56049f9bd628a8aadae6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1009 zcmeH`{V&u30EfSgc}dE-m`V$^bx1?Dm}XwKayZe%&8$vRCR5xJqt$iJaTW8@g@o(U zg_}Ds#hi`nCbn)It{hHXb-N^6C#`(9yM4+((NBGTezs?Ow$Ca0$wEF43GFP4D2wDBhbRjJ<>=?&+j~nJ3%zAzW14A6i_WVkaK*26 zG$f!kV`WB(X&L!26`wWcUOoz3AS*%BS=`u1)+gd|I$o5Ur5qIRCu* zyW{5?##>PyjFJP8%2>{#8%HD$(rn&nT7L-_2 zk`2k=24Z6kcO&p&k`zSa5fkbz)546Uv%s`CL)OHR{O}dc*!R9Fl=>joj=UFx1_l(> zD5Rn}6<_9YjvzTfq%cLLQfal?{{DWW(MbH?KP=!)+HNBV9&u#Lx%COcVTy2a^o*6a zE4dC-zl=$_NX2(K7}pY8E7}?EHPA8{^)za{f?D3lj27EfJJWBMrRcmgHoIMmGD=vY zY0pr9ieQMSaN6N;$WOkx&Y@3n6N5+0XQHQhfqAVt?QE^V**->1Q`UJi?CpI+Qvy5= zS31*NE~N}@yx#S|Bg^qgXP<;`8yum39^})(&~qr8(y(LM@j^;~)Z)95#^RocO=Tug tKE+bEdl*C9Lq9sz9K9egC^If^jM-5x4tdzn1om_CtT(NU(xONr{0}%{a!&vN diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Images/dialog_background.png deleted file mode 100644 index 208d9c259ae11a8f7ee7e0ab0f147312f6ade91f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13247 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 - UmbracoContext.cs - - - - - - - - - AAABAAAAQAAEIhAAEAEAAAAQAAAAAEQAAAAAFAgAEAA= - umbraco\LiveEditing\Controls\LiveEditingManager.cs - - - - - - - - - - - BAAAAAAAAAIAKBAAAGCAIAAQAAAAAAQAAFgAAAABAAA= - umbraco\LiveEditing\Controls\LiveEditingToolbar.cs - - - - - - AAAAAAAAQAAAABAQAECAAAAgAAAAAAQAABBAAAAQAAA= - umbraco\LiveEditing\Controls\Communicator.cs - - - - - - AAAAAAAAAAAAAIAAAAAAAAAAAAAIAAAAAAAAAgAAAAA= - umbraco\LiveEditing\ILiveEditingContext.cs - - - - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - umbraco\LiveEditing\Menu\ILiveEditingMenu.cs - - - - - - AAIAAAAAAAAAAAABAAAAAGAAAAAAAAAAAgAAAAAAIAA= - umbraco\LiveEditing\Updates\IUpdateList.cs - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js deleted file mode 100644 index e278c4b3ab..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/CreateModule.js +++ /dev/null @@ -1,5 +0,0 @@ -/********************* Live Editing CreateModule functions *********************/ -function CreateModuleOk() -{ - UmbracoCommunicator.SendClientMessage('createcontent', ''); -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/CreateModule/create.png deleted file mode 100644 index ea3f06e5a688563c9425dcaebdcd355873bedbb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3764 zcmV;l4omTgP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000BuNklZMa)g4CM@cvWFYtOR zV>sLU&cNBWwzlEP$;q$QH`gOCKLYY)RF);Px5@iO|C^ytS-Hr>HF;#HBJ5Th+zl=i zbcc9YUc~qNQ{dgojKkiSV<8<(f)9Li6!WS=m@H(ZVLaca*s#1fVqQS`(>>VbM z&E>$RS+IvmaAFY}SpY>zSg0-Fd37r=G&t0)x;($n?^P(+GeRDX=2tN2?n5e{My`+p zU*u3M=P`=6@V5C3%#0Z`nmJ5LHxUzeC|9G)s|r(EN-HWN`DgMe990L-I8Vc=t%sHZ z*h~gTl?obk4j5JJWoYqn}@yxyz+s1N!8Kh2xi?-oB zF#;=X!DIal_Q-8$6&g_~0y}AfrB?RMOIfBkW z!$j+0GuU7^)T53vqF!r)ktSi0j2PetQHqs+i6`R`RhZ4P{Ee?~{Ol;#-TN~18BDYT zyj(z@xrC?K!0HDc{S>b3o(d_fV!Fm_0`5?dNXr(c4qb)UgrPa+1ZgLNkS%*QHL3Z zL94G78bX6$dr+TFrJCCV9o=rXyNQ=XDwoYB78e(n{jI)@m5r5>j?rOvcNd~4s>A>9 euj$0#e+B^I{LK$t{mZ`q0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0009&Nkl8;#h_A9YP$$X=(cEWt!N7s258D|1at}&O=k)e&{o6{ zm4Bs$GSHS*%;3cah>3!rL_*L+dr+e$Mgs@D#%B#C}<=TphKxZ~X1Iq&M^+IPb2xC?& zTxD7Pd51&CP!vdFVuaz2$w@fJ^D+0Eo4X!!+=ZHL+fubfMNt0*J`fDTHHJxeP+L1R z&2fWPic0(@*f%~d4SPJT?|OQWT)vD?+S;ZYi;J_XEEYJ}-VQv+$?v&c7w5xaoF5&< zp~Av}T%}Sg2)9j4#DyG=wqFef{MgrrWONi?csvig%gZ+n)z@qOtg9QF8$5yYr%vHh zmPMahJ)&1CGlk*Xx53-evb<}}n%>`YvhWknBkAqM8Lst@mu~mNPlrQDLLq!&+Jd}7 zerauDqH5`~Wf6jK`_vTpTrOzH%M*FE8vZvU^=gi5MdI&3;`bx*`SFn{|3h%K?6e{w zUKSY@1<@jraAU6jI1GDzFc|27>x~VfD|TBL>uQlSxsf!vkT{($_9_DPCEFOHqH=-9f`FRNkt`2*-Fp23O3~m z!o#-wU#7RF-}qQ=L9%Zj&awqKochzi%Gg-(X0>Wzf11+$kBOQgduxzXRpMP*_gBcM zb_&8Zj9J{dCB5_!t$O~3G0YxIPwrb08!Ls##lULRP)1Qd@M#L?bF=>Sv#q)hP3xoq zeX>*|2=BBqP;8>X^K%*-)T_O5;-ykpxCj<3iGmW18g^$}fg)3`pxC0ij8 zr6fp&8&{Puu)UCmOl@kk{KvQ?h=>G;T>KTT&Z2 0, "Live Editing - ItemEditing: Could not find the editor control."); - //this._activeItem.jItem.fadeIn(); - this.moveChildControls(this._editControl, this._activeItem.jItem); - - // Only elements that are currently present, can cause item editing to stop. - // This enables transparent use of dynamically created elements (such as context/dropdown menus) - // as clicks on those elements will not trigger the stop edit signal. - jQuery("*").each(function () { jQuery(this).data("canStopEditing", true); }); - - // raise event - var handler = this.get_events().getHandler("startEdit"); - if (handler) - handler(this, Sys.EventArgs.Empty); - - this.ignoreChildClicks(this._activeItem.jItem); - - LiveEditingToolbar.setDirty(true); - }, - - // Stops the editing of a specified item, and raises the stopEdit event. - stopEdit: function() { - if (this._activeItem != null) { - Sys.Debug.trace("Live Editing - ItemEditing: Stop editing of " + this._activeItem.toString() + "."); - - // raise event - var handler = this.get_events().getHandler("stopEdit"); - if (handler) - handler(this, Sys.EventArgs.Empty); - - // submit changes - Sys.Debug.assert(this._submitControl != null, "Live Editing - ItemEditing: Submit button not set."); - this._submitControl.click(); - - // hide control - //this._activeItem.jItem.fadeOut(); - this._activeItem = null; - this._submitControl = null; - this._editControl = null; - } - }, - - // Adds an event handler to the startEdit event. - add_startEdit: function(handler) { - this.get_events().addHandler("startEdit", handler); - }, - - // Removes an event handler from the startEdit event. - remove_startEdit: function(handler) { - this.get_events().removeHandler("startEdit", handler); - }, - - // Adds an event handler to the stopEdit event. - add_stopEdit: function(handler) { - this.get_events().addHandler("stopEdit", handler); - }, - - // Removes an event handler from the stopEdit event. - remove_stopEdit: function(handler) { - this.get_events().removeHandler("stopEdit", handler); - }, - - // Cancels the save method when an item is active, and postpones it to the next postback. - delaySaveWhenEditing: function(args, type) { - if (this._activeItem != null) { - this.stopEdit(); - args.cancel = true; - (function() { - var f = function() { - Sys.Application.remove_load(f); - setTimeout(function() { - Sys.Debug.trace("Live Editing - Delayed Saving Changes to server"); - UmbracoCommunicator.SendClientMessage(type, ""); - }, 100); - } - Sys.Application.add_load(f); - })(); - } - else { - Sys.Debug.trace("Live Editing - Saving Changes to server"); - if (!Sys.WebForms.PageRequestManager.getInstance().get_isInAsyncPostBack()) { - UmbracoCommunicator.SendClientMessage(type, ""); - } - else { - Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function() { - UmbracoCommunicator.SendClientMessage(type, ""); - }); - } - } - }, - - // Enables Live Editing of items. - itemsEnable: function() { - var items = this.getElementsByTagName("umbraco:iteminfo"); - Sys.Debug.trace(" Found " + items.length + " editable Umbraco item(s)."); - - // enhance items with edit functionality - var _this = this; - var i = 0; - items.each(function() { - var item = new umbraco.presentation.LiveEditing.activeItem(jQuery(this)); - _this._items[item.itemId] = item; - Sys.Debug.trace(" " + (++i) + ". " + item.toString() + " is Live Editing enabled."); - }); - // disable hyperlinks to make them clickable for Live Editing - this.disableHyperlinks(); - - // add "stop editing" handler when clicking outside the item - var _this = this; - jQuery(document).mousedown(function(event) { - Sys.Debug.trace("DOCUMENT CLICKED"); - // the canStopEditing property is set in startEdit - if (_this._activeItem != null && jQuery(event.target).data("canStopEditing")) { - if (!_this._activeItem.clicked) - _this.stopEdit(); - else - _this._activeItem.clicked = false; - } - }); - jQuery("#LiveEditingToolbar").mousedown(function() { - Sys.Debug.trace("TOOLBAR CLICKED"); - if (_this._activeItem != null) - _this._activeItem.clicked = true; - }); - }, - - // Update items that have changed. - updateItems: function() { - var itemUpdates = this.getElementsByTagName("umbraco:itemupdate"); - Sys.Debug.trace("Live Editing - ItemEditing: " + itemUpdates.length + " item update(s)."); - - var _this = this; - itemUpdates.each(function() { - var itemUpdate = jQuery(this); - var itemId = itemUpdate.attr("itemId"); - var item = _this._items[itemId]; - - if (item != null) { - Sys.Debug.trace(" Updating " + item.toString() + "."); - - // remove old children and add updates ones - _this.moveChildControls(itemUpdate, item.jItem); - //item.jItem.fadeIn(); - - // disable hyperlinks to make them clickable for Live Editing - _this.disableHyperlinks(); - } - else { - itemUpdate.html(""); - } - }); - }, - - // Update controls that have changed. - updateControls: function() { - Sys.Debug.trace("Live Editing - ItemEditing: In updatecontrols"); - var controlUpdates = this.getElementsByTagName("umbraco:control"); - Sys.Debug.trace("Live Editing - ItemEditing: " + controlUpdates.length + " control update(s)."); - - if (controlUpdates.length == 1) { - if (this._activeItem != null && controlUpdates.children().length > 0) { - Sys.Debug.trace("Live Editing - ItemEditing: updating edit control."); - this.moveChildControls(controlUpdates, this._activeItem.jItem); - this.ignoreChildClicks(); - } - - this._submitControl = controlUpdates.next(); - Sys.Debug.assert(this._submitControl.length > 0, "Live Editing - ItemEditing: Submit button not found."); - } - }, - - // ignores clicks on child elements of the control - ignoreChildClicks: function() { - var _this = this; - this._activeItem.jItem.children().mousedown(function(e) { - _this._activeItem.clicked = true; - }); - }, - - // Moves the child controls from source into destination, overwriting existing elements. - moveChildControls: function(source, dest) { - Sys.Debug.trace("Live Editing - Moving Child Controls"); - - //remove contents in the destination - dest.html(""); - - //add the source to the destination - dest.append(source.html()); - - //remove teh contents from the source - source.html(""); - - }, - - // Gets a list of elements with the specified tagname including namespaced ones - getElementsByTagName: function(tagname) { - var found = jQuery("body").find("*").filter(function(index) { - if (this.nodeType != 3) { - var nn = this.nodeName.toLowerCase(); - var ftn = tagname.toLowerCase(); - var ln = (ftn.indexOf(":") > 0 ? ftn.substr(ftn.indexOf(":") + 1) : ftn); - return (nn == ftn - || (typeof this.scopeName != "undefined" && nn == ln && this.scopeName.toLowerCase() == ftn.substr(0, ftn.indexOf(":")))); - } - return false; - }); - Sys.Debug.trace("found " + found.length + " elements with selector: " + tagname); - return found; - }, - - // Disables hyperlinks inside the specified element. - disableHyperlinks: function() { - jQuery("a").click(function() { - return false; - }); - } -} - -umbraco.presentation.LiveEditing.ItemEditing.registerClass("umbraco.presentation.LiveEditing.ItemEditing", Sys.Component); - -//an object to store the information for the active item -umbraco.presentation.LiveEditing.activeItem = function(item) { - //error checking - if (item != null && item.length != 1) { - return null; - } - //create the object with values, wire up events and return it - var obj = { - jItem: item, - nodeId: item.attr("nodeId"), - fieldName: item.attr("name"), - itemId: item.attr("itemId"), - clicked: false, - toString: function() { - return "Item " + this.itemId + " (node " + this.nodeId + ": " + this.fieldName + ")"; - }, - // Activates an item for editing. - activate: function() { - ItemEditing._items[this.itemId] = this; - if (this != ItemEditing._activeItem) { - Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " was activated."); - if (!Sys.WebForms.PageRequestManager.getInstance().get_isInAsyncPostBack()) { - UmbracoCommunicator.SendClientMessage("edititem", this.itemId); - } - else { - var itemId = this.itemId; - Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function() { - if (itemId != 0) { - UmbracoCommunicator.SendClientMessage("edititem", itemId); - itemId = 0; - } - }); - } - //this.jItem.fadeOut(); - } - }, - // Item click handler. - onClick: function(e) { - if (ItemEditing._activeItem != null && ItemEditing._activeItem.itemId == this.itemId) { - Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " click ignored because it is already active."); - } - else { - Sys.Debug.trace("Live Editing - ItemEditing: " + this.toString() + " was clicked."); - e.stopPropagation(); // disable click event propagation to parent elements - this.activate(); - } - } - } - - //keep the scope on the click event method call - obj.jItem.click(function(e) { - obj.onClick.call(obj, e); - }); - - return obj; -} - - -// global instance of the ItemEditing class -function initializeGlobalItemEditing() { - ItemEditing = new umbraco.presentation.LiveEditing.ItemEditing(); -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js deleted file mode 100644 index 47c371631d..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/ItemEditing/ItemEditingInvoke.js +++ /dev/null @@ -1,3 +0,0 @@ -//this is simply used for live editing in order to invoke a method from a previously lazy loaded script; -//alert("ItemEditingInvoke: " + initializeGlobalItemEditing); -initializeGlobalItemEditing(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js deleted file mode 100644 index 80721af012..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/MacroModule/MacroModule.js +++ /dev/null @@ -1,21 +0,0 @@ -/********************* Live Editing MacroModule functions *********************/ - -function MacroOnDrop( sender, e ) -{ -var container = e.get_container(); -var item = e.get_droppedItem(); -var position = e.get_position(); - -//alert( String.format( "Container: {0}, Item: {1}, Position: {2}", container.id, item.id, position ) ); - -var instanceId = parseInt(item.getAttribute("InstanceId")); -var columnNo = parseInt(container.getAttribute("columnNo")); -var row = position; - -} - -function okAddMacro(sender, e) -{ - $find('ModalMacro').hide(); - /*__doPostBack('AddMacro', e); */ -} diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx deleted file mode 100644 index 1ebd8692cf..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/CssParser.aspx +++ /dev/null @@ -1 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CssParser.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.CssParser" %> \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx deleted file mode 100644 index 63e64045cc..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx +++ /dev/null @@ -1,193 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ImageUploader.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ImageUploader" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -

    - or Cancel -

    -     - - - - - - - - -
    - -
    -     - - -
    -
    -
    -     - - - - - - -     - -

    - or Cancel -

    - -     - - - - diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx deleted file mode 100644 index 253ce9ead3..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx +++ /dev/null @@ -1 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInjectionMacroRenderer.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInjectionMacroRenderer" %> diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx deleted file mode 100644 index 8909fc1f36..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx +++ /dev/null @@ -1,141 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInjector.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInjector" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Import Namespace="Umbraco.Core.Configuration" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - - - - - - - - - - - - - - - - -
    - - -
    -
    -
    - -
    -
    -
    -
    - -
    - -

    - " - onclick="updateMacro()" /> -

    -
    - - diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx deleted file mode 100644 index 48eb082bca..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx +++ /dev/null @@ -1 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInstaller.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInstaller" %> diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx deleted file mode 100644 index 01e108cf36..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx +++ /dev/null @@ -1,55 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ModuleSelector.ascx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleSelector" %> -<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> - - -
    - - - -
    -

    Please select the module you wish to insert.

    -
      - - -
    • - - - <%# ((Package)Container.DataItem).Text %> - <%# ((Package)Container.DataItem).Text %> - - - -
      • -       - -
    -
    - - - -     - -

    -Unable to fetch module, please try again later. -

    - - - - - - Cancel -
    diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx deleted file mode 100644 index 8bcd50acd8..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx +++ /dev/null @@ -1,125 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SkinCustomizer.ascx.cs" Inherits="umbraco.presentation.LiveEditing.Modules.SkinModule.SkinCustomizer" %> -<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> - -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - - - -

    Connection to repository failed...

    -     - - - - - - - -
    > - -

    - Personalize your skin, by defining colors, images and texts -

    - -
    - -
    - -

    - - or Cancel -

    - - -

    You could also change to another skin: Browse available skins

    - -
    - - - -
    > - -

    - Choose a skin from your local collection, or download one from the umbraco package repository -

    - - -
    - - -
      - - -
    • - <%# ((Skin)Container.DataItem).Text %> - <%# ((Skin)Container.DataItem).Text %> -
      - -
      • -       - -
    - -     - -
    - -
    -

    Looks like there are also some local skins

    - - - -
      - - -
    • - <%# ((string)Container.DataItem).ToString() %> - - -
      • -       - -
    - -     - - -
    - -

    - Go back to your current skin -

    - -
    - - - - diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js deleted file mode 100644 index ab545be481..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/SkinModule.js +++ /dev/null @@ -1 +0,0 @@ -/********************* Live Editing SkinModule functions *********************/ diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif deleted file mode 100644 index 4e651edc478b3db7ad5758bdb912e890e884aaf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1737 zcmaLXeN0pL8o=>mVSNFFR?eYHw^G0X@>)6Uoc8qfwB-~EmKV=JuoeomNbTCui!i-L z=kN3!r(^bLoJMDK8l%x|IKbKHm<(nhIwM!-)#&x=G)AK_8jR7aG1oiqb^nq3{Q1k1 zUp~nzkUI+-`SAN5_T@8zv_wD=RBEZ{Ga)@#E>~>GS8$@7uR891gEtyY}qavsbTP z^>{osn{EI8{U=YJT(f4)_U+s6-MhDE&mN=E$Z_1!qeml=$m!Fk{eC||5Tm1`M~)n! zC<@2%hYuek@#4kHmoGnf@L*zMV#kghhYlSY931TH>pOVxU@#aA1OiT{GZu@POeVcvKQc0c zVc5XHKwVv(#bRk`X^BRojg5_3t+v0vzq-1*x3_oW#*I67?u7oF%-4y|a(c0qtSv7s zR>#fy<301=>DI8<)8p+>^>y_uS9$!NPXZxNM{!rs7lJZh#7h$X*eZPU!<&eZ=!;Jw zz(iP9k-eaZW5w^z&o2fTfwKvT@4a780&ukfV+6uEN)ChJ?ND4|YCmK!89;oJY!Ee@ zz&o?yK}c5)gvrPtP8xwIC2bJ4=zv%#A2eERKq8%+!RZRpC`L9aDHH#}` zFzs;XyCU}Z+OODBHbI!p1DvU-svCv~48&I(PEr)eU37XFMu6N&4ijy^LX}eSFl`=# zO!E44u0&w_31~~pDkTI_Qr@cgjUjUy3Y#+=Ru9e7+DiYo(yb6Tz(9goGXXcg1xgZ9 zyM*pS0S8${Rl=0y*-8EYt8sTOuR{=P{fZY{Kaku17HRcbV;I4}8NN}LFibJ_4>Cv^$JKBNg0W_6p4CF?%q7=3 zN}>q=OEu?c^AF~kbkVmuQ=U@l%naB$NGliR&g)$2cRE-yyCR^V43=dnHF}25Db;Yk zmTDc)HstY8MN%Aa6iQ;U6^$U^BVzEJ4?!p}$yMl+jO9Q~Dp<@>RO5m~JF(jpGgq-A& zWZ|$t9kcej0U{aYSBB#N)@J%Ut87{zU{D%HnS$KEBqp#Jr6xdeutyvVYEbp~01W+&U*-=m_&?a36sMhwFQDo6g^Oz(TyI~{Rn!!o ztLMq=uEeDC+pbQ3^ZVB`CjRVgV%%WT8Fg7|4kBoqL_k_Jby+NilprXCBf7jwb3|<* zID3Wz0XX_CU*{u-Fdo2*^o~W)G9?fe|I7;(=77?C_eiry1{BFIIj487`3f|z zDEg!wM$#HqyEUx1W>vU1ImQ21>y&q1iZEGK(Ryx)YNocI{}0FE1ce|J#xWR5!EH91 zfz9CvxLgM_bFz3zh8d% zbLG|(Z$AAwaP{lrO($lp*t>k&nYpX?FIabI;krXhHyvHE^~B{zKiBR&y>aikL#J;( zdHehA=Rcpn|26eYp1f%L^kuuJE!{PB$n^m$|Gmo3p>wk3YqnelaR!MB6u-wsuOJ5u-USj+blZQoCJeLvOn{dE8Lvy*?E zpZ??GoS#>h{Jg&M=dJa>?rs0|V9)Qzhkidj_WSAafB*jd|Noz1pn>8~7Dfh!5C$EP zLqKujz`nmBq^Y^3wXIbkxU0LHSw>X0Jw#4YLY!MfSe0L1QBH2+q(zIH6uL~c^qIAF zELg<&7cSYnWvfO|V1U1$uaCEvr-z%yB&A?I(;iDhV-}%Jt#ZMZ!F@bzY+S6oiWj!t zfAH|pW)1geZZ1v^_I9>5)>f0Ay1P0%zIku;>qt9aPmdZ)&VmQI7dkZ6V^(Z1WOd_` zWZ-bo(C~=j7FTDB*?q97ja5iQT~kUxp@EHwQ%J#r!AocbpF#4e7Rz3i6n%gZl)59LtvU{FwU8Z1B0(^bMU5zn+9H<8WR#R7GiC;p&`l5_xZ_s$ zT3fq_h9FiWpw`xB6BjL! zBK}|us6#=C+w69`&1NetElo+OC@wDU=;*LmS^%wUYisN7?gq_H;7A6}W>DV%oK0O_ zUErY$)VKg$+u7L(=qqVQ9s~M%kEz*Ya-y`Z$I{Z1`KUVebPcVurJe(h&7jEz?zpm3 zDw>%slk*reT3U|Nx&(VOa5jL(MnIQ$80!Fitun<9=%e>&9iSh8^2H1c)Vr9mjn#9v zy}ccjlyzDj1INi~lM@t`g={Imno?Z+$=Ne2|Y$3kXf%YkTSCzMl`q@lQDDF&4VE~gvyY^QS1i9=2YND3<}}$ zgHe7c9|{$41tM`+SXdAwIIn@&r<;l;sc#gBe6HX)#cUIoLo3_A)3j5;bZGN{bsHmJw0onUox6 zl>S|Up6H`BkX&~;Tol*y%m~2~aQSRWy+D=fzoB}4ADW~RuxEPzm6%Mj5Ew53Bk@cl ziZSp&HWeXL7%_yxjY&AJ>-~xg({TzX({Tb)B!)msv<3}sBHd_}N)~4zDa3$caY{MN z#B;S;jVx3mQiMpOL<*%?ED$K8qa=K#M8TIRqQ#0i3aO+wR*9pTddxue#%i9$iu;Xa z8$nMnnU$DPyBgC(8*x44E?B1RUyGn$zNfL8{Ub%ef;uoJ^`0V_-vlZoKXB?+beR{I=M2WrFcKle; z(N8}9=))r)ynpz;L+>6uuz%m)J-gr8wR6YzZG~I6Y~HkS!}^q-hS)N zH(t-Om`$rQDbl!#zzup`#%tR2l`Aj}sz%aYU7oru<&~G0E?JzMl$fw+Vf+Hs{CRWZ zVq>D`C>67#B4;ecIG1lLO&N(8LMjUwD4p*nlzq zqy0vW95H;@&>_$H4j$y=J&-fN%hLmZN$mre5d}f)t;62d!28x3G-qw@y1aaA!TJpw zH=!O|3%4OV5UZzp&)$7|cIEF*^Pj~++VczbydKW8l{Ok3-}E;k^8h{P`W3Wglg z6=tv6>cNpu&$U-Z&L12&@x%_l+yblTc<-S}R(s^AqS>A~19$ozs)~<^-9BTApAVS% E7fdjV-~a#s diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js deleted file mode 100644 index ecaa195dc2..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js +++ /dev/null @@ -1,130 +0,0 @@ -var umbModuleToInsertAlias; - - -function umbMakeModulesSortable() { - - if (jQuery('.umbModuleContainer').length > 0) { - jQuery('.umbModuleContainer').sortable({ - connectWith: '.umbModuleContainer', - items: '.umbModule', - stop: function (event, ui) { - - UmbracoCommunicator.SendClientMessage("movemodule", ui.item.attr('id') + ";" + ui.item.parent().attr('id') + ";" + jQuery('.umbModule', ui.item.parent()).index(ui.item)); - } - }); - } - -} - -function umbSelectModule(alias,sender) { - jQuery('#modules').hide(); - jQuery('#moduleSelect').show(); - umbShowModuleContainerSelectors(jQuery('span', sender).html()); - umbModuleToInsertAlias = alias; - - jQuery('.selectedModule').html(jQuery('span',sender).html()); - -} -function umbInstallModuleAndGetAlias(guid,name,sender) { - - jQuery('#modules').hide(); - jQuery('.selectedModule').html(name); - jQuery("#installingModule").show(); - - jQuery.post(umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx?guid=" + guid + "&name=" + name, - function (data) { - - if (data == "error") { - - } - else { - jQuery("#installingModule").hide(); - jQuery('#moduleSelect').show(); - umbShowModuleContainerSelectors(jQuery('span', sender).html()); - umbModuleToInsertAlias = data; - - jQuery(sender).attr("onclick", ""); - - jQuery(sender).click(function () { - umbSelectModule(data, this); - return false; - }); - } - - - }); - -} -function umbShowModuleSelection() { - - umbRemoveModuleContainerSelectors(); - - jQuery("#moduleSelect").hide(); - jQuery("#modules").show(); - - jQuery(".ModuleSelector").show(); - -} - -function umbShowModuleContainerSelectors(moduleName) { - - jQuery(".umbModuleContainer").each(function () { - - if (jQuery(this).children().size() > 0) { - jQuery(this).prepend("
    Insert module here
    "); - } - - jQuery(this).append("
    Insert module here
    "); - - }); - - jQuery(".umbModuleContainerSelector").click(function () { - - jQuery(".ModuleSelector").hide(); - Umbraco.Controls.ModalWindow().open(umbCurrentUmbracoDir + '/LiveEditing/Modules/SkinModule/ModuleInjector.aspx?macroAlias=' + umbModuleToInsertAlias + '&target=' + jQuery(this).parent().attr('id') + "&type=" + jQuery(this).attr('rel'), 'Insert ' + moduleName + ' module', true, 550, 550, 50, 0, ['.modalbuton'], null); - - }); -} - -function umbRemoveModuleContainerSelectors() { - jQuery(".umbModuleContainerSelector").remove(); -} - -function umbInsertModule(container,macro,type) { - umbRemoveModuleContainerSelectors(); - - var working = "
    Inserting module...
    "; - - if (type == "append") { - jQuery("#" + container).append(working); - } else { - jQuery("#" + container).prepend(working); - } - - var moduleguid = guid(); - - - - UmbracoCommunicator.SendClientMessage("injectmodule", container + ";" + "
    " + macro + "
    ;" + type); - - //need to lose these replace calls - - jQuery.post(umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx?tag=" + macro.replace('>', '').replace('<', '').replace('', '') + "&umbPageID=" + umbCurrentPageId, - function (data) { - jQuery(".umbModuleContainerPlaceHolder").html("
    " + data + "
    ;"); - - UmbSpeechBubble.ShowMessage("Info", "Module", "Module inserted"); - }); - - } - - - function S4() { - return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); - } - function guid() { - return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4()); - } - - //startup stuff - umbMakeModulesSortable(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js deleted file mode 100644 index f21e5aacd0..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js +++ /dev/null @@ -1 +0,0 @@ -ShowSkinModule(); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js deleted file mode 100644 index 4df5f81ad1..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/disableInstallButtonsOnClick.js +++ /dev/null @@ -1,8 +0,0 @@ -jQuery('.selectskin').click(function () { - - jQuery('#skinupdateinprogress').show(); - - jQuery('#skins').hide(); - - jQuery('#localSkinsContainer').hide(); -}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js deleted file mode 100644 index 4a6e407296..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js +++ /dev/null @@ -1,22 +0,0 @@ -var activecolorpicker; - -jQuery('input.skinningcolorpicker').ColorPicker({ - onSubmit: function (hsb, hex, rgb, el) { - jQuery(el).val('#' + hex); - jQuery(el).ColorPickerHide(); - jQuery(el).trigger('change'); - }, - onBeforeShow: function () { - activecolorpicker = this; - jQuery(this).ColorPickerSetColor(this.value); - }, - onChange: function (hsb, hex, rgb) { - - jQuery(activecolorpicker).val('#' + hex); - jQuery(activecolorpicker).trigger('change'); - } -}) -.bind('keyup', function () { - jQuery(this).ColorPickerSetColor(this.value); -}); - diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js deleted file mode 100644 index 691a6b5001..0000000000 --- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/js/initslider.js +++ /dev/null @@ -1,19 +0,0 @@ -jQuery(".skinningslider").each(function () { - - var vals = jQuery(this).attr("rel").split(","); - - var minimum = vals[0]; - var maximum = vals[1]; - var initial = vals[2]; - var ratio = vals[3] - var target = vals[4]; - - jQuery(this).slider({ - change: function (event, ui) { if (ratio != "") { jQuery("#" + target).val(ui.value / ratio); } else { jQuery("#" + target).val(ui.value); } jQuery("#" + target).trigger("change"); }, - slide: function (event, ui) { if (ratio != "") { jQuery("#" + target).val(ui.value / ratio); } else { jQuery("#" + target).val(ui.value); } jQuery("#" + target).trigger("change"); }, - min: minimum, - max: maximum, - value: initial - }); - -}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/skin.png deleted file mode 100644 index ea3f06e5a688563c9425dcaebdcd355873bedbb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3764 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 mnOym+v^o6$4|3zce-8lTDp?-_2ub$<0000 - - - - - - Untitled Page - - -
    -
    - -
    -
    - - diff --git a/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css b/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css deleted file mode 100644 index fa189266ea..0000000000 --- a/src/Umbraco.Web.UI/umbraco/css/umbLiveEditing.css +++ /dev/null @@ -1,14 +0,0 @@ -.umbEditItem:hover { - border: 1px dotted orange; - padding: 5px; -} - -.umbLiveEditingToggleButton -{ - display: none; -} - -.umbLiveEditingCancelButton -{ - margin-left: 10px; -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs index d7298d09a1..af31f42143 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs @@ -13,10 +13,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages protected void Page_Load(object sender, EventArgs e) { - if (!global::umbraco.cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) - ShowStarterKits(); - else - ShowSkins((Guid)global::umbraco.cms.businesslogic.skinning.Skinning.StarterKitGuid()); + ShowStarterKits(); } private void ShowStarterKits() @@ -40,22 +37,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages StarterKitInstalled.Visible = false; } - - public void ShowSkins(Guid starterKitGuid) - { - - var ctrl = (LoadStarterKitDesigns)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx"); - ctrl.ID = "StarterKitDesigns"; - - ctrl.StarterKitGuid = starterKitGuid; - ctrl.StarterKitDesignInstalled += CtrlStarterKitDesignInstalled; - ph_skins.Controls.Add(ctrl); - - StarterKitNotInstalled.Visible = false; - StarterKitInstalled.Visible = true; - - } - + void StarterkitsctrlStarterKitInstalled() { StarterKitNotInstalled.Visible = false; @@ -65,13 +47,5 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages } - void CtrlStarterKitDesignInstalled() - { - StarterKitNotInstalled.Visible = false; - StarterKitInstalled.Visible = false; - - installationCompleted.Visible = true; - } - } } \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx deleted file mode 100644 index 829ba939ef..0000000000 --- a/src/Umbraco.Web.UI/umbraco/dialogs/TemplateSkinning.aspx +++ /dev/null @@ -1,57 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="TemplateSkinning.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.TemplateSkinning" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> - - - - - - - Download more skins - - - - -
    - - - - - or Rollback current skin - - -     -     - - - -
    - - -
      - - -
    • - - <%# ((Skin)Container.DataItem).Text %> - - <%# ((Skin)Container.DataItem).Text %> - -
      - - -
      • -       - - -
    - -     - -
    - -     - -     diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js index 3ff3e7beec..1b0acc0150 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js +++ b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js @@ -270,12 +270,6 @@ Umbraco.Application.Actions = function () { } }, - actionLiveEdit: function () { - /// - - window.open("canvas.aspx?redir=/" + UmbClientMgr.mainTree().getActionNode().nodeId + ".aspx", "liveediting"); - }, - actionNew: function () { /// Show the create new modal overlay var actionNode = UmbClientMgr.mainTree().getActionNode(); diff --git a/src/Umbraco.Web.UI/umbraco_client/tinymce3/themes/umbraco/editor_template_src.js b/src/Umbraco.Web.UI/umbraco_client/tinymce3/themes/umbraco/editor_template_src.js index 98a1ed21ac..6516bc2f73 100644 --- a/src/Umbraco.Web.UI/umbraco_client/tinymce3/themes/umbraco/editor_template_src.js +++ b/src/Umbraco.Web.UI/umbraco_client/tinymce3/themes/umbraco/editor_template_src.js @@ -843,24 +843,11 @@ }); */ - if (jQuery("#LiveEditingToolbar")) { - // NH: Live editing hack for empty div in IE - if (jQuery.browser.msie) { - var emptyDiv = jQuery("#" + ed.getParam("umbraco_toolbar_id", "*")).prev(); - if (emptyDiv.get(0).tagName == "DIV" && emptyDiv.html() == "") { - emptyDiv.hide(); - } - } - - t._addToolbars(etb, o); - DOM.show(DOM.get(ed.id + '_external')); - } else { - jQuery(document).ready(function () { - t._addToolbars(etb, o); - DOM.show(DOM.get(ed.id + '_external')); - }); - } - + jQuery(document).ready(function () { + t._addToolbars(etb, o); + DOM.show(DOM.get(ed.id + '_external')); + }); + ed.onMouseUp.add(function () { jQuery(".tinymceMenuBar").hide(); jQuery("#" + ed.id + "_external").parent().show(); diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs index 11946fedd5..2c0c8b1176 100644 --- a/src/Umbraco.Web/Security/WebSecurity.cs +++ b/src/Umbraco.Web/Security/WebSecurity.cs @@ -306,7 +306,7 @@ namespace Umbraco.Web.Security var user = CurrentUser; // Check for console access - if (user.IsLockedOut || (user.NoConsole && GlobalSettings.RequestIsInUmbracoApplication(_httpContext) && GlobalSettings.RequestIsLiveEditRedirector(_httpContext) == false)) + if (user.IsLockedOut || (user.NoConsole && GlobalSettings.RequestIsInUmbracoApplication(_httpContext))) { if (throwExceptions) throw new ArgumentException("You have no priviledges to the umbraco console. Please contact your administrator"); return ValidateRequestAttempt.FailedNoPrivileges; diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index 55fd9e6f1f..56ba066f2d 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -272,13 +272,7 @@ namespace Umbraco.Web.Trees return Attempt.Succeed( new LegacyUrlAction( "dialogs/assignDomain2.aspx?id=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks, - ui.GetText("actions", "assignDomain"))); - case "UmbClientMgr.appActions().actionLiveEdit()": - return Attempt.Succeed( - new LegacyUrlAction( - "canvas.aspx?redir=/" + nodeId + ".aspx", - "", - ActionUrlMethod.BlankWindow)); + ui.GetText("actions", "assignDomain"))); case "UmbClientMgr.appActions().actionSendToTranslate()": return Attempt.Succeed( new LegacyUrlAction( diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 12a6f1dc7d..4f81de58e5 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1066,13 +1066,6 @@ SettingsDashboardVideos.ascx - - Applyskin.ascx - ASPXCodeBehind - - - Applyskin.ascx - StartupDashboardIntro.ascx @@ -1110,13 +1103,6 @@ Preview.aspx - - TemplateSkinning.aspx - ASPXCodeBehind - - - TemplateSkinning.aspx - MemberSearch.ascx ASPXCodeBehind @@ -1864,14 +1850,12 @@ - ASPXCodeBehind - ASPXCodeBehind diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index c25e446fa3..4935886e9a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -174,9 +174,6 @@ namespace umbraco treeElement.SetAttribute("text", ui.Text("treeHeaders", "installStarterKit")); - if (cms.businesslogic.skinning.Skinning.IsStarterKitInstalled()) - treeElement.SetAttribute("text", ui.Text("treeHeaders", "installSkin")); - break; default: diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index bde3301b46..b313b200ac 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -27,7 +27,7 @@ using umbraco.cms.businesslogic.template; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; -using umbraco.cms.businesslogic.skinning; + namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx deleted file mode 100644 index 6f336980ce..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx +++ /dev/null @@ -1,9 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Applyskin.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.Settings.Applyskin" %> - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs deleted file mode 100644 index 458293c2a1..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using umbraco.cms.businesslogic.skinning; -using umbraco.cms.businesslogic.template; - -namespace umbraco.presentation.umbraco.dashboard.Settings -{ - public partial class Applyskin : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) - { - - skinpicker.Items.Add("Choose..."); - foreach (Skin s in Skinning.GetAllSkins()) - { - skinpicker.Items.Add( new ListItem(s.Name, s.Alias)); - } - } - - protected void apply(object sender, EventArgs e) - { - if (skinpicker.SelectedIndex > 0) - { - Skin s = Skin.CreateFromAlias(skinpicker.SelectedValue); - Skinning.ActivateAsCurrentSkin(s); - } - } - - protected void rollback(object sender, EventArgs e) - { - Template t = Template.GetByAlias("RunwayHomepage"); - Skinning.RollbackSkin(t.Id); - } - - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs deleted file mode 100644 index c9d7cd1b76..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/Settings/Applyskin.ascx.designer.cs +++ /dev/null @@ -1,42 +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.presentation.umbraco.dashboard.Settings { - - - public partial class Applyskin { - - /// - /// skinpicker control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList skinpicker; - - /// - /// bt_apply control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_apply; - - /// - /// bt_rollback control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_rollback; - } -} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx deleted file mode 100644 index 829ba939ef..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx +++ /dev/null @@ -1,57 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="TemplateSkinning.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.TemplateSkinning" %> -<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %> - - - - - - - Download more skins - - - - -
    - - - - - or Rollback current skin - - -     -     - - - -
    - - -
      - - -
    • - - <%# ((Skin)Container.DataItem).Text %> - - <%# ((Skin)Container.DataItem).Text %> - -
      - - -
      • -       - - -
    - -     - -
    - -     - -     diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs deleted file mode 100644 index 78c6ef69f6..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.cs +++ /dev/null @@ -1,190 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Umbraco.Core.Logging; -using umbraco.BusinessLogic; -using umbraco.cms.businesslogic.skinning; -using umbraco.cms.businesslogic.template; -using umbraco.cms.businesslogic; - -namespace umbraco.presentation.umbraco.dialogs -{ - public partial class TemplateSkinning : BasePages.UmbracoEnsuredPage - { - private int _templateId = 0; - - private readonly cms.businesslogic.packager.repositories.Repository _repo; - private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66"; - - public TemplateSkinning() - { - CurrentApp = DefaultApps.settings.ToString(); - _repo = cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid); - - if (_repo == null) - { - throw new InvalidOperationException("Could not find repository with id " + RepoGuid); - } - } - - protected void Page_Load(object sender, EventArgs e) - { - _templateId = int.Parse(Request["id"]); - var t = new Template(_templateId); - - if (Skinning.StarterKitGuid(_templateId).HasValue) - { - p_apply.Visible = true; - - var currentSkin = Skinning.GetCurrentSkinAlias(_templateId); - var templateRoot = FindTemplateRoot(t); - - dd_skins.Items.Add("Choose..."); - foreach (var kvp in Skinning.AllowedSkins(templateRoot)) - { - var li = new ListItem(kvp.Value, kvp.Key); - if (kvp.Key == currentSkin) - li.Selected = true; - - dd_skins.Items.Add(li); - } - - if (!string.IsNullOrEmpty(Skinning.GetCurrentSkinAlias(_templateId))) - { - ph_rollback.Visible = true; - } - } - } - - private int FindTemplateRoot(CMSNode t) - { - if (t.ParentId < 0) - return t.Id; - return FindTemplateRoot(t.Parent); - } - - protected void openRepo(object sender, EventArgs e) { - - var g = Skinning.StarterKitGuid(_templateId); - - - if (g == null || !Skinning.HasAvailableSkins(_templateId)) - { - bt_repo.Visible = false; - } - else - { - if (_repo.HasConnection()) - { - try - { - rep_starterKitDesigns.DataSource = _repo.Webservice.Skins(g.ToString()); - rep_starterKitDesigns.DataBind(); - } - catch (Exception ex) - { - LogHelper.Error("An error occurred", ex); - - //ShowConnectionError(); - } - } - } - - p_apply.Visible = false; - p_download.Visible = true; - - } - - protected void SelectStarterKitDesign(object sender, EventArgs e) - { - if (((Button)sender).CommandName == "apply") - { - var s = Skin.CreateFromName(((Button)sender).CommandArgument); - Skinning.ActivateAsCurrentSkin(s); - - Page.Response.Redirect(library.NiceUrl(int.Parse(UmbracoContext.Current.PageId.ToString()))); - } - else if (((Button)sender).CommandName == "remove") - { - var n = NodeFactory.Node.GetCurrent(); - - var t = new Template(n.template); - Skinning.RollbackSkin(t.Id); - - Page.Response.Redirect(library.NiceUrl(int.Parse(UmbracoContext.Current.PageId.ToString()))); - } - else - { - - var kitGuid = new Guid(((Button)sender).CommandArgument); - - if (_repo.HasConnection()) - { - var p = new cms.businesslogic.packager.Installer(); - - var tempFile = p.Import(_repo.fetch(kitGuid.ToString())); - p.LoadConfig(tempFile); - var pId = p.CreateManifest(tempFile, kitGuid.ToString(), RepoGuid); - - p.InstallFiles(pId, tempFile); - p.InstallBusinessLogic(pId, tempFile); - p.InstallCleanUp(pId, tempFile); - - //NOTE: This seems excessive to have to re-load all content from the database here!? - library.RefreshContent(); - - if (Skinning.GetAllSkins().Count > 0) - { - Skinning.ActivateAsCurrentSkin(Skinning.GetAllSkins()[0]); - } - - - Page.Response.Redirect(library.NiceUrl(int.Parse(UmbracoContext.Current.PageId.ToString()))); - } - } - } - - protected void apply(object sender, EventArgs e) { - - if (dd_skins.SelectedIndex > 0) - { - var s = Skin.CreateFromAlias(dd_skins.SelectedValue); - Skinning.ActivateAsCurrentSkin(s); - } - - } - protected void rollback(object sender, EventArgs e) { - - Skinning.RollbackSkin(_templateId); - } - - protected void rep_starterKitDesigns_ItemDataBound(object sender, RepeaterItemEventArgs e) - { - if (e.Item.DataItem != null) - { - var s = (cms.businesslogic.packager.repositories.Skin)e.Item.DataItem; - - if (Skinning.IsSkinInstalled(s.RepoGuid)) - { - var inst = (Button)e.Item.FindControl("Button1"); - inst.Text = "Apply (already downloaded)"; - inst.CommandName = "apply"; - inst.CommandArgument = s.Text; - - } - - if (Skin.CreateFromAlias(Skinning.GetCurrentSkinAlias(_templateId)).Name == s.Text) - { - var inst = (Button)e.Item.FindControl("Button1"); - inst.Text = "Rollback (active skin)"; - inst.CommandName = "remove"; - inst.CommandArgument = s.Text; - } - } - - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs deleted file mode 100644 index bf1ea07579..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/TemplateSkinning.aspx.designer.cs +++ /dev/null @@ -1,105 +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.presentation.umbraco.dialogs { - - - public partial class TemplateSkinning { - - /// - /// p_apply control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane p_apply; - - /// - /// PropertyPanel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel PropertyPanel1; - - /// - /// dd_skins control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList dd_skins; - - /// - /// bt_repo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton bt_repo; - - /// - /// PropertyPanel2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.PropertyPanel PropertyPanel2; - - /// - /// Button1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button1; - - /// - /// ph_rollback control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_rollback; - - /// - /// lb_rollback control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lb_rollback; - - /// - /// p_download control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane p_download; - - /// - /// rep_starterKitDesigns control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Repeater rep_starterKitDesigns; - } -} 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 f3a7b650a7..0b8a8f1e7f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Configuration; using Umbraco.Core.IO; using umbraco.BasePages; using umbraco.BusinessLogic; -using umbraco.cms.businesslogic.skinning; + using umbraco.cms.businesslogic.template; using umbraco.cms.presentation.Trees; using umbraco.DataLayer; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index 8a30dfe1ee..6d0465f693 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -120,20 +120,6 @@ namespace umbraco.presentation.templateControls set { ViewState["DebugMode"] = value; } } - /// - /// Gets or sets a value indicating whether Live Editing is disabled for this field. - /// - /// true if you manually wish to disable Live Editing for this field; otherwise, false (default is false). - [Bindable(true)] - [Category("Umbraco")] - [DefaultValue("")] - [Localizable(true)] - public bool LiveEditingDisabled - { - get { return ((ViewState["LiveEditingDisabled"] == null) ? false : (bool)ViewState["LiveEditingDisabled"]); } - set { ViewState["LiveEditingDisabled"] = value; } - } - public ItemRenderer Renderer { get; set; } #endregion @@ -148,24 +134,7 @@ namespace umbraco.presentation.templateControls { get { return m_ItemId; } } - - /// - /// Gets a value indicating whether this control can be used in Live Editing mode. - /// Checks whether live editing has not been disabled, - /// the control is inside a form tag, - /// the field is editable - /// and the user has sufficient permissions. - /// - /// true if live editing is useLiveEditing; otherwise, false. - public bool CanUseLiveEditing - { - get - { - return !LiveEditingDisabled && IsInsideFormTag() - && FieldSupportsLiveEditing() && FieldEditableWithUserPermissions(); - } - } - + /// /// Gets the Umbraco page elements. /// @@ -186,12 +155,7 @@ namespace umbraco.presentation.templateControls /// Initializes a new instance of the class. ///
public Item() - { - // create page unique ID for this item - object lastItemId = HttpContext.Current.Items["LiveEditing_LastItemId"]; - m_ItemId = (lastItemId != null ? (int)lastItemId + 1 : 1); - HttpContext.Current.Items["LiveEditing_LastItemId"] = m_ItemId; - + { Renderer = ItemRenderer.Instance; } @@ -302,23 +266,7 @@ namespace umbraco.presentation.templateControls #endregion #region Field Information Functions - // 27/08/2008 Ruben Verborgh: This functionality should really be inside some kind of super Field class, - // which could be anything from a property to a dictionary item. - // However, I don't think we should do this in the current Umbraco generation. - /// - /// Gets a value indicating whether Live Editing is useLiveEditing on this field. - /// Certain functionalities of the item field makes it hard to - /// support Live Editing, like dictionary items and recursive values. - /// - /// - /// true if Live Editing is useLiveEditing; otherwise, false. - /// - protected virtual bool FieldSupportsLiveEditing() - { - return !(FieldIsRercursive() || FieldIsDictionaryItem()); - } - /// /// Determines whether the field is a dictionary item. /// diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs index c0171d7d9a..d30d5aa506 100644 --- a/src/umbraco.businesslogic/BasePages/BasePage.cs +++ b/src/umbraco.businesslogic/BasePages/BasePage.cs @@ -146,7 +146,7 @@ namespace umbraco.BasePages _user = BusinessLogic.User.GetUser(GetUserId("")); // Check for console access - if (_user.Disabled || (_user.NoConsole && GlobalSettings.RequestIsInUmbracoApplication(Context) && GlobalSettings.RequestIsLiveEditRedirector(Context) == false)) + if (_user.Disabled || (_user.NoConsole && GlobalSettings.RequestIsInUmbracoApplication(Context))) { throw new ArgumentException("You have no priviledges to the umbraco console. Please contact your administrator"); } diff --git a/src/umbraco.businesslogic/GlobalSettings.cs b/src/umbraco.businesslogic/GlobalSettings.cs index 0c8f598ec1..2e5ec00903 100644 --- a/src/umbraco.businesslogic/GlobalSettings.cs +++ b/src/umbraco.businesslogic/GlobalSettings.cs @@ -329,12 +329,7 @@ namespace umbraco { return Umbraco.Core.Configuration.GlobalSettings.RequestIsInUmbracoApplication(context); } - - public static bool RequestIsLiveEditRedirector(HttpContext context) - { - return Umbraco.Core.Configuration.GlobalSettings.RequestIsLiveEditRedirector(context); - } - + /// /// Gets a value indicating whether umbraco should force a secure (https) connection to the backoffice. /// diff --git a/src/umbraco.businesslogic/IO/SystemFiles.cs b/src/umbraco.businesslogic/IO/SystemFiles.cs index 874f792cf4..85d2c3d766 100644 --- a/src/umbraco.businesslogic/IO/SystemFiles.cs +++ b/src/umbraco.businesslogic/IO/SystemFiles.cs @@ -38,10 +38,6 @@ namespace umbraco.IO get { return Umbraco.Core.IO.SystemFiles.DashboardConfig; } } - public static string SkinningXml - { - get { return Umbraco.Core.IO.SystemFiles.SkinningXml; } - } public static string NotFoundhandlersConfig { diff --git a/src/umbraco.cms/businesslogic/datatype/ClientDependencyAttribute.cs b/src/umbraco.cms/businesslogic/datatype/ClientDependencyAttribute.cs deleted file mode 100644 index ff0ee1d577..0000000000 --- a/src/umbraco.cms/businesslogic/datatype/ClientDependencyAttribute.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System; -using ClientDependency.Core.Controls; - -namespace umbraco.cms.businesslogic.datatype -{ - /// - /// This attribute is used for data types that uses client assets like Javascript and CSS for liveediting. - /// The Live Editing feature in umbraco will look for this attribute and preload all dependencies to the page - /// to ensure that all client events and assets gets loaded - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - [Obsolete("Use the new ClientDependency framework. Priority and InvokeJavascriptMethodOnLoad are ignored. Documentation here: http://clientdependency.codeplex.com/documentation")] - public class ClientDependencyAttribute : Attribute - { - /// - /// Gets or sets the priority. - /// - /// The priority. - [Obsolete("This property is ignored")] - public int Priority { get; set; } - - /// - /// Gets or sets the file path. - /// - /// The file path. - public string FilePath { get; set; } - - /// - /// Gets or sets the type of the dependency. - /// - /// The type of the dependency. - public ClientDependencyType DependencyType { get; set; } - - /// - /// Gets or sets the name of an optional javascript method that should be called on load. - /// - /// The name of the method. - [Obsolete("This property is ignored")] - public string InvokeJavascriptMethodOnLoad { get; set; } - - /// - /// Initializes a new instance of the class. - /// - /// The priority. - /// Type of the dependency. - /// The file path to the dependency. - public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath) - : this(priority, dependencyType, filePath, false, string.Empty) - { } - - /// - /// Initializes a new instance of the class. - /// - /// The priority. - /// Type of the dependency. - /// The file path to the dependency. - /// The name of the Javascript method to invoke when the dependency is loaded. - public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, string invokeJavascriptMethodOnLoad) - : this(priority, dependencyType, filePath, false, invokeJavascriptMethodOnLoad) - { } - - /// - /// Initializes a new instance of the class. - /// - /// The priority. - /// Type of the dependency. - /// The file path to the dependency. - /// if set to true the current umbraco path will be prefixed to the filePath. - public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath) - : this(priority, dependencyType, filePath, appendUmbracoPath, String.Empty) - { } - - /// - /// Initializes a new instance of the class. - /// - /// The priority. - /// Type of the dependency. - /// The file path to the dependency. - /// if set to true the current umbraco path will be prefixed to the filePath. - /// The name of the Javascript method to invoke when the dependency is loaded. - public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string filePath, bool appendUmbracoPath, string invokeJavascriptMethodOnLoad) - { - if (String.IsNullOrEmpty(filePath)) - throw new ArgumentException("filePath"); - - Priority = priority; - FilePath = appendUmbracoPath ? GlobalSettings.Path + "/" + filePath : filePath; - DependencyType = dependencyType; - InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? String.Empty; - - ClientDependencyLoader.Instance.RegisterDependency(FilePath, DependencyType == ClientDependencyType.Css ? ClientDependency.Core.ClientDependencyType.Css : ClientDependency.Core.ClientDependencyType.Javascript); - } - } - - /// - /// The type of client file - /// - public enum ClientDependencyType - { - Javascript, Css - } -} \ No newline at end of file diff --git a/src/umbraco.cms/businesslogic/skinning/CssVariable.cs b/src/umbraco.cms/businesslogic/skinning/CssVariable.cs deleted file mode 100644 index 258892b4d9..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/CssVariable.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; - -namespace umbraco.cms.businesslogic.skinning -{ - public class CssVariable - { - public string Name { get; set; } - public string DefaultValue { get; set; } - public List Properties { get; set; } - - - - public static CssVariable CreateFromXmlNode(XmlNode node) - { - CssVariable var = new CssVariable(); - - if (node.Attributes["name"] != null) - var.Name = node.Attributes["name"].Value; - - var.DefaultValue = node.InnerText; - - return var; - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/CssVariableProperty.cs b/src/umbraco.cms/businesslogic/skinning/CssVariableProperty.cs deleted file mode 100644 index 5730a00b85..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/CssVariableProperty.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace umbraco.cms.businesslogic.skinning -{ - public class CssVariableProperty - { - public string Name { get; set; } - public List Selectors { get; set; } - - public CssVariableProperty(string name) - { - this.Name = name; - Selectors = new List(); - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/Dependency.cs b/src/umbraco.cms/businesslogic/skinning/Dependency.cs deleted file mode 100644 index f8c0c6db23..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/Dependency.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; -using System.Web; -using System.Reflection; -using Umbraco.Core.Logging; - -namespace umbraco.cms.businesslogic.skinning -{ - public class Dependency - { - public Dependency() - { - Tasks = new List(); - Properties = new Dictionary(); - } - - public static Dependency CreateFromXmlNode(XmlNode node) - { - Dependency d = new Dependency(); - - - - if (node.SelectSingleNode("Properties") != null) - { - foreach (XmlNode prop in node.SelectSingleNode("Properties").ChildNodes) - { - if(prop.Name != "Output" && prop.Name != "#comment") - d.Properties.Add(prop.Name, prop.InnerText); - } - } - - - if(node.Attributes["label"] != null) - d.Label = node.Attributes["label"].Value; - - if (node.Attributes["type"] != null) - { - - if (node.Attributes["assembly"] != null) - { - //custom dependency type - - //string assemblyFile = - // HttpContext.Current.Server.MapPath( - // String.Format("{0}/../bin/{1}.dll", - // GlobalSettings.Path, - // node.Attributes["assembly"].Value)); - - //Assembly customAssembly = Assembly.LoadFrom(assemblyFile); - - Assembly customAssembly = Assembly.Load(node.Attributes["assembly"].Value); - - d.DependencyType = (DependencyType)Activator.CreateInstance( - customAssembly.GetType(node.Attributes["type"].Value),d); - - foreach (var prop in d.Properties) - { - d.DependencyType.GetType().InvokeMember(prop.Key, System.Reflection.BindingFlags.SetProperty, null, d.DependencyType, new object[] { prop.Value }); - } - //d.DependencyType.Properties = d.Properties; - - } - else - { - //internal dependency type - - //string assemblyFile = - // HttpContext.Current.Server.MapPath( - // String.Format("{0}/../bin/{1}.dll", - // GlobalSettings.Path, - // "cms")); - - //Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile); - - Assembly defaultAssembly = Assembly.Load("cms"); - - d.DependencyType = (DependencyType)Activator.CreateInstance( - defaultAssembly.GetType( - string.Format( - "umbraco.cms.businesslogic.skinning.dependencies.{0}", - node.Attributes["type"].Value))); - - - foreach (var prop in d.Properties) - { - d.DependencyType.GetType().InvokeMember(prop.Key, System.Reflection.BindingFlags.SetProperty, null, d.DependencyType, new object[] { prop.Value }); - } - - //d.DependencyType.Properties = d.Properties; - } - - XmlNode outputNode = node.SelectSingleNode("Properties/Output"); - - if (outputNode != null) - { - d.DependencyType.Values.Add(outputNode.InnerText); - } - - if (node.Attributes["variable"] != null) - d.Variable = node.Attributes["variable"].Value; - } - - - - - foreach (XmlNode taskNode in node.SelectNodes("Tasks/Task")) - { - try - { - d.Tasks.Add(Task.CreateFromXmlNode(taskNode)); - } - catch (Exception ex) - { - LogHelper.Error("Failed to load task type " + (taskNode.Attributes["type"] != null ? taskNode.Attributes["type"].Value : string.Empty), ex); - } - } - - - return d; - } - - - public DependencyType DependencyType { get; set; } - - public string Label { get; set; } - - public Dictionary Properties {get; set;} - - public List Tasks { get; set; } - - public string Variable { get; set; } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/DependencyType.cs b/src/umbraco.cms/businesslogic/skinning/DependencyType.cs deleted file mode 100644 index 3f854d4fda..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/DependencyType.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; -using umbraco.interfaces.skinning; - -namespace umbraco.cms.businesslogic.skinning -{ - public abstract class DependencyType : ProviderBase, IDependencyType - { - public virtual WebControl Editor { get; set; } - public virtual List Values { get; set; } - - public virtual string CssVariablePreviewClientScript(string ControlClientId, string VariableClientId) - { - return string.Format( - @"jQuery('#{0}').bind('{2}', function() {{ - {3} = {1}; - PreviewCssVariables(); - }}); - - - //cancel support (not implemented yet) - jQuery('#cancelSkinCustomization').click(function () {{ - - }}); - - ", - ControlClientId, - this.ClientSideGetValueScript(), - this.ClientSideCssVariablePreviewEventType(), - VariableClientId); - } - - public virtual string ClientSideGetValueScript() - { - return string.Format( - "jQuery('#{0}').val()" - ,Editor.ClientID); - } - public virtual string ClientSidePreviewEventType() - { - return "change"; - } - - public virtual string ClientSideCssVariablePreviewEventType() - { - //should be something that doesn't execute at every change - return "change"; - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/EmbeddedCss.cs b/src/umbraco.cms/businesslogic/skinning/EmbeddedCss.cs deleted file mode 100644 index 7ccebf0caf..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/EmbeddedCss.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; - -namespace umbraco.cms.businesslogic.skinning -{ - public class EmbeddedCss - { - public string TargetFile { get; set; } - public List Variables { get; set; } - public string Content { get; set; } - - - public EmbeddedCss() - { - Variables = new List(); - } - - - public static EmbeddedCss CreateFromXmlNode(XmlNode node) - { - EmbeddedCss css = new EmbeddedCss(); - - if (node.Attributes["targetfile"] != null) - css.TargetFile = node.Attributes["targetfile"].Value; - - if (node.SelectSingleNode("Content") != null) - css.Content = node.SelectSingleNode("Content").InnerText; - - - foreach (XmlNode variableNode in node.SelectNodes("Variables/Variable")) - { - - css.Variables.Add(CssVariable.CreateFromXmlNode(variableNode)); - - } - - return css; - - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/Skin.cs b/src/umbraco.cms/businesslogic/skinning/Skin.cs deleted file mode 100644 index 82f493798f..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/Skin.cs +++ /dev/null @@ -1,344 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; -using System.IO; -using System.Xml.XPath; -using Umbraco.Core.Logging; -using umbraco.interfaces.skinning; - -namespace umbraco.cms.businesslogic.skinning -{ - public class Skin - { - public Skin() - { - - Dependencies = new List(); - - } - - public static Skin CreateFromFile(string filename) - { - XmlDocument manifest = new XmlDocument(); - - FileInfo f = new FileInfo(filename); - - if (f.Exists) - { - manifest.Load(filename); - - Skin s = Skin.CreateFromXmlNode(manifest.SelectSingleNode("//Skin")); - s.FullFileName = filename; - s.Alias = f.Directory.Name; - - return s; - } - else - return null; - - - } - - public static string GetSkinNameFromFile(string filename) - { - XmlDocument manifest = new XmlDocument(); - - FileInfo f = new FileInfo(filename); - - if (f.Exists) - { - manifest.Load(filename); - return manifest.SelectSingleNode("//Skin/Name").InnerText; - } - else - return null; - } - - public static Skin CreateFromXmlNode(XmlNode node) - { - Skin s = new Skin(); - - - if(node.SelectSingleNode("/Skin/Name") != null) - s.Name = node.SelectSingleNode("/Skin/Name").InnerText; - - if(node.SelectSingleNode("/Skin/Author") != null) - s.Author = node.SelectSingleNode("/Skin/Author").InnerText; - - if(node.SelectSingleNode("/Skin/Version") != null) - s.Version = node.SelectSingleNode("/Skin/Version").InnerText; - - if(node.SelectSingleNode("/Skin/Description") != null) - s.Description = node.SelectSingleNode("/Skin/Description").InnerText; - - - - if (node.SelectSingleNode("/Skin/AllowedRootTemplate") != null) - s.AllowedRootTemplate = node.SelectSingleNode("/Skin/AllowedRootTemplate").InnerText; - - - foreach (XmlNode depNode in node.SelectNodes("/Skin//Dependency")) - { - try - { - s.Dependencies.Add(Dependency.CreateFromXmlNode(depNode)); - } - catch (Exception ex) - { - LogHelper.Error("Failed to load dependency type " + (depNode.Attributes["type"] != null ? depNode.Attributes["type"].Value : string.Empty), ex); - } - } - - if (node.SelectSingleNode("/Skin/CSS") != null) - s.Css = EmbeddedCss.CreateFromXmlNode(node.SelectSingleNode("/Skin/CSS")); - - return s; - } - - public static Skin CreateFromAlias(string alias) - { - string manifest = Path.Combine(IO.IOHelper.MapPath( IO.SystemDirectories.Masterpages + "/" + alias), "skin.xml"); - return CreateFromFile(manifest); - } - - public static Skin CreateFromName(string name) - { - foreach (Skin s in Skinning.GetAllSkins()) - { - if (s.Name == name) - return s; - } - - return null; - } - public bool OverridesTemplates() - { - return (System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master").Count() > 0); - } - - public bool HasBackupFiles() - { - return System.IO.Directory.Exists( IO.IOHelper.MapPath(SkinBackupFolder) ); - } - - - public void SaveOutput() - { - - XmlDocument manifest = new XmlDocument(); - manifest.Load(FullFileName); - - int i = 1; - foreach (Dependency d in Dependencies) - { - if (d.DependencyType.Values.Count > 0) - { - XmlNode pNode = manifest.SelectSingleNode( - string.Format("/Skin/Dependencies/Dependency[{0}]/Properties", i.ToString())); - - - XmlNode outputNode = pNode.SelectSingleNode("./Output"); - - if (outputNode == null) - { - outputNode = manifest.CreateElement("Output"); - outputNode.InnerText = d.DependencyType.Values[0].ToString(); - pNode.AppendChild(outputNode); - } - else - { - outputNode.InnerText = d.DependencyType.Values[0].ToString(); - } - - - } - - i++; - } - - manifest.Save(FullFileName); - } - - public string FullFileName { get; set; } - - public string Name { get; set; } - - public string Author { get; set; } - public string Version { get; set; } - public string Description { get; set; } - - public string Alias { get; set; } - - - public string AllowedRootTemplate { get; set; } - - - public List Dependencies { get; set; } - - - - public EmbeddedCss Css { get; set; } - - public void RollbackDependencies() - { - - XmlDocument manifest = new XmlDocument(); - manifest.Load(FullFileName); - - //emtpy output tags - - foreach(XmlNode oNode in manifest.SelectNodes("/Skin/Dependencies/Dependency/Properties/Output")) - { - oNode.RemoveAll(); - } - - //execute rollback tasks - XmlNode hNode = manifest.SelectSingleNode("/Skin/History"); - - if (!(hNode == null || hNode.SelectNodes("Task").Count == 0)) - { - XPathNavigator navigator = manifest.CreateNavigator(); - XPathExpression expression = navigator.Compile("/Skin/History/Task"); - - expression.AddSort("@executed", XmlSortOrder.Descending, XmlCaseOrder.UpperFirst, - string.Empty, XmlDataType.Text); - - XPathNodeIterator iterator = navigator.Select(expression); - - foreach (XPathNavigator item in iterator) - { - Task t = Task.CreateFromXmlNode(((System.Xml.IHasXmlNode)item).GetNode()); - t.TaskType.RollBack(((System.Xml.IHasXmlNode)item).GetNode().SelectSingleNode("OriginalValue").InnerText); - } - - hNode.RemoveAll(); - - } - - manifest.Save(FullFileName); - } - - public void DeployTemplateFiles() - { - DeployTemplateFiles(IO.SystemDirectories.Masterpages); - } - - - public void DeployTemplateFiles(string folder) - { - string[] masterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master"); - - if (masterFiles.Count() > 0) - { - if (!System.IO.Directory.Exists(IO.IOHelper.MapPath(SkinBackupFolder))) - System.IO.Directory.CreateDirectory(IO.IOHelper.MapPath(SkinBackupFolder)); - - foreach (string master in masterFiles) - { - FileInfo fi = new FileInfo(master); - string original = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name); - string backup = Path.Combine(IO.IOHelper.MapPath(SkinBackupFolder), fi.Name); - - if (System.IO.File.Exists(original)) - System.IO.File.Copy(original, backup, true); - - System.IO.File.Copy(master, original, true); - } - } - } - - - public void RollbackTemplateFiles(){ - RollbackTemplateFiles(IO.SystemDirectories.Masterpages); - } - - public void RollbackTemplateFiles(string folder) - { - string[] masterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master"); - - //1. take the skin files back into skin folder to store the changes made - if (masterFiles.Count() > 0) - { - foreach (string master in masterFiles) - { - FileInfo fi = new FileInfo(master); - string inUse = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name); - - - if (System.IO.File.Exists(inUse)) - System.IO.File.Copy(inUse, master, true); - } - } - - - //2. copy the /backup files back to the masterpages to restore the templates to the way they were before the skin was applied - string[] backedUpmasterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinBackupFolder), "*.master"); - foreach (string backup in backedUpmasterFiles) - { - FileInfo fi = new FileInfo(backup); - string inUse = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name); - - System.IO.File.Copy(backup, inUse, true); - System.IO.File.Delete(backup); - } - - //3. put on some clothes - } - - public void ExecuteInstallTasks() - { - XmlDocument manifest = new XmlDocument(); - manifest.Load(FullFileName); - - foreach (XmlNode tNode in manifest.SelectNodes("/Skin/Install/Task")) - { - Task t = Task.CreateFromXmlNode(tNode); - TaskExecutionDetails details = t.TaskType.Execute(t.Value); - - if (details.TaskExecutionStatus == TaskExecutionStatus.Completed) - { - AddTaskHistoryNode( - t.TaskType.ToXml(details.OriginalValue, details.NewValue)); - } - - } - } - - public void AddTaskHistoryNode(XmlNode taskNode) - { - XmlDocument manifest = new XmlDocument(); - manifest.Load(FullFileName); - - XmlNode hNode = manifest.SelectSingleNode("/Skin/History"); - - if (hNode == null) - { - hNode = manifest.CreateElement("History"); - manifest.SelectSingleNode("/Skin").AppendChild(hNode); - } - - hNode.AppendChild(manifest.ImportNode(taskNode, true)); - - manifest.Save(FullFileName); - } - - public string SkinFolder - { - get - { - return IO.SystemDirectories.Masterpages + "/" + Alias; - } - } - - public string SkinBackupFolder - { - get - { - return SkinFolder + "/backup"; - } - } - - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/Skinning.cs b/src/umbraco.cms/businesslogic/skinning/Skinning.cs deleted file mode 100644 index 5d4cfd9f31..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/Skinning.cs +++ /dev/null @@ -1,374 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; -using System.IO; -using System.Collections; -using System.Web; -using System.Web.Caching; -using Umbraco.Core; -using Umbraco.Core.IO; -using umbraco.cms.businesslogic.web; -using umbraco.BusinessLogic; -using umbraco.cms.businesslogic.template; - -namespace umbraco.cms.businesslogic.skinning -{ - - //TODO: Convert the caching to use ApplicationContext.Current.ApplicationCache - - public class Skinning - { - static private readonly Hashtable CheckedPages = new Hashtable(); - static private XmlDocument _skinningXmlContent; - static private string _skinningXmlSource = IOHelper.MapPath(SystemFiles.SkinningXml, false); - - private const string Cachekey = "SkinnableTemplates"; - - private static void ClearCheckPages() - { - CheckedPages.Clear(); - } - - public static void RollbackSkin(int template) - { - string currentSkin = GetCurrentSkinAlias(template); - Skin skin = Skin.CreateFromAlias(currentSkin); - - if (skin != null) - { - skin.RollbackDependencies(); - - if (skin.OverridesTemplates()) - skin.RollbackTemplateFiles(); - - //else - // skin.RollbackDependencies(); - } - - RemoveSkin(template); - Save(); - } - - public static void ActivateAsCurrentSkin(Skin skin) - { - Template t = Template.GetByAlias(skin.AllowedRootTemplate); - ActivateAsCurrentSkin(t.Id, skin.Alias); - } - - public static void ActivateAsCurrentSkin(int template, string skinAlias) - { - //lookup template in skinning.config - string currentSkin = GetCurrentSkinAlias(template); - - //if different from current, and the template is skinned - if (currentSkin != skinAlias) - { - - //this will restore the files to the standard runway, as they looked before the skin was applied - if (currentSkin != string.Empty) - { - RollbackSkin(template); - } - - Skin newSkin = Skin.CreateFromAlias(skinAlias); - - if (newSkin.OverridesTemplates()) - newSkin.DeployTemplateFiles(); - - SetSkin(template, skinAlias); - - newSkin.ExecuteInstallTasks(); - - Save(); - } - } - - private static void Save() - { - var f = File.Open(_skinningXmlSource, FileMode.Create); - SkinXml.Save(f); - f.Close(); - } - - public static string GetCurrentSkinAlias(int templateID) - { - var x = (XmlElement)GetTemplate(templateID); - if (x != null && x.HasAttribute("alias") && !string.IsNullOrEmpty(x.Attributes["alias"].Value)) - return x.Attributes["alias"].Value; - - return string.Empty; - } - - private static void SetSkin(int templateId, string skinAlias) - { - var x = (XmlElement)GetTemplate(templateId); - if (x == null) - { - x = (XmlElement)_skinningXmlContent.CreateNode(XmlNodeType.Element, "skin", ""); - SkinXml.DocumentElement.AppendChild(x); - } - - x.SetAttribute("template", templateId.ToString()); - x.SetAttribute("alias", skinAlias); - Save(); - - ClearCheckPages(); - } - - private static void RemoveSkin(int templateId) - { - var x = (XmlElement)GetTemplate(templateId); - if (x != null) - { - x.ParentNode.RemoveChild(x); - Save(); - ClearCheckPages(); - } - } - - private static XmlNode GetTemplate(int templateId) - { - var x = SkinXml.SelectSingleNode("/skinning/skin [@template=" + templateId.ToString() + "]"); - return x; - } - - public static List GetAllSkins() - { - var skins = new List(); - - foreach (var dir in Directory.GetDirectories(IOHelper.MapPath(SystemDirectories.Masterpages))) - { - if (File.Exists(Path.Combine(dir, "skin.xml"))) - { - var s = Skin.CreateFromFile((Path.Combine(dir, "skin.xml"))); - s.Alias = new DirectoryInfo(dir).Name; - skins.Add(s); - } - } - return skins; - } - - - private static XmlDocument SkinXml - { - get - { - if (_skinningXmlContent == null) - { - if (_skinningXmlSource == null) - { - //if we pop it here it'll make for better stack traces ;) - _skinningXmlSource = IOHelper.MapPath(SystemFiles.SkinningXml, false); - } - - _skinningXmlContent = new XmlDocument(); - - if (!File.Exists(_skinningXmlSource)) - { - var f = File.Open(_skinningXmlSource, FileMode.Create); - var sw = new StreamWriter(f); - sw.WriteLine(""); - sw.Close(); - f.Close(); - } - _skinningXmlContent.Load(_skinningXmlSource); - } - return _skinningXmlContent; - } - } - - public static Dictionary> SkinnableTemplates() - { - var dts = (Dictionary>)HttpRuntime.Cache[Cachekey]; - if (dts == null) - dts = RegisterSkinnableTemplates(); - - return dts; - } - - //this is an pretty expensive operation, so we will cache the result... - private static Dictionary> RegisterSkinnableTemplates() - { - HttpRuntime.Cache.Remove(Cachekey); - - var allowedTemplates = new Dictionary>(); - - foreach (string dir in Directory.GetDirectories(IOHelper.MapPath(SystemDirectories.Masterpages))) - { - if (File.Exists(Path.Combine(dir, "skin.xml"))) - { - var manifest = new XmlDocument(); - manifest.Load(Path.Combine(dir, "skin.xml")); - - var name = XmlHelper.GetNodeValue(manifest.SelectSingleNode("/Skin/Name")); - var types = XmlHelper.GetNodeValue(manifest.SelectSingleNode("/Skin/AllowedRootTemplate")).Split(','); - var alias = new DirectoryInfo(dir).Name; - - //foreach allowed type, test if it is already there... - foreach (var t in types) - { - if (!allowedTemplates.ContainsKey(t)) - allowedTemplates.Add(t, new Dictionary()); - - if (!allowedTemplates[t].ContainsKey(alias)) - allowedTemplates[t].Add(alias, name); - } - } - } - HttpRuntime.Cache.Insert(Cachekey, allowedTemplates, new CacheDependency(IOHelper.MapPath(SystemDirectories.Masterpages))); - - return allowedTemplates; - } - - //Helpers for detecting what skins work with what document types - public static bool IsSkinnable(string templateAlias) - { - return SkinnableTemplates().ContainsKey(templateAlias); - } - - public static bool IsSkinnable(Template template) - { - return IsSkinnable(template.Alias); - } - - - public static Dictionary AllowedSkins(int templateID) - { - var template = new Template(templateID); - return AllowedSkins(template.Alias); - } - - public static Dictionary AllowedSkins(Template template) - { - return AllowedSkins(template.Alias); - } - - public static Dictionary AllowedSkins(string templateAlias) - { - if (IsSkinnable(templateAlias)) - { - return SkinnableTemplates()[templateAlias]; - } - else - return new Dictionary(); - } - - public static bool IsStarterKitInstalled() - { - foreach (var p in packager.InstalledPackage.GetAllInstalledPackages()) - { - if (p.Data.EnableSkins) - return true; - - } - return false; - } - - public static Guid? StarterKitGuid() - { - foreach (var p in packager.InstalledPackage.GetAllInstalledPackages()) - { - if (p.Data.EnableSkins) - return new Guid(p.Data.PackageGuid); - - } - return null; - } - - public static Guid? StarterKitGuid(int template) - { - string packageFile = IOHelper.MapPath(SystemDirectories.Packages) + "/installed/installedPackages.config"; - var installed = new XmlDocument(); - if (File.Exists(packageFile)) - { - installed.Load(packageFile); - - var starterKit = installed.SelectSingleNode( - string.Format("//package [@enableSkins = 'True' and @packageGuid != '' and contains(./templates, '{0}')]", template)); - - if (starterKit != null) - return new Guid(starterKit.Attributes["packageGuid"].Value); - } - - return null; - } - - public static bool HasAvailableSkins(int template) - { - var r = false; - - var g = StarterKitGuid(template); - - if (g != null) - { - try - { - var skinRepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66"; - - if (packager.InstalledPackage.GetByGuid(g.ToString()).Data.SkinRepoGuid != null && - packager.InstalledPackage.GetByGuid(g.ToString()).Data.SkinRepoGuid != Guid.Empty) - { - skinRepoGuid = packager.InstalledPackage.GetByGuid(g.ToString()).Data.SkinRepoGuid.ToString(); - } - - - var repo = packager.repositories.Repository.getByGuid(skinRepoGuid); - if (repo == null) - { - return false; - } - - r = repo.Webservice.Skins(g.ToString()).Length > 0; - } - catch { } - } - return r; - } - - public static bool IsSkinInstalled(Guid SkinGuid) - { - - return IsPackageInstalled(SkinGuid); - } - - public static bool IsPackageInstalled(Guid PackageGuid) - { - var installed = new XmlDocument(); - installed.Load(IOHelper.MapPath(SystemDirectories.Packages) + "/installed/installedPackages.config"); - - var packageNode = installed.SelectSingleNode( - string.Format("//package [@packageGuid = '{0}']", PackageGuid.ToString())); - - return packageNode != null; - } - - public static bool IsPackageInstalled(string Name) - { - var installed = new XmlDocument(); - installed.Load(IOHelper.MapPath(SystemDirectories.Packages) + "/installed/installedPackages.config"); - - var packageNode = installed.SelectSingleNode( - string.Format("//package [@name = '{0}']", Name)); - - return packageNode != null; - } - - public static string GetModuleAlias(string Name) - { - var installed = new XmlDocument(); - installed.Load(IOHelper.MapPath(SystemDirectories.Packages) + "/installed/installedPackages.config"); - - var packageNode = installed.SelectSingleNode( - string.Format("//package [@name = '{0}']", Name)); - - var macroNode = packageNode.SelectSingleNode(".//macros"); - - var m = new macro.Macro(Convert.ToInt32(macroNode.InnerText.Split(',')[0])); - - return m.Alias; - } - - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/Task.cs b/src/umbraco.cms/businesslogic/skinning/Task.cs deleted file mode 100644 index 653b6d6d2c..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/Task.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Xml; -using System.Web; -using System.Reflection; - -namespace umbraco.cms.businesslogic.skinning -{ - public class Task - { - public Task() - { - Properties = new Dictionary(); - } - - public static Task CreateFromXmlNode(XmlNode node) - { - Task t = new Task(); - - if (node.Attributes["type"] != null) - { - - if (node.Attributes["assembly"] != null) - { - //custom task type - - //string assemblyFile = - // HttpContext.Current.Server.MapPath( - // String.Format("{0}/../bin/{1}.dll", - // GlobalSettings.Path, - // node.Attributes["assembly"].Value)); - - //Assembly customAssembly = Assembly.LoadFrom(assemblyFile); - Assembly customAssembly = Assembly.Load(node.Attributes["assembly"].Value); - - t.TaskType = (TaskType)Activator.CreateInstance( - customAssembly.GetType(node.Attributes["type"].Value)); - - - - } - else - { - //internal dependency type - - //string assemblyFile = - // HttpContext.Current.Server.MapPath( - // String.Format("{0}/../bin/{1}.dll", - // GlobalSettings.Path, - // "cms")); - - //Assembly defaultAssembly = Assembly.LoadFrom(assemblyFile); - - Assembly defaultAssembly = Assembly.Load("cms"); - - t.TaskType = (TaskType)Activator.CreateInstance( - defaultAssembly.GetType( - string.Format( - "umbraco.cms.businesslogic.skinning.tasks.{0}", - node.Attributes["type"].Value))); - } - } - - foreach (XmlNode prop in node.ChildNodes) - { - if (prop.Name != "OriginalValue" && prop.Name != "NewValue") - { - if (prop.Name == "Value") - t.Value = prop.InnerText; - else - t.Properties.Add(prop.Name, prop.InnerText); - - t.TaskType.GetType().InvokeMember( - prop.Name, - System.Reflection.BindingFlags.SetProperty, - null, - t.TaskType, - new object[] { prop.InnerText }); - } - } - return t; - } - - public TaskType TaskType { get; set; } - - public Dictionary Properties { get; set; } - - public string Value { get; set; } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/TaskType.cs b/src/umbraco.cms/businesslogic/skinning/TaskType.cs deleted file mode 100644 index 4c0092667e..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/TaskType.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using umbraco.interfaces.skinning; -using System.Xml; -using System.Reflection; - -namespace umbraco.cms.businesslogic.skinning -{ - public abstract class TaskType : ProviderBase, ITaskType - { - public abstract TaskExecutionDetails Execute(string Value); - - public virtual TaskExecutionStatus RollBack(string OriginalValue) - { - return Execute(OriginalValue).TaskExecutionStatus; - } - - public abstract string PreviewClientScript(string ControlClientId, string ClientSidePreviewEventType, string ClientSideGetValueScript); - - public String Value { get; set; } - - public virtual XmlNode ToXml(string OriginalValue, string NewValue) - { - XmlDocument d = new XmlDocument(); - - XmlNode n = d.CreateElement("Task"); - - XmlAttribute type = d.CreateAttribute("type"); - type.Value = this.GetType().Name; - n.Attributes.Append(type); - - if (!this.GetType().FullName.Contains("umbraco.cms.businesslogic.skinning")) - { - XmlAttribute assembly = d.CreateAttribute("assembly"); - assembly.Value = this.GetType().Assembly.FullName; - n.Attributes.Append(assembly); - } - - XmlAttribute executed = d.CreateAttribute("executed"); - executed.Value = DateTime.Now.ToString("s"); - n.Attributes.Append(executed); - - foreach(PropertyInfo p in this.GetType().GetProperties()) - { - if(p.Name != "Name" && p.Name != "Description") - { - XmlNode pNode = d.CreateElement(p.Name); - pNode.InnerText = p.GetValue(this,null) != null ? p.GetValue(this,null).ToString() : string.Empty; - - n.AppendChild(pNode); - } - } - - - XmlNode origValNode = d.CreateElement("OriginalValue"); - origValNode.InnerText = OriginalValue; - n.AppendChild(origValNode); - - XmlNode newValNode = d.CreateElement("NewValue"); - newValNode.InnerText = NewValue; - n.AppendChild(newValNode); - - return n; - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/controls/ColorPicker.cs b/src/umbraco.cms/businesslogic/skinning/controls/ColorPicker.cs deleted file mode 100644 index ddefa66efb..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/controls/ColorPicker.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; -using ClientDependency.Core; -using System.Web.UI; -using ClientDependency.Core.Controls; - -namespace umbraco.cms.businesslogic.skinning.controls -{ - [ClientDependency(450,ClientDependencyType.Javascript, "colorpicker/js/colorpicker.js", "UmbracoClient")] - [ClientDependency(460, ClientDependencyType.Javascript, "LiveEditing/Modules/SkinModule/js/initcolorpicker.js", "UmbracoRoot")] - [ClientDependency(200,ClientDependencyType.Css, "colorpicker/css/colorpicker.css", "UmbracoClient")] - public class ColorPicker: TextBox - { - - protected override void Render(HtmlTextWriter writer) - { - this.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine; - this.CssClass = "skinningcolorpicker"; - - base.Render(writer); - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/controls/ImageUploader.cs b/src/umbraco.cms/businesslogic/skinning/controls/ImageUploader.cs deleted file mode 100644 index 20d340e01e..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/controls/ImageUploader.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; -using ClientDependency.Core; - - -namespace umbraco.cms.businesslogic.skinning.controls -{ - [ClientDependency(ClientDependencyType.Css, "modal/style.css", "UmbracoClient")] - [ClientDependency(500,ClientDependencyType.Javascript, "modal/modal.js", "UmbracoClient")] - public class ImageUploader : TextBox - { - public int ImageHeight { get; set; } - public int ImageWidth { get; set; } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - base.Render(writer); - - writer.WriteLine( - string.Format( - " Upload image", - "Umbraco.Controls.ModalWindow().open('" + this.ResolveUrl(GlobalSettings.Path) + "/LiveEditing/Modules/SkinModule/ImageUploader.aspx?ctrl=" + this.ClientID + "&w="+this.ImageWidth+"&h="+this.ImageHeight +"','Upload image',true,750,550,50,0, ['.modalbuton'], null);return false;")); - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/controls/SliderControl.cs b/src/umbraco.cms/businesslogic/skinning/controls/SliderControl.cs deleted file mode 100644 index 8bc1aa29c3..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/controls/SliderControl.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; -using ClientDependency.Core.Controls; -using ClientDependency.Core; - -namespace umbraco.cms.businesslogic.skinning.controls -{ - [ClientDependency(430, ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")] - [ClientDependency(440, ClientDependencyType.Javascript, "LiveEditing/Modules/SkinModule/js/initslider.js", "UmbracoRoot")] - [ClientDependency(ClientDependencyType.Css, "ui/ui-lightness/jquery-ui.custom.css", "UmbracoClient")] - public class SliderControl: TextBox - { - public int MinimumValue { get; set; } - public int MaximumValue { get; set; } - public int InitialValue { get; set; } - public int Ratio { get; set; } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - this.Attributes.Add("style", "display:none;"); - - base.Render(writer); - - writer.WriteLine( - string.Format( - "
", - MinimumValue + "," + MaximumValue + "," + InitialValue + "," + Ratio +","+this.ClientID)); - - - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/dependencies/Color.cs b/src/umbraco.cms/businesslogic/skinning/dependencies/Color.cs deleted file mode 100644 index adb80c7439..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/dependencies/Color.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using umbraco.cms.businesslogic.skinning; -using umbraco.cms.businesslogic.skinning.controls; -using System.Web.UI.WebControls; - -namespace umbraco.cms.businesslogic.skinning.dependencies -{ - public class Color : DependencyType - { - public ColorPicker cp; - public List _value; - - public Color() - { - this.Name = "Color"; - this.Description = "Will render a color picker"; - - - cp = new ColorPicker(); - _value = new List(); - } - - public override WebControl Editor - { - get - { - - if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString())) - cp.Text = _value[0].ToString(); - - return cp; - } - set - { - base.Editor = value; - } - } - - public override List Values - { - get - { - if (cp.Text != "") - { - _value.Clear(); - _value.Add(cp.Text); - } - return _value; - } - set - { - _value = value; - } - } - - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/dependencies/Image.cs b/src/umbraco.cms/businesslogic/skinning/dependencies/Image.cs deleted file mode 100644 index 3840164d7b..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/dependencies/Image.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; -using umbraco.cms.businesslogic.skinning.controls; - -namespace umbraco.cms.businesslogic.skinning.dependencies -{ - public class Image: DependencyType - { - - public string Height { get; set; } - public string Width { get; set; } - //currently just returning a textbox, need to replace this with a custom image control - - public ImageUploader iu; - public List _value; - - public Image() - { - this.Name = "Text"; - this.Description = "Will render a text input"; - - - iu = new ImageUploader(); - - _value = new List(); - } - - public override WebControl Editor - { - get - { - iu.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine; - iu.CssClass = "image"; - - - int w; - - if(int.TryParse(Width, out w)) - iu.ImageWidth = w; - - int h; - - if(int.TryParse(Height, out h)) - iu.ImageHeight = h; - - - if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString())) - iu.Text = _value[0].ToString(); - - return iu; - } - set - { - base.Editor = value; - } - } - - - - public override List Values - { - get - { - if (iu.Text != "") - { - _value.Clear(); - _value.Add(iu.Text); - } - return _value; - } - set - { - _value = value; - } - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/dependencies/Option.cs b/src/umbraco.cms/businesslogic/skinning/dependencies/Option.cs deleted file mode 100644 index ffa7b8083f..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/dependencies/Option.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; - -namespace umbraco.cms.businesslogic.skinning.dependencies -{ - public class Option : DependencyType - { - public DropDownList ddl; - public List _value; - - public string Options { get; set; } - - public Option() - { - this.Name = "Option"; - this.Description = "Will render a dropdown"; - - - ddl = new DropDownList(); - _value = new List(); - } - - public override WebControl Editor - { - get - { - ddl.Items.Clear(); - - - ddl.Items.Add(""); - - foreach (string option in Options.Split('|')) - { - string text = option.Split(';')[0]; - string value = option.Split(';').Length == 2 ? option.Split(';')[1] : text; - - ddl.Items.Add(new ListItem(text,value)); - } - - if (_value.Count > 0) - ddl.SelectedValue = _value[0].ToString(); - - return ddl; - } - set - { - base.Editor = value; - } - } - - public override List Values - { - get - { - if (ddl.SelectedValue != "") - { - _value.Clear(); - _value.Add(ddl.SelectedValue); - } - return _value; - } - set - { - _value = value; - } - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/dependencies/Slider.cs b/src/umbraco.cms/businesslogic/skinning/dependencies/Slider.cs deleted file mode 100644 index 4e6f450271..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/dependencies/Slider.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using umbraco.cms.businesslogic.skinning.controls; -using System.Web.UI.WebControls; - -namespace umbraco.cms.businesslogic.skinning.dependencies -{ - public class Slider : DependencyType - { - public SliderControl sc; - public List _value; - - public string Minimum { get; set; } - public string Maximum { get; set; } - public string Initial { get; set; } - - public string Ratio { get; set; } - - public Slider() - { - this.Name = "Slider"; - this.Description = "Will render a slider"; - - - sc = new SliderControl(); - _value = new List(); - } - - public override WebControl Editor - { - get - { - - int min; - - if (int.TryParse(Minimum, out min)) - sc.MinimumValue = min; - - int max; - - if (int.TryParse(Maximum, out max)) - sc.MaximumValue = max; - - int ratio; - - if (int.TryParse(Ratio, out ratio)) - sc.Ratio = max; - - int init; - - if (int.TryParse(Initial, out init)) - { - sc.InitialValue = init; - sc.Text = init.ToString(); - } - - - if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString())) - sc.Text = _value[0].ToString(); - - return sc; - } - set - { - base.Editor = value; - } - } - - public override List Values - { - get - { - if (sc.Text != "") - { - _value.Clear(); - _value.Add(sc.Text); - } - return _value; - } - set - { - _value = value; - } - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/dependencies/Text.cs b/src/umbraco.cms/businesslogic/skinning/dependencies/Text.cs deleted file mode 100644 index 1997e68829..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/dependencies/Text.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI.WebControls; - -namespace umbraco.cms.businesslogic.skinning.dependencies -{ - public class Text : DependencyType - { - public System.Web.UI.WebControls.TextBox tb; - public List _value; - - public Text() - { - this.Name = "Text"; - this.Description = "Will render a text input"; - - - tb = new TextBox(); - _value = new List(); - } - - public override WebControl Editor - { - get - { - tb.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine; - tb.CssClass = "text"; - - if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString())) - tb.Text = _value[0].ToString(); - - return tb; - } - set - { - base.Editor = value; - } - } - - public override List Values - { - get - { - if (tb.Text != "") - { - _value.Clear(); - _value.Add(tb.Text); - } - return _value; - } - set - { - _value = value; - } - } - - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs b/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs deleted file mode 100644 index 44f67d4506..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using umbraco.interfaces.skinning; -using HtmlAgilityPack; -using umbraco.IO; - -namespace umbraco.cms.businesslogic.skinning.tasks -{ - public class AddStyleSheetToTemplate : TaskType - { - public string TargetFile { get; set; } - public string TargetSelector { get; set; } - public string Media { get; set; } - - public AddStyleSheetToTemplate() - { - this.Name = "Add StyleSheet To Template"; - this.Description = "Will add an additional stylesheet to a template"; - } - - public override TaskExecutionDetails Execute(string Value) - { - TaskExecutionDetails d = new TaskExecutionDetails(); - - - HtmlDocument doc = new HtmlDocument(); - doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile); - - //if (doc.DocumentNode.SelectSingleNode(string.Format("//link [@href = '{0}']", Value)) == null) - //{ - - HtmlNode target = doc.DocumentNode.SelectSingleNode(string.IsNullOrEmpty(TargetSelector) ? "//head" : TargetSelector.ToLower()); - - if (target != null) - { - - HtmlNode s = doc.CreateElement("link"); - //s.Name = "link"; - s.Attributes.Append("rel", "stylesheet"); - s.Attributes.Append("type", "text/css"); - - - s.Attributes.Append("href", Value); - - - if (!string.IsNullOrEmpty(Media)) - s.Attributes.Append("media", Media); - - target.AppendChild(s); - - doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile); - - d.TaskExecutionStatus = TaskExecutionStatus.Completed; - d.NewValue = Value; - } - else - d.TaskExecutionStatus = TaskExecutionStatus.Cancelled; - //} - //else - // d.TaskExecutionStatus = TaskExecutionStatus.Cancelled; - - return d; - } - - public override TaskExecutionStatus RollBack(string OriginalValue) - { - HtmlDocument doc = new HtmlDocument(); - doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile); - - HtmlNode s = doc.DocumentNode.SelectSingleNode(string.Format("//link [@href = '{0}']", Value)); - - if (s != null) - { - s.RemoveAll(); - - doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile); - - return TaskExecutionStatus.Completed; - } - else - return TaskExecutionStatus.Cancelled; - - - } - - public override string PreviewClientScript(string ControlClientId, string ClientSidePreviewEventType, string ClientSideGetValueScript) - { - return string.Format( - @"var link{4}; - jQuery('#{0}').bind('{2}', function() {{ - jQuery(link{4}).remove(); - link{4} = jQuery(''); - link{4}.attr({{ - type: 'text/css', - rel: 'stylesheet', - {3} - href:{1} - }}); - jQuery('head').append(link{4}); - }}); - - - //cancel support - jQuery('#cancelSkinCustomization').click(function () {{ - jQuery(link{4}).remove(); - }}); - ", - ControlClientId, - ClientSideGetValueScript, - ClientSidePreviewEventType, - string.IsNullOrEmpty(Media) ? "" : string.Format("media :'{0}',",Media), - Guid.NewGuid().ToString().Replace("-", "")); - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs deleted file mode 100644 index c4fdf5c07b..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using umbraco.interfaces.skinning; -using System.IO; -using umbraco.IO; -using System.Web; - -namespace umbraco.cms.businesslogic.skinning.tasks -{ - public class ModifyCss : TaskType - { - public string TargetFile { get; set; } - public string TargetRule { get; set; } - public string TargetParameter { get; set; } - - public ModifyCss() - { - this.Name = "Modify Css"; - this.Description = "Will modify the stylesheet"; - } - - public override TaskExecutionDetails Execute(string Value) - { - TaskExecutionDetails d = new TaskExecutionDetails(); - - //currently just appending it to the end of the css file - StreamWriter sw = File.AppendText(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile); - sw.WriteLine(string.Format("{0}{{ {1}:{2};}}", TargetRule, TargetParameter, Value)); - sw.Close(); - - d.TaskExecutionStatus = TaskExecutionStatus.Completed; - d.OriginalValue = ""; - d.NewValue = Value; - - return d; - } - - public override TaskExecutionStatus RollBack(string OriginalValue) - { - string[] filecontents = File.ReadAllLines(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile); - - for (int i = filecontents.Length; i > 0; i--) - { - if (filecontents[i - 1].Contains(string.Format("{0}{{ {1}:", TargetRule, TargetParameter))) - { - filecontents[i - 1] = string.Empty; - break; - } - } - - StringBuilder s = new StringBuilder(); - - foreach (string line in filecontents) - s.AppendLine(line); - - System.IO.StreamWriter file = new System.IO.StreamWriter(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile); - file.WriteLine(s.ToString()); - - file.Close(); - - - return TaskExecutionStatus.Completed; - } - - public override string PreviewClientScript(string ControlClientId,string ClientSidePreviewEventType, string ClientSideGetValueScript) - { - - return string.Format( - @"jQuery('#{0}').bind('{5}', function() {{ - var val = '{3}'; - jQuery('{1}').css('{2}', val.replace('${{Output}}',{4})); - }}); - - - //cancel support - var init{6} = jQuery('{1}').css('{2}'); - jQuery('#cancelSkinCustomization').click(function () {{ - jQuery('{1}').css('{2}',init{6}); - }}); - - ", - ControlClientId, - TargetRule, - TargetParameter, - Value, - ClientSideGetValueScript, - ClientSidePreviewEventType, - Guid.NewGuid().ToString().Replace("-", "")); - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs deleted file mode 100644 index cba9da77fb..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using umbraco.interfaces.skinning; -using umbraco.cms.businesslogic.web; -using System.Web; - -namespace umbraco.cms.businesslogic.skinning.tasks -{ - public class ModifyPageProperty : TaskType - { - public string PropertyAlias { get; set; } - public string ClientSideContainerID { get; set; } - - public ModifyPageProperty() - { - this.Name = " Modify page property"; - this.Description = "Will modify a property on the current page"; - } - - public override TaskExecutionDetails Execute(string Value) - { - TaskExecutionDetails d = new TaskExecutionDetails(); - - if (HttpContext.Current != null && HttpContext.Current.Items["pageID"] != null) - { - string id = HttpContext.Current.Items["pageID"].ToString(); - - Document doc = new Document(Convert.ToInt32(id)); - - if (doc.getProperty(PropertyAlias) != null) - { - d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString(); - - doc.getProperty(PropertyAlias).Value = Value; - doc.SaveAndPublish(new BusinessLogic.User(0)); - - d.NewValue = Value; - d.TaskExecutionStatus = TaskExecutionStatus.Completed; - } - else - d.TaskExecutionStatus = TaskExecutionStatus.Cancelled; - - } - else - d.TaskExecutionStatus = TaskExecutionStatus.Cancelled; - - return d; - } - - - public override string PreviewClientScript(string ControlClientId, string ClientSidePreviewEventType, string ClientSideGetValueScript) - { - - - return string.Format( - @"jQuery('#{0}').bind('{3}', function() {{ - jQuery('#{1}').html({2}); - }}); - - //cancel support - var init{4} = jQuery('#{1}').html(); - jQuery('#cancelSkinCustomization').click(function () {{ - jQuery('#{1}').html(init{4}); - }}); - ", - ControlClientId, - ClientSideContainerID, - ClientSideGetValueScript, - ClientSidePreviewEventType, - Guid.NewGuid().ToString().Replace("-", "")); - - - } - } -} diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs deleted file mode 100644 index 7d3d7a7c63..0000000000 --- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System; -using umbraco.interfaces.skinning; -using umbraco.IO; -using HtmlAgilityPack; - -namespace umbraco.cms.businesslogic.skinning.tasks -{ - public class ModifyTemplate : TaskType - { - public string TargetFile { get; set; } - public string TargetID { get; set; } - public string TargetAttribute { get; set; } - - public ModifyTemplate() - { - this.Name = " Modify template"; - this.Description = "Will modify a template"; - } - - public override TaskExecutionDetails Execute(string Value) - { - TaskExecutionDetails d = new TaskExecutionDetails(); - - //open template - - HtmlDocument doc = new HtmlDocument(); - doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" +TargetFile); - - if (doc.DocumentNode.SelectNodes(string.Format("//*[@id = '{0}']", TargetID)) != null) - { - foreach (HtmlNode target in doc.DocumentNode.SelectNodes(string.Format("//*[@id = '{0}']", TargetID))) - { - if (string.IsNullOrEmpty(TargetAttribute)) - { - d.OriginalValue = target.InnerHtml; - target.InnerHtml = Value; - } - else - { - if (target.Attributes[TargetAttribute] == null) - { - target.Attributes.Append(TargetAttribute, Value); - } - else - { - d.OriginalValue = target.Attributes[TargetAttribute].Value; - target.Attributes[TargetAttribute].Value = Value; - } - } - } - } - doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile); - - d.TaskExecutionStatus = TaskExecutionStatus.Completed; - d.NewValue = Value; - //save - - return d; - } - - - public override string PreviewClientScript(string ControlClientId,string ClientSidePreviewEventType, string ClientSideGetValueScript) - { - - if (string.IsNullOrEmpty(TargetAttribute)) - { - return string.Format( - @"jQuery('#{0}').bind('{3}', function() {{ - var val = '{5}'; - jQuery('#{1}').html(val.replace('${{Output}}',{2})); - }}); - - //cancel support - var init{4} = jQuery('#{1}').html(); - jQuery('#cancelSkinCustomization').click(function () {{ - jQuery('#{1}').html(init{4}); - }}); - ", - ControlClientId, - TargetID, - ClientSideGetValueScript, - ClientSidePreviewEventType, - Guid.NewGuid().ToString().Replace("-", ""), - Value); - } - else - { - return string.Format( - @"jQuery('#{0}').bind('{4}', function() {{ - var val = '{6}'; - jQuery('#{1}').attr('{2}',val.replace('${{Output}}',{3})); - }}); - - - //cancel support - var init{5} = jQuery('#{1}').attr('{2}'); - jQuery('#cancelSkinCustomization').click(function () {{ - jQuery('#{1}').attr('{2}',init{5}); - }}); - ", - ControlClientId, - TargetID, - TargetAttribute, - ClientSideGetValueScript, - ClientSidePreviewEventType, - Guid.NewGuid().ToString().Replace("-", ""), - Value); - } - } - } -} diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index 1c218bc3a8..6262adb867 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -212,7 +212,6 @@ - @@ -257,34 +256,13 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.editorControls/AbstractPrevalueEditor.cs b/src/umbraco.editorControls/AbstractPrevalueEditor.cs index 0d6521449a..c63c06ec75 100644 --- a/src/umbraco.editorControls/AbstractPrevalueEditor.cs +++ b/src/umbraco.editorControls/AbstractPrevalueEditor.cs @@ -1,6 +1,7 @@ using System; using System.Web.UI; using System.Web.UI.WebControls; +using ClientDependency.Core; using umbraco.interfaces; using umbraco.cms.businesslogic.datatype; diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs index 979eb06e80..fde7e6cac0 100644 --- a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs +++ b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs @@ -313,8 +313,8 @@ namespace umbraco.editorControls.MultiNodeTreePicker base.OnLoad(e); //add the js/css required - this.RegisterEmbeddedClientResource("umbraco.editorControls.MultiNodeTreePicker.MultiNodePickerStyles.css", umbraco.cms.businesslogic.datatype.ClientDependencyType.Css); - this.RegisterEmbeddedClientResource("umbraco.editorControls.MultiNodeTreePicker.MultiNodePickerScripts.js", umbraco.cms.businesslogic.datatype.ClientDependencyType.Javascript); + this.RegisterEmbeddedClientResource("umbraco.editorControls.MultiNodeTreePicker.MultiNodePickerStyles.css", ClientDependencyType.Css); + this.RegisterEmbeddedClientResource("umbraco.editorControls.MultiNodeTreePicker.MultiNodePickerScripts.js", ClientDependencyType.Javascript); //update the tree type (we need to do this each time because i don't think view state works with these controls) switch (TreeToRender) diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs index 352288d301..dbdc356273 100644 --- a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs +++ b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_PrevalueEditor.cs @@ -3,10 +3,11 @@ using System.Collections; using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; +using ClientDependency.Core; using umbraco.cms.businesslogic.datatype; using umbraco.interfaces; using umbraco.uicontrols.TreePicker; -using Umbraco.Core; +using Constants = Umbraco.Core.Constants; namespace umbraco.editorControls.MultiNodeTreePicker { diff --git a/src/umbraco.editorControls/MultipleTextstring/MultipleTextstringControl.cs b/src/umbraco.editorControls/MultipleTextstring/MultipleTextstringControl.cs index fb925d4ee1..384e24144f 100644 --- a/src/umbraco.editorControls/MultipleTextstring/MultipleTextstringControl.cs +++ b/src/umbraco.editorControls/MultipleTextstring/MultipleTextstringControl.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Web.UI; using System.Web.UI.WebControls; +using ClientDependency.Core; using umbraco; using umbraco.cms.businesslogic.datatype; diff --git a/src/umbraco.editorControls/ResourceExtensions.cs b/src/umbraco.editorControls/ResourceExtensions.cs index 18593679f4..e0923669cf 100644 --- a/src/umbraco.editorControls/ResourceExtensions.cs +++ b/src/umbraco.editorControls/ResourceExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Web.UI; +using ClientDependency.Core; using umbraco; using umbraco.cms.businesslogic.datatype; using System.Web.UI.HtmlControls; diff --git a/src/umbraco.editorControls/macrocontainer/Editor.cs b/src/umbraco.editorControls/macrocontainer/Editor.cs index 4f0d62630f..d4cbdeaeca 100644 --- a/src/umbraco.editorControls/macrocontainer/Editor.cs +++ b/src/umbraco.editorControls/macrocontainer/Editor.cs @@ -170,21 +170,7 @@ namespace umbraco.editorControls.macrocontainer base.OnLoad(e); // And a reference to the macro container calls - //if (!UmbracoContext.Current.LiveEditingContext.Enabled) - //{ - // ScriptManager sm = ScriptManager.GetCurrent(base.Page); - // ServiceReference webservicePath = new ServiceReference(SystemDirectories.Webservices + "/MacroContainerService.asmx"); - - // if (!sm.Services.Contains(webservicePath)) - // sm.Services.Add(webservicePath); - //} - //else - //{ - // ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); - //} - - - + //ClientDependencyLoader.Instance.RegisterDependency("webservices/MacroContainerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); string script = "function " + ID + "makesortable(){ "; diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs index adf6a73b6c..64d859e45e 100644 --- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs +++ b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs @@ -18,7 +18,7 @@ using umbraco.uicontrols; namespace umbraco.editorControls.tinyMCE3 { - public class TinyMCE : TinyMCEWebControl, IDataEditor, IMenuElement, ILiveEditingDataEditor + public class TinyMCE : TinyMCEWebControl, IDataEditor, IMenuElement { private readonly string _activateButtons = ""; private readonly string _advancedUsers = ""; @@ -38,8 +38,6 @@ namespace umbraco.editorControls.tinyMCE3 private readonly int m_maxImageWidth = 500; private bool _isInitialized; private string _plugins = ""; - private bool m_isInLiveEditingMode; - public TinyMCE(IData Data, string Configuration) { @@ -402,19 +400,6 @@ namespace umbraco.editorControls.tinyMCE3 } } - #region ILiveEditingDataEditor Members - - public Control LiveEditingControl - { - get - { - m_isInLiveEditingMode = true; - base.IsInLiveEditingMode = true; - return this; - } - } - - #endregion #region IMenuElement Members @@ -457,20 +442,9 @@ namespace umbraco.editorControls.tinyMCE3 config.Add("theme_umbraco_versionId", base.VersionId.ToString()); // we'll need to make an extra check for the liveediting as that value is set after the constructor have initialized - if (IsInLiveEditingMode) - { - if (config["theme_umbraco_toolbar_location"] == null) - config.Add("theme_umbraco_toolbar_location", ""); - config["theme_umbraco_toolbar_location"] = "external"; - config.Add("umbraco_toolbar_id", - "LiveEditingClientToolbar"); - } - else - { - config.Add("umbraco_toolbar_id", + config.Add("umbraco_toolbar_id", ElementIdPreFix + ((cms.businesslogic.datatype.DefaultData)_data).PropertyId); - } } else { diff --git a/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs b/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs index 8492aaef6a..3093b42003 100644 --- a/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs +++ b/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs @@ -26,8 +26,6 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol private int _nodeId = 0; private Guid _versionId; - public bool IsInLiveEditingMode { get; set; } - public int NodeId { set { _nodeId = value; } @@ -109,33 +107,19 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol protected override void Render(HtmlTextWriter writer) { base.Render(writer); - if (!IsInLiveEditingMode) - writer.Write(m_scriptInitBlock.ToString()); - else - // add a marker to tell Live Editing when a tinyMCE control is on the page - writer.Write(""); + // add a marker to tell Live Editing when a tinyMCE control is on the page + writer.Write(""); } protected override void OnLoad(EventArgs args) { - if (!IsInLiveEditingMode) - this.config["elements"] = this.ClientID; + this.config["elements"] = this.ClientID; + bool first = true; - // Render HTML for TinyMCE instance - // in the liveediting mode we're always preloading tinymce script - if (!IsInLiveEditingMode) - { - //TinyMCE uses it's own compressor so leave it up to ScriptManager to render - ScriptManager.RegisterClientScriptInclude(this, this.GetType(), _versionId.ToString(), this.ScriptURI); - } - else - { - //We're in live edit mode so add the base js file to the dependency list - ClientDependencyLoader.Instance.RegisterDependency("tinymce3/tiny_mce_src.js", - "UmbracoClient", ClientDependencyType.Javascript); - } + //TinyMCE uses it's own compressor so leave it up to ScriptManager to render + ScriptManager.RegisterClientScriptInclude(this, this.GetType(), _versionId.ToString(), this.ScriptURI); // Write script tag start m_scriptInitBlock.Append(HtmlTextWriter.TagLeftChar.ToString()); @@ -150,54 +134,28 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol foreach (string key in this.config.Keys) { //TODO: This is a hack to test if we can prevent tinymce from automatically download languages - if (!IsInLiveEditingMode || (key != "language")) - { - string val = this.config[key]; + string val = this.config[key]; - if (!first) - m_scriptInitBlock.Append(",\n"); - else - first = false; + if (!first) + m_scriptInitBlock.Append(",\n"); + else + first = false; - // Is boolean state or string - if (val == "true" || val == "false") - m_scriptInitBlock.Append(key + ":" + this.config[key]); - else - m_scriptInitBlock.Append(key + ":'" + this.config[key] + "'"); - } + // Is boolean state or string + if (val == "true" || val == "false") + m_scriptInitBlock.Append(key + ":" + this.config[key]); + else + m_scriptInitBlock.Append(key + ":'" + this.config[key] + "'"); } m_scriptInitBlock.Append("\n});\n"); - // we're wrapping the tinymce init call in a load function when in live editing, - // so we'll need to close that function declaration - if (IsInLiveEditingMode) - { - m_scriptInitBlock.Append(@"(function() { var f = - function() { - if(document.getElementById('__umbraco_tinyMCE')) - tinyMCE.execCommand('mceAddControl',false,'").Append(ClientID).Append(@"'); - ItemEditing.remove_startEdit(f); - } - ItemEditing.add_startEdit(f);})();"); - m_scriptInitBlock.Append(@"(function() { var f = - function() { - tinyMCE.execCommand('mceRemoveControl',false,'").Append(ClientID).Append(@"'); - ItemEditing.remove_stopEdit(f); - } - ItemEditing.add_stopEdit(f);})();"); - } + // Write script tag end m_scriptInitBlock.Append(HtmlTextWriter.EndTagLeftChars); m_scriptInitBlock.Append("script"); m_scriptInitBlock.Append(HtmlTextWriter.TagRightChar.ToString()); - - // add to script manager - if (IsInLiveEditingMode) - { - ScriptManager.RegisterClientScriptBlock(this, this.GetType(), new Guid().ToString(), - m_scriptInitBlock.ToString(), false); - } + } diff --git a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs index de2afaa555..10741b9c35 100644 --- a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs +++ b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs @@ -237,7 +237,7 @@ namespace umbraco.editorControls.tinymce data += "|"; - // full width currenctly not useLiveEditing + data += "0|"; /* if (_fullWidth.Checked) diff --git a/src/umbraco.interfaces/ILiveEditingDataEditor.cs b/src/umbraco.interfaces/ILiveEditingDataEditor.cs deleted file mode 100644 index 4a8a2b9eb6..0000000000 --- a/src/umbraco.interfaces/ILiveEditingDataEditor.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Web.UI; - -namespace umbraco.interfaces -{ - /// - /// Data type editor controls can choose to implement this interface - /// to customize their Live Editing behavior. - /// - [Obsolete("ILiveEditingDataEditor is obsolete and is no longer used, it will be removed from the codebase in future versions")] - public interface ILiveEditingDataEditor - { - /// - /// Gets the control used for Live Editing. - /// - Control LiveEditingControl { get; } - } -} diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj index 0f617173bd..167abaf79d 100644 --- a/src/umbraco.interfaces/umbraco.interfaces.csproj +++ b/src/umbraco.interfaces/umbraco.interfaces.csproj @@ -150,7 +150,6 @@ Code - Code