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

Merge pull request #476 from joshua-stewart/7.2.0

Browse Source 
U4-5457 & U4-5458 - Updates /Trees/UserTypes.cs and settingsdashboardintro.html
This commit is contained in:
Shannon Deminick
2014-09-10 11:29:08 +10:00
parent 09a2d660c7 ea9975b2c1
commit d7b02f0a30
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
View File

@@ -6,9 +6,9 @@
<ul>
<li>Read more about working with the Items in Settings <a href="http://our.umbraco.org/wiki/umbraco-help/settings" target="_blank">in the Community Wiki</a></li>
<li>Download the <a href="http://our.umbraco.org/projects/website-utilities/editors-manual" target="_blank">Editors Manual</a> for details on working with the Umbraco UI</li>
<li>Download the <a href="http://our.umbraco.org/projects/website-utilities/umbraco-7-editors-manual" target="_blank">Editors Manual</a> for details on working with the Umbraco UI</li>
<li>Ask a question in the <a href="http://our.umbraco.org/" target="_blank">Community Forum</a></li>
<li>Watch our <a href="http://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)</li>
<li>Find out about our <a href="http://umbraco.org/products" target="_blank">productivity boosting tools and commercial support</a></li>
<li>Find out about real-life <a href="http://umbraco.org/training/training-schedule" target="_blank">training and certification</a> opportunities</li>
<li>Find out about our <a href="http://umbraco.com/products" target="_blank">productivity boosting tools and commercial support</a></li>
<li>Find out about real-life <a href="http://umbraco.com/products/training/schedule" target="_blank">training and certification</a> opportunities</li>
</ul>

2
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs
View File

@@ -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)