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

DO NOT DOWNLOAD, STABLE RELEASE AVAILABLE ON THE DOWNLOADS TAB

Browse Source 
Fixes many path issues relating to GlobalSettings.Path

[TFS Changeset #62345]
This commit is contained in:
Shandem
2009-12-17 07:12:54 +00:00
parent aa7c518db4
commit 152cbabfa6
27 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UpgradeReadme.txt
View File

@@ -22,7 +22,7 @@ to use the UmbracoClientPath setting
* All references to the old Client Dependency libraries have been removed completely.
* Moved treeIcons.css to ~/umbraco_client/Tree/treeIcons.css
* Moved treeIcons.css to ~/[UmbracoClientFolder]/Tree/treeIcons.css
* Removed all IFormHandler dependencies and therefore removed the idea of FormHandlers all together:
- IFormHandler

2
components/editorControls/umbraco.editorControls.csproj
View File

@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{255F5DF1-4E43-4758-AC05-7A0B68EB021B}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
umbraco/presentation/install/default.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" CodeBehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.presentation.install._default" EnableViewState="False" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >

2
umbraco/presentation/install/default.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/create/xslt.ascx.cs
View File

@@ -69,7 +69,7 @@ namespace umbraco.presentation.create
.ChildNodeCreated()
.CloseModalWindow();
//Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "refresh", "<script type='text/javascript'>\ntop.right.location.href = '" + returnUrl + "';\ntop.refreshTree(false, true);\ntop.closeModal();</script>");
}

7
umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx
View File

@@ -2,6 +2,9 @@
Inherits="umbraco.developer.assemblyBrowser" %>
<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
<asp:Content ContentPlaceHolderID="body" runat="server">
<h3 style="MARGIN-LEFT: 0px"><asp:Label id="AssemblyName" runat="server"></asp:Label></h3>
@@ -24,9 +27,7 @@
</p>
<script type="text/javascript">
top.right.document.location.href = top.right.document.location.href;
</script>
</asp:Panel>
</asp:Content>

2
umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/developer/Packages/Boost.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Install boost" CodeBehind="Boost.aspx.cs" Inherits="umbraco.presentation.developer.packages.Boost" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar" %>
<asp:Content ContentPlaceHolderID="head" runat="server">

2
umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">

2
umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.

2
umbraco/presentation/umbraco/developer/Packages/installer.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="installer.aspx.cs"
AutoEventWireup="True" Inherits="umbraco.presentation.developer.packages.Installer"
Trace="false" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">

2
umbraco/presentation/umbraco/developer/Packages/installer.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.

2
umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">

2
umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.

2
umbraco/presentation/umbraco/dialogs/publish.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="publish.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.publish" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">

2
umbraco/presentation/umbraco/dialogs/publish.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/dialogs/republish.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="c#" Codebehind="republish.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.cms.presentation.republish" %>
<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %>
<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">

2
umbraco/presentation/umbraco/dialogs/republish.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.

3
umbraco/presentation/umbraco/members/ViewMembers.aspx
View File

@@ -1,5 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/umbraco/masterpages/umbracoPage.Master"
AutoEventWireup="true" CodeBehind="ViewMembers.aspx.cs" Inherits="umbraco.presentation.members.ViewMembers" %>
<%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="ViewMembers.aspx.cs" Inherits="umbraco.presentation.members.ViewMembers" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">

2
umbraco/presentation/umbraco/members/ViewMembers.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/treeInit.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="c#" CodeBehind="treeInit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.TreeInit" %>
<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register Src="controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>

2
umbraco/presentation/umbraco/treeInit.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
umbraco/presentation/umbraco/umbraco.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Trace="false" Language="c#" CodeBehind="umbraco.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation._umbraco" ClientTarget="uplevel" %>
<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register Src="controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="uc1" TagName="quickSearch" Src="Search/QuickSearch.ascx" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>

5
umbraco/presentation/umbraco/users/PermissionsHandler.asmx.cs
View File

@@ -39,7 +39,10 @@ namespace umbraco.cms.presentation.user
Authorize();
Page page = new Page();
NodePermissions nodePermissions = page.LoadControl("~/umbraco/users/NodePermissions.ascx") as NodePermissions;
string path = umbraco.GlobalSettings.Path + "/users/NodePermissions.ascx";
NodePermissions nodePermissions = page.LoadControl(path) as NodePermissions;
nodePermissions.UserID = userID;
nodePermissions.NodeID = toIntArray(nodes);
nodePermissions.ID = "nodePermissions";

5
umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js
View File

@@ -14,7 +14,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
return {
_isDirty: false,
_debug: false,
_isDebug: true,
_mainTree: null,
_appActions: null,
_rootPath: "/umbraco", //this is the default
@@ -23,7 +23,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
/// <summary>
/// sets the Umbraco root path folder
/// </summary>
_rootPath = strPath;
this._debug("setUmbracoPath: " + strPath);
this._rootPath = strPath;
},
mainWindow: function() {

5
umbraco/umbraco.Legacy/umbraco.Legacy.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{27A2590E-1313-4A33-89FD-92811540B69C}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -1011,6 +1011,9 @@
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>