From 310a31b03e235ec33f43dc8f9913f910ae25ffec Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 1 May 2018 01:01:24 +1000 Subject: [PATCH] More xslt removal and other file cleanup --- .../UmbracoSettings/DeveloperElement.cs | 47 --- .../UmbracoSettings/IDeveloperSection.cs | 9 - .../IUmbracoSettingsSection.cs | 5 +- .../UmbracoSettings/UmbracoSettingsSection.cs | 14 +- src/Umbraco.Core/Models/Macro.cs | 2 - src/Umbraco.Core/Umbraco.Core.csproj | 2 - .../DeveloperElementDefaultTests.cs | 13 - .../UmbracoSettings/DeveloperElementTests.cs | 17 -- .../TestHelpers/SettingsForTests.cs | 2 - src/Umbraco.Tests/Umbraco.Tests.csproj | 2 - src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 21 -- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 10 +- src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 10 +- .../Umbraco/config/lang/zh_tw.xml | 8 - .../config/umbracoSettings.config | 9 - src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 8 - .../umbraco/config/lang/en_us.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 11 - src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 10 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 10 +- src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 8 - src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 8 - .../developer/Packages/editPackage.aspx | 2 +- .../umbraco/dialogs/search.aspx | 48 --- .../settings/modals/ShowUmbracoTags.aspx | 60 ---- .../umbraco/settings/scripts/editScript.aspx | 60 ---- .../settings/stylesheet/editstylesheet.aspx | 54 ---- .../stylesheet/editstylesheet.aspx.cs | 11 - .../editstylesheet.aspx.designer.cs | 15 - .../property/EditStyleSheetProperty.aspx | 67 ----- .../property/EditStyleSheetProperty.aspx.cs | 11 - .../EditStyleSheetProperty.aspx.designer.cs | 15 - .../umbraco/settings/views/EditView.aspx | 89 ------ .../umbraco/settings/views/EditView.aspx.cs | 281 ------------------ .../settings/views/EditView.aspx.designer.cs | 132 -------- .../umbraco_client/CodeArea/UmbracoEditor.js | 163 ---------- .../umbraco_client/CodeArea/javascript.js | 191 ------------ .../umbraco_client/CodeArea/styles.css | 8 - src/Umbraco.Web/Umbraco.Web.csproj | 18 -- src/Umbraco.Web/_Legacy/Controls/CodeArea.cs | 243 --------------- .../umbraco/dialogs/search.aspx | 48 --- .../umbraco/dialogs/search.aspx.cs | 119 -------- .../umbraco/dialogs/search.aspx.designer.cs | 60 ---- .../settings/modals/ShowUmbracoTags.aspx.cs | 33 -- .../stylesheet/editstylesheet.aspx.cs | 151 ---------- .../property/EditStyleSheetProperty.aspx.cs | 159 ---------- 56 files changed, 7 insertions(+), 2345 deletions(-) delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs delete mode 100644 src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/dialogs/search.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs delete mode 100644 src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs delete mode 100644 src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js delete mode 100644 src/Umbraco.Web.UI/umbraco_client/CodeArea/javascript.js delete mode 100644 src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css delete mode 100644 src/Umbraco.Web/_Legacy/Controls/CodeArea.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs deleted file mode 100644 index 66531a1ab1..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections.Generic; -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class DeveloperElement : ConfigurationElement, IDeveloperSection - { - private AppCodeFileExtensionsElement _default; - - [ConfigurationProperty("appCodeFileExtensions")] - internal AppCodeFileExtensionsElement AppCodeFileExtensions - { - get - { - if (_default != null) - { - return _default; - } - - //here we need to check if this element is defined, if it is not then we'll setup the defaults - var prop = Properties["appCodeFileExtensions"]; - var autoFill = this[prop] as ConfigurationElement; - if (autoFill != null && autoFill.ElementInformation.IsPresent == false) - { - var collection = new AppCodeFileExtensionsCollection - { - new FileExtensionElement {RawValue = "cs"}, - new FileExtensionElement {RawValue = "vb"} - }; - _default = new AppCodeFileExtensionsElement - { - AppCodeFileExtensionsCollection = collection - }; - - return _default; - } - - return (AppCodeFileExtensionsElement)base["appCodeFileExtensions"]; - } - } - - IEnumerable IDeveloperSection.AppCodeFileExtensions - { - get { return AppCodeFileExtensions.AppCodeFileExtensionsCollection; } - } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs deleted file mode 100644 index 40aa6af0db..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface IDeveloperSection : IUmbracoConfigurationSection - { - IEnumerable AppCodeFileExtensions { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs index 6bbfea49da..1776f1cbf2 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs @@ -14,10 +14,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings IRequestHandlerSection RequestHandler { get; } ITemplatesSection Templates { get; } - - IDeveloperSection Developer { get; } - - + ILoggingSection Logging { get; } IScheduledTasksSection ScheduledTasks { get; } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs index f972c2c7b3..3b76a43c39 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs @@ -37,14 +37,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings { get { return (TemplatesElement)this["templates"]; } } - - [ConfigurationProperty("developer")] - internal DeveloperElement Developer - { - get { return (DeveloperElement)this["developer"]; } - } - - + [ConfigurationProperty("logging")] internal LoggingElement Logging { @@ -101,11 +94,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings get { return BackOffice; } } - IDeveloperSection IUmbracoSettingsSection.Developer - { - get { return Developer; } - } - ILoggingSection IUmbracoSettingsSection.Logging { get { return Logging; } diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs index 6e72942b6e..a24d659ce3 100644 --- a/src/Umbraco.Core/Models/Macro.cs +++ b/src/Umbraco.Core/Models/Macro.cs @@ -96,9 +96,7 @@ namespace Umbraco.Core.Models private bool _cacheByMember; private bool _dontRender; private string _scriptFile; - private string _scriptAssembly; private string _scriptPath; - private string _xslt; private MacroPropertyCollection _properties; private List _addedProperties; private List _removedProperties; diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 3f67f820e1..448acce472 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -250,7 +250,6 @@ - @@ -259,7 +258,6 @@ - diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs deleted file mode 100644 index a3f8b79aa1..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs +++ /dev/null @@ -1,13 +0,0 @@ -using NUnit.Framework; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class DeveloperElementDefaultTests : DeveloperElementTests - { - protected override bool TestingDefaults - { - get { return true; } - } - } -} diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs deleted file mode 100644 index aa79ffd965..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Linq; -using NUnit.Framework; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class DeveloperElementTests : UmbracoSettingsTests - { - [Test] - public void AppCodeFileExtensions() - { - Assert.IsTrue(SettingsSection.Developer.AppCodeFileExtensions.Count() == 2); - Assert.IsTrue(SettingsSection.Developer.AppCodeFileExtensions.All( - x => "cs,vb".Split(',').Contains(x.Extension))); - } - } -} diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs index f3b7eee50a..34c6a35833 100644 --- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs +++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs @@ -56,7 +56,6 @@ namespace Umbraco.Tests.TestHelpers var security = new Mock(); var requestHandler = new Mock(); var templates = new Mock(); - var dev = new Mock(); var logging = new Mock(); var tasks = new Mock(); var distCall = new Mock(); @@ -67,7 +66,6 @@ namespace Umbraco.Tests.TestHelpers settings.Setup(x => x.Security).Returns(security.Object); settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object); settings.Setup(x => x.Templates).Returns(templates.Object); - settings.Setup(x => x.Developer).Returns(dev.Object); settings.Setup(x => x.Logging).Returns(logging.Object); settings.Setup(x => x.ScheduledTasks).Returns(tasks.Object); settings.Setup(x => x.DistributedCall).Returns(distCall.Object); diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 3eb6d8ae73..d39608c49c 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -282,8 +282,6 @@ - - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 0fb48f2d93..20f75c30d4 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -228,20 +228,6 @@ umbracoPage.Master - - editstylesheet.aspx - ASPXCodeBehind - - - editstylesheet.aspx - - - EditStyleSheetProperty.aspx - ASPXCodeBehind - - - EditStyleSheetProperty.aspx - treeInit.aspx ASPXCodeBehind @@ -411,7 +397,6 @@ - @@ -425,7 +410,6 @@ - @@ -552,9 +536,6 @@ Form - - - @@ -565,8 +546,6 @@ - - diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index d8c9f8570f..f9d7fc616e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -321,8 +321,6 @@ Žádne aktivní styly nejsou dostupné Umístěte, prosím, kurzor nalevo od těch dvou buňek, které chcete sloučit Nemužete rozdělit buňku, která nebyla sloučená. - Chyba ve zdroji XSLT - Soubor XSLT nebyl uložen, protože obsahoval chyby V nastavení datového typu použitého pro tuto vlastnost je chyba, zkontrolujte, prosím, datový typ @@ -817,11 +815,6 @@ Ujistěte se, prosím, že nemáte 2 šablony se stejným aliasem Šablona byla uložena Šablona byla uložena bez chyb! - XSLT nebyl uložen - XSLT obsahoval chybu - XSLT nemohl být uložen, zkontrolujte oprávnění k souboru - XSLT byl uložen - V XSLT nejsou žádné chyby Publikování obsahu bylo zrušeno Částečný pohled byl uložen Částečný pohled byl uložen bez chyb! @@ -990,7 +983,6 @@ Skripty Stylopisy Šablony - XSLT soubory Oprávnění Uživatele Typy Uživatelů Uživatelé @@ -1041,4 +1033,4 @@ Vaše nedávná historie Relace vyprší za - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index dee52cff5c..e3b58903d1 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -337,8 +337,6 @@ Det er ingen aktive stiler eller formateringer på denne siden Sett markøren til venstre i de 2 cellene du ønsker å slå sammen Du kan ikke dele en celle som allerede er delt. - Feil i XSLT kode - XSLT ble ikke lagret på grunn av feil i koden Det er et problem dem datatypen som brukes til denne egenskapen. Kontroller innstillingene og prøv igjen. @@ -795,11 +793,6 @@ Vennlig hilsen Umbraco roboten Vennligst forviss deg om at du ikke har to maler med samme alias Malen ble lagret Malen ble lagret uten feil! - XSLT-koden ble ikke lagret - XSLT-koden inneholdt en feil - XSLT-koden ble ikke lagret, sjekk filrettigheter - XSLT lagret - Ingen feil i XSLT! Innhold avpublisert Delmal lagret Delmal lagret uten feil @@ -974,7 +967,6 @@ Vennlig hilsen Umbraco roboten Skript Stiler Maler - XSLT Filer Analytics Brukertillatelser Brukertyper typer @@ -1028,4 +1020,4 @@ Vennlig hilsen Umbraco roboten Din historikk Sesjonen utløper om - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index c362f91df0..37c3dec60e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -388,8 +388,6 @@ 沒有可用的樣式 請把游標放在您要合併的兩個儲存格中的左邊儲存格 非合併儲存格不能分離。 - XSLT源碼出錯 - XSLT未保存，因為包含錯誤。 這是此屬性所使用的資料類別設定錯誤，請檢查資料類別 @@ -957,11 +955,6 @@ 範本別名相同 範本已保存 範本保存，無錯誤。 - XSLT未保存 - XSLT有錯誤 - XSLT無法保存，請檢查許可權。 - XSLT已保存 - XSLT無錯誤 內容已取消發佈 片段視圖已保存 片段視圖保存，無錯誤。 @@ -1184,7 +1177,6 @@ 腳本 樣式表 範本 - XSLT文件 統計 diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config index 84b610b4af..fc7bcad135 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.config @@ -173,15 +173,6 @@ Mvc - - - - - cs - vb - - -