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

Work items: 30272, 30280

Browse Source
This commit is contained in:
hartvig
2011-05-02 09:42:34 -02:00
parent 0661842dea
commit 157e96c935
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
umbraco/cms/businesslogic/events/EventArgs.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using umbraco.cms.businesslogic.member;
using umbraco.cms.businesslogic.web;
namespace umbraco.cms.businesslogic {
@@ -28,11 +29,14 @@ namespace umbraco.cms.businesslogic {
public class NewEventArgs : System.ComponentModel.CancelEventArgs { }
//Special Members Event args
public class AddToCacheEventArgs : System.ComponentModel.CancelEventArgs { }
public class RemoveFromCacheEventArgs : System.ComponentModel.CancelEventArgs { }
public class AddGroupEventArgs : System.ComponentModel.CancelEventArgs { }
public class RemoveGroupEventArgs : System.ComponentModel.CancelEventArgs { }
public class AddToCacheEventArgs : GroupEventArgs { }
public class RemoveFromCacheEventArgs : GroupEventArgs { }
public class AddGroupEventArgs : GroupEventArgs { }
public class RemoveGroupEventArgs : GroupEventArgs { }
public class GroupEventArgs : System.ComponentModel.CancelEventArgs
{
public int GroupId{ get; set; }
}
//Tree node event args
public class NodeRenderEventArgs : System.ComponentModel.CancelEventArgs { }

2
umbraco/cms/businesslogic/member/Member.cs
View File

@@ -648,6 +648,7 @@ namespace umbraco.cms.businesslogic.member
public void AddGroup(int GroupId)
{
AddGroupEventArgs e = new AddGroupEventArgs();
e.GroupId = GroupId;
FireBeforeAddGroup(e);
if (!e.Cancel)
@@ -673,6 +674,7 @@ namespace umbraco.cms.businesslogic.member
public void RemoveGroup(int GroupId)
{
RemoveGroupEventArgs e = new RemoveGroupEventArgs();
e.GroupId = GroupId;
FireBeforeRemoveGroup(e);
if (!e.Cancel)

16
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -2568,13 +2568,15 @@
<Content Include="umbraco\masterpages\umbracoPage.Master" />
<Content Include="umbraco\masterpages\umbracoDialog.Master" />
<Content Include="umbraco\Search\QuickSearchHandler.ashx" />
<Content Include="umbraco\scripting\templates\cshtml\Breadcrumb-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\ListSubPagesByDateAndLimit-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Media-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Paging-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Parameters-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\SelectChildrenByDocumentType-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\SiteMap-DynamicNode.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Breadcrumb.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\ListSubPagesByDateAndLimit.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Macro-Parameters.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Media.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Navigation.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\Paging.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\SelectChildrenByDocumentType.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\SiteMap.cshtml" />
<Content Include="umbraco\scripting\templates\cshtml\UsingRelatedLinks.cshtml" />
<None Include="umbraco\scripting\templates\py\SubpagesAsThumnbnails.py" />
<None Include="umbraco\scripting\templates\py\SubpagesFromAChangeableSource.py" />
<None Include="umbraco\scripting\templates\py\SubpagesFromCurrentPage.py" />

2
umbraco/presentation/umbraco/scripting/templates/cshtml/SiteMap.cshtml
View File

@@ -27,6 +27,7 @@ var values = new Dictionary<string,object>();
values.Add("maxLevelForSitemap", maxLevelForSitemap) ;
var items = node.Children.Where("Visible").Where("Level <= maxLevelForSitemap", values);
if (items.Count() > 0) {
<ul>
@foreach (var item in items) {
<li>
@@ -35,6 +36,7 @@ values.Add("maxLevelForSitemap", maxLevelForSitemap) ;
</li>
}
</ul>
}
}
<div class="sitemap">
@traverse(@Model.AncestorOrSelf())