diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs deleted file mode 100644 index cc4d459359..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections.Generic; -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class HelpElement : ConfigurationElement, IHelpSection - { - [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] - public string DefaultUrl - { - get { return (string) base["defaultUrl"]; } - } - - [ConfigurationCollection(typeof (LinksCollection), AddItemName = "link")] - [ConfigurationProperty("", IsDefaultCollection = true)] - public LinksCollection Links - { - get { return (LinksCollection) base[""]; } - } - - string IHelpSection.DefaultUrl - { - get { return DefaultUrl; } - } - - IEnumerable IHelpSection.Links - { - get { return Links; } - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IHelpSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IHelpSection.cs deleted file mode 100644 index 61be2dfaf2..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IHelpSection.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface IHelpSection : IUmbracoConfigurationSection - { - string DefaultUrl { get; } - - IEnumerable Links { get; } - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs index 83bf26e288..56faf4f973 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs @@ -22,9 +22,7 @@ IRepositoriesSection PackageRepositories { get; } IProvidersSection Providers { get; } - - IHelpSection Help { get; } - + IWebRoutingSection WebRouting { get; } } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs index f7c862588b..a92b2b952c 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs @@ -105,12 +105,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings get { return (ProvidersElement)this["providers"]; } } - [ConfigurationProperty("help")] - internal HelpElement Help - { - get { return (HelpElement)this["help"]; } - } - [ConfigurationProperty("web.routing")] internal WebRoutingElement WebRouting { @@ -167,11 +161,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings get { return Providers; } } - IHelpSection IUmbracoSettingsSection.Help - { - get { return Help; } - } - IWebRoutingSection IUmbracoSettingsSection.WebRouting { get { return WebRouting; } diff --git a/src/Umbraco.Core/Models/ITemplate.cs b/src/Umbraco.Core/Models/ITemplate.cs index 7a8d0c8bd0..4ca639dd81 100644 --- a/src/Umbraco.Core/Models/ITemplate.cs +++ b/src/Umbraco.Core/Models/ITemplate.cs @@ -28,14 +28,7 @@ namespace Umbraco.Core.Models /// returns the master template alias /// string MasterTemplateAlias { get; } - - /// - /// Returns the that corresponds to the template file - /// - /// - [Obsolete("This is no longer used and will be removed from the codebase in future versions, use the IFileSystem DetermineRenderingEngine method instead")] - RenderingEngine GetTypeOfRenderingEngine(); - + /// /// Set the mastertemplate /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 9e39022440..cf1aba5b86 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -231,7 +231,6 @@ - @@ -239,7 +238,6 @@ - diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs deleted file mode 100644 index 5c8047895d..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementDefaultTests.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Linq; -using NUnit.Framework; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class HelpElementDefaultTests : HelpElementTests - { - protected override bool TestingDefaults - { - get { return true; } - } - - [Test] - public override void Links() - { - Assert.IsTrue(SettingsSection.Help.Links.Any() == false); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementTests.cs deleted file mode 100644 index ba43db8cf0..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/HelpElementTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Linq; -using NUnit.Framework; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class HelpElementTests : UmbracoSettingsTests - { - [Test] - public void DefaultUrl() - { - Assert.IsTrue(SettingsSection.Help.DefaultUrl == "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}"); - } - - [Test] - public virtual void Links() - { - Assert.IsTrue(SettingsSection.Help.Links.Count() == 2); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(0).Application == "content"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(0).ApplicationUrl == "dashboard.aspx"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(0).Language == "en"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(0).UserType == "Administrators"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(0).HelpUrl == "http://www.xyz.no?{0}/{1}/{2}/{3}"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(1).Application == "media"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(1).ApplicationUrl == "dashboard2.aspx"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(1).Language == "ch"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(1).UserType == "Writers"); - Assert.IsTrue(SettingsSection.Help.Links.ElementAt(1).HelpUrl == "http://www.abc.no?{0}/{1}/{2}/{3}"); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config index 8d3ec2e77c..9bc8e99b66 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config @@ -201,13 +201,6 @@ - - - - - - - - - - - -