Resolved #686 #687

7 years ago · 0a5a3133e0
10 changed files with 104 additions and 29 deletions
--- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@ -19,17 +19,17 @@ namespace Volo.Abp.Identity.Web.Navigation
            var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
            var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<IdentityResource>>();

-            var identityMenuItem = new ApplicationMenuItem("Identity", l["Menu:IdentityManagement"], icon: "fa fa-id-card-o");
+            var identityMenuItem = new ApplicationMenuItem(IdentityMenuNames.GroupName, l["Menu:IdentityManagement"], icon: "fa fa-id-card-o");
            context.Menu.AddItem(identityMenuItem);

            if (await authorizationService.IsGrantedAsync(IdentityPermissions.Roles.Default))
            {
-                identityMenuItem.AddItem(new ApplicationMenuItem("Roles", l["Roles"], url: "/Identity/Roles"));
+                identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "/Identity/Roles"));
            }

            if (await authorizationService.IsGrantedAsync(IdentityPermissions.Users.Default))
            {
-                identityMenuItem.AddItem(new ApplicationMenuItem("Users", l["Users"], url: "/Identity/Users"));
+                identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/Identity/Users"));
            }
        }
    }
--- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/IdentityMenuNames.cs
@ -0,0 +1,10 @@
+namespace Volo.Abp.Identity.Web.Navigation
+{
+    public class IdentityMenuNames
+    {
+        public const string GroupName = "AbpIdentity";
+
+        public const string Roles = GroupName + ".Roles";
+        public const string Users = GroupName + ".Users";
+    }
+}
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
@ -1,9 +1,17 @@
@page
@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
@using Volo.Abp.Identity.Localization
+@using Volo.Abp.Identity.Web.Navigation
@using Volo.Abp.Identity.Web.Pages.Identity.Roles
@model IndexModel
@inject IHtmlLocalizer<IdentityResource> L
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = L["Roles"].Value;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
+    PageLayout.Content.MenuItemName = IdentityMenuNames.Roles;
+}
@section scripts {
    <abp-script-bundle name="@typeof(IndexModel).FullName">
        <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
@ -14,7 +22,7 @@
    <abp-card-header>
        <abp-row>
            <abp-column size-md="_6">
-                <h2>@L["Roles"]</h2>
+                <abp-card-title>@L["Roles"]</abp-card-title>
            </abp-column>
            <abp-column size-md="_6" class="text-right">
                <abp-button button-type="Primary" name="CreateRole" text="@L["NewRole"].Value" icon="plus" />
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
@ -1,12 +1,20 @@
@page
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
@using Volo.Abp.Identity
@using Volo.Abp.Identity.Localization
+@using Volo.Abp.Identity.Web.Navigation
@using Volo.Abp.Identity.Web.Pages.Identity.Users
@model IndexModel
@inject IHtmlLocalizer<IdentityResource> L
@inject IAuthorizationService Authorization
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = L["Users"].Value;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
+    PageLayout.Content.MenuItemName = IdentityMenuNames.Users;
+}
@section scripts {
    <abp-script-bundle name="@typeof(IndexModel).FullName">
        <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
@ -18,26 +26,26 @@
    <abp-card-header>
        <abp-row>
            <abp-column size-md="_6">
-                <h2>@L["Users"]</h2>
+                <abp-card-title>@L["Users"]</abp-card-title>
            </abp-column>
-            <abp-column  size-md="_6" class="text-right">
+            <abp-column size-md="_6" class="text-right">
                @if (await Authorization.IsGrantedAsync(IdentityPermissions.Users.Create))
                {
-                    <abp-button button-type="Primary" name="CreateUser" text="@L["NewUser"].Value" icon="plus"/>
+                    <abp-button button-type="Primary" name="CreateUser" text="@L["NewUser"].Value" icon="plus" />
                }
            </abp-column>
        </abp-row>
    </abp-card-header>
    <abp-card-body>
        <abp-table striped-rows="true" class="nowrap">
-                <thead>
-                    <tr>
-                        <th>@L["Actions"]</th>
-                        <th>@L["UserName"]</th>
-                        <th>@L["EmailAddress"]</th>
-                        <th>@L["PhoneNumber"]</th>
-                    </tr>
-                </thead>
+            <thead>
+                <tr>
+                    <th>@L["Actions"]</th>
+                    <th>@L["UserName"]</th>
+                    <th>@L["EmailAddress"]</th>
+                    <th>@L["PhoneNumber"]</th>
+                </tr>
+            </thead>
        </abp-table>
    </abp-card-body>
 </abp-card>
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
@ -25,7 +25,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
            //TODO: Localize
            //var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<IdentityResource>>();

-            context.Menu.AddItem(new ApplicationMenuItem("Volo.Abp.SettingManagement", "Settings", "/SettingManagement", icon: "fa fa-cog", order: int.MaxValue - 1000));
+            context.Menu.AddItem(new ApplicationMenuItem(SettingManagementMenuNames.GroupName, "Settings", "/SettingManagement", icon: "fa fa-cog", order: int.MaxValue - 1000));

            return Task.CompletedTask;
        }
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMenuNames.cs
@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Volo.Abp.SettingManagement.Web.Navigation
+{
+    public class SettingManagementMenuNames
+    {
+        public const string GroupName = "SettingManagement";
+
+        public const string Settings = GroupName + ".Settings";
+    }
+}
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml
@ -1,19 +1,37 @@
@page
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.SettingManagement.Web.Navigation
@using Volo.Abp.SettingManagement.Web.Pages.SettingManagement
@model IndexModel
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = /*L["Settings"].Value*/ "Settings";
+    PageLayout.Content.MenuItemName = SettingManagementMenuNames.GroupName;
+}
@section scripts {
    <abp-script-bundle name="@typeof(IndexModel).FullName">
        <abp-script src="/Pages/SettingManagement/Index.js" />
    </abp-script-bundle>
 }
-<abp-tabs tab-style="PillVertical"  vertical-header-size="_2">

-@foreach (var group in Model.SettingPageCreationContext.Groups)
-{
-    <abp-tab title="@group.DisplayName">
-        
-        <h2>@group.DisplayName</h2>
-        @await Component.InvokeAsync(group.ComponentType)
-    </abp-tab>
-}
-</abp-tabs>
+<abp-card id="SettingManagementWrapper">
+    <abp-card-header>
+        <abp-row>
+            <abp-column size-md="_6">
+                <abp-card-title>@*@L["Settings"]*@Settings</abp-card-title>
+            </abp-column>
+        </abp-row>
+    </abp-card-header>
+    <abp-card-body>
+        <abp-tabs tab-style="PillVertical" vertical-header-size="_2">
+            @foreach (var group in Model.SettingPageCreationContext.Groups)
+            {
+                <abp-tab title="@group.DisplayName">
+
+                    <h2>@group.DisplayName</h2>
+                    @await Component.InvokeAsync(group.ComponentType)
+                </abp-tab>
+            }
+        </abp-tabs>
+    </abp-card-body>
+</abp-card>
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs
@ -19,12 +19,12 @@ namespace Volo.Abp.TenantManagement.Web.Navigation
            var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
            var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AbpTenantManagementResource>>();

-            var tenantManagementMenuItem = new ApplicationMenuItem("TenantManagement", l["Menu:TenantManagement"]);
+            var tenantManagementMenuItem = new ApplicationMenuItem(TenantManagementMenuNames.GroupName, l["Menu:TenantManagement"], icon: "fa fa-users");
            context.Menu.AddItem(tenantManagementMenuItem);

            if (await authorizationService.IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
            {
-                tenantManagementMenuItem.AddItem(new ApplicationMenuItem("Tenants", l["Tenants"], url: "/TenantManagement/Tenants"));
+                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "/TenantManagement/Tenants"));
            }
        }
    }
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs
@ -0,0 +1,9 @@
+namespace Volo.Abp.TenantManagement.Web.Navigation
+{
+    public class TenantManagementMenuNames
+    {
+        public const string GroupName = "TenantManagement";
+
+        public const string Tenants = GroupName + ".Tenants";
+    }
+}
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
@ -1,9 +1,17 @@
@page
@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
@using Volo.Abp.TenantManagement.Localization
+@using Volo.Abp.TenantManagement.Web.Navigation
@using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
@model IndexModel
@inject IHtmlLocalizer<AbpTenantManagementResource> L
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.Title = L["Tenants"].Value;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:TenantManagement"].Value);
+    PageLayout.Content.MenuItemName = TenantManagementMenuNames.Tenants;
+}
@section scripts {
    <script type="text/javascript" src="~/modules/multi-tenancy/views/tenants/index.js"></script>
 }
@ -11,7 +19,7 @@
    <abp-card-header>
        <abp-row>
            <abp-column size-md="_6">
-                <h2>@L["Tenants"]</h2>
+                <abp-card-title>@L["Tenants"]</abp-card-title>
            </abp-column>
            <abp-column size-md="_6" class="text-right">
                <abp-button button-type="Primary" name="CreateTenant" icon="plus" text="@L["NewTenant"].Value" />