diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs index 9a1883a065..ac42274a71 100644 --- a/src/Umbraco.Core/Constants-Applications.cs +++ b/src/Umbraco.Core/Constants-Applications.cs @@ -13,9 +13,9 @@ public const string Content = "content"; /// - /// Application alias for the developer section. + /// Application alias for the packages section. /// - public const string Developer = "developer"; + public const string Packages = "packages"; /// /// Application alias for the media section. diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs index 8d8991c396..4f929ae718 100644 --- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs +++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs @@ -186,7 +186,7 @@ namespace Umbraco.Core.Migrations.Install private void CreateUserGroup2AppData() { _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Content }); - _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Developer }); + _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Packages }); _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Media }); _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Members }); _database.Insert(new UserGroup2AppDto { UserGroupId = 1, AppAlias = Constants.Applications.Settings }); diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs index ffbca1e0e8..ba7c4f0e66 100644 --- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs +++ b/src/Umbraco.Tests/UI/LegacyDialogTests.cs @@ -25,8 +25,8 @@ namespace Umbraco.Tests.UI [TestCase(typeof(MemberGroupTasks), Constants.Applications.Members)] [TestCase(typeof(dictionaryTasks), Constants.Applications.Settings)] - [TestCase(typeof(macroTasks), Constants.Applications.Developer)] - [TestCase(typeof(CreatedPackageTasks), Constants.Applications.Developer)] + [TestCase(typeof(macroTasks), Constants.Applications.Packages)] + [TestCase(typeof(CreatedPackageTasks), Constants.Applications.Packages)] public void Check_Assigned_Apps_For_Tasks(Type taskType, string app) { var task = (LegacyDialogTask)Activator.CreateInstance(taskType); diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 835bf6b884..7239880956 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -1326,21 +1326,14 @@ To manage your website, simply open the Umbraco back office and start adding con Edit script file - Concierge Content - Courier - Developer - Umbraco Configuration Wizard + Packages Media Members - Newsletters Settings - Statistics Translation Users - Help Forms - Analytics go to diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs index 1379e1003b..b9c0577c95 100644 --- a/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs +++ b/src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Macros { public EditMacro() { - CurrentApp = Constants.Applications.Developer.ToString(); + CurrentApp = Constants.Applications.Packages.ToString(); } protected PlaceHolder Buttons; diff --git a/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs b/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs index ed5b62c4dc..3e2edd1471 100644 --- a/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs +++ b/src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { public DirectoryBrowser() { - CurrentApp = Constants.Applications.Developer; + CurrentApp = Constants.Applications.Packages; } string _lsScriptName; diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index c1a1d8815a..fab6fa6ea3 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -29,12 +29,7 @@ views/dashboard/forms/formsdashboardintro.html - -
- - developer - -
+
media diff --git a/src/Umbraco.Web.UI/config/applications.config b/src/Umbraco.Web.UI/config/applications.config index 7f88f58801..268d94a255 100644 --- a/src/Umbraco.Web.UI/config/applications.config +++ b/src/Umbraco.Web.UI/config/applications.config @@ -3,9 +3,9 @@ - + - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index c445e92807..cf546ed6f5 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -8,33 +8,29 @@ - - - - - - - - + + + + + + + + + + + + - - - - + - - + - - - + - diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index 78775de2cc..e11ea7cbef 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -290,7 +290,7 @@ namespace Umbraco.Web.Editors /// [UmbracoApplicationAuthorize( Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members, - Constants.Applications.Settings, Constants.Applications.Developer)] + Constants.Applications.Settings, Constants.Applications.Packages)] public IEnumerable GetAll() { return Services.DataTypeService @@ -307,7 +307,7 @@ namespace Umbraco.Web.Editors /// [UmbracoTreeAuthorize( Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members, - Constants.Applications.Settings, Constants.Applications.Developer)] + Constants.Applications.Settings, Constants.Applications.Packages)] public IDictionary> GetGroupedDataTypes() { var dataTypes = Services.DataTypeService @@ -340,7 +340,7 @@ namespace Umbraco.Web.Editors /// [UmbracoTreeAuthorize( Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members, - Constants.Applications.Settings, Constants.Applications.Developer)] + Constants.Applications.Settings, Constants.Applications.Packages)] public IDictionary> GetGroupedPropertyEditors() { var datatypes = new List(); @@ -373,7 +373,7 @@ namespace Umbraco.Web.Editors /// [UmbracoTreeAuthorize( Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members, - Constants.Applications.Settings, Constants.Applications.Developer)] + Constants.Applications.Settings, Constants.Applications.Packages)] public IEnumerable GetAllPropertyEditors() { return Current.PropertyEditors diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 1c3bddb115..6111a931e3 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -37,7 +37,7 @@ namespace Umbraco.Web.Editors /// A controller used for installing packages and managing all of the data in the packages section in the back office ///
[PluginController("UmbracoApi")] - [UmbracoApplicationAuthorize(Core.Constants.Applications.Developer)] + [UmbracoApplicationAuthorize(Core.Constants.Applications.Packages)] public class PackageInstallController : UmbracoAuthorizedJsonController { /// diff --git a/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs b/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs index 002b96bc64..67b542e840 100644 --- a/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs +++ b/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs @@ -19,8 +19,8 @@ namespace Umbraco.Web.Models.Trees public class SettingsApplicationDefinition : IApplication { } - [Application(Constants.Applications.Developer, "Developer", ".traydeveloper", sortOrder: 3)] - public class DeveloperApplicationDefinition : IApplication + [Application(Constants.Applications.Packages, "Packages", ".traydeveloper", sortOrder: 3)] + public class PackagesApplicationDefinition : IApplication { } [Application(Constants.Applications.Users, "Users", ".trayusers", sortOrder: 4)] diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 13deec0aaa..e5b859b502 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.Trees Constants.Applications.Media, Constants.Applications.Users, Constants.Applications.Settings, - Constants.Applications.Developer, + Constants.Applications.Packages, Constants.Applications.Members)] [Tree(Constants.Applications.Content, Constants.Trees.Content)] [PluginController("UmbracoTrees")] diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs index c2491fefe0..dda14f5054 100644 --- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs @@ -9,10 +9,11 @@ using Umbraco.Web.WebApi.Filters; namespace Umbraco.Web.Trees { + [UmbracoTreeAuthorize(Constants.Trees.Dictionary)] [Mvc.PluginController("UmbracoTrees")] [CoreTree] - [Tree(Constants.Applications.Settings, Constants.Trees.Dictionary, null, sortOrder: 3)] + [Tree(Constants.Applications.Translation, Constants.Trees.Dictionary, null, sortOrder: 3)] public class DictionaryTreeController : TreeController { protected override TreeNode CreateRootNode(FormDataCollection queryStrings) @@ -21,7 +22,7 @@ namespace Umbraco.Web.Trees // the default section is settings, falling back to this if we can't // figure out where we are from the querystring parameters - var section = Constants.Applications.Settings; + var section = Constants.Applications.Translation; if (queryStrings["application"] != null) section = queryStrings["application"]; diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs index 2968408bdb..e1d0e17acc 100644 --- a/src/Umbraco.Web/Trees/MacrosTreeController.cs +++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs @@ -13,7 +13,7 @@ using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees { [UmbracoTreeAuthorize(Constants.Trees.Macros)] - [Tree(Constants.Applications.Developer, Constants.Trees.Macros, "Macros", sortOrder: 2)] + [Tree(Constants.Applications.Settings, Constants.Trees.Macros, "Macros", sortOrder: 2)] [PluginController("UmbracoTrees")] [CoreTree] public class MacrosTreeController : TreeController diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs index 53f1b0a97e..8eb37e6224 100644 --- a/src/Umbraco.Web/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTreeController.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Trees Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Settings, - Constants.Applications.Developer, + Constants.Applications.Packages, Constants.Applications.Members)] [Tree(Constants.Applications.Media, Constants.Trees.Media)] [PluginController("UmbracoTrees")] diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index 235f249509..8e572139ca 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Net.Http.Formatting; using Umbraco.Web.Models.Trees; @@ -13,7 +14,7 @@ using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees { [UmbracoTreeAuthorize(Constants.Trees.Packages)] - [Tree(Constants.Applications.Developer, Constants.Trees.Packages, null, sortOrder: 0)] + [Tree(Constants.Applications.Packages, Constants.Trees.Packages, null, sortOrder: 0)] [PluginController("UmbracoTrees")] [CoreTree] public class PackagesTreeController : TreeController @@ -26,10 +27,10 @@ namespace Umbraco.Web.Trees { var root = base.CreateRootNode(queryStrings); - root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Developer, Constants.Trees.Packages, "overview"); + root.RoutePath = $"{Constants.Applications.Packages}/{Constants.Trees.Packages}/{"overview"}"; root.Icon = "icon-box"; - + return root; } protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs index db97d5c3a4..43fe068334 100644 --- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs +++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs @@ -10,7 +10,7 @@ namespace Umbraco.Web.Trees /// /// Tree for displaying partial view macros in the developer app /// - [Tree(Constants.Applications.Developer, Constants.Trees.PartialViewMacros, null, sortOrder: 6)] + [Tree(Constants.Applications.Settings, Constants.Trees.PartialViewMacros, null, sortOrder: 6)] [UmbracoTreeAuthorize(Constants.Trees.PartialViewMacros)] [PluginController("UmbracoTrees")] [CoreTree] diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs index 14fd817a7c..0a70c446a0 100644 --- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs @@ -12,7 +12,7 @@ using Umbraco.Core.Models.Entities; namespace Umbraco.Web.Trees { [UmbracoTreeAuthorize(Constants.Trees.RelationTypes)] - [Tree(Constants.Applications.Developer, Constants.Trees.RelationTypes, null, sortOrder: 4)] + [Tree(Constants.Applications.Settings, Constants.Trees.RelationTypes, null, sortOrder: 4)] [Mvc.PluginController("UmbracoTrees")] [CoreTree] public class RelationTypeTreeController : TreeController diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs index 3d0f768dae..64f2c94b0a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs @@ -39,7 +39,7 @@ namespace Umbraco.Web public override string AssignedApp { - get { return Constants.Applications.Developer.ToString(); } + get { return Constants.Applications.Packages.ToString(); } } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs index f71cd4e792..ad7ce68c32 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs @@ -36,7 +36,7 @@ namespace Umbraco.Web public override string AssignedApp { - get { return Constants.Applications.Developer.ToString(); } + get { return Constants.Applications.Packages.ToString(); } } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs index 676f272e5b..22a9f4292f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs @@ -20,7 +20,7 @@ namespace umbraco.presentation.developer.packages public _Default() { - CurrentApp = Constants.Applications.Developer.ToString(); + CurrentApp = Constants.Applications.Packages.ToString(); } public Umbraco.Web._Legacy.Controls.TabPage packageInfo; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs index 52c021fc3c..d07251ea7a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs @@ -26,7 +26,7 @@ namespace umbraco.presentation.developer.packages public Installer() { - CurrentApp = Constants.Applications.Developer; + CurrentApp = Constants.Applications.Packages; _installer = new cms.businesslogic.packager.Installer(Security.CurrentUser.Id); }