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

packages section is there with translations sections and correct trees

Browse Source
This commit is contained in:
elitsa
2018-10-05 11:09:33 +02:00
parent f3d1cc29bb
commit 0cc5a01069
23 changed files with 49 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Constants-Applications.cs
View File

@@ -13,9 +13,9 @@
public const string Content = "content";
/// <summary>
/// Application alias for the developer section.
/// Application alias for the packages section.
/// </summary>
public const string Developer = "developer";
public const string Packages = "packages";
/// <summary>
/// Application alias for the media section.

2
src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
View File

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

4
src/Umbraco.Tests/UI/LegacyDialogTests.cs
View File

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

9
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -1326,21 +1326,14 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editscript">Edit script file</key>
</area>
<area alias="sections">
<key alias="concierge">Concierge</key>
<key alias="content">Content</key>
<key alias="courier">Courier</key>
<key alias="developer">Developer</key>
<key alias="installer">Umbraco Configuration Wizard</key>
<key alias="packages">Packages</key>
<key alias="media">Media</key>
<key alias="member">Members</key>
<key alias="newsletters">Newsletters</key>
<key alias="settings">Settings</key>
<key alias="statistics">Statistics</key>
<key alias="translation">Translation</key>
<key alias="users">Users</key>
<key alias="help" version="7.0">Help</key>
<key alias="forms">Forms</key>
<key alias="analytics">Analytics</key>
</area>
<area alias="help">
<key alias="goTo">go to</key>

2
src/Umbraco.Web.UI/Umbraco/developer/Macros/EditMacro.aspx.cs
View File

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

2
src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
{
public DirectoryBrowser()
{
CurrentApp = Constants.Applications.Developer;
CurrentApp = Constants.Applications.Packages;
}
string _lsScriptName;

7
src/Umbraco.Web.UI/config/Dashboard.config
View File

@@ -29,12 +29,7 @@
views/dashboard/forms/formsdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupDeveloperDashboardSection">
<areas>
<area>developer</area>
</areas>
</section>
</section>
<section alias="StartupMediaDashboardSection">
<areas>
<area>media</area>

4
src/Umbraco.Web.UI/config/applications.config
View File

@@ -3,9 +3,9 @@
<add alias="content" name="Content" icon="traycontent" sortOrder="0" />
<add alias="media" name="Media" icon="traymedia" sortOrder="1" />
<add alias="settings" name="Settings" icon="traysettings" sortOrder="2" />
<add alias="developer" name="Developer" icon="traydeveloper" sortOrder="3" />
<add alias="packages" name="Packages" icon="traydeveloper" sortOrder="3" />
<add alias="users" name="Users" icon="trayuser" sortOrder="4" />
<add alias="member" name="Members" icon="traymember" sortOrder="5" />
<add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" />
<add alias="translation" name="Translation" icon="traytranslation" sortOrder="7" />
</applications>
</applications>

34
src/Umbraco.Web.UI/config/trees.config
View File

@@ -8,33 +8,29 @@
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" />
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web" />
<add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" initialize="true" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" sortOrder="2" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="Umbraco.Web.Trees.StylesheetsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" sortOrder="5" />
<add initialize="true" sortOrder="7" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web" />
<add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="8" />
<add initialize="true" sortOrder="9" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="2" alias="memberTypes" application="settings" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="3" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="10" alias="contentBlueprints" application="settings" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentBlueprintTreeController, Umbraco.Web" />
<add application="settings" sortOrder="4" alias="macros" title="Macros" type="Umbraco.Web.Trees.MacrosTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="5" alias="relationTypes" title="Relation Types" type="Umbraco.Web.Trees.RelationTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="6" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" initialize="true" />
<add application="settings" sortOrder="7" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" />
<add application="settings" sortOrder="8" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="9" alias="stylesheets" title="Stylesheets" type="Umbraco.Web.Trees.StylesheetsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="10" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="11" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="packages" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" />
<add application="developer" alias="macros" title="Macros" type="Umbraco.Web.Trees.MacrosTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<add application="developer" alias="relationTypes" title="Relation Types" type="Umbraco.Web.Trees.RelationTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<add initialize="true" sortOrder="0" alias="packages" application="packages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" />
<!--Users-->
<add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" />
<!--Members-->
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="2" alias="memberGroups" application="member" title="Member Groups" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberGroupTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="memberGroups" application="member" title="Member Groups" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberGroupTreeController, Umbraco.Web" />
<!--Translation-->
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, Umbraco.Web" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, Umbraco.Web" />
<add initialize="true" application="translation" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
<!-- Custom -->
<!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
<add initialize="true" sortOrder="2" alias="datasource" application="forms" title="Datasources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.DataSourceTreeController, Umbraco.Forms.Web" />
<add initialize="true" sortOrder="0" alias="form" application="forms" title="Forms" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormTreeController, Umbraco.Forms.Web" />
<add initialize="true" sortOrder="3" alias="prevaluesource" application="forms" title="Prevalue sources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.PreValueSourceTreeController, Umbraco.Forms.Web" />

8
src/Umbraco.Web/Editors/DataTypeController.cs
View File

@@ -290,7 +290,7 @@ namespace Umbraco.Web.Editors
/// </remarks>
[UmbracoApplicationAuthorize(
Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
Constants.Applications.Settings, Constants.Applications.Developer)]
Constants.Applications.Settings, Constants.Applications.Packages)]
public IEnumerable<DataTypeBasic> GetAll()
{
return Services.DataTypeService
@@ -307,7 +307,7 @@ namespace Umbraco.Web.Editors
/// </remarks>
[UmbracoTreeAuthorize(
Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
Constants.Applications.Settings, Constants.Applications.Developer)]
Constants.Applications.Settings, Constants.Applications.Packages)]
public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedDataTypes()
{
var dataTypes = Services.DataTypeService
@@ -340,7 +340,7 @@ namespace Umbraco.Web.Editors
/// </remarks>
[UmbracoTreeAuthorize(
Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
Constants.Applications.Settings, Constants.Applications.Developer)]
Constants.Applications.Settings, Constants.Applications.Packages)]
public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedPropertyEditors()
{
var datatypes = new List<DataTypeBasic>();
@@ -373,7 +373,7 @@ namespace Umbraco.Web.Editors
/// </remarks>
[UmbracoTreeAuthorize(
Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
Constants.Applications.Settings, Constants.Applications.Developer)]
Constants.Applications.Settings, Constants.Applications.Packages)]
public IEnumerable<PropertyEditorBasic> GetAllPropertyEditors()
{
return Current.PropertyEditors

2
src/Umbraco.Web/Editors/PackageInstallController.cs
View File

@@ -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
/// </summary>
[PluginController("UmbracoApi")]
[UmbracoApplicationAuthorize(Core.Constants.Applications.Developer)]
[UmbracoApplicationAuthorize(Core.Constants.Applications.Packages)]
public class PackageInstallController : UmbracoAuthorizedJsonController
{
/// <summary>

4
src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs
View File

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

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

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

5
src/Umbraco.Web/Trees/DictionaryTreeController.cs
View File

@@ -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"];

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

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

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

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

7
src/Umbraco.Web/Trees/PackagesTreeController.cs
View File

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

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

@@ -10,7 +10,7 @@ namespace Umbraco.Web.Trees
/// <summary>
/// Tree for displaying partial view macros in the developer app
/// </summary>
[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]

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

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

2
src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Web
public override string AssignedApp
{
get { return Constants.Applications.Developer.ToString(); }
get { return Constants.Applications.Packages.ToString(); }
}
}
}

2
src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Web
public override string AssignedApp
{
get { return Constants.Applications.Developer.ToString(); }
get { return Constants.Applications.Packages.ToString(); }
}
}
}

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
View File

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

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
View File

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