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 
Removed tree edit mode (for now).
Updated jquery.ui and fixed sortable doctype properties - removed duplicate sortable lib.

[TFS Changeset #62338]
This commit is contained in:
Shandem
2009-12-16 23:51:43 +00:00
parent cf9fad89ad
commit aa7c518db4
9 changed files with 296 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/editorControls/macrocontainer/Editor.cs
View File

@@ -17,7 +17,7 @@ using umbraco.presentation;
namespace umbraco.editorControls.macrocontainer
{
[ClientDependency(100, ClientDependencyType.Javascript, "js/sortable/jquery-ui-1.7.2.custom.min.js", "UmbracoRoot")]
[ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")]
public class Editor : UpdatePanel, IDataEditor
{
private IData _data;
@@ -181,8 +181,6 @@ namespace umbraco.editorControls.macrocontainer
}
//ClientDependencyLoader.Instance.RegisterDependency("js/sortable/jquery-ui-1.7.2.custom.min.js",
// "UmbracoRoot", ClientDependencyType.Javascript);

86
umbraco/cms/Actions/ActionTreeEditMode.cs
View File

@@ -4,56 +4,56 @@ using umbraco.BasePages;
namespace umbraco.BusinessLogic.Actions
{
public class ActionTreeEditMode : IAction
{
//create singleton
private static readonly ActionTreeEditMode instance = new ActionTreeEditMode();
private ActionTreeEditMode() { }
public static ActionTreeEditMode Instance
{
get { return instance; }
}
//public class ActionTreeEditMode : IAction
//{
// //create singleton
// private static readonly ActionTreeEditMode instance = new ActionTreeEditMode();
// private ActionTreeEditMode() { }
// public static ActionTreeEditMode Instance
// {
// get { return instance; }
// }
#region IAction Members
// #region IAction Members
public char Letter
{
get { return 'G'; }
}
// public char Letter
// {
// get { return 'G'; }
// }
public bool ShowInNotifier
{
get { return false; }
}
// public bool ShowInNotifier
// {
// get { return false; }
// }
public bool CanBePermissionAssigned
{
get { return false; }
}
// public bool CanBePermissionAssigned
// {
// get { return false; }
// }
public string Icon
{
get { return ".sprAudit"; }
}
// public string Icon
// {
// get { return ".sprAudit"; }
// }
public string Alias
{
get { return "treeEditMode"; }
}
// public string Alias
// {
// get { return "treeEditMode"; }
// }
public string JsFunctionName
{
get
{
return string.Format("{0}.actionTreeEditMode()", ClientTools.Scripts.GetAppActions);
}
}
// public string JsFunctionName
// {
// get
// {
// return string.Format("{0}.actionTreeEditMode()", ClientTools.Scripts.GetAppActions);
// }
// }
public string JsSource
{
get { return ""; }
}
// public string JsSource
// {
// get { return ""; }
// }
#endregion
}
// #endregion
//}
}

2
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -1436,6 +1436,7 @@
<Content Include="config\splashes\booting.aspx" />
<Content Include="config\splashes\noNodes.aspx" />
<Content Include="config\splashes\worker.png" />
<Content Include="web.config.SHOCKING.xslt" />
<Content Include="umbraco\Search\QuickSearch.ascx" />
<Content Include="umbraco\images\umbraco\bin.png" />
<Content Include="umbraco\images\umbraco\bin_closed.png" />
@@ -1513,7 +1514,6 @@
<Content Include="umbraco\dialogs\ExportCode.aspx" />
<Content Include="umbraco\dialogs\mediaPicker.aspx" />
<Content Include="umbraco\images\editor\spellchecker.gif" />
<Content Include="umbraco\js\sortable\jquery-ui-1.7.2.custom.min.js" />
<Content Include="umbraco\webservices\MacroContainerService.asmx" />
<Content Include="umbraco\webservices\MediaPickerService.asmx" />
<Content Include="umbraco_client\Application\JQuery\jquery.cookie.js" />

2
umbraco/presentation/umbraco/Trees/loadContent.cs
View File

@@ -105,7 +105,7 @@ namespace umbraco
actions.Add(ActionRePublish.Instance);
actions.Add(ContextMenuSeperator.Instance);
actions.Add(ActionRefresh.Instance);
actions.Add(ActionTreeEditMode.Instance);
//actions.Add(ActionTreeEditMode.Instance);
}
}

34
umbraco/presentation/umbraco/js/sortable/jquery-ui-1.7.2.custom.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -111,7 +111,7 @@
jQuery(document).ready(function() {
//UmbClientMgr.setUmbracoPath("<%=umbraco.GlobalSettings.Path %>");
UmbClientMgr.setUmbracoPath("<%=umbraco.GlobalSettings.Path %>");
jQuery(window).load(function() { resizePage('load'); });
jQuery(window).wresize(function() { resizePage('resize'); });

2
umbraco/presentation/umbraco/umbraco.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.

260
umbraco/presentation/umbraco_client/ui/jqueryui.js vendored
View File

File diff suppressed because one or more lines are too long

24
umbraco/presentation/web.config.SHOCKING.xslt Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl">
<xsl:output method="xml" indent="yes"/>
<!-- Set up a local connection string -->
<xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
<xsl:attribute name="value">datalayer=&quot;VistaDB,VistaDB For Umbraco&quot;</xsl:attribute>
</xsl:template>
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
<xsl:attribute name="value">4.1.0.beta</xsl:attribute>
</xsl:template>
<!-- Default templates to match anything else -->
<xsl:template match="@*">
<xsl:copy/>
</xsl:template>
<xsl:template match="node()">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>