Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize the Admin Menu #17112

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
803216e
Move all settings under "Settings" menu item and add "Tools" in place…
MikeAlhayek Dec 3, 2024
5c63ae5
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 3, 2024
d505ad1
more organization
MikeAlhayek Dec 4, 2024
2da1ea0
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 4, 2024
70f7cce
use PrefixPosition
MikeAlhayek Dec 4, 2024
779e7fc
update NavigationConstants
MikeAlhayek Dec 4, 2024
77dc434
ensure tools come before settings at the end of the menu
MikeAlhayek Dec 4, 2024
f27202d
placement
MikeAlhayek Dec 4, 2024
6c0065c
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 5, 2024
042d83b
Add a swich for legacy format
MikeAlhayek Dec 5, 2024
94fbe43
fix missed menus
MikeAlhayek Dec 5, 2024
a0d7962
group settings
MikeAlhayek Dec 6, 2024
6e753b9
Use Model.Text in the templates
MikeAlhayek Dec 6, 2024
9962424
shorten the switch key
MikeAlhayek Dec 6, 2024
8869d23
don't use icons
MikeAlhayek Dec 6, 2024
a0ae2e0
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 6, 2024
b5fa299
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 11, 2024
6e6cdb0
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 13, 2024
7c9cd3c
move Content definitions into Design menu
MikeAlhayek Dec 13, 2024
dbdd7ff
fix placement of content definitions
MikeAlhayek Dec 13, 2024
e514594
move media to root level
MikeAlhayek Dec 13, 2024
adde19b
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 13, 2024
9a00fc3
update blog theme
MikeAlhayek Dec 15, 2024
9aa6120
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 15, 2024
ab9b7d4
adding content
MikeAlhayek Dec 15, 2024
e8f3514
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 17, 2024
995ed06
Use title case
MikeAlhayek Dec 17, 2024
ff19ab9
move media options under settings
MikeAlhayek Dec 17, 2024
8960ba7
Merge branch 'main' into ma/admin-menu-settings
MikeAlhayek Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
builder
.Add(S["Design"], content => content
.Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition
.Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes
.Add(S["Types"], S["Types"].PrefixPosition("1"), types => types
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
.Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes")
.Permission(Permissions.ViewContentTypes)
.LocalNav()
)
.Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts
.Add(S["Parts"], S["Parts"].PrefixPosition("2"), parts => parts
.Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes")
.Permission(Permissions.ViewContentTypes)
.LocalNav()
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder)
await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
{
content.AddClass("content").Id("content");
await content.AddAsync(S["Content items"], S["Content items"].PrefixPosition(), async contentItems =>
await content.AddAsync(S["Content items"], "before", async contentItems =>
{
if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager))
{
Expand Down
72 changes: 30 additions & 42 deletions src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,19 @@
}
]
},
{
"name": "MediaProfiles",
"MediaProfiles": {
"banner": {
"Hint": "A banner image (2048px x 600px, cropped)",
"Width": 2048,
"Height": 600,
"Mode": 2,
"Format": 0,
"Quality": 100
}
}
},
{
"name": "media",
"Files": [
Expand Down Expand Up @@ -1264,62 +1277,37 @@
"Classes": []
},
{
"$type": "OrchardCore.AdminMenu.AdminNodes.PlaceholderAdminNode, OrchardCore.AdminMenu",
"LinkText": "Content Types",
"IconClass": null,
"PermissionNames": [],
"UniqueId": "2f1fc33133334a1abf7d1a0516ee8b4e",
"$type": "OrchardCore.Contents.AdminNodes.ContentTypesAdminNode, OrchardCore.Contents",
"ShowAll": false,
"ContentTypes": [
{
"ContentTypeId": "Article"
},
{
"ContentTypeId": "Page"
},
{
"ContentTypeId": "Taxonomy"
}
],
"UniqueId": "ee18224e1b814c638b0732678b74cfd9",
"Enabled": true,
"Text": null,
"Id": null,
"Href": null,
"Url": null,
"Position": "1",
"Priority": 50,
"Position": null,
"LinkToFirstChild": true,
"LocalNav": false,
"Culture": null,
"Items": [
{
"$type": "OrchardCore.Contents.AdminNodes.ContentTypesAdminNode, OrchardCore.Contents",
"ShowAll": true,
"IconClass": null,
"ContentTypes": [],
"UniqueId": "ee18224e1b814c638b0732678b74cfd9",
"Enabled": true,
"Text": null,
"Id": null,
"Href": null,
"Url": null,
"Position": null,
"LinkToFirstChild": true,
"LocalNav": false,
"Culture": null,
"Items": [],
"Classes": []
}
],
"Items": [],
"Classes": []
}
],
"Classes": []
]
}
]
}
]
},
{
"name": "MediaProfiles",
"MediaProfiles": {
"banner": {
"Hint": "A banner image (2048px x 600px, cropped)",
"Width": 2048,
"Height": 600,
"Mode": 2,
"Format": 0,
"Quality": 100
}
}
}
]
}
Loading