swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
This commit is contained in:
Stephan
2013-10-03 18:16:29 +02:00
parent 06206c60d9 08660704cc
commit a264342bcc
161 changed files with 387 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Core/EnumerableExtensions.cs
+31 -11
View File
@@ -17,21 +17,41 @@ namespace Umbraco.Core
throw new NullReferenceException("source");
// enumerate the source only once!
var enumerator = source.GetEnumerator();
while (enumerator.MoveNext())
yield return EnumerateGroup(enumerator, groupSize);
return new InGroupsEnumerator<T>(source, groupSize).Groups();
}
private static IEnumerable<T> EnumerateGroup<T>(IEnumerator<T> enumerator, int count)
// this class makes sure that the source is enumerated only ONCE
// which means that when it is enumerated, the actual groups content
// has to be evaluated at the same time, and stored in an array.
private class InGroupsEnumerator<T>
{
var c = 1;
do
{
yield return enumerator.Current;
} while (c++ < count && enumerator.MoveNext());
}
private readonly IEnumerator<T> _source;
private readonly int _count;
private bool _mightHaveNext;
public InGroupsEnumerator(IEnumerable<T> source, int count)
{
_source = source.GetEnumerator();
_count = count;
_mightHaveNext = true;
}
public IEnumerable<IEnumerable<T>> Groups()
{
while (_mightHaveNext && _source.MoveNext())
yield return Group().ToArray(); // see note above
}
private IEnumerable<T> Group()
{
var c = 0;
do
{
yield return _source.Current;
} while (++c < _count && _source.MoveNext());
_mightHaveNext = c == _count;
}
}
/// <summary>The distinct by.</summary>
/// <param name="source">The source.</param>
src/Umbraco.Core/Profiling/ProfilingView.cs
+28
View File
@@ -0,0 +1,28 @@
using System.IO;
using System.Web.Mvc;
namespace Umbraco.Core.Profiling
{
public class ProfilingView : IView
{
private readonly IView _inner;
private readonly string _name;
private readonly string _viewPath;
public ProfilingView(IView inner)
{
_inner = inner;
_name = inner.GetType().Name;
var razorView = inner as RazorView;
_viewPath = razorView != null ? razorView.ViewPath : "Unknown";
}
public void Render(ViewContext viewContext, TextWriter writer)
{
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.Render: {1}", _name, _viewPath)))
{
_inner.Render(viewContext, writer);
}
}
}
}
src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
+48
View File
@@ -0,0 +1,48 @@
using System.Web.Mvc;
namespace Umbraco.Core.Profiling
{
public class ProfilingViewEngine: IViewEngine
{
private readonly IViewEngine _inner;
private readonly string _name;
public ProfilingViewEngine(IViewEngine inner)
{
_inner = inner;
_name = inner.GetType().Name;
}
public ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache)
{
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.FindPartialView, {1}, {2}", _name, partialViewName, useCache)))
{
return WrapResult(_inner.FindPartialView(controllerContext, partialViewName, useCache));
}
}
public ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache)
{
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.FindView, {1}, {2}, {3}", _name, viewName, masterName, useCache)))
{
return WrapResult(_inner.FindView(controllerContext, viewName, masterName, useCache));
}
}
private static ViewEngineResult WrapResult(ViewEngineResult innerResult)
{
var profiledResult = innerResult.View != null ?
new ViewEngineResult(new ProfilingView(innerResult.View), innerResult.ViewEngine) :
new ViewEngineResult(innerResult.SearchedLocations);
return profiledResult;
}
public void ReleaseView(ControllerContext controllerContext, IView view)
{
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.ReleaseView, {1}", _name, view.GetType().Name)))
{
_inner.ReleaseView(controllerContext, view);
}
}
}
}
src/Umbraco.Core/StringExtensions.cs
+4 -4
View File
@@ -999,7 +999,7 @@ namespace Umbraco.Core
/// strings are cleaned up to camelCase and Ascii.</param>
/// <returns>The clean string.</returns>
/// <remarks>The string is cleaned in the context of the IShortStringHelper default culture.</remarks>
public static string ToCleanString(string text, CleanStringType stringType)
public static string ToCleanString(this string text, CleanStringType stringType)
{
return ShortStringHelper.CleanString(text, stringType);
}
@@ -1013,7 +1013,7 @@ namespace Umbraco.Core
/// <param name="separator">The separator.</param>
/// <returns>The clean string.</returns>
/// <remarks>The string is cleaned in the context of the IShortStringHelper default culture.</remarks>
public static string ToCleanString(string text, CleanStringType stringType, char separator)
public static string ToCleanString(this string text, CleanStringType stringType, char separator)
{
return ShortStringHelper.CleanString(text, stringType, separator);
}
@@ -1026,7 +1026,7 @@ namespace Umbraco.Core
/// strings are cleaned up to camelCase and Ascii.</param>
/// <param name="culture">The culture.</param>
/// <returns>The clean string.</returns>
public static string ToCleanString(string text, CleanStringType stringType, CultureInfo culture)
public static string ToCleanString(this string text, CleanStringType stringType, CultureInfo culture)
{
return ShortStringHelper.CleanString(text, stringType, culture);
}
@@ -1040,7 +1040,7 @@ namespace Umbraco.Core
/// <param name="separator">The separator.</param>
/// <param name="culture">The culture.</param>
/// <returns>The clean string.</returns>
public static string ToCleanString(string text, CleanStringType stringType, char separator, CultureInfo culture)
public static string ToCleanString(this string text, CleanStringType stringType, char separator, CultureInfo culture)
{
return ShortStringHelper.CleanString(text, stringType, separator, culture);
}
src/Umbraco.Core/Umbraco.Core.csproj
+2
View File
@@ -584,6 +584,8 @@
<Compile Include="Profiling\LogProfiler.cs" />
<Compile Include="Profiling\ProfilerExtensions.cs" />
<Compile Include="Profiling\ProfilerResolver.cs" />
<Compile Include="Profiling\ProfilingView.cs" />
<Compile Include="Profiling\ProfilingViewEngine.cs" />
<Compile Include="Profiling\WebProfiler.cs" />
<Compile Include="Dictionary\ICultureDictionary.cs" />
<Compile Include="Dynamics\ClassFactory.cs" />
src/Umbraco.Tests/BusinessLogic/BaseTest.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Umbraco.Core;
using Umbraco.Tests.TestHelpers;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.IO;
using Umbraco.Core.IO;
using GlobalSettings = umbraco.GlobalSettings;
namespace Umbraco.Tests.BusinessLogic
src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
+2 -2
View File
@@ -19,9 +19,9 @@ namespace Umbraco.Tests.CodeFirst
foreach (var property in content.Properties)
{
var @alias = property.PropertyTypeAlias;
var @alias = property.PropertyTypeAlias.ToLowerInvariant();
var propertyInfo = propertyInfos.FirstOrDefault(x => x.Name.ToUmbracoAlias() == @alias);
var propertyInfo = propertyInfos.FirstOrDefault(x => x.Name.ToLowerInvariant() == @alias);
if (propertyInfo == null) continue;
object value = null;
src/Umbraco.Tests/CodeFirst/TypeInheritanceTest.cs
+3 -3
View File
@@ -64,9 +64,9 @@ namespace Umbraco.Tests.CodeFirst
}
Assert.That(list.Count, Is.EqualTo(3));
Assert.That(list.Any(x => x == "meta"), Is.True);
Assert.That(list.Any(x => x == "metaSeo"), Is.True);
Assert.That(list.Any(x => x == "base"), Is.True);
Assert.Contains("Meta", list);
Assert.Contains("MetaSeo", list);
Assert.Contains("Base", list);
}
[Test]
src/Umbraco.Tests/CoreStrings/CmsHelperCasingTests.cs
+2 -1
View File
@@ -17,7 +17,8 @@ namespace Umbraco.Tests.CoreStrings
[TestCase("t", "t")]
[TestCase("thisis", "Thisis")]
[TestCase("ThisIsTheEnd", "This Is The End")]
[TestCase("WhoIsNumber6InTheVillage", "Who Is Number6In The Village")] // note the issue with Number6In
//[TestCase("WhoIsNumber6InTheVillage", "Who Is Number6In The Village")] // note the issue with Number6In
[TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // now fixed since DefaultShortStringHelper is the default
public void SpaceCamelCasing(string input, string expected)
{
var output = umbraco.cms.helpers.Casing.SpaceCamelCasing(input);
src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web.UI/install/steps/theend.ascx
+2 -2
View File
@@ -31,8 +31,8 @@ jQuery(document).ready(function () {
<br />
If you installed a starter kit you can start by configuring your new site, just click &quot;Preview your new website&quot; and follow the instructions. Or to start adding content right away click &quot;Set up your new website&quot; </p>
<ul class="btn-web">
<li class="btn-preview-web" id="customizeSite" runat="server"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/") %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
<li class="btn-set"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
<li class="btn-preview-web" id="customizeSite" runat="server"><a href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/") %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
<li class="btn-set"><a href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
</ul>
</div>
<div class="threcol">
src/Umbraco.Web.UI/umbraco/Default.aspx
+1 -1
View File
@@ -12,7 +12,7 @@
}
</script>
<link href="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco_client ) %>/ui/default.css" type="text/css" rel="stylesheet"/>
<link href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.UmbracoClient ) %>/ui/default.css" type="text/css" rel="stylesheet"/>
<style type="text/css">
body {
text-align: center;
src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx
+1 -1
View File
@@ -6,7 +6,7 @@
<script type="text/javascript">
jQuery(document).ready(function () {
jQuery("#umbSearchField").UmbQuickSearch('<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
jQuery("#umbSearchField").UmbQuickSearch('<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
UmbClientMgr.historyManager().addEventHandler("navigating", function (e, app) {
jQuery("#umbSearchField").flushCache();
src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+2 -2
View File
@@ -10,7 +10,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
<asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
</a>
@@ -21,7 +21,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right" />
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right" />
Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
</h3>
src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx
+1 -1
View File
@@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
+2 -2
View File
@@ -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();
src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
+1 -1
View File
@@ -46,7 +46,7 @@
// alert('Please select the xslt to visualize');
}
UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
UmbClientMgr.openModalWindow('<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
}
</script>
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<style type="text/css">
#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;
src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
+1 -1
View File
@@ -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" %>
<cdf:CssInclude ID="CssInclude1" runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />
src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
+2 -2
View File
@@ -62,10 +62,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;
src/Umbraco.Web.UI/umbraco/umbraco.aspx
+2 -2
View File
@@ -157,7 +157,7 @@
var initApp = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["app"]%>';
var rightAction = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["rightAction"]%>';
var rightActionId = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["id"]%>';
var base = '<%=string.Format("{0}/", umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco))%>';
var base = '<%=string.Format("{0}/", Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco))%>';
var url = ''
if (rightActionId && rightActionId != '') {
url = base + rightAction + ".aspx?id=" + rightActionId
@@ -166,7 +166,7 @@
}
jQuery(document).ready(function () {
UmbClientMgr.setUmbracoPath("<%=umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>");
UmbClientMgr.setUmbracoPath("<%=Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>");
//call wresize first for IE/FF resize issues
jQuery(window).wresize(function () { resizePage(); });
src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/Models/DynamicPublishedContent.cs
+4 -3
View File
@@ -14,6 +14,7 @@ using Umbraco.Core.Models;
using Umbraco.Core;
using System.Reflection;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Strings;
using ContentType = umbraco.cms.businesslogic.ContentType;
namespace Umbraco.Web.Models
@@ -354,9 +355,9 @@ namespace Umbraco.Web.Models
{
//if we cannot get with the current alias, try changing it's case
attempt = alias[0].IsUpperCase()
? getMember(alias.ConvertCase(StringAliasCaseType.CamelCase))
: getMember(alias.ConvertCase(StringAliasCaseType.PascalCase));
}
? getMember(alias.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.CamelCase))
: getMember(alias.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.PascalCase));
}
return !attempt.Success
? null
src/Umbraco.Web/UI/Controls/FolderBrowser.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/UmbracoContext.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web.Security;
using umbraco;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.presentation;
using umbraco.presentation.LiveEditing;
using umbraco.BasePages;
src/Umbraco.Web/WebBootManager.cs
+13 -6
View File
@@ -9,7 +9,6 @@ using StackExchange.Profiling.MVCHelpers;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Dictionary;
using Umbraco.Core.Dynamics;
using Umbraco.Core.Logging;
using Umbraco.Core.ObjectResolution;
using Umbraco.Core.Profiling;
@@ -27,9 +26,8 @@ using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web.WebApi;
using umbraco.BusinessLogic;
using umbraco.businesslogic;
using umbraco.cms.businesslogic;
using umbraco.presentation.cache;
using ProfilingViewEngine = Umbraco.Core.Profiling.ProfilingViewEngine;
namespace Umbraco.Web
@@ -75,9 +73,9 @@ namespace Umbraco.Web
new MasterControllerFactory(FilteredControllerFactoriesResolver.Current));
//set the render view engine
ViewEngines.Engines.Add(new ProfilingViewEngine(new RenderViewEngine()));
ViewEngines.Engines.Add(new RenderViewEngine());
//set the plugin view engine
ViewEngines.Engines.Add(new ProfilingViewEngine(new PluginViewEngine()));
ViewEngines.Engines.Add(new PluginViewEngine());
//set model binder
ModelBinders.Binders.Add(new KeyValuePair<Type, IModelBinder>(typeof(RenderModel), new RenderModelBinder()));
@@ -131,7 +129,16 @@ namespace Umbraco.Web
/// <returns></returns>
public override IBootManager Complete(Action<ApplicationContext> afterComplete)
{
//set routes
//Wrap viewengines in the profiling engine
IViewEngine[] engines = ViewEngines.Engines.Select(e => e).ToArray();
ViewEngines.Engines.Clear();
foreach (var engine in engines)
{
var wrappedEngine = engine is ProfilingViewEngine ? engine : new ProfilingViewEngine(engine);
ViewEngines.Engines.Add(wrappedEngine);
}
//set routes
CreateRoutes();
base.Complete(afterComplete);
src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Web;
using System.Web.UI;
using System.Xml;
using Umbraco.Core;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.NodeFactory;
using umbraco.cms.businesslogic.web;
using umbraco.interfaces;
src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
+1 -1
View File
@@ -10,7 +10,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 {
src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using umbraco.presentation.LiveEditing;
using umbraco.BasePages;
using umbraco.cms.businesslogic.web;
using System.Xml.Linq;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.presentation.preview;
using umbraco.BusinessLogic;
using System.Xml;
src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
+6 -6
View File
@@ -27,7 +27,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/welcome.ascx"; }
get { return SystemDirectories.Install + "/steps/welcome.ascx"; }
}
public override bool Completed()
@@ -60,7 +60,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }
get { return SystemDirectories.Install + "/steps/skinning.ascx"; }
}
public override bool Completed()
@@ -85,7 +85,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/theend.ascx"; }
get { return SystemDirectories.Install + "/steps/theend.ascx"; }
}
public override bool Completed()
@@ -110,7 +110,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }
get { return SystemDirectories.Install + "/steps/skinning.ascx"; }
}
public override bool Completed()
@@ -146,7 +146,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/license.ascx"; }
get { return SystemDirectories.Install + "/steps/license.ascx"; }
}
public override bool Completed()
@@ -214,7 +214,7 @@ namespace umbraco.presentation.install.steps.Definitions
public override string UserControl
{
get { return IO.SystemDirectories.Install + "/steps/defaultuser.ascx"; }
get { return SystemDirectories.Install + "/steps/defaultuser.ascx"; }
}
public override bool Completed()
src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
+9 -9
View File
@@ -54,8 +54,8 @@ namespace umbraco.presentation.install
{
// check if sql ce is present
if (
!File.Exists(IO.IOHelper.MapPath(Path.Combine(IO.IOHelper.ResolveUrl(IO.SystemDirectories.Bin), "System.Data.SqlServerCe.dll"))) ||
!File.Exists(IO.IOHelper.MapPath(Path.Combine(IO.IOHelper.ResolveUrl(IO.SystemDirectories.Bin), "SQLCE4Umbraco.dll")))
!File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "System.Data.SqlServerCe.dll"))) ||
!File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "SQLCE4Umbraco.dll")))
)
return false;
else
@@ -679,8 +679,8 @@ namespace umbraco.presentation.install
[Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.Renaming")]
public partial class renaming : System.Web.UI.UserControl
{
private string _oldAccessFilePath = IO.IOHelper.MapPath(IO.SystemDirectories.Data + "/access.xml");
private string _newAccessFilePath = IO.IOHelper.MapPath(IO.SystemDirectories.Data + "/access.config");
private string _oldAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.xml");
private string _newAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.config");
private bool _changesNeeded = false;
protected void Page_Load(object sender, EventArgs e)
@@ -756,7 +756,7 @@ namespace umbraco.presentation.install
private void updateExtensionPaths(string filename)
{
filename = IO.IOHelper.MapPath(IO.SystemDirectories.Config + "/" + filename);
filename = IOHelper.MapPath(SystemDirectories.Config + "/" + filename);
XmlDocument xsltExt = new XmlDocument();
xsltExt.Load(filename);
@@ -785,7 +785,7 @@ namespace umbraco.presentation.install
{
try
{
File.Move(_oldAccessFilePath, IO.IOHelper.MapPath(IO.SystemFiles.AccessXml));
File.Move(_oldAccessFilePath, IOHelper.MapPath(SystemFiles.AccessXml));
progressText += String.Format("<li>Public Access file renamed</li>");
}
catch (Exception ee)
@@ -832,7 +832,7 @@ namespace umbraco.presentation.install
// Load the XSLT extensions configuration
XmlDocument xsltExt = new XmlDocument();
xsltExt.Load(IO.IOHelper.MapPath(IO.SystemDirectories.Config + "/" + filename));
xsltExt.Load(IOHelper.MapPath(SystemDirectories.Config + "/" + filename));
return xsltExt.SelectNodes("//" + elementName);
}
@@ -921,7 +921,7 @@ namespace umbraco.presentation.install
}
private void showStarterKits()
{
ph_starterKits.Controls.Add(new UserControl().LoadControl(IO.SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"));
ph_starterKits.Controls.Add(new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"));
pl_starterKit.Visible = true;
pl_starterKitDesign.Visible = false;
@@ -931,7 +931,7 @@ namespace umbraco.presentation.install
public void showStarterKitDesigns(Guid starterKitGuid)
{
steps.Skinning.loadStarterKitDesigns ctrl = (steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(IO.SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
steps.Skinning.loadStarterKitDesigns ctrl = (steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
ctrl.ID = "StarterKitDesigns";
ctrl.StarterKitGuid = starterKitGuid;
src/Umbraco.Web/umbraco.presentation/item.cs
+2 -1
View File
@@ -7,6 +7,7 @@ using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Web;
using Umbraco.Core.Profiling;
using Umbraco.Core.Strings;
namespace umbraco
{
@@ -181,7 +182,7 @@ namespace umbraco
else if (helper.FindAttribute(attributes, "case") == "upper")
_fieldContent = _fieldContent.ToUpper();
else if (helper.FindAttribute(attributes, "case") == "title")
_fieldContent = _fieldContent.ConvertCase(StringAliasCaseType.PascalCase);
_fieldContent = _fieldContent.ToCleanString(CleanStringType.Ascii | CleanStringType.Alias | CleanStringType.PascalCase);
// OTHER FORMATTING FUNCTIONS
// If we use masterpages, this is moved to the ItemRenderer to add support for before/after in inline XSLT
src/Umbraco.Web/umbraco.presentation/library.cs
+2 -2
View File
@@ -30,7 +30,7 @@ using umbraco.scripting;
using umbraco.DataLayer;
using System.Web.Security;
using umbraco.cms.businesslogic.language;
using umbraco.IO;
using Umbraco.Core.IO;
using System.Collections;
using System.Collections.Generic;
using umbraco.cms.businesslogic.cache;
@@ -1136,7 +1136,7 @@ namespace umbraco
/// </summary>
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)));
}
src/Umbraco.Web/umbraco.presentation/python.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.scripting
{
src/Umbraco.Web/umbraco.presentation/requestModule.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web/umbraco.presentation/template.cs
+1 -1
View File
@@ -15,7 +15,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
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
+1 -1
View File
@@ -13,7 +13,7 @@ using umbraco.cms.businesslogic.web;
using umbraco.BusinessLogic.Actions;
using umbraco.presentation.umbraco.controls;
using ClientDependency.Core;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule;
using umbraco.cms.businesslogic.skinning;
using umbraco.BusinessLogic;
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using umbraco.presentation.LiveEditing.Controls;
using Content = umbraco.cms.businesslogic.Content;
using umbraco.BusinessLogic.Actions;
using ClientDependency.Core;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.presentation.LiveEditing.Modules.CreateModule
{
[ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/CreateModule/CreateModule.js", "UmbracoRoot")]
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using umbraco.cms.businesslogic.web;
using umbraco.presentation.LiveEditing.Controls;
using umbraco.BusinessLogic.Actions;
using ClientDependency.Core;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.presentation.LiveEditing.Modules.DeleteModule
{
[ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/DeleteModule/DeleteModule.js", "UmbracoRoot")]
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using umbraco.presentation.LiveEditing.Updates;
using umbraco.presentation.templateControls;
using UM = umbraco.cms.businesslogic.macro;
using ClientDependency.Core;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.presentation.LiveEditing.Modules.MacroEditing
{
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
+6 -5
View File
@@ -8,6 +8,7 @@ using System.IO;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using Umbraco.Core.IO;
using umbraco.BusinessLogic;
namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
@@ -36,7 +37,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
{
Guid g = Guid.NewGuid();
DirectoryInfo updir = new DirectoryInfo(IO.IOHelper.MapPath("~/media/upload/" + g));
DirectoryInfo updir = new DirectoryInfo(IOHelper.MapPath("~/media/upload/" + g));
if (!updir.Exists)
updir.Create();
@@ -55,7 +56,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
if (Convert.ToInt32(Request["w"]) > MaxWidth || Convert.ToInt32(Request["h"]) > MaxHeight)
{
System.Drawing.Image img = System.Drawing.Image.FromFile(IO.IOHelper.MapPath(Image.Value));
System.Drawing.Image img = System.Drawing.Image.FromFile(IOHelper.MapPath(Image.Value));
Image1.Width = img.Width / 2;
Image1.Height = img.Height / 2;
@@ -91,7 +92,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
protected void bt_crop_Click(object sender, EventArgs e)
{
System.Drawing.Image imgToResize = System.Drawing.Image.FromFile(IO.IOHelper.MapPath(Image.Value));
System.Drawing.Image imgToResize = System.Drawing.Image.FromFile(IOHelper.MapPath(Image.Value));
int sourceWidth = imgToResize.Width;
int sourceHeight = imgToResize.Height;
@@ -126,12 +127,12 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
Guid id = Guid.NewGuid();
DirectoryInfo updir = new DirectoryInfo(IO.IOHelper.MapPath("~/media/upload/" + id));
DirectoryInfo updir = new DirectoryInfo(IOHelper.MapPath("~/media/upload/" + id));
if (!updir.Exists)
updir.Create();
FileInfo img = new FileInfo(IO.IOHelper.MapPath(Image.Value));
FileInfo img = new FileInfo(IOHelper.MapPath(Image.Value));
// Copy metadata
ImageCodecInfo[] codecs = ImageCodecInfo.GetImageEncoders();
ImageCodecInfo codec = null;
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
+2 -2
View File
@@ -9,7 +9,7 @@ using umbraco.cms.businesslogic.skinning;
using System.Xml;
using System.Text;
using umbraco.interfaces.skinning;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.template;
using umbraco.BusinessLogic;
using umbraco.NodeFactory;
@@ -87,7 +87,7 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
//save
StreamWriter sw = File.AppendText(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + this.ActiveSkin.Css.TargetFile);
StreamWriter sw = File.AppendText(IOHelper.MapPath(SystemDirectories.Css) + "/" + this.ActiveSkin.Css.TargetFile);
sw.Write(content);
sw.Close();
}
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using umbraco.presentation.LiveEditing.Modules;
using ClientDependency.Core;
using System.Web.UI.WebControls;
using umbraco.presentation.LiveEditing.Controls;
using umbraco.IO;
using Umbraco.Core.IO;
using System.Web.UI;
using umbraco.cms.businesslogic.skinning;
using ClientDependency.Core.Controls;
src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using umbraco.cms.businesslogic.web;
using umbraco.presentation.LiveEditing.Controls;
using umbraco.BusinessLogic.Actions;
using ClientDependency.Core;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.presentation.LiveEditing.Modules.UnpublishModule
{
[ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/UnpublishModule/UnpublishModule.js", "UmbracoRoot")]
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+4 -3
View File
@@ -8,6 +8,7 @@ using System.Web;
using System.Xml;
using System.Configuration;
using Umbraco.Core;
using Umbraco.Core.IO;
using umbraco.BasePages;
using umbraco.BusinessLogic;
using umbraco.businesslogic;
@@ -80,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))
{
@@ -154,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);
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs
+2 -2
View File
@@ -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)));
}
}
}
src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
+1 -1
View File
@@ -19,7 +19,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
src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
+2 -2
View File
@@ -10,7 +10,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
<asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
</a>
@@ -21,7 +21,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right" />
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right" />
Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
</h3>
src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
+1 -1
View File
@@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs
+1 -1
View File
@@ -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;
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx
+2 -2
View File
@@ -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();
src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
using umbraco.cms.businesslogic.macro;
using System.Reflection;
using System.Collections;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.controls
{
[DefaultProperty("Text")]
src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
+3 -2
View File
@@ -11,6 +11,7 @@ using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Xml.Linq;
using Umbraco.Core;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.macro;
using umbraco.scripting;
using umbraco.BasePages;
@@ -58,8 +59,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
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
+2 -2
View File
@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
@@ -74,7 +74,7 @@ namespace umbraco
string scriptContent = "";
if (!string.IsNullOrEmpty(template))
{
System.IO.StreamReader templateFile = System.IO.File.OpenText(IOHelper.MapPath(IO.SystemDirectories.Umbraco + "/scripting/templates/" + template));
System.IO.StreamReader templateFile = System.IO.File.OpenText(IOHelper.MapPath(SystemDirectories.Umbraco + "/scripting/templates/" + template));
scriptContent = templateFile.ReadToEnd();
templateFile.Close();
}
src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs
+1 -1
View File
@@ -5,7 +5,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
src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Umbraco.Core.Models;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using umbraco.cms.helpers;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.presentation.umbraco.create
{
src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using umbraco.DataLayer;
using umbraco.BasePages;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.member;
namespace umbraco
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
+1 -1
View File
@@ -13,7 +13,7 @@ using System.IO;
using System.Xml;
using System.Xml.XPath;
using umbraco.uicontrols;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.helpers;
using umbraco.BusinessLogic;
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using umbraco.BusinessLogic;
using System;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.web;
namespace dashboardUtilities
src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco.cms.presentation.Trees;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.cms.presentation.developer
{
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
+1 -1
View File
@@ -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 {
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
+2 -2
View File
@@ -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 = " &nbsp; <a href='" + IO.IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
packageUmbFile.Text = " &nbsp; <a href='" + IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
this.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.success, "Package saved and published", "");
} else {
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs
+1 -1
View File
@@ -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
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs
+1 -1
View File
@@ -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
{
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
+1 -1
View File
@@ -13,7 +13,7 @@ using Umbraco.Core.Logging;
using umbraco.BusinessLogic;
using System.Web.Security;
using umbraco.businesslogic.Exceptions;
using umbraco.IO;
using Umbraco.Core.IO;
using umbraco.cms.businesslogic.web;
using System.Linq;
using Umbraco.Core;

Some files were not shown because too many files have changed in this diff Show More