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

Fixed: U4-7150 Inconsistent tree aliases

Browse Source 
Changes all translation files and tree classes to have consistent
naming, updates trees.config to these new alias's
This commit is contained in:
Per Ploug
2015-09-28 08:54:00 +02:00
parent e4e3c46d15
commit 6c5e35ec2c
30 changed files with 142 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Web.Trees
Constants.Applications.Developer,
Constants.Applications.Members)]
[LegacyBaseTree(typeof(loadContent))]
[Tree(Constants.Applications.Content, Constants.Trees.Content, "Content")]
[Tree(Constants.Applications.Content, Constants.Trees.Content)]
[PluginController("UmbracoTrees")]
[CoreTree]
public class ContentTreeController : ContentTreeControllerBase

2
src/Umbraco.Web/Trees/ContentTypeTreeController.cs
View File

@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
[Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types", sortOrder: 6)]
[Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, null, sortOrder: 6)]
[Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
[CoreTree]
public class ContentTypeTreeController : TreeController

2
src/Umbraco.Web/Trees/DataTypeTreeController.cs
View File

@@ -17,7 +17,7 @@ using Constants = Umbraco.Core.Constants;
namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
[Tree(Constants.Applications.Developer, Constants.Trees.DataTypes, "Data Types")]
[Tree(Constants.Applications.Developer, Constants.Trees.DataTypes)]
[PluginController("UmbracoTrees")]
[CoreTree]
public class DataTypeTreeController : TreeController

2
src/Umbraco.Web/Trees/LanguageTreeController.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.Languages)]
[LegacyBaseTree(typeof(loadLanguages))]
[Tree(Constants.Applications.Settings, Constants.Trees.Languages, "Languages", sortOrder: 4)]
[Tree(Constants.Applications.Settings, Constants.Trees.Languages, null, sortOrder: 4)]
[PluginController("UmbracoTrees")]
[CoreTree]
public class LanguageTreeController : TreeController

2
src/Umbraco.Web/Trees/MediaTreeController.cs
View File

@@ -26,7 +26,7 @@ namespace Umbraco.Web.Trees
Constants.Applications.Developer,
Constants.Applications.Members)]
[LegacyBaseTree(typeof(loadMedia))]
[Tree(Constants.Applications.Media, Constants.Trees.Media, "Media")]
[Tree(Constants.Applications.Media, Constants.Trees.Media)]
[PluginController("UmbracoTrees")]
[CoreTree]
public class MediaTreeController : ContentTreeControllerBase

2
src/Umbraco.Web/Trees/MediaTypeTreeController.cs
View File

@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
[Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, "Media Types", sortOrder:5)]
[Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, null, sortOrder:5)]
[Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
[CoreTree]
public class MediaTypeTreeController : TreeController

2
src/Umbraco.Web/Trees/MemberTypeTreeController.cs
View File

@@ -13,7 +13,7 @@ using Umbraco.Web.WebApi.Filters;
namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
[Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, "Member Types", sortOrder:2 )]
[Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, null, sortOrder:2 )]
[Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
[CoreTree]
public class MemberTypeTreeController : TreeController

3
src/Umbraco.Web/Trees/TemplatesTreeController.cs
View File

@@ -52,7 +52,8 @@ namespace Umbraco.Web.Trees
queryStrings,
template.Name,
template.IsMasterTemplate ? "icon-newspaper" : "icon-newspaper-alt",
template.IsMasterTemplate)));
template.IsMasterTemplate,
GetEditorPath(template, queryStrings))));
return nodes;
}