diff --git a/umbraco/businesslogic/BasePages/BasePage.cs b/umbraco/businesslogic/BasePages/BasePage.cs
index e42e004c4a..a17ce33609 100644
--- a/umbraco/businesslogic/BasePages/BasePage.cs
+++ b/umbraco/businesslogic/BasePages/BasePage.cs
@@ -311,9 +311,7 @@ namespace umbraco.BasePages {
/// The object that contains the event data.
protected override void OnLoad(EventArgs e) {
base.OnLoad(e);
- if (OverrideClientTarget)
- ClientTarget = "uplevel";
-
+
if (!Request.IsSecureConnection && GlobalSettings.UseSSL) {
string serverName = HttpUtility.UrlEncode(Request.ServerVariables["SERVER_NAME"]);
Response.Redirect(string.Format("https://{0}{1}", serverName, Request.FilePath));
@@ -323,6 +321,7 @@ namespace umbraco.BasePages {
///
/// Override client target.
///
- public bool OverrideClientTarget = true;
+ [Obsolete("This is no longer supported")]
+ public bool OverrideClientTarget = false;
}
}
diff --git a/umbraco/presentation/config/ClientDependency.config b/umbraco/presentation/config/ClientDependency.config
index f9992259eb..11b6deeb6c 100644
--- a/umbraco/presentation/config/ClientDependency.config
+++ b/umbraco/presentation/config/ClientDependency.config
@@ -1,21 +1,36 @@
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/umbraco/presentation/config/ExamineSettings.config b/umbraco/presentation/config/ExamineSettings.config
index 1b0d9884f5..556d2131fa 100644
--- a/umbraco/presentation/config/ExamineSettings.config
+++ b/umbraco/presentation/config/ExamineSettings.config
@@ -6,7 +6,7 @@ Index sets can be defined in the ExamineIndex.config if you're using the standar
More information and documentation can be found on CodePlex: http://umbracoexamine.codeplex.com
-->
-
+
-
+
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index e55793f91a..f50134267d 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -122,13 +122,13 @@
- 3.5
+ False
System.Data
- 3.5
+ False
@@ -141,8 +141,12 @@
3.5
-
-
+
+ False
+
+
+ False
+
System.Web.Services
@@ -150,7 +154,7 @@
System.XML
- 3.5
+ False
False
diff --git a/umbraco/presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs b/umbraco/presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs
index 1d79fccfa1..9fd81bf5ac 100644
--- a/umbraco/presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/CanvasClientDependencyProvider.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using ClientDependency.Core.FileRegistration.Providers;
using umbraco.presentation;
+using ClientDependency.Core;
namespace umbraco.presentation.LiveEditing
{
@@ -11,19 +12,53 @@ namespace umbraco.presentation.LiveEditing
{
public CanvasClientDependencyProvider()
: base()
- {
- //Force this to always be debug mode!
- this.IsDebugMode = true;
- }
+ {}
public new const string DefaultName = "CanvasProvider";
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
{
- base.Initialize(name, config);
+ base.Initialize(name, config);
+ }
- //Force this to always be debug mode!
- this.IsDebugMode = true;
+ ///
+ /// override to never render out the dependency handler address (no compression, combination, etc...)
+ ///
+ ///
+ ///
+ protected override string RenderCssDependencies(List cssDependencies)
+ {
+ if (cssDependencies.Count == 0)
+ return string.Empty;
+
+ StringBuilder sb = new StringBuilder();
+
+ foreach (IClientDependencyFile dependency in cssDependencies)
+ {
+ sb.Append(RenderSingleCssFile(dependency.FilePath));
+ }
+
+ return sb.ToString();
+ }
+
+ ///
+ /// override to never render out the dependency handler address (no compression, combination, etc...)
+ ///
+ ///
+ ///
+ protected override string RenderJsDependencies(List jsDependencies)
+ {
+ if (jsDependencies.Count == 0)
+ return string.Empty;
+
+ StringBuilder sb = new StringBuilder();
+
+ foreach (IClientDependencyFile dependency in jsDependencies)
+ {
+ sb.Append(RenderSingleJsFile(string.Format("'{0}','{1}'", dependency.FilePath, string.Empty)));
+ }
+
+ return sb.ToString();
}
protected override string RenderSingleCssFile(string css)
diff --git a/umbraco/presentation/umbraco/dashboard.aspx.cs b/umbraco/presentation/umbraco/dashboard.aspx.cs
index fb2b88bcfd..e77df31af6 100644
--- a/umbraco/presentation/umbraco/dashboard.aspx.cs
+++ b/umbraco/presentation/umbraco/dashboard.aspx.cs
@@ -91,7 +91,7 @@ namespace umbraco.cms.presentation
}
else
{
- //bodyAttributes.Text = " onLoad=\"resizePanel('Panel2',false);\" onResize=\"resizePanel('Panel2',false);\"";
+
foreach (XmlNode entry in dashBoardXml.SelectNodes("//entry [@section='" + _section.ToLower() + "']"))
{
diff --git a/umbraco/presentation/umbraco/editContent.aspx b/umbraco/presentation/umbraco/editContent.aspx
index b955a0fe59..950329f9a2 100644
--- a/umbraco/presentation/umbraco/editContent.aspx
+++ b/umbraco/presentation/umbraco/editContent.aspx
@@ -6,6 +6,26 @@
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/umbraco/presentation/umbraco/editContent.aspx.cs b/umbraco/presentation/umbraco/editContent.aspx.cs
index 61895d17ad..2f5ff11202 100644
--- a/umbraco/presentation/umbraco/editContent.aspx.cs
+++ b/umbraco/presentation/umbraco/editContent.aspx.cs
@@ -61,9 +61,6 @@ namespace umbraco.cms.presentation
if (!CheckUserValidation())
return;
- //if (helper.Request("frontEdit") != "")
- // syncScript.Visible = false;
-
// clear preview cookie
if (!String.IsNullOrEmpty(StateHelper.GetCookieValue(PreviewContent.PREVIEW_COOKIE_KEY))) {
PreviewContent.ClearPreviewCookie();
@@ -71,17 +68,11 @@ namespace umbraco.cms.presentation
if (!IsPostBack)
{
- //SyncPath.Text = _document.Path;
- //newName.Text = _document.Text.Replace("'", "\\'");
- //_refreshTree = true;
+
BusinessLogic.Log.Add(BusinessLogic.LogTypes.Open, base.getUser(), _document.Id, "");
ClientTools.SyncTree(_document.Path, false);
}
- else
- {
- // by default, don't refresh the tree on postbacks
- //_refreshTree = false;
- }
+
jsIds.Text = "var umbPageId = " + _document.Id.ToString() + ";\nvar umbVersionId = '" + _document.Version.ToString() + "';\n";
@@ -161,10 +152,6 @@ namespace umbraco.cms.presentation
{
Trace.Warn("before d.publish");
- // Refresh tree as the document publishing status changes (we'll always update the tree on publish as the icon can have been marked with the star indicating that the content of the page have been changed)
- //_refreshTree = true;
- //newPublishStatus.Text = "1";
-
if (_document.PublishWithResult(base.getUser()))
{
ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editContentPublishedHeader", null), ui.Text("speechBubbles", "editContentPublishedText", null));
@@ -202,8 +189,6 @@ namespace umbraco.cms.presentation
library.UnPublishSingleNode(_document.Id);
- // the treeview should be updated to reflect changes
- //_refreshTree = true;
//newPublishStatus.Text = "0";
}
@@ -322,25 +307,13 @@ namespace umbraco.cms.presentation
}
}
- //protected override void OnPreRender(EventArgs e)
- //{
- // base.OnPreRender(e);
- // if (_refreshTree && _document != null)
- // {
- // ClientTools.SyncTree(_document.Path);
- // }
-
- // //syncScript.Visible = _refreshTree;
- //}
-
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
- {
- base.OverrideClientTarget = false;
-
- InitializeComponent();
+ {
base.OnInit(e);
+ this.UnPublish.Click += new System.EventHandler(this.UnPublishDo);
+
_document = new cms.businesslogic.web.Document(int.Parse(Request.QueryString["id"]));
// Check publishing permissions
@@ -467,10 +440,7 @@ namespace umbraco.cms.presentation
menuItem.ImageURL = SystemDirectories.Umbraco + "/images/editor/vis.gif";
}
- private void InitializeComponent()
- {
- this.UnPublish.Click += new System.EventHandler(this.UnPublishDo);
- }
+
#endregion
}
}
diff --git a/umbraco/presentation/umbraco/editContent.aspx.designer.cs b/umbraco/presentation/umbraco/editContent.aspx.designer.cs
index 21c0e34fd4..7f1e794705 100644
--- a/umbraco/presentation/umbraco/editContent.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/editContent.aspx.designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3082
+// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/umbraco/presentation/umbraco/umbraco.aspx b/umbraco/presentation/umbraco/umbraco.aspx
index 94667b3997..ba3eccf928 100644
--- a/umbraco/presentation/umbraco/umbraco.aspx
+++ b/umbraco/presentation/umbraco/umbraco.aspx
@@ -1,5 +1,5 @@
<%@ Page Trace="false" Language="c#" CodeBehind="umbraco.aspx.cs" AutoEventWireup="True"
- Inherits="umbraco.cms.presentation._umbraco" ClientTarget="uplevel" %>
+ Inherits="umbraco.cms.presentation._umbraco" %>
<%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
@@ -40,7 +40,12 @@