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

Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0

Browse Source
This commit is contained in:
Shannon
2014-10-21 13:21:12 +10:00
parent 967030a9c4 fbed14a9e0
commit 4494d8cc91
12 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
View File

@@ -31,7 +31,17 @@ namespace Umbraco.Web.Trees
UmbClientMgr.contentFrame('Settings/Views/EditView.aspx?treeType=partialViewMacros&file=MacroPartials%2f' + id);
}
");
}
}/// <summary>
/// Ensures that no folders can be added
/// </summary>
/// <param name="xNode"></param>
protected override void OnRenderFolderNode(ref XmlTreeNode xNode)
{
base.OnRenderFolderNode(ref xNode);
xNode.NodeType = "partialViewMacrosFolder";
}
protected override void ChangeNodeAction(XmlTreeNode xNode)
{

6
src/Umbraco.Web/Trees/PartialViewsTree.cs
View File

@@ -57,7 +57,11 @@ namespace Umbraco.Web.Trees
/// <param name="xNode"></param>
protected override void OnRenderFolderNode(ref XmlTreeNode xNode)
{
xNode = null;
// We should allow folder hierarchy for organization in large sites.
xNode.Action = "javascript:void(0);";
xNode.NodeType = "partialViewsFolder";
xNode.Menu = new List<IAction>(new IAction[] { ActionDelete.Instance, ContextMenuSeperator.Instance, ActionNew.Instance, ContextMenuSeperator.Instance, ActionRefresh.Instance });
}
protected virtual void ChangeNodeAction(XmlTreeNode xNode)

1
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
View File

@@ -76,6 +76,7 @@ namespace umbraco
xNode.Menu = new List<IAction>(new IAction[] { ActionDelete.Instance, ContextMenuSeperator.Instance, ActionNew.Instance, ContextMenuSeperator.Instance, ActionRefresh.Instance });
xNode.Action = "javascript:void(0)";
xNode.NodeType = "scriptsFolder";
xNode.Action = "javascript:void(0);";
}
protected override void OnRenderFileNode(ref XmlTreeNode xNode)

2
src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx
View File

@@ -3,7 +3,7 @@
<input type="hidden" name="nodeType" value="-1"/>
<cc1:Pane runat="server">
<cc1:PropertyPanel runat="server" Text="Name">
<cc1:PropertyPanel runat="server" Text="Name (use / to make folders)">
<asp:TextBox ID="rename" runat="server" CssClass="bigInput input-large-type input-block-level"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>