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.

Sign up for GitHub

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

Jump to bottom

Suggestion for Admin Trees: Find a new name #2923

Merged
merged 4 commits into from
Jan 8, 2019
Merged

Suggestion for Admin Trees: Find a new name #2923

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca29808
(wip) first commit
Skrypt Dec 22, 2018
afd3e77
Renaming AdminTree to AdminMenu for everything
Skrypt Dec 27, 2018
d8b7651
fixing some remaining renames missing
Skrypt Jan 2, 2019
ec71e6d
Renaming TreeController to MenuController
Skrypt Jan 3, 2019
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 OrchardCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.ContentManageme
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.ReverseProxy", "src\OrchardCore.Modules\OrchardCore.ReverseProxy\OrchardCore.ReverseProxy.csproj", "{76871CE0-43F9-49D3-AAAB-4A8510F76447}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AdminTrees.Abstractions", "src\OrchardCore\OrchardCore.AdminTrees.Abstractions\OrchardCore.AdminTrees.Abstractions.csproj", "{3850142E-FA8B-4C26-A4BA-542928D4DF35}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AdminMenu.Abstractions", "src\OrchardCore\OrchardCore.AdminMenu.Abstractions\OrchardCore.AdminMenu.Abstractions.csproj", "{3850142E-FA8B-4C26-A4BA-542928D4DF35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AdminTrees", "src\OrchardCore.Modules\OrchardCore.AdminTrees\OrchardCore.AdminTrees.csproj", "{9B11A694-BD8F-47F0-AF0C-BC7E11579DC4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AdminMenu", "src\OrchardCore.Modules\OrchardCore.AdminMenu\OrchardCore.AdminMenu.csproj", "{9B11A694-BD8F-47F0-AF0C-BC7E11579DC4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Microsoft.Authentication", "src\OrchardCore.Modules\OrchardCore.Microsoft.Authentication\OrchardCore.Microsoft.Authentication.csproj", "{6B15CC95-04C7-42A4-96A5-F98664242069}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ nav:
- Widgets: OrchardCore.Modules/OrchardCore.Widgets/README.md
- Flows: OrchardCore.Modules/OrchardCore.Flows/README.md
- Forms: OrchardCore.Modules/OrchardCore.Forms/README.md
- Admin Trees: OrchardCore.Modules/OrchardCore.AdminTrees/README.md
- Admin Menu: OrchardCore.Modules/OrchardCore.AdminMenu/README.md
- Core Modules:
- Dynamic Cache: OrchardCore.Modules/OrchardCore.DynamicCache/README.md
- GraphQL: OrchardCore.Modules/OrchardCore.Apis.GraphQL/README.md
Expand Down
22 changes: 11 additions & 11 deletions ...dules/OrchardCore.AdminTrees/AdminMenu.cs → ...odules/OrchardCore.AdminMenu/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Localization;
using OrchardCore.AdminTrees.Services;
using OrchardCore.AdminMenu.Services;
using OrchardCore.Navigation;

namespace OrchardCore.AdminTrees
namespace OrchardCore.AdminMenu
{
public class AdminMenu : INavigationProvider
{
private readonly AdminTreeNavigationProvidersCoordinator _adminTreeNavigationProvider;
private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;

public AdminMenu(AdminTreeNavigationProvidersCoordinator adminTreeNavigationProvider,
public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
IStringLocalizer<AdminMenu> localizer)
{
_adminTreeNavigationProvider = adminTreeNavigationProvider;
_adminMenuNavigationProvider = adminMenuNavigationProvider;
S = localizer;
}

Expand All @@ -26,16 +26,16 @@ public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
return;
}

// Configuration and settings menus for the AdminTree module
// Configuration and settings menus for the AdminMenu module
builder.Add(S["Configuration"], cfg => cfg
.Add(S["Admin Trees"], "1.5", admt => admt
.Permission(Permissions.ManageAdminTree)
.Action("List", "Tree", new { area = "OrchardCore.AdminTrees" })
.Add(S["Admin Menus"], "1.5", admt => admt
.Permission(Permissions.ManageAdminMenu)
.Action("List", "Tree", new { area = "OrchardCore.AdminMenu" })
.LocalNav()
));

// This is the entry point for the adminTree: dynamically generated custom admin menus
await _adminTreeNavigationProvider.BuildNavigationAsync("admintree", builder);
// This is the entry point for the adminMenu: dynamically generated custom admin menus
await _adminMenuNavigationProvider.BuildNavigationAsync("adminMenu", builder);
}
}
}
4 changes: 2 additions & 2 deletions ...re.AdminTrees/AdminNodes/LinkAdminNode.cs → ...ore.AdminMenu/AdminNodes/LinkAdminNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminMenu.Models;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class LinkAdminNode : AdminNode
{
Expand Down
8 changes: 4 additions & 4 deletions ...inTrees/AdminNodes/LinkAdminNodeDriver.cs → ...minMenu/AdminNodes/LinkAdminNodeDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminTrees.AdminNodes;
using OrchardCore.AdminTrees.ViewModels;
using OrchardCore.AdminMenu.Models;
using OrchardCore.AdminMenu.AdminNodes;
using OrchardCore.AdminMenu.ViewModels;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.ModelBinding;
using OrchardCore.DisplayManagement.Views;
using OrchardCore.Navigation;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class LinkAdminNodeDriver : DisplayDriver<MenuItem, LinkAdminNode>
{
Expand Down
8 changes: 4 additions & 4 deletions ...inNodes/LinkAdminNodeNavigationBuilder.cs → ...inNodes/LinkAdminNodeNavigationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using System.Text;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Logging;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminTrees.Services;
using OrchardCore.AdminTrees.AdminNodes;
using OrchardCore.AdminMenu.Models;
using OrchardCore.AdminMenu.Services;
using OrchardCore.AdminMenu.AdminNodes;
using OrchardCore.Navigation;
using System.Threading.Tasks;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class LinkAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion ...rees/AdminNodes/LinkAdminNodeViewModel.cs → ...Menu/AdminNodes/LinkAdminNodeViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class LinkAdminNodeViewModel
{
Expand Down
4 changes: 2 additions & 2 deletions ...nTrees/AdminNodes/PlaceholderAdminNode.cs → ...inMenu/AdminNodes/PlaceholderAdminNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminMenu.Models;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class PlaceholderAdminNode : AdminNode
{
Expand Down
8 changes: 4 additions & 4 deletions .../AdminNodes/PlaceholderAdminNodeDriver.cs → .../AdminNodes/PlaceholderAdminNodeDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminTrees.AdminNodes;
using OrchardCore.AdminTrees.ViewModels;
using OrchardCore.AdminMenu.Models;
using OrchardCore.AdminMenu.AdminNodes;
using OrchardCore.AdminMenu.ViewModels;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.ModelBinding;
using OrchardCore.DisplayManagement.Views;
using OrchardCore.Navigation;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class PlaceholderAdminNodeDriver : DisplayDriver<MenuItem, PlaceholderAdminNode>
{
Expand Down
8 changes: 4 additions & 4 deletions .../PlaceholderAdminNodeNavigationBuilder.cs → .../PlaceholderAdminNodeNavigationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using System.Text;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Logging;
using OrchardCore.AdminTrees.Models;
using OrchardCore.AdminTrees.Services;
using OrchardCore.AdminTrees.AdminNodes;
using OrchardCore.AdminMenu.Models;
using OrchardCore.AdminMenu.Services;
using OrchardCore.AdminMenu.AdminNodes;
using OrchardCore.Navigation;
using System.Threading.Tasks;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class PlaceholderAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion ...minNodes/PlaceholderAdminNodeViewModel.cs → ...minNodes/PlaceholderAdminNodeViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace OrchardCore.AdminTrees.AdminNodes
namespace OrchardCore.AdminMenu.AdminNodes
{
public class PlaceholderAdminNodeViewModel
{
Expand Down
12 changes: 6 additions & 6 deletions ...odules/OrchardCore.AdminTrees/Assets.json → ...Modules/OrchardCore.AdminMenu/Assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
{
"generateSourceMaps": false,
"inputs": [
"Assets/scss/admin-trees.scss"
"Assets/scss/admin-menu.scss"
],
"output": "wwwroot/Styles/admin-trees.css"
"output": "wwwroot/Styles/admin-menu.css"
},
{
"generateSourceMaps": false,
"inputs": [
"Assets/scss/fontawesome-iconpicker.css",
"Assets/scss/admin-trees-icon-picker.scss"
"Assets/scss/admin-menu-icon-picker.scss"
],
"output": "wwwroot/Styles/admin-trees-icon-picker.css"
"output": "wwwroot/Styles/admin-menu-icon-picker.css"
},
{
"inputs": [
"Assets/js/jquery.mjs.nestedSortable.js",
"Assets/js/resizeTableBody.js"
],
"output": "wwwroot/Scripts/admin-trees.js"
"output": "wwwroot/Scripts/admin-menu.js"
},
{
"inputs": [
"Assets/js/fontawesome-iconpicker.js",
"Assets/js/AdminNodeIconPicker.js"
],
"output": "wwwroot/Scripts/admin-trees-icon-picker.js"
"output": "wwwroot/Scripts/admin-menu-icon-picker.js"
}
]
0 ...minTrees/Assets/js/AdminNodeIconPicker.js → ...dminMenu/Assets/js/AdminNodeIconPicker.js
View file
Open in desktop
File renamed without changes.
0 ...Trees/Assets/js/fontawesome-iconpicker.js → ...nMenu/Assets/js/fontawesome-iconpicker.js
View file
Open in desktop
File renamed without changes.
0 ...es/Assets/js/jquery.mjs.nestedSortable.js → ...nu/Assets/js/jquery.mjs.nestedSortable.js
View file
Open in desktop
File renamed without changes.
0 ...e.AdminTrees/Assets/js/resizeTableBody.js → ...re.AdminMenu/Assets/js/resizeTableBody.js
View file
Open in desktop
File renamed without changes.
0 .../Assets/scss/admin-trees-icon-picker.scss → ...u/Assets/scss/admin-menu-icon-picker.scss
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...e.AdminTrees/Assets/scss/admin-trees.scss → ...ore.AdminMenu/Assets/scss/admin-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ html, body, .ta-wrapper {
#menu li {
list-style: none;
cursor: move;
background-color: white;
}

.card-columns {
Expand Down
0 ...es/Assets/scss/fontawesome-iconpicker.css → ...nu/Assets/scss/fontawesome-iconpicker.css
View file
Open in desktop
File renamed without changes.
Loading