DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB
Fixes 26360 (Content doesn't load on clean install 4.1b2) Fixes some tree, pickers and live editing issues. [TFS Changeset #64360]
This commit is contained in:
Shandem
@@ -4,6 +4,8 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using umbraco.uicontrols.TreePicker;
|
||||
using umbraco.interfaces;
|
||||
using System.Web.UI;
|
||||
using umbraco.presentation;
|
||||
|
||||
namespace umbraco.editorControls
|
||||
{
|
||||
@@ -44,7 +46,10 @@ namespace umbraco.editorControls
|
||||
{
|
||||
base.OnLoad(e);
|
||||
|
||||
if (!Page.IsPostBack)
|
||||
//need to check if this is an async postback in live editing, because if it is, we need to set the value
|
||||
if ((ScriptManager.GetCurrent(Page).IsInAsyncPostBack
|
||||
&& UmbracoContext.Current.LiveEditingContext.Enabled)
|
||||
|| !Page.IsPostBack)
|
||||
{
|
||||
ItemIdValue.Value = StoredItemId != -1 ? StoredItemId.ToString() : "";
|
||||
}
|
||||
@@ -68,7 +73,6 @@ namespace umbraco.editorControls
|
||||
|
||||
public void Save()
|
||||
{
|
||||
//_text = helper.Request(this.ClientID);
|
||||
if (ItemIdValue.Value.Trim() != "")
|
||||
_data.Value = ItemIdValue.Value.Trim();
|
||||
else
|
||||
|
||||
@@ -96,6 +96,7 @@ namespace umbraco.editorControls
|
||||
/// </summary>
|
||||
protected override void RenderJSComponents()
|
||||
{
|
||||
base.RenderJSComponents();
|
||||
|
||||
if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack)
|
||||
{
|
||||
|
||||
@@ -19,9 +19,19 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
return $("#" + this._itemIdValueClientID).val();
|
||||
},
|
||||
|
||||
LaunchPicker: function() {
|
||||
LaunchPicker: function(e) {
|
||||
var _this = this;
|
||||
UmbClientMgr.openModalWindow(this._itemPickerUrl, this._label, this._showHeader, this._width, this._height, 30, 0, ['#cancelbutton'], function(e) { _this.SaveSelection(e); });
|
||||
|
||||
var aBetterEventObject = jQuery.Event(e);
|
||||
// Now you can do what you want: (Cross-browser)
|
||||
aBetterEventObject.preventDefault()
|
||||
aBetterEventObject.isDefaultPrevented()
|
||||
aBetterEventObject.stopPropagation()
|
||||
aBetterEventObject.isPropagationStopped()
|
||||
aBetterEventObject.stopImmediatePropagation()
|
||||
aBetterEventObject.isImmediatePropagationStopped()
|
||||
return false;
|
||||
},
|
||||
|
||||
SaveSelection: function(e) {
|
||||
|
||||
@@ -58,23 +58,25 @@ namespace umbraco.cms.businesslogic.web
|
||||
{1}
|
||||
";
|
||||
private const string m_SQLOptimizedChildren = @"
|
||||
select
|
||||
count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, cmsDocument.templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as published, umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId
|
||||
from umbracoNode
|
||||
left join umbracoNode children on children.parentId = umbracoNode.id
|
||||
inner join cmsContent on cmsContent.nodeId = umbracoNode.id
|
||||
inner join cmsContentType on cmsContentType.nodeId = cmsContent.contentType
|
||||
inner join (select contentId, max(versionDate) AS versionDate from cmsContentVersion
|
||||
inner join umbracoNode on umbracoNode.id = cmsContentVersion.contentId and umbracoNode.parentId = @parentId
|
||||
group by contentId) AS temp
|
||||
on temp.contentId = cmsContent.nodeId
|
||||
inner join cmsContentVersion on cmsContentVersion.contentId = temp.contentId and cmsContentVersion.versionDate = temp.versionDate
|
||||
inner join cmsDocument on cmsDocument.versionId = cmsContentversion.versionId
|
||||
left join cmsDocument publishCheck on publishCheck.nodeId = cmsContent.nodeID and publishCheck.published = 1
|
||||
where {0}
|
||||
group by umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, cmsDocument.templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId
|
||||
order by {1}
|
||||
";
|
||||
select count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser,
|
||||
coalesce(cmsDocument.templateId, cmsDocumentType.templateNodeId) as templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as published, umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId
|
||||
from umbracoNode
|
||||
left join umbracoNode children on children.parentId = umbracoNode.id
|
||||
inner join cmsContent on cmsContent.nodeId = umbracoNode.id
|
||||
inner join cmsContentType on cmsContentType.nodeId = cmsContent.contentType
|
||||
inner join (select contentId, max(versionDate) AS versionDate from cmsContentVersion
|
||||
inner join umbracoNode on umbracoNode.id = cmsContentVersion.contentId and umbracoNode.parentId = @parentId
|
||||
group by contentId) AS temp
|
||||
on temp.contentId = cmsContent.nodeId
|
||||
inner join cmsContentVersion on cmsContentVersion.contentId = temp.contentId and cmsContentVersion.versionDate = temp.versionDate
|
||||
inner join cmsDocument on cmsDocument.versionId = cmsContentversion.versionId
|
||||
left join cmsDocument publishCheck on publishCheck.nodeId = cmsContent.nodeID and publishCheck.published = 1
|
||||
left join cmsDocumentType on
|
||||
cmsDocumentType.contentTypeNodeId = cmsContent.contentType and cmsDocumentType.IsDefault = 1
|
||||
where {0}
|
||||
group by umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, cmsDocument.templateId, cmsDocumentType.templateNodeId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId
|
||||
order by {1}
|
||||
";
|
||||
|
||||
private const string m_SQLOptimizedForPreview = @"
|
||||
select umbracoNode.id, umbracoNode.parentId, umbracoNode.level, umbracoNode.sortOrder, cmsDocument.versionId, cmsPreviewXml.xml from cmsDocument
|
||||
@@ -1245,7 +1247,7 @@ namespace umbraco.cms.businesslogic.web
|
||||
, dr.GetString("description")
|
||||
, masterContentType
|
||||
, dr.GetInt("contentTypeId")
|
||||
,dr.GetInt("templateId"));
|
||||
, dr.GetInt("templateId"));
|
||||
tmp.Add(d);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<clientDependency isDebugMode="false" version="6">
|
||||
<clientDependency isDebugMode="false" version="7">
|
||||
<fileRegistration defaultProvider="PageHeaderProvider" fileDependencyExtensions="js,css" enableCompositeFiles="true">
|
||||
<providers>
|
||||
<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
|
||||
|
||||
@@ -845,13 +845,6 @@
|
||||
<Compile Include="umbraco\dialogs\insertTable.aspx.designer.cs">
|
||||
<DependentUpon>insertTable.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\modalHolder.aspx.cs">
|
||||
<DependentUpon>modalHolder.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\modalHolder.aspx.designer.cs">
|
||||
<DependentUpon>modalHolder.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\moveOrCopy.aspx.cs">
|
||||
<DependentUpon>moveOrCopy.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1848,7 +1841,6 @@
|
||||
<Content Include="umbraco\dialogs\importDocumenttype.aspx" />
|
||||
<Content Include="umbraco\dialogs\insertMacro.aspx" />
|
||||
<Content Include="umbraco\dialogs\insertTable.aspx" />
|
||||
<Content Include="umbraco\dialogs\modalHolder.aspx" />
|
||||
<Content Include="umbraco\dialogs\moveOrCopy.aspx" />
|
||||
<Content Include="umbraco\dialogs\notifications.aspx" />
|
||||
<Content Include="umbraco\developer\Packages\installer.aspx" />
|
||||
@@ -2801,7 +2793,6 @@
|
||||
<None Include="umbraco\schemas\umbraco.xsx">
|
||||
<DependentUpon>umbraco.xsd</DependentUpon>
|
||||
</None>
|
||||
<Content Include="web.config" />
|
||||
<Content Include="config\UrlRewriting.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -133,7 +133,7 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
|
||||
ItemUpdate latestUpdate = updates.GetLatest<ItemUpdate>(u => u.NodeId == item.GetParsedNodeId()
|
||||
&& u.Field == item.Field);
|
||||
if (latestUpdate != null)
|
||||
return latestUpdate.Data.ToString();
|
||||
return latestUpdate.Data as string; //can't use ToString() as a null value will throw an exception
|
||||
else
|
||||
return base.GetFieldContents(item);
|
||||
}
|
||||
|
||||
@@ -32,9 +32,8 @@ jQuery(document).ready(function() {
|
||||
//create the javascript tree
|
||||
jQuery("#<%=ClientID%>").UmbracoTree({
|
||||
jsonFullMenu: ctxMenu,
|
||||
//jsonInitNode: initNode,
|
||||
appActions: UmbClientMgr.appActions(),
|
||||
uiKeys: UmbClientMgr.uiKeys(),
|
||||
deletingText: '<%=umbraco.ui.GetText("deleting")%>',
|
||||
app: app,
|
||||
showContext: showContext,
|
||||
isDialog: isDialog,
|
||||
@@ -47,12 +46,15 @@ jQuery(document).ready(function() {
|
||||
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"});
|
||||
|
||||
//add event handler for ajax errors, this will refresh the whole application
|
||||
UmbClientMgr.mainTree().addEventHandler("ajaxError", function(e) {
|
||||
if (e.msg == "rebuildTree") {
|
||||
UmbClientMgr.mainWindow("umbraco.aspx");
|
||||
}
|
||||
});
|
||||
//add event handler for ajax errors, this will refresh the whole application
|
||||
var mainTree = UmbClientMgr.mainTree();
|
||||
if (mainTree != null) {
|
||||
mainTree.addEventHandler("ajaxError", function(e) {
|
||||
if (e.msg == "rebuildTree") {
|
||||
UmbClientMgr.mainWindow("umbraco.aspx");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.4927
|
||||
// Runtime Version:2.0.50727.4200
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
||||
@@ -46,12 +46,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
|
||||
if (this.mainWindow().jQuery == null
|
||||
|| this.mainWindow().jQuery(".umbTree").length == 0
|
||||
|| this.mainWindow().jQuery(".umbTree").UmbracoTreeAPI() == null) {
|
||||
|
||||
this._mainTree = $("<div id='falseTree' />").appendTo("body").hide().UmbracoTree({
|
||||
uiKeys: this.uiKeys(),
|
||||
jsonFullMenu: {},
|
||||
appActions: this.appActions()
|
||||
}).UmbracoTreeAPI();
|
||||
this._mainTree = null;
|
||||
}
|
||||
else {
|
||||
this._mainTree = this.mainWindow().jQuery(".umbTree").UmbracoTreeAPI();
|
||||
|
||||
@@ -9,13 +9,18 @@
|
||||
|
||||
Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
|
||||
|
||||
//TODO: The configuration properties need to be refactored.
|
||||
// we should have internal objects holding the properties instead of global class properties, this
|
||||
// will make it much easier to use $.extend to set the properties of this class from user properties.
|
||||
|
||||
(function($) {
|
||||
$.fn.UmbracoTree = function(opts) {
|
||||
/// <summary>opts must have these properties: (* is required)
|
||||
///
|
||||
/// *jsonFullMenu :
|
||||
/// *appActions : A reference to a MenuActions object
|
||||
/// *uiKeys : A reference to a uiKeys object
|
||||
/// jsonFullMenu : The tree menu, by default is empty
|
||||
/// appActions : A reference to a MenuActions object
|
||||
/// deletingText : the txt to display when a node is deleting
|
||||
/// treeMode :determines the type of tree: false/null = normal, 'checkbox' = checkboxes enabled, 'inheritedcheckbox' = parent nodes have checks inherited from children
|
||||
/// *serviceUrl :Url path for the tree client service
|
||||
/// *dataUrl :Url path for the tree data service
|
||||
@@ -33,9 +38,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
return this.each(function() {
|
||||
|
||||
var conf = $.extend({
|
||||
jsonFullMenu: null,
|
||||
jsonFullMenu: {},
|
||||
appActions: null,
|
||||
uiKeys: null,
|
||||
|
||||
//These are all properties of the ITreeService and are
|
||||
//used to pass the properties in to the InitAppTreeData service
|
||||
@@ -50,9 +54,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
treeMode: "standard",
|
||||
umbClientFolderRoot: "/umbraco_client", //default setting... this gets overriden.
|
||||
recycleBinId: -20, //default setting for content tree
|
||||
serviceUrl: "", //if these aren't set, nothing will work
|
||||
dataUrl: "" //if these arent' set, nothing will work
|
||||
serviceUrl: "", //if not set, no async calls are made, the tree won't work
|
||||
dataUrl: "" //if not set, no async calls are made, the tree won't work
|
||||
}, opts);
|
||||
|
||||
new Umbraco.Controls.UmbracoTree().init($(this), conf);
|
||||
});
|
||||
};
|
||||
@@ -82,10 +87,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
_activeTreeType: "content", //tracks which is the active tree type, this is used in searching and syncing.
|
||||
_recycleBinId: -20,
|
||||
_umbClientFolderRoot: "/umbraco_client", //this should be set externally!!!
|
||||
_fullMenu: null,
|
||||
_fullMenu: {},
|
||||
_appActions: null,
|
||||
_tree: null, //reference to the jsTree object
|
||||
_uiKeys: null,
|
||||
_deletingText: "...",
|
||||
_app: null, //the reference to the current app
|
||||
_showContext: true,
|
||||
_isDialog: false,
|
||||
@@ -120,7 +125,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
|
||||
this._fullMenu = conf.jsonFullMenu;
|
||||
this._appActions = conf.appActions;
|
||||
this._uiKeys = conf.uiKeys;
|
||||
this._deletingText = conf.deletingText;
|
||||
this._treeMode = conf.treeMode;
|
||||
this._serviceUrl = conf.serviceUrl;
|
||||
this._dataUrl = conf.dataUrl;
|
||||
@@ -190,7 +195,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
this.rebuildTree(app);
|
||||
|
||||
this._debug("Edit mode. New Mode: " + this._tree.settings.rules.draggable);
|
||||
this._appActions.showSpeachBubble("info", "Tree Edit Mode", "The tree is now operating in edit mode");
|
||||
if (this._appActions)
|
||||
this._appActions.showSpeachBubble("info", "Tree Edit Mode", "The tree is now operating in edit mode");
|
||||
},
|
||||
|
||||
refreshTree: function() {
|
||||
@@ -552,7 +558,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
//show the ajax loader with deleting text
|
||||
this._actionNode.jsNode.find("a").attr("class", "loading");
|
||||
this._actionNode.jsNode.find("a").css("background-image", "");
|
||||
this._actionNode.jsNode.find("a").html(this._uiKeys['deleting']);
|
||||
this._actionNode.jsNode.find("a").html(this._deletingText);
|
||||
},
|
||||
|
||||
onNodeDeleted: function(EV) {
|
||||
@@ -560,12 +566,17 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
|
||||
this._debug("onNodeDeleted");
|
||||
|
||||
var nodeToDel = this._actionNode.jsNode;
|
||||
|
||||
//remove the ajax loader
|
||||
this._actionNode.jsNode.find("a").removeClass("loading");
|
||||
nodeToDel.find("a").removeClass("loading");
|
||||
//ensure the branch is closed
|
||||
this._tree.close_branch(this._actionNode.jsNode);
|
||||
this._tree.close_branch(nodeToDel);
|
||||
//make the node disapear
|
||||
this._actionNode.jsNode.hide("drop", { direction: "down" }, 400);
|
||||
nodeToDel.hide("drop", { direction: "down" }, 400, function() {
|
||||
//remove the node from the DOM
|
||||
nodeToDel.remove();
|
||||
});
|
||||
|
||||
this._updateRecycleBin();
|
||||
},
|
||||
@@ -697,7 +708,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
case "inside":
|
||||
if (nodeParentDef.nodeId == refNodeDef.nodeId) {
|
||||
//moving to the same node!
|
||||
this._appActions.showSpeachBubble("warning", "Tree Edit Mode", "Cannot move a node to it's same parent node");
|
||||
if (this._appActions)
|
||||
this._appActions.showSpeachBubble("warning", "Tree Edit Mode", "Cannot move a node to it's same parent node");
|
||||
return false;
|
||||
}
|
||||
//check move permissions, then attempt move
|
||||
@@ -732,7 +744,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
},
|
||||
|
||||
_debug: function(strMsg) {
|
||||
if (this._isDebug) {
|
||||
if (this._isDebug && Sys && Sys.Debug) {
|
||||
Sys.Debug.trace("UmbracoTree: " + strMsg);
|
||||
}
|
||||
},
|
||||
@@ -799,6 +811,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
},
|
||||
|
||||
_updateRecycleBin: function() {
|
||||
/// <summary>Generally used for when a node is deleted. This will set the actionNode to the recycle bin node and force a refresh of it's children</summary>
|
||||
this._debug("_updateRecycleBin BinId: " + this._recycleBinId);
|
||||
|
||||
var rNode = this.findNode(this._recycleBinId, true);
|
||||
@@ -1029,11 +1042,18 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
options.plugins.checkbox = { three_state: false }
|
||||
}
|
||||
|
||||
//if there's no service URL, then disable ajax requests
|
||||
if (this._serviceUrl == "" || this._dataUrl == "") {
|
||||
options.data.async = false;
|
||||
options.data.opts.static = {};
|
||||
}
|
||||
|
||||
//set global ajax settings:
|
||||
$.ajaxSetup({
|
||||
contentType: "application/json; charset=utf-8"
|
||||
});
|
||||
|
||||
this._debug("_getInitOptions. Async enabled = " + options.data.async);
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
@@ -1,221 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
|
||||
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
|
||||
<!-- ASPNETAJAX -->
|
||||
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
|
||||
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" />
|
||||
<section name="UmbracoExamine" type="UmbracoExamine.Core.Config.UmbracoExamineSettings, UmbracoExamine.Core" />
|
||||
<section name="ExamineLuceneIndexSets" type="UmbracoExamine.Providers.Config.ExamineLuceneIndexes, UmbracoExamine.Providers" />
|
||||
</configSections>
|
||||
<urlrewritingnet configSource="config\UrlRewriting.config" />
|
||||
<microsoft.scripting configSource="config\scripting.config" />
|
||||
<clientDependency configSource="config\ClientDependency.config" />
|
||||
<UmbracoExamine configSource="config\ExamineSettings.config" />
|
||||
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
|
||||
<appSettings>
|
||||
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=umbraco41;integrated security=false;user id=sa;pwd=password" />
|
||||
<add key="umbracoConfigurationStatus" value="4.1.0.betaII" />
|
||||
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx" />
|
||||
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
|
||||
<add key="umbracoContentXML" value="~/data/umbraco.config" />
|
||||
<add key="umbracoStorageDirectory" value="~/data" />
|
||||
<add key="umbracoPath" value="~/umbraco" />
|
||||
<add key="umbracoEnableStat" value="false" />
|
||||
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
|
||||
<add key="umbracoEditXhtmlMode" value="true" />
|
||||
<add key="umbracoUseDirectoryUrls" value="false" />
|
||||
<add key="umbracoDebugMode" value="true" />
|
||||
<add key="umbracoTimeOutInMinutes" value="20" />
|
||||
<add key="umbracoVersionCheckPeriod" value="7" />
|
||||
<add key="umbracoDisableXsltExtensions" value="true" />
|
||||
<add key="umbracoDefaultUILanguage" value="en" />
|
||||
<add key="umbracoProfileUrl" value="profiler" />
|
||||
<add key="umbracoUseSSL" value="false" />
|
||||
<add key="umbracoUseMediumTrust" value="false" />
|
||||
<!--
|
||||
Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS
|
||||
Alex Norcliffe 2010 02 for 4.1
|
||||
-->
|
||||
<add key="umbracoContentXMLUseLocalTemp" value="false" />
|
||||
</appSettings>
|
||||
<system.net>
|
||||
<mailSettings>
|
||||
<smtp>
|
||||
<network host="127.0.0.1" userName="username" password="password" />
|
||||
</smtp>
|
||||
</mailSettings>
|
||||
</system.net>
|
||||
<!-- REMOVE FOR BETA -->
|
||||
<!-- added by NH to test foreign membership providers-->
|
||||
<connectionStrings>
|
||||
<remove name="LocalSqlServer" />
|
||||
<!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
|
||||
</connectionStrings>
|
||||
<system.web>
|
||||
<!-- <trust level="Medium" originUrl=".*" />-->
|
||||
<customErrors mode="Off" />
|
||||
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
|
||||
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
|
||||
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
|
||||
<xhtmlConformance mode="Strict" />
|
||||
<pages enableEventValidation="false">
|
||||
<!-- ASPNETAJAX -->
|
||||
<controls>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</controls>
|
||||
</pages>
|
||||
<httpModules>
|
||||
<!-- URL REWRTIER -->
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
<!-- UMBRACO -->
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
<!-- ASPNETAJAX -->
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</httpModules>
|
||||
<httpHandlers>
|
||||
<remove verb="*" path="*.asmx" />
|
||||
<!-- ASPNETAJAX -->
|
||||
<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<!-- UMBRACO CHANNELS -->
|
||||
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
|
||||
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
|
||||
</httpHandlers>
|
||||
<compilation defaultLanguage="c#" debug="true" batch="false">
|
||||
<assemblies>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<authentication mode="Forms">
|
||||
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
|
||||
</authentication>
|
||||
<authorization>
|
||||
<allow users="?" />
|
||||
</authorization>
|
||||
<!-- Membership Provider -->
|
||||
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
|
||||
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
|
||||
</providers>
|
||||
</membership>
|
||||
<!-- added by NH to support membership providers in access layer -->
|
||||
<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
|
||||
</providers>
|
||||
</roleManager>
|
||||
<!-- Sitemap provider-->
|
||||
<siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
|
||||
</providers>
|
||||
</siteMap>
|
||||
</system.web>
|
||||
<!-- ASPNETAJAX -->
|
||||
<system.web.extensions>
|
||||
<scripting>
|
||||
<scriptResourceHandler enableCompression="true" enableCaching="true" />
|
||||
</scripting>
|
||||
</system.web.extensions>
|
||||
<applicationSettings>
|
||||
<umbraco.presentation.Properties.Settings>
|
||||
<setting name="umbraco_com_regexlib_Webservices" serializeAs="String">
|
||||
<value>http://regexlib.com/WebServices.asmx</value>
|
||||
</setting>
|
||||
</umbraco.presentation.Properties.Settings>
|
||||
</applicationSettings>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<modules>
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
<remove name="ScriptModule" />
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</modules>
|
||||
<handlers accessPolicy="Read, Write, Script, Execute">
|
||||
<remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="ScriptHandlerFactory" />
|
||||
<remove name="ScriptHandlerFactoryAppServices" />
|
||||
<remove name="ScriptResource" />
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add verb="*" name="Channels" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" name="Channels_Word" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
<add verb="*" name="ClientDependency" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
|
||||
<add verb="GET,HEAD,POST" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
<system.codedom>
|
||||
<compilers>
|
||||
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
|
||||
<providerOption name="CompilerVersion" value="v3.5" />
|
||||
<providerOption name="WarnAsError" value="false" />
|
||||
</compiler>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<!--
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<modules>
|
||||
<remove name="ScriptModule" />
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</modules>
|
||||
<handlers>
|
||||
<remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="ScriptHandlerFactory" />
|
||||
<remove name="ScriptHandlerFactoryAppServices" />
|
||||
<remove name="ScriptResource" />
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
-->
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<!-- Set up a local connection string -->
|
||||
<xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
|
||||
<xsl:attribute name="value">server=.\sqlexpress;database=UmbracoTest3;user id=sa;password=test</xsl:attribute>
|
||||
<xsl:attribute name="value">server=.\sqlexpress;database=UmbracoTest4;user id=sa;password=test</xsl:attribute>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
|
||||
|
||||
@@ -84,6 +84,13 @@
|
||||
<Compile Include="umbraco\controls\CheckboxTree.cs" />
|
||||
<Compile Include="umbraco\controls\progressBar.cs" />
|
||||
<Compile Include="umbraco\controls\windowCloser.cs" />
|
||||
<Compile Include="umbraco\dialogs\modalHolder.aspx.cs">
|
||||
<DependentUpon>modalHolder.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\modalHolder.aspx.designer.cs">
|
||||
<DependentUpon>modalHolder.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\paste.aspx.cs">
|
||||
<DependentUpon>paste.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -199,6 +206,7 @@
|
||||
<Content Include="umbraco\css\umbContext_background.gif" />
|
||||
<Content Include="umbraco\css\umbracoTabs.css" />
|
||||
<Content Include="umbraco\css\xtree.css" />
|
||||
<Content Include="umbraco\dialogs\modalHolder.aspx" />
|
||||
<Content Include="umbraco\dialogs\paste.aspx" />
|
||||
<Content Include="umbraco\dialogs\editCell.aspx" />
|
||||
<Content Include="umbraco\dialogs\insertAnchor.aspx" />
|
||||
|
||||
Reference in New Issue
Block a user