diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index d31e6dbec8..ea62370655 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -10,7 +10,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Routing; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.cache; using umbraco.cms.businesslogic.template; diff --git a/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx b/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx index c3a8df1f7d..e6dc8ebb85 100644 --- a/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx +++ b/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx @@ -6,7 +6,7 @@ #propertyMapping thead tr th{border-bottom:1px solid #ccc; padding: 4px; padding-right: 25px; - background-image: url(<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco_client) %>/tableSorting/img/bg.gif); + background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif); cursor: pointer; font-weight: bold; background-repeat: no-repeat; diff --git a/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx b/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx index 94b056f296..a5ee2d2ba5 100644 --- a/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx +++ b/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Dashboard.ascx.cs" Inherits="Our.Umbraco.uGoLive.Web.Umbraco.Plugins.uGoLive.Dashboard" %> -<%@ Import Namespace="umbraco.IO" %> <%@ Import Namespace="Our.Umbraco.uGoLive.Web" %> +<%@ Import Namespace="Umbraco.Core.IO" %> <%@ Register Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" TagPrefix="cdf" %> diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx index a6f25da43e..4c65d01255 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx @@ -63,10 +63,10 @@ var templateCode = UmbEditor.GetCode(); var selectedTemplate = templateDropDown.options[templateDropDown.selectedIndex].id; - var masterTemplate = "<%= umbraco.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master"; + var masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master"; if (selectedTemplate == "") - masterTemplate = "<%= umbraco.IO.SystemDirectories.Umbraco%>/masterpages/default.master"; + masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Umbraco%>/masterpages/default.master"; var regex = /MasterPageFile=[~a-z0-9/._"-]+/im; diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs index a96eea0475..4d6489cb2c 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; using Umbraco.Core.ObjectResolution; -using umbraco.IO; +using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders { diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs index 8b5aeaf318..a2777c0137 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs @@ -6,7 +6,7 @@ using System.Text; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.ObjectResolution; -using umbraco.IO; +using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders { diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs index ce6ee054a4..be1e6b4b42 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; using Umbraco.Core.ObjectResolution; -using umbraco.IO; +using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders { diff --git a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs index 08d9cbc4de..97512dff17 100644 --- a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs +++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs @@ -5,7 +5,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using ClientDependency.Core; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; namespace Umbraco.Web.UI.Controls { diff --git a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs index 032f08586a..ecfa83b1ae 100644 --- a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs +++ b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs @@ -11,7 +11,7 @@ using umbraco.cms.businesslogic.member; using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.interfaces; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.NodeFactory; namespace umbraco { diff --git a/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs index b50fddc254..1e0a77f273 100644 --- a/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs +++ b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs @@ -1,7 +1,7 @@ using System; using System.Web; using System.Xml.Linq; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.presentation.preview; using umbraco.BusinessLogic; using System.Xml; diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs index 0b6c35e394..23e694ecce 100644 --- a/src/Umbraco.Web/umbraco.presentation/library.cs +++ b/src/Umbraco.Web/umbraco.presentation/library.cs @@ -29,7 +29,7 @@ using umbraco.cms.helpers; using umbraco.scripting; using umbraco.DataLayer; using umbraco.cms.businesslogic.language; -using umbraco.IO; +using Umbraco.Core.IO; using UmbracoContext = umbraco.presentation.UmbracoContext; namespace umbraco @@ -1116,7 +1116,7 @@ namespace umbraco /// public static void AddJquery() { - RegisterJavaScriptFile("jQuery", String.Format("{0}/ui/jquery.js", IOHelper.ResolveUrl(SystemDirectories.Umbraco_client))); + RegisterJavaScriptFile("jQuery", String.Format("{0}/ui/jquery.js", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient))); } diff --git a/src/Umbraco.Web/umbraco.presentation/python.cs b/src/Umbraco.Web/umbraco.presentation/python.cs index 61bda0c142..80b80c78a6 100644 --- a/src/Umbraco.Web/umbraco.presentation/python.cs +++ b/src/Umbraco.Web/umbraco.presentation/python.cs @@ -1,5 +1,5 @@ using System; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.scripting { diff --git a/src/Umbraco.Web/umbraco.presentation/requestModule.cs b/src/Umbraco.Web/umbraco.presentation/requestModule.cs index 14fe89193e..6be1737545 100644 --- a/src/Umbraco.Web/umbraco.presentation/requestModule.cs +++ b/src/Umbraco.Web/umbraco.presentation/requestModule.cs @@ -11,7 +11,7 @@ using umbraco.BusinessLogic.Utils; using umbraco.businesslogic; using umbraco.cms.businesslogic.cache; using System.Web.Caching; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.interfaces; diff --git a/src/Umbraco.Web/umbraco.presentation/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs index 1b51a735ca..40a786325a 100644 --- a/src/Umbraco.Web/umbraco.presentation/template.cs +++ b/src/Umbraco.Web/umbraco.presentation/template.cs @@ -16,7 +16,7 @@ using Umbraco.Web; using Umbraco.Web.Cache; using umbraco.DataLayer; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; using System.Web; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs index 458798dd38..8e7098e3d1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs @@ -21,7 +21,7 @@ using umbraco.cms.businesslogic.web; using umbraco.interfaces; using umbraco.DataLayer; using System.Collections.Specialized; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.uicontrols; namespace umbraco.cms.presentation.Trees diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs index 5d71a2f606..85f769a251 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs @@ -9,7 +9,7 @@ using System.Web.Script.Serialization; using System.Text; using umbraco.businesslogic.Utils; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.presentation.Trees { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs index def06a2292..c64e044400 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs @@ -22,7 +22,7 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs index a91a748bf9..168f17b60a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs @@ -23,7 +23,7 @@ using umbraco.interfaces; using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 605ca14946..0b86c90e2a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -26,7 +26,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs index 5056d970e7..b923e8c075 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs @@ -81,11 +81,11 @@ namespace umbraco private void RenderTemplateFolderItems(string folder, string folderPath, ref XmlTree tree) { - string relPath = IO.SystemDirectories.Masterpages + "/" + folder; + string relPath = SystemDirectories.Masterpages + "/" + folder; if (!string.IsNullOrEmpty(folderPath)) relPath += folderPath; - string fullPath = IO.IOHelper.MapPath(relPath); + string fullPath = IOHelper.MapPath(relPath); foreach (string dir in System.IO.Directory.GetDirectories(fullPath)) { @@ -155,7 +155,7 @@ namespace umbraco { if (base.m_id == -1) { - foreach (string s in Directory.GetDirectories(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages))) + foreach (string s in Directory.GetDirectories(IOHelper.MapPath(SystemDirectories.Masterpages))) { var _s = Path.GetFileNameWithoutExtension(s); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs index 812083da84..49c54554c2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs @@ -24,7 +24,7 @@ using umbraco.DataLayer; using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Utils; using umbraco.BusinessLogic.Actions; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs index 4cad4cae4b..08d33ed969 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using umbraco.cms.businesslogic.web; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.actions { @@ -28,7 +28,7 @@ namespace umbraco.presentation.actions protected void Page_Load(object sender, EventArgs e) { Document doc = new Document(int.Parse(helper.Request("id"))); - Response.Redirect(IOHelper.ResolveUrl(string.Format("{0}/dialogs/preview.aspx?id= {1}", IO.SystemDirectories.Umbraco, doc.Id))); + Response.Redirect(IOHelper.ResolveUrl(string.Format("{0}/dialogs/preview.aspx?id= {1}", SystemDirectories.Umbraco, doc.Id))); } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs index c048ada53b..56b8a9000e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs @@ -20,7 +20,7 @@ using Post = CookComputing.MetaWeblog.Post; using System.Collections.Generic; using System.Web.Security; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; namespace umbraco.presentation.channels diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs index 2a6610b4c7..3cb25cb765 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs @@ -3,7 +3,7 @@ using System.IO; using System.Web; using System.Xml; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.channels.businesslogic { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs index a3c93bcc1d..5a8b0b616e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs @@ -3,7 +3,7 @@ using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; using System.Collections; using System.IO; -using umbraco.IO; +using Umbraco.Core.IO; using System.Linq; namespace umbraco.controls diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx index b99e16d8fc..4cdad45578 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx @@ -10,7 +10,7 @@

- + @@ -21,7 +21,7 @@

- + Edit ""

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs index 81a3bf2e50..4cd8d046a9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.propertytype; namespace umbraco.controls.GenericProperties diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs index a93108357a..d03a2a668b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs @@ -42,7 +42,7 @@ namespace umbraco.controls.Images //load the control with the specified properties and render the output as a string and return it Page page = new Page(); - string path = umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx"; + string path = Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx"; ImageViewer imageViewer = page.LoadControl(path) as ImageViewer; imageViewer.MediaId = mediaId; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx index 42dce282c0..2d5ef2d26f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx @@ -1,2 +1,2 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %> -<%#umbraco.ui.Text("publish", "inProgress", null)%>
\ No newline at end of file +<%#umbraco.ui.Text("publish", "inProgress", null)%>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs index 3e19d63189..b318919a3f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs @@ -8,7 +8,7 @@ using System.Web.UI.HtmlControls; using System.Collections; using System.Web.UI; using ClientDependency.Core; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.presentation; using System.Collections.Generic; using System.Linq; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs index 89eeaa74d2..42f7ad8c9b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs @@ -4,7 +4,7 @@ using System.Web.UI; using System.Web.UI.HtmlControls; using ClientDependency.Core; using umbraco.controls.Tree; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.controls.Tree { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx index c7fa6aa5d5..41ac545d6f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx @@ -44,8 +44,8 @@ jQuery(document).ready(function() { functionToCall : functionToCall, nodeKey : nodeKey, treeMode: "<%#Mode.ToString().ToLower()%>", - dataUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx", - serviceUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"}); + dataUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx", + serviceUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"}); //add event handler for ajax errors, this will refresh the whole application var mainTree = UmbClientMgr.mainTree(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs index 6a156f9099..8c2f9ca837 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs @@ -6,7 +6,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs index c64dfb947a..4a67a7cab4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs @@ -63,8 +63,8 @@ namespace umbraco.presentation.create private void _loadTemplates(ListBox list, string scriptType) { - string path = IO.SystemDirectories.Umbraco + "/scripting/templates/" + scriptType + "/"; - string abPath = IO.IOHelper.MapPath(path); + string path = SystemDirectories.Umbraco + "/scripting/templates/" + scriptType + "/"; + string abPath = IOHelper.MapPath(path); list.Items.Clear(); // always add the option of an empty one diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs index fcde3d2e43..cc3192cc1c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs index ac51e788aa..38912b7f4f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs index 0f74ff4496..f871f55ea0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs index 743b81f780..8e7eab0984 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs @@ -4,7 +4,7 @@ using System.Web.Security; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs index defba78e19..595090828f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs @@ -4,7 +4,7 @@ using System.Web.Security; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs index 594ae2b039..5d7be690e8 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs index 1e18d40910..851faaf616 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs index 12de0b4efb..17041f635a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs index 8e3f60cc25..fc2244a418 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs @@ -6,7 +6,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs index 19d50a1228..05ab623caa 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs @@ -6,7 +6,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs index c0f5de6943..5ad5999eb7 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs index 0b5928d0ad..24df854710 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs @@ -6,7 +6,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs index 253d7a0b7c..a156ec9cdd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs @@ -9,7 +9,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs index 2d96c9d563..def558135f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs @@ -13,7 +13,7 @@ using Umbraco.Core.Configuration; using Umbraco.Web.UI; using umbraco.cms.helpers; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.umbraco.create { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs index ef00c4902a..dbf0f8e249 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs @@ -5,7 +5,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs index b84a7479a3..63a4d10e4a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs @@ -7,7 +7,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs index bd9443fb3a..436aabc97f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs @@ -7,7 +7,7 @@ using Umbraco.Web.UI; using umbraco.BusinessLogic; using umbraco.DataLayer; using umbraco.BasePages; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.member; namespace umbraco diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs index b62b6d0bc3..8317f8ab5d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs @@ -9,7 +9,7 @@ namespace dashboardUtilities using umbraco; using umbraco.BasePages; using umbraco.BusinessLogic; - using umbraco.IO; + using Umbraco.Core.IO; public partial class FeedProxy : UmbracoEnsuredPage { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs index 8286a74cae..fe2dc67250 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs @@ -1,6 +1,6 @@ using umbraco.BusinessLogic; using System; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.web; namespace dashboardUtilities diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs index 6085caeb48..3f2b466345 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs @@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls; using System.Xml; using System.Xml.XPath; using Umbraco.Core.Configuration; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.developer.packages { public partial class BrowseRepository : BasePages.UmbracoEnsuredPage { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index 4975783f97..0be95f6fa1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -12,7 +12,7 @@ using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.cms.presentation.Trees; using umbraco.controls; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.developer.packages { @@ -226,7 +226,7 @@ namespace umbraco.presentation.developer.packages if (!string.IsNullOrEmpty(pack.PackagePath)) { - packageUmbFile.Text = "   Download"; + packageUmbFile.Text = "   Download"; this.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.success, "Package saved and published", ""); } else { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs index 61d03e9515..39a734a158 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs @@ -7,7 +7,7 @@ using System.Web; using System.Web.Services; using System.Xml; using System.IO; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.presentation.webservices; namespace umbraco.developer diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs index b8ba3f7d9e..f76bff3d2c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; using System.Text; using System.Xml; using System.IO; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.umbraco.developer.Xslt { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs index 9a2c7a9baa..3a2917f24f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs @@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls; using System.IO; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; namespace umbraco.dialogs diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs index 86aabc6589..f5b9415f85 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs @@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls; using System.Xml; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.dialogs { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs index 9ffee7ba1c..a5b0cd39ef 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Umbraco.Core.IO; namespace umbraco.presentation.masterpages { @@ -16,7 +17,7 @@ namespace umbraco.presentation.masterpages protected void Page_Load(object sender, EventArgs e) { ClientLoader.DataBind(); - ScriptManager.RegisterStartupScript(Page, Page.GetType(), "setRoot", "UmbClientMgr.setUmbracoPath(\"" + IO.IOHelper.ResolveUrl(IO.SystemDirectories.Umbraco) + "\");", true); + ScriptManager.RegisterStartupScript(Page, Page.GetType(), "setRoot", "UmbClientMgr.setUmbracoPath(\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "\");", true); FireOnLoad(e); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs index 390de21e89..51cfddbaad 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs @@ -10,7 +10,7 @@ using System.Web; using System.Text.RegularExpressions; using System.IO; using Umbraco.Core.Logging; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.plugins.tinymce3 { @@ -39,7 +39,7 @@ namespace umbraco.presentation.plugins.tinymce3 // UMBRACO: Populate the configsection if it's empty configSection.Add("GzipEnabled", "true"); - configSection.Add("InstallPath", IOHelper.ResolveUrl(SystemDirectories.Umbraco_client) + "/tinymce3"); + configSection.Add("InstallPath", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient) + "/tinymce3"); configSection.Add("GzipExpiresOffset", TimeSpan.FromDays(10).Ticks.ToString()); // Setup cache diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs index b6165ac86c..5c48b5745f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs @@ -9,7 +9,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using umbraco.cms.presentation.Trees; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.settings { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs index 850cc5eb33..8340d97dac 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs @@ -146,7 +146,7 @@ namespace umbraco.cms.presentation.settings.scripts Panel1.Menu.InsertSplitter(); uicontrols.MenuIconI helpIcon = Panel1.Menu.NewIcon(); - helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", ui.Text("template", "quickGuide"), 600, 580); + helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", ui.Text("template", "quickGuide"), 600, 580); helpIcon.ImageURL = UmbracoPath + "/images/editor/help.png"; helpIcon.AltText = ui.Text("template", "quickGuide"); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs index 6fc4e32ea5..9676f1d184 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs @@ -21,7 +21,7 @@ using Umbraco.Web.Templates; using umbraco.cms.businesslogic; using umbraco.cms.businesslogic.property; using umbraco.cms.businesslogic.web; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.templateControls { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs index 8064dd3627..9a9ccbd467 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs @@ -18,7 +18,7 @@ using ICSharpCode.SharpZipLib.Zip; using ICSharpCode.SharpZipLib.Zip.Compression; using ICSharpCode.SharpZipLib.Zip.Compression.Streams; using ICSharpCode.SharpZipLib.GZip; -using umbraco.IO; +using Umbraco.Core.IO; using System.Collections.Generic; namespace umbraco.presentation.translation diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs index cd070e0a5a..c7199313ec 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs @@ -16,7 +16,7 @@ using Umbraco.Core.Configuration; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.task; using umbraco.cms.businesslogic.web; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.translation { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs index cc26cdbd91..b02cdb0862 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs @@ -19,7 +19,7 @@ using umbraco.presentation.channels.businesslogic; using umbraco.uicontrols; using umbraco.providers; using umbraco.cms.presentation.Trees; -using umbraco.IO; +using Umbraco.Core.IO; using Umbraco.Core; namespace umbraco.cms.presentation.user diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs index b41df24988..b6796e45fa 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs @@ -15,7 +15,7 @@ using umbraco.BusinessLogic.Actions; using umbraco.BusinessLogic; using umbraco.uicontrols; using umbraco.cms.presentation.Trees; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs index 995860e65f..1a8a0a37cc 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs @@ -19,7 +19,7 @@ using umbraco.BusinessLogic.Actions; using umbraco.interfaces; using umbraco.cms.presentation.Trees; using System.Xml.XPath; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.presentation.user { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs index 05044c6e3b..7813e7e5cb 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs @@ -14,7 +14,7 @@ using umbraco.BasePages; using System.Collections.Generic; using umbraco.interfaces; using umbraco.BusinessLogic.Actions; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.presentation.user { diff --git a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs index 83304f7ab2..0eb1f8ce30 100644 --- a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs +++ b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs @@ -9,7 +9,7 @@ using System.Web.WebPages; using Umbraco.Core; using umbraco.cms.businesslogic.macro; using umbraco.interfaces; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.MacroEngines { diff --git a/src/umbraco.businesslogic/BasePages/ClientTools.cs b/src/umbraco.businesslogic/BasePages/ClientTools.cs index 45344ce412..f291f32844 100644 --- a/src/umbraco.businesslogic/BasePages/ClientTools.cs +++ b/src/umbraco.businesslogic/BasePages/ClientTools.cs @@ -4,7 +4,7 @@ using System.Text; using System.Web; using umbraco.BasePages; using System.Web.UI; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.BusinessLogic; namespace umbraco.BasePages diff --git a/src/umbraco.businesslogic/GlobalSettings.cs b/src/umbraco.businesslogic/GlobalSettings.cs index 2e5ec00903..5084be1d0b 100644 --- a/src/umbraco.businesslogic/GlobalSettings.cs +++ b/src/umbraco.businesslogic/GlobalSettings.cs @@ -9,7 +9,7 @@ using Umbraco.Core; using Umbraco.Core.Configuration; using umbraco.BusinessLogic; using umbraco.DataLayer; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco { diff --git a/src/umbraco.businesslogic/xmlHelper.cs b/src/umbraco.businesslogic/xmlHelper.cs index 5eb07b5309..5d187dbfca 100644 --- a/src/umbraco.businesslogic/xmlHelper.cs +++ b/src/umbraco.businesslogic/xmlHelper.cs @@ -1,6 +1,6 @@ using System; using System.Xml; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco { diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index 4ba13aa582..f8f5aa756b 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -13,7 +13,7 @@ using umbraco.BusinessLogic; using System.IO; using System.Text.RegularExpressions; using System.ComponentModel; -using umbraco.IO; +using Umbraco.Core.IO; using System.Collections; using umbraco.cms.businesslogic.task; using umbraco.cms.businesslogic.workflow; @@ -58,7 +58,7 @@ namespace umbraco.cms.businesslogic #region Private static - private static readonly string DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.Umbraco_client + "/Tree/treeIcons.css"); + private static readonly string DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.UmbracoClient + "/Tree/treeIcons.css"); private static readonly List InternalDefaultIconClasses = new List(); private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(); diff --git a/src/umbraco.cms/businesslogic/CMSPreviewNode.cs b/src/umbraco.cms/businesslogic/CMSPreviewNode.cs index fdcbeab082..4cae6acb29 100644 --- a/src/umbraco.cms/businesslogic/CMSPreviewNode.cs +++ b/src/umbraco.cms/businesslogic/CMSPreviewNode.cs @@ -8,7 +8,7 @@ using umbraco.BusinessLogic; using System.IO; using System.Text.RegularExpressions; using System.ComponentModel; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic { diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 867474f9be..cd6096eb60 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -963,10 +963,10 @@ namespace umbraco.cms.businesslogic.packager if (path.Contains("[$")) { //this is experimental and undocumented... - path = path.Replace("[$UMBRACO]", IO.SystemDirectories.Umbraco); - path = path.Replace("[$UMBRACOCLIENT]", IO.SystemDirectories.Umbraco_client); - path = path.Replace("[$CONFIG]", IO.SystemDirectories.Config); - path = path.Replace("[$DATA]", IO.SystemDirectories.Data); + path = path.Replace("[$UMBRACO]", SystemDirectories.Umbraco); + path = path.Replace("[$UMBRACOCLIENT]", SystemDirectories.UmbracoClient); + path = path.Replace("[$CONFIG]", SystemDirectories.Config); + path = path.Replace("[$DATA]", SystemDirectories.Data); } //to support virtual dirs we try to lookup the file... diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs index 70cf3070e7..825b3c63cd 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs @@ -1,6 +1,6 @@ using System; using System.Xml; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager.standardPackageActions { diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs index 113ef2e014..2c718a1d41 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs @@ -1,5 +1,5 @@ using System.Xml; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager.standardPackageActions { diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs index 5e2d887030..3aff552bf8 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Logging; using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.macro; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager { @@ -104,7 +104,7 @@ namespace umbraco.cms.businesslogic.packager { int outInt = 0; //Path checking... - string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder); + string localPath = IOHelper.MapPath(SystemDirectories.Media + "/" + pack.Folder); if (!System.IO.Directory.Exists(localPath)) System.IO.Directory.CreateDirectory(localPath); @@ -271,7 +271,7 @@ namespace umbraco.cms.businesslogic.packager { //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension; // check if there's a packages directory below media - string packagesDirectory = IO.SystemDirectories.Media + "/created-packages"; + string packagesDirectory = SystemDirectories.Media + "/created-packages"; if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory))) System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory)); diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index 94c523aeab..5351bda083 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Umbraco.Core.Logging; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager { public class InstalledPackage diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs index 29d1f07b3e..fdebbc8e3c 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs @@ -18,7 +18,7 @@ using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.macro; using ICSharpCode.SharpZipLib.Zip; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager { /// diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs index d7165557fa..0ca3b50416 100644 --- a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs +++ b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs @@ -7,7 +7,7 @@ using System.IO; using System.Net; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager.repositories { diff --git a/src/umbraco.cms/businesslogic/Packager/Settings.cs b/src/umbraco.cms/businesslogic/Packager/Settings.cs index 67651e087b..e8136fc95e 100644 --- a/src/umbraco.cms/businesslogic/Packager/Settings.cs +++ b/src/umbraco.cms/businesslogic/Packager/Settings.cs @@ -8,7 +8,7 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using System.IO; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.packager { diff --git a/src/umbraco.cms/businesslogic/Packager/data.cs b/src/umbraco.cms/businesslogic/Packager/data.cs index ceae03b0c3..6f0df33b4d 100644 --- a/src/umbraco.cms/businesslogic/Packager/data.cs +++ b/src/umbraco.cms/businesslogic/Packager/data.cs @@ -4,6 +4,7 @@ using System.Xml.XPath; using System.Collections.Generic; using System.IO; using Umbraco.Core; +using Umbraco.Core.IO; using Umbraco.Core.Logging; namespace umbraco.cms.businesslogic.packager @@ -25,17 +26,17 @@ namespace umbraco.cms.businesslogic.packager //do some error checking and create the folders/files if they don't exist if (!File.Exists(dataSource)) { - if (!Directory.Exists(IO.IOHelper.MapPath(Settings.PackagerRoot))) + if (!Directory.Exists(IOHelper.MapPath(Settings.PackagerRoot))) { - Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.PackagerRoot)); + Directory.CreateDirectory(IOHelper.MapPath(Settings.PackagerRoot)); } - if (!Directory.Exists(IO.IOHelper.MapPath(Settings.PackagesStorage))) + if (!Directory.Exists(IOHelper.MapPath(Settings.PackagesStorage))) { - Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.PackagesStorage)); + Directory.CreateDirectory(IOHelper.MapPath(Settings.PackagesStorage)); } - if (!Directory.Exists(IO.IOHelper.MapPath(Settings.InstalledPackagesStorage))) + if (!Directory.Exists(IOHelper.MapPath(Settings.InstalledPackagesStorage))) { - Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.InstalledPackagesStorage)); + Directory.CreateDirectory(IOHelper.MapPath(Settings.InstalledPackagesStorage)); } StreamWriter sw = File.CreateText(dataSource); diff --git a/src/umbraco.cms/businesslogic/translation/Translation.cs b/src/umbraco.cms/businesslogic/translation/Translation.cs index ab0d0d9482..42ca56c574 100644 --- a/src/umbraco.cms/businesslogic/translation/Translation.cs +++ b/src/umbraco.cms/businesslogic/translation/Translation.cs @@ -8,7 +8,7 @@ using umbraco.cms.businesslogic.language; using umbraco.cms.businesslogic.property; using umbraco.cms.businesslogic.task; using umbraco.cms.businesslogic.web; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.translation { diff --git a/src/umbraco.cms/businesslogic/web/Access.cs b/src/umbraco.cms/businesslogic/web/Access.cs index 64d43c8756..8f0cffd4b2 100644 --- a/src/umbraco.cms/businesslogic/web/Access.cs +++ b/src/umbraco.cms/businesslogic/web/Access.cs @@ -6,7 +6,7 @@ using System.Collections; using System.IO; using System.Web.Security; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.web { diff --git a/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs b/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs index 5709d71295..994f3c3209 100644 --- a/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs +++ b/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs @@ -10,7 +10,7 @@ using umbraco.cms.businesslogic.property; using umbraco.cms.businesslogic.relation; using umbraco.cms.helpers; using umbraco.DataLayer; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.web { diff --git a/src/umbraco.cms/businesslogic/workflow/Notification.cs b/src/umbraco.cms/businesslogic/workflow/Notification.cs index 4814eff551..9387ad4444 100644 --- a/src/umbraco.cms/businesslogic/workflow/Notification.cs +++ b/src/umbraco.cms/businesslogic/workflow/Notification.cs @@ -11,7 +11,7 @@ using umbraco.cms.businesslogic.property; using umbraco.cms.businesslogic.web; using umbraco.DataLayer; using umbraco.interfaces; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.workflow { diff --git a/src/umbraco.controls/CodeArea.cs b/src/umbraco.controls/CodeArea.cs index 1d273e32f3..6cf048004c 100644 --- a/src/umbraco.controls/CodeArea.cs +++ b/src/umbraco.controls/CodeArea.cs @@ -12,7 +12,6 @@ using ClientDependency.Core; using System.Linq; using ClientDependency.Core.Controls; using Umbraco.Core.Configuration; -using umbraco.IO; namespace umbraco.uicontrols { diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs index 89cff8fe24..d7b5f80f4f 100644 --- a/src/umbraco.controls/ProgressBar.cs +++ b/src/umbraco.controls/ProgressBar.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Web.UI.WebControls; +using Umbraco.Core.IO; namespace umbraco.uicontrols { diff --git a/src/umbraco.controls/Splitter.cs b/src/umbraco.controls/Splitter.cs index 12424c8b61..fb42b00c28 100644 --- a/src/umbraco.controls/Splitter.cs +++ b/src/umbraco.controls/Splitter.cs @@ -1,6 +1,6 @@ using System.ComponentModel; using System.Web.UI; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.uicontrols { internal class Splitter : System.Web.UI.WebControls.Image { @@ -9,7 +9,7 @@ namespace umbraco.uicontrols { this.Height = System.Web.UI.WebControls.Unit.Pixel(21); this.Style.Add("border", "0px"); this.Attributes.Add("class", "editorIconSplit"); - this.ImageUrl = SystemDirectories.Umbraco_client + "/menuicon/images/split.gif"; + this.ImageUrl = SystemDirectories.UmbracoClient + "/menuicon/images/split.gif"; } } } \ No newline at end of file diff --git a/src/umbraco.controls/TreePicker/BaseTreePicker.cs b/src/umbraco.controls/TreePicker/BaseTreePicker.cs index a91a718e9b..6659e01e93 100644 --- a/src/umbraco.controls/TreePicker/BaseTreePicker.cs +++ b/src/umbraco.controls/TreePicker/BaseTreePicker.cs @@ -143,7 +143,7 @@ namespace umbraco.uicontrols.TreePicker ModalWidth.ToString(), ModalHeight.ToString(), ShowHeader.ToString().ToLower(), - umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco).TrimEnd('/') + Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco).TrimEnd('/') }); } diff --git a/src/umbraco.controls/TreeUrlGenerator.cs b/src/umbraco.controls/TreeUrlGenerator.cs index a136772028..0ca735cb4f 100644 --- a/src/umbraco.controls/TreeUrlGenerator.cs +++ b/src/umbraco.controls/TreeUrlGenerator.cs @@ -79,7 +79,7 @@ namespace umbraco.uicontrols /// Tree service url as a string public string GetServiceUrl() { - return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(TREE_URL); + return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/" + GetUrl(TREE_URL); } /// @@ -115,7 +115,7 @@ namespace umbraco.uicontrols /// public string GetInitUrl() { - return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(INIT_URL); + return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/" + GetUrl(INIT_URL); } /// @@ -161,7 +161,7 @@ namespace umbraco.uicontrols /// public string GetPickerUrl() { - return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/" + GetUrl(PICKER_URL); + return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dialogs/" + GetUrl(PICKER_URL); } [Obsolete("No longer used as useSubModal no longer has any relavence")] diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs b/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs index f344fd0f4c..1c384dbcbf 100644 --- a/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs +++ b/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs @@ -4,7 +4,7 @@ using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; using umbraco.controls.Images; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.editorControls.MultiNodeTreePicker { diff --git a/src/umbraco.editorControls/XmlData.cs b/src/umbraco.editorControls/XmlData.cs index 147080e4d2..e8883fec3f 100644 --- a/src/umbraco.editorControls/XmlData.cs +++ b/src/umbraco.editorControls/XmlData.cs @@ -1,4 +1,5 @@ using System.Xml; +using Umbraco.Core; using umbraco.cms.businesslogic.datatype; namespace umbraco.editorControls @@ -25,7 +26,7 @@ namespace umbraco.editorControls public override XmlNode ToXMl(XmlDocument data) { // check that the value isn't null and starts with an opening angle-bracket. - if (this.Value != null && xmlHelper.CouldItBeXml(this.Value.ToString())) + if (this.Value != null && XmlHelper.CouldItBeXml(this.Value.ToString())) { // load the value into an XML document. var xd = new XmlDocument(); diff --git a/src/umbraco.editorControls/colorpicker/colorPicker.cs b/src/umbraco.editorControls/colorpicker/colorPicker.cs index 5c6200acd6..509010554d 100644 --- a/src/umbraco.editorControls/colorpicker/colorPicker.cs +++ b/src/umbraco.editorControls/colorpicker/colorPicker.cs @@ -3,7 +3,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.ComponentModel; using System.Collections; -using umbraco.IO; +using Umbraco.Core.IO; using System.Collections.Generic; namespace umbraco.editorControls diff --git a/src/umbraco.editorControls/imagecropper/ImageInfo.cs b/src/umbraco.editorControls/imagecropper/ImageInfo.cs index 08bdeab11b..c85292cc81 100644 --- a/src/umbraco.editorControls/imagecropper/ImageInfo.cs +++ b/src/umbraco.editorControls/imagecropper/ImageInfo.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.IO; using System.Web; using umbraco.editorControls.imagecropper; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.editorControls.imagecropper { diff --git a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs index f2c50e7818..aad1a2e2ca 100644 --- a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs +++ b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs @@ -10,7 +10,7 @@ using umbraco.interfaces; using umbraco.editorControls; using umbraco.cms.businesslogic; using umbraco.cms.businesslogic.datatype; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.editorControls.relatedlinks { diff --git a/src/umbraco.editorControls/simpleEditor/simpleEditor.cs b/src/umbraco.editorControls/simpleEditor/simpleEditor.cs index 3e0b6ee0b4..8a7843a012 100644 --- a/src/umbraco.editorControls/simpleEditor/simpleEditor.cs +++ b/src/umbraco.editorControls/simpleEditor/simpleEditor.cs @@ -3,7 +3,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.ComponentModel; using System.Collections; -using umbraco.IO; +using Umbraco.Core.IO; namespace umbraco.editorControls.simpleEditor { @@ -88,13 +88,13 @@ namespace umbraco.editorControls.simpleEditor output.WriteLine("
"); output.WriteLine( "

" + - "" + + "" + "" + "" + - "" + + "" + "" + " " + - "" + + "" + "" + "

"); base.Render(output); diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs index b9c5ace6c1..0edd0aad4c 100644 --- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs +++ b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs @@ -12,7 +12,7 @@ using umbraco.editorControls.tinymce; using umbraco.editorControls.tinyMCE3.webcontrol; using umbraco.editorControls.wysiwyg; using umbraco.interfaces; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.presentation; using umbraco.uicontrols; @@ -263,7 +263,7 @@ namespace umbraco.editorControls.tinyMCE3 } } - //if (HttpContext.Current.Request.Path.IndexOf(umbraco.IO.SystemDirectories.Umbraco) > -1) + //if (HttpContext.Current.Request.Path.IndexOf(Umbraco.Core.IO.SystemDirectories.Umbraco) > -1) // config.Add("language", User.GetUser(BasePage.GetUserId(BasePage.umbracoUserContextID)).Language); //else // config.Add("language", System.Threading.Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName); diff --git a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs index ff3d89de26..3155fc7ba5 100644 --- a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs +++ b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs @@ -409,7 +409,7 @@ namespace umbraco.editorControls.ultimatepicker string autoCompleteScript = "jQuery(\"#" + childtxt.ClientID + "\").autocomplete(\"" - + umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + + Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/webservices/UltimatePickerAutoCompleteHandler.ashx\",{minChars: 2,max: 100, extraParams:{id:\"" + parentNodeId.ToString() + "\",showchildren:\"" + config[3] + "\",filter:\"" + config[2] + "\",rnd:\"" + DateTime.Now.Ticks + "\"}});"; diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs index 34b4c1b568..096b708804 100644 --- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs +++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs @@ -13,7 +13,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic; using umbraco.editorControls; -using umbraco.IO; +using Umbraco.Core.IO; using System.Collections.Generic; using umbraco.cms.businesslogic.datatype; @@ -68,7 +68,7 @@ namespace umbraco.editorControls.userControlGrapper // populate the usercontrol dropdown _dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), "")); - populateUserControls( IOHelper.MapPath( SystemDirectories.Usercontrols) ); + populateUserControls( IOHelper.MapPath( SystemDirectories.UserControls) ); } @@ -79,11 +79,11 @@ namespace umbraco.editorControls.userControlGrapper foreach (FileInfo uc in di.GetFiles("*.ascx")) { - string ucRoot = IOHelper.MapPath(SystemDirectories.Usercontrols); + string ucRoot = IOHelper.MapPath(SystemDirectories.UserControls); _dropdownlistUserControl.Items.Add( - - new ListItem( SystemDirectories.Usercontrols + + + new ListItem(SystemDirectories.UserControls + uc.FullName.Substring(ucRoot.Length).Replace(IOHelper.DirSepChar, '/')) /* diff --git a/src/umbraco.macroRenderings/content.cs b/src/umbraco.macroRenderings/content.cs index 6f2833b02f..06d71d5a4e 100644 --- a/src/umbraco.macroRenderings/content.cs +++ b/src/umbraco.macroRenderings/content.cs @@ -4,7 +4,7 @@ using Microsoft.ApplicationBlocks.Data; using System.Data.SqlClient; using System.Web.UI; using ClientDependency.Core; -using umbraco.IO; + using umbraco.interfaces; using umbraco.uicontrols.TreePicker; diff --git a/src/umbraco.macroRenderings/media.cs b/src/umbraco.macroRenderings/media.cs index 71755121ff..e447195a69 100644 --- a/src/umbraco.macroRenderings/media.cs +++ b/src/umbraco.macroRenderings/media.cs @@ -5,7 +5,6 @@ using System.Data.SqlClient; using System.Web.UI; using ClientDependency.Core; -using umbraco.IO; using umbraco.interfaces; using umbraco.uicontrols.TreePicker;