diff --git a/src/Umbraco.Web/UI/Controls/ProgressBar.cs b/src/Umbraco.Web/UI/Controls/ProgressBar.cs deleted file mode 100644 index 3e87da1d6f..0000000000 --- a/src/Umbraco.Web/UI/Controls/ProgressBar.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Umbraco.Core.IO; - -namespace Umbraco.Web.UI.Controls -{ - public class ProgressBar : System.Web.UI.WebControls.Image - { - public string Title { get; set; } - - protected override void Render(System.Web.UI.HtmlTextWriter writer) - { - base.ImageUrl = "/images/progressBar.gif"; - base.AlternateText = Title; - - base.Render(writer); - } - } -} diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs deleted file mode 100644 index c56e4fe07f..0000000000 --- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Web.Mvc; -using System.Web.UI; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Services; -using Umbraco.Web.Composing; - -namespace Umbraco.Web.UI.Controls -{ - /// - /// A control that exposes the helpful Umbraco context objects - /// - public abstract class UmbracoControl : Control - { - private UrlHelper _url; - - protected UmbracoControl(UmbracoContext umbracoContext, ServiceContext services) - { - UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext)); - Umbraco = new UmbracoHelper(umbracoContext, services); - - // todo inject somehow - Logger = Current.Logger; - ProfilingLogger = Current.ProfilingLogger; - Services = Current.Services; - } - - /// - /// Empty constructor, uses Singleton to resolve the UmbracoContext. - /// - protected UmbracoControl() - : this(Current.UmbracoContext, Current.Services) - { } - - /// - /// Returns an UmbracoHelper object - /// - public UmbracoHelper Umbraco { get; } - - /// - /// Gets the logger. - /// - public ILogger Logger { get; } - - /// - /// Gets the profiling logger. - /// - public IProfilingLogger ProfilingLogger { get; } - - /// - /// Gets the Umbraco context. - /// - public UmbracoContext UmbracoContext { get; } - - /// - /// Gets the services context. - /// - protected ServiceContext Services { get; } - - /// - /// Gets a Url helper. - /// - /// This URL helper is created without any route data and an empty request context. - public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); - } -} diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs deleted file mode 100644 index f4cd7f1b50..0000000000 --- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Web.Mvc; -using System.Web.UI; -using Umbraco.Core.Cache; -using Umbraco.Core.Composing; -using Umbraco.Core.Logging; -using Umbraco.Core.Services; -using Umbraco.Web.Security; -using Umbraco.Web.UI.Pages; -using Current = Umbraco.Web.Composing.Current; - -namespace Umbraco.Web.UI.Controls -{ - /// - /// A base class for all Presentation UserControls to inherit from - /// - public abstract class UmbracoUserControl : UserControl - { - private ClientTools _clientTools; - private UrlHelper _url; - - /// - /// Default constructor - /// - /// - /// - protected UmbracoUserControl(UmbracoContext umbracoContext, ServiceContext services) - { - if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext)); - UmbracoContext = umbracoContext; - Umbraco = new UmbracoHelper(umbracoContext, services); - Members = Current.Factory.GetInstance(); - - // todo inject somehow - Logger = Current.Logger; - ProfilingLogger = Current.ProfilingLogger; - Services = Current.Services; - } - - /// - /// Empty constructor, uses Singleton to resolve the UmbracoContext - /// - protected UmbracoUserControl() - : this(Current.UmbracoContext, Current.Services) - { } - - // for debugging purposes - internal Guid InstanceId { get; } = Guid.NewGuid(); - - /// - /// Gets the Umbraco helper. - /// - public UmbracoHelper Umbraco { get; } - - /// - /// Gets the membership helper; - /// - public MembershipHelper Members { get; } - - /// - /// Gets the web security helper. - /// - public WebSecurity Security => UmbracoContext.Security; - - /// - /// Gets the logger. - /// - public ILogger Logger { get; } - - /// - /// Gets the ProfilingLogger. - /// - public IProfilingLogger ProfilingLogger { get; } - - /// - /// Gets the Umbraco context. - /// - public UmbracoContext UmbracoContext { get; } - - /// - /// Gets the services context. - /// - public ServiceContext Services { get; } - - /// - /// Gets an instance of ClientTools for access to the pages client API. - /// - public ClientTools ClientTools - { - get - { - var page = Page as BasePage; - return _clientTools ?? (_clientTools = page != null ? page.ClientTools : new ClientTools(Page)); - } - } - - /// - /// Gets a Url helper. - /// - /// This URL helper is created without any route data and an empty request context. - public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); - } -} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 64a60d824a..bf91933745 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1145,11 +1145,6 @@ - - - - ASPXCodeBehind - ASPXCodeBehind