From d82fd3dd04557cea1664c1b613dd1969691e724d Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 22 Oct 2013 14:58:42 +0200 Subject: [PATCH] member groups tree and editor polish --- .../umbraco/Trees/loadMemberGroups.cs | 3 +-- .../umbraco/members/EditMemberGroup.aspx.cs | 15 ++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs index 1b12404840..fc41fd7384 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs @@ -72,8 +72,7 @@ function openMemberGroup(id) { xNode.NodeID = role; xNode.Text = role; xNode.Action = "javascript:openMemberGroup('" + HttpContext.Current.Server.UrlEncode(role.Replace("'", "\\'")) + "');"; - xNode.Icon = "membergroup.gif"; - xNode.OpenIcon = "membergroup.gif"; + xNode.Icon = "icon-users"; if (!Member.IsUsingUmbracoRoles()) { xNode.Menu = null; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs index 8ed1b24570..b126282300 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberGroup.aspx.cs @@ -12,6 +12,7 @@ using System.Web.UI.HtmlControls; using System.Web.Security; using umbraco.cms.businesslogic.member; using umbraco.cms.presentation.Trees; +using umbraco.uicontrols; namespace umbraco.presentation.members { @@ -27,7 +28,7 @@ namespace umbraco.presentation.members } private MemberGroup _memberGroup = null; - protected ImageButton save = null; + protected MenuButton save = null; string _memberGroupId = String.Empty; protected void Page_Load(object sender, System.EventArgs e) @@ -61,7 +62,7 @@ namespace umbraco.presentation.members } } - private void save_click(object sender, System.Web.UI.ImageClickEventArgs e) + private void save_click(object sender, EventArgs e) { _memberGroup.Text = NameTxt.Text; memberGroupName.Value = NameTxt.Text; @@ -82,11 +83,11 @@ namespace umbraco.presentation.members InitializeComponent(); base.OnInit(e); Panel1.hasMenu = true; - save = Panel1.Menu.NewImageButton(); - save.ImageUrl = UmbracoPath + "/images/editor/save.gif"; - save.Click += new System.Web.UI.ImageClickEventHandler(save_click); - save.AlternateText = ui.Text("save"); - + save = Panel1.Menu.NewButton(); + save.Text = ui.Text("save"); + save.Click += new EventHandler(save_click); + save.ButtonType = MenuButtonType.Primary; + Panel1.Text = ui.Text("membergroup"); }