From 0661b12b562f7cb127304356c42407108a463360 Mon Sep 17 00:00:00 2001 From: Joshua Stewart Date: Mon, 8 Sep 2014 10:02:36 -0500 Subject: [PATCH 1/4] This commit updates /Trees/UserTypes,cs to use userType.Name rather than userType.Alias for displaying the tree item text. --- src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs index 6f2f1bf85a..8ac4771672 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs @@ -41,7 +41,7 @@ function openUserTypes(id) { node.NodeID = userType.Id.ToString(); node.Action = string.Format("javascript:openUserTypes({0})", userType.Id.ToString()); node.Icon = "icon-users"; - node.Text = userType.Alias; + node.Text = userType.Name; OnBeforeNodeRender(ref tree, ref node, EventArgs.Empty); if (node != null) From 226d3715b92487382ecd83afc349eaca2c578bf8 Mon Sep 17 00:00:00 2001 From: Joshua Stewart Date: Mon, 8 Sep 2014 16:16:15 -0500 Subject: [PATCH 2/4] Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton. --- .../views/dashboard/settings/settingsdashboardintro.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index a425ed670b..afda190327 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -6,9 +6,9 @@ \ No newline at end of file From 229575d3b0c8b5d5cceba60529e4ef206629d91e Mon Sep 17 00:00:00 2001 From: Joshua Stewart Date: Mon, 8 Sep 2014 16:17:51 -0500 Subject: [PATCH 3/4] Revert "Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton." This reverts commit 226d3715b92487382ecd83afc349eaca2c578bf8. --- .../views/dashboard/settings/settingsdashboardintro.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index afda190327..a425ed670b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -6,9 +6,9 @@ \ No newline at end of file From ea9975b2c1dfc563a263918f41a13a848e2bda53 Mon Sep 17 00:00:00 2001 From: Joshua Stewart Date: Mon, 8 Sep 2014 16:28:07 -0500 Subject: [PATCH 4/4] Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton. --- .../views/dashboard/settings/settingsdashboardintro.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index a425ed670b..afda190327 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -6,9 +6,9 @@ \ No newline at end of file