Improve the management page UI

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.7.0</Version>
+    <Version>5.8.0-preview.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml

@@ -8,8 +8,9 @@
 @inject IPageLayout PageLayout
 @inject IStringLocalizer<OrdersResource> L
 @{
-    PageLayout.Content.Title = L["Order"].Value;
+    PageLayout.Content.Title = L["Menu:Order"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Order"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:OrderManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = OrdersMenus.Order;
 
     var cardTitle = L["Order"].Value;
@@ -41,7 +42,7 @@
 <abp-card>
     <abp-card-header>
         <abp-row>
-            <abp-column size-md="_6">
+            <abp-column size-md="_12">
                 <abp-card-title>@cardTitle</abp-card-title>
             </abp-column>
         </abp-row>

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml

@@ -10,8 +10,9 @@
 @inject IStringLocalizer<PaymentsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Payment"].Value;
+    PageLayout.Content.Title = L["Menu:Payment"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Payment"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = PaymentsMenus.Payment;
     
     var cardTitle = L["Payment"].Value;
@@ -39,7 +40,7 @@
 <abp-card>
     <abp-card-header>
         <abp-row>
-            <abp-column size-md="_6">
+            <abp-column size-md="_12">
                 <abp-card-title>@cardTitle</abp-card-title>
             </abp-column>
         </abp-row>

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/PaymentItem/Index.cshtml

@@ -8,8 +8,9 @@
 @inject IPageLayout PageLayout
 @inject IHtmlLocalizer<PaymentsResource> L
 @{
-    PageLayout.Content.Title = L["PaymentItem"].Value;
+    PageLayout.Content.Title = L["Menu:PaymentItem"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentItem"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = PaymentsMenus.Payment;
 }
 
@@ -27,13 +28,6 @@
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["PaymentItem"]</abp-card-title>
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="PaymentItemTable" class="nowrap">
             <thead>

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IStringLocalizer<PaymentsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Refund"].Value;
+    PageLayout.Content.Title = L["Menu:Refund"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Refund"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = PaymentsMenus.Refund;
     
     var cardTitle = L["Refund"].Value;

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/RefundItem/Index.cshtml

@@ -7,8 +7,9 @@
 @inject IPageLayout PageLayout
 @inject IHtmlLocalizer<PaymentsResource> L
 @{
-    PageLayout.Content.Title = L["RefundItem"].Value;
+    PageLayout.Content.Title = L["Menu:RefundItem"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:RefundItem"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:PaymentManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = PaymentsMenus.Refund;
 }
 
@@ -26,13 +27,6 @@
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["RefundItem"]</abp-card-title>
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="RefundTable" class="nowrap">
             <thead>

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml

@@ -8,11 +8,11 @@
 @model IndexModel
 @inject IPageLayout PageLayout
 @{
-    PageLayout.Content.Title = L["Category"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Category"].Value);
-    PageLayout.Content.MenuItemName = ProductsMenus.Category;
-
     var parentDisplayName = Model.ParentDisplayName.IsNullOrEmpty() ? "" : $" - {Model.ParentDisplayName}";
+    PageLayout.Content.Title = L["Menu:Category"].Value + parentDisplayName;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
+    PageLayout.Content.MenuItemName = ProductsMenus.Category;
 }
 
 @section scripts
@@ -23,25 +23,20 @@
 {
     <abp-style src="/Pages/EShop/Products/Categories/Category/index.css"/>
 }
+@section content_toolbar
+{
+    <abp-button id="NewCategoryButton"
+                text="@L["CreateCategory"].Value"
+                icon="plus"
+                size="Smallz"
+                button-type="Primary" />
+}
 
 <script>
     let parentId = '@Model.ParentId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["Category"]@parentDisplayName</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                <abp-button id="NewCategoryButton"
-                            text="@L["CreateCategory"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="CategoryTable" class="nowrap">
             <thead>

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml

@@ -8,8 +8,10 @@
 @inject IPageLayout PageLayout
 @inject IHtmlLocalizer<ProductsResource> L
 @{
-    PageLayout.Content.Title = L["Product"].Value;
+    var titlePostfix = Model.StoreName != null ? $" - {Model.StoreName}" : "";
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value);
+    PageLayout.Content.Title = L["Menu:Product"].Value + titlePostfix;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = ProductsMenus.Product;
 }
 
@@ -21,6 +23,18 @@
 {
     <abp-style src="/Pages/EShop/Products/Products/Product/index.css"/>
 }
+@section content_toolbar
+{
+    @if (Model.Filter.StoreId != null)
+    {
+        <abp-button id="NewProductButton"
+                    text="@L["CreateProduct"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
+
 <script>
     let storeId = '@Model.Filter.StoreId';
     let categoryId = '@Model.Filter.CategoryId';
@@ -30,13 +44,6 @@
 {
     <abp-dynamic-form abp-model="Filter" data-ajaxForm="true" asp-page="Index">
         <abp-card>
-            <abp-card-header>
-                <abp-row>
-                    <abp-column size-md="_6">
-                        <abp-card-title>@L["Product"]</abp-card-title>
-                    </abp-column>
-                </abp-row>
-            </abp-card-header>
             <abp-card-body>
                 <abp-form-content></abp-form-content>
             </abp-card-body>
@@ -49,19 +56,6 @@
 else
 {
     <abp-card>
-        <abp-card-header>
-            <abp-row>
-                <abp-column size-md="_6">
-                    <abp-card-title>@L["Product"] - @Model.StoreName</abp-card-title>
-                </abp-column>
-                <abp-column size-md="_6" class="text-end">
-                    <abp-button id="NewProductButton"
-                                text="@L["CreateProduct"].Value"
-                                icon="plus"
-                                button-type="Primary" />
-                </abp-column>
-            </abp-row>
-        </abp-card-header>
         <abp-card-body>
             <abp-table striped-rows="true" id="ProductTable" class="nowrap">
                 <thead>

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml

@@ -11,8 +11,10 @@
 @inject IHtmlLocalizer<ProductsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["ProductSku"].Value;
+    PageLayout.Content.Title = Model.ProductDisplayName + " - " + L["ProductSku"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = ProductsMenus.Product;
 }
 
@@ -24,27 +26,23 @@
 {
     <abp-style src="/Pages/EShop/Products/Products/ProductSku/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(ProductsPermissions.Products.Create))
+    { 
+        <abp-button id="NewProductSkuButton"
+                    text="@L["CreateProductSku"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
+
 <script>
     let productId = '@Model.ProductId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["ProductSku"] - @Model.ProductDisplayName</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                @if (await Authorization.IsGrantedAsync(ProductsPermissions.Products.Create))
-                { 
-                <abp-button id="NewProductSkuButton"
-                            text="@L["CreateProductSku"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="ProductSkuTable" class="nowrap">
             <thead>

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/StoreOwners/StoreOwner/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<StoresResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["StoreOwner"].Value;
+    PageLayout.Content.Title = L["Menu:StoreOwner"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:StoreOwner"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:StoreManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = StoresMenus.StoreOwner;
 }
 
@@ -25,28 +26,23 @@
 {
     <abp-style src="/Pages/EShop/Stores/StoreOwners/StoreOwner/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(StoresPermissions.Stores.Manage))
+    {
+        <abp-button id="NewStoreOwnerButton"
+                    text="@L["CreateStoreOwner"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary"/>
+    }
+}
 
 <script>
      let storeId = '@Model.StoreId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["StoreOwner"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                @if (await Authorization.IsGrantedAsync(StoresPermissions.Stores.Manage))
-                {
-                    <abp-button id="NewStoreOwnerButton"
-                                text="@L["CreateStoreOwner"].Value"
-                                icon="plus"
-                                button-type="Primary"/>
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="StoreOwnerTable">
             <thead>

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Stores/Store/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<StoresResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Store"].Value;
+    PageLayout.Content.Title = L["Menu:Store"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Store"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:StoreManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = StoresMenus.Store;
 }
 
@@ -24,24 +25,19 @@
 {
     <abp-style src="/Pages/EShop/Stores/Stores/Store/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(StoresPermissions.Stores.Create))
+    { 
+        <abp-button id="NewStoreButton"
+                    text="@L["CreateStore"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["Store"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(StoresPermissions.Stores.Create))
-                { 
-                <abp-button id="NewStoreButton"
-                            text="@L["CreateStore"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="StoreTable">
             <thead>

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Transactions/Transaction/Index.cshtml

@@ -10,8 +10,9 @@
 @inject IHtmlLocalizer<StoresResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Transaction"].Value;
+    PageLayout.Content.Title = L["Menu:Transaction"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Transaction"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:StoreManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = StoresMenus.Transaction;
 }
 
@@ -23,28 +24,23 @@
 {
     <abp-style src="/Pages/EShop/Stores/Transactions/Transaction/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(StoresPermissions.Transaction.Create))
+    { 
+        <abp-button id="NewTransactionButton"
+                    text="@L["CreateTransaction"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <script>
     var storeId = '@Model.StoreId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["Transaction"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(StoresPermissions.Transaction.Create))
-                { 
-                <abp-button id="NewTransactionButton"
-                            text="@L["CreateTransaction"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="TransactionTable" class="nowrap">
             <thead>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/Index.cshtml

@@ -12,8 +12,7 @@
 @inject IHtmlLocalizer<BasketsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["BasketItem"].Value;
+    PageLayout.Content.Title = L["Menu:BasketItem"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:BasketItem"].Value);
     PageLayout.Content.MenuItemName = BasketsMenus.BasketItem;
 }
 
@@ -25,25 +24,21 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.css"/>
 }
+@section content_toolbar
+{
+    <abp-button id="NewBasketItemButton"
+                text="@L["CreateBasketItem"].Value"
+                icon="plus"
+                size="Small"
+                button-type="Primary" />
+}
+
 <script>
     let basketName = '@Model.BasketName';
     let userId = '@Model.UserId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["BasketItem"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                <abp-button id="NewBasketItemButton"
-                            text="@L["CreateBasketItem"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="BasketItemTable" class="nowrap">
             <thead>

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Pages/EShop/Plugins/Booking/GrantedStores/GrantedStore/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<BookingResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["GrantedStore"].Value;
+    PageLayout.Content.Title = L["Menu:GrantedStore"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:GrantedStore"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Booking"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = BookingMenus.GrantedStore;
 }
 
@@ -24,24 +25,19 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Booking/GrantedStores/GrantedStore/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(BookingPermissions.GrantedStore.Create))
+    {
+        <abp-button id="NewGrantedStoreButton"
+                    text="@L["CreateGrantedStore"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["GrantedStore"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(BookingPermissions.GrantedStore.Create))
-                {
-                <abp-button id="NewGrantedStoreButton"
-                            text="@L["CreateGrantedStore"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="GrantedStoreTable" class="nowrap"/>
     </abp-card-body>

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Pages/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategory/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<BookingResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["ProductAssetCategory"].Value;
+    PageLayout.Content.Title = L["Menu:ProductAssetCategory"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductAssetCategory"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Booking"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = BookingMenus.ProductAssetCategory;
 }
 
@@ -24,6 +25,20 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategory/index.css"/>
 }
+@section content_toolbar
+{
+    @if (Model.Filter.StoreId != null)
+    {
+        if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAssetCategory.Create))
+        {
+            <abp-button id="NewProductAssetCategoryButton"
+                        text="@L["CreateProductAssetCategory"].Value"
+                        icon="plus"
+                        size="Small"
+                        button-type="Primary"/>
+        }
+    }
+}
 
 <script>
     let storeId = '@Model.Filter.StoreId';
@@ -33,13 +48,6 @@
 {
     <abp-dynamic-form abp-model="Filter" data-ajaxForm="true" asp-page="Index">
         <abp-card>
-            <abp-card-header>
-                <abp-row>
-                    <abp-column size-md="_6">
-                        <abp-card-title>@L["ProductAssetCategory"]</abp-card-title>
-                    </abp-column>
-                </abp-row>
-            </abp-card-header>
             <abp-card-body>
                 <abp-form-content></abp-form-content>
             </abp-card-body>
@@ -52,22 +60,6 @@
 else
 {
     <abp-card>
-        <abp-card-header>
-            <abp-row>
-                <abp-column size-md="_6">
-                    <abp-card-title>@L["ProductAssetCategory"]</abp-card-title>
-                </abp-column>
-                <abp-column size-md="_6" class="text-end">
-                    @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAssetCategory.Create))
-                    {
-                        <abp-button id="NewProductAssetCategoryButton"
-                                    text="@L["CreateProductAssetCategory"].Value"
-                                    icon="plus"
-                                    button-type="Primary"/>
-                    }
-                </abp-column>
-            </abp-row>
-        </abp-card-header>
         <abp-card-body>
             <abp-table striped-rows="true" id="ProductAssetCategoryTable" class="nowrap"/>
         </abp-card-body>

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Pages/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryPeriod/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<BookingResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["ProductAssetCategoryPeriod"].Value;
+    PageLayout.Content.Title = L["Menu:ProductAssetCategoryPeriod"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductAssetCategoryPeriod"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Booking"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = BookingMenus.ProductAssetCategory;
 }
 
@@ -24,28 +25,23 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Booking/ProductAssetCategories/ProductAssetCategoryPeriod/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAssetCategory.Update))
+    {
+        <abp-button id="NewProductAssetCategoryPeriodButton"
+                    text="@L["CreateProductAssetCategoryPeriod"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary"/>
+    }
+}
 
 <script>
     let productAssetCategoryId = '@Model.ProductAssetCategoryId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["ProductAssetCategoryPeriod"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAssetCategory.Update))
-                {
-                    <abp-button id="NewProductAssetCategoryPeriodButton"
-                                text="@L["CreateProductAssetCategoryPeriod"].Value"
-                                icon="plus"
-                                button-type="Primary"/>
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="ProductAssetCategoryPeriodTable" class="nowrap"/>
     </abp-card-body>

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Pages/EShop/Plugins/Booking/ProductAssets/ProductAsset/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<BookingResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["ProductAsset"].Value;
+    PageLayout.Content.Title = L["Menu:ProductAsset"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductAsset"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Booking"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = BookingMenus.ProductAsset;
 }
 
@@ -24,6 +25,20 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Booking/ProductAssets/ProductAsset/index.css"/>
 }
+@section content_toolbar
+{
+    @if (Model.Filter.StoreId != null)
+    {
+        if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAsset.Create))
+        {
+            <abp-button id="NewProductAssetButton"
+                        text="@L["CreateProductAsset"].Value"
+                        icon="plus"
+                        size="Small"
+                        button-type="Primary"/>
+        }
+    }
+}
 
 <script>
     let storeId = '@Model.Filter.StoreId';
@@ -33,13 +48,6 @@
 {
     <abp-dynamic-form abp-model="Filter" data-ajaxForm="true" asp-page="Index">
         <abp-card>
-            <abp-card-header>
-                <abp-row>
-                    <abp-column size-md="_6">
-                        <abp-card-title>@L["ProductAsset"]</abp-card-title>
-                    </abp-column>
-                </abp-row>
-            </abp-card-header>
             <abp-card-body>
                 <abp-form-content></abp-form-content>
             </abp-card-body>
@@ -52,22 +60,6 @@
 else
 {
     <abp-card>
-        <abp-card-header>
-            <abp-row>
-                <abp-column size-md="_6">
-                    <abp-card-title>@L["ProductAsset"]</abp-card-title>
-                </abp-column>
-                <abp-column size-md="_6" class="text-end">
-                    @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAsset.Create))
-                    {
-                        <abp-button id="NewProductAssetButton"
-                                    text="@L["CreateProductAsset"].Value"
-                                    icon="plus"
-                                    button-type="Primary"/>
-                    }
-                </abp-column>
-            </abp-row>
-        </abp-card-header>
         <abp-card-body>
             <abp-table striped-rows="true" id="ProductAssetTable" class="nowrap"/>
         </abp-card-body>

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Pages/EShop/Plugins/Booking/ProductAssets/ProductAssetPeriod/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<BookingResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["ProductAssetPeriod"].Value;
+    PageLayout.Content.Title = L["Menu:ProductAssetPeriod"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:ProductAssetPeriod"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Booking"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = BookingMenus.ProductAsset;
 }
 
@@ -24,28 +25,23 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Booking/ProductAssets/ProductAssetPeriod/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAsset.Update))
+    {
+        <abp-button id="NewProductAssetPeriodButton"
+                    text="@L["CreateProductAssetPeriod"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary"/>
+    }
+}
 
 <script>
     let productAssetId = '@Model.ProductAssetId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["ProductAssetPeriod"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                @if (await Authorization.IsGrantedAsync(BookingPermissions.ProductAsset.Update))
-			    {
-			        <abp-button id="NewProductAssetPeriodButton"
-                                text="@L["CreateProductAssetPeriod"].Value"
-                                icon="plus"
-                                button-type="Primary"/>
-			    }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="ProductAssetPeriodTable" class="nowrap"/>
     </abp-card-body>

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Pages/EShop/Plugins/Coupons/CouponTemplates/CouponTemplate/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<CouponsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["CouponTemplate"].Value;
+    PageLayout.Content.Title = L["Menu:CouponTemplate"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:CouponTemplate"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:CouponManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = CouponsMenus.CouponTemplate;
 }
 
@@ -24,24 +25,19 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Coupons/CouponTemplates/CouponTemplate/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(CouponsPermissions.CouponTemplate.Create))
+    {
+        <abp-button id="NewCouponTemplateButton"
+                    text="@L["CreateCouponTemplate"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["CouponTemplate"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(CouponsPermissions.CouponTemplate.Create))
-                {
-                <abp-button id="NewCouponTemplateButton"
-                            text="@L["CreateCouponTemplate"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="CouponTemplateTable" class="nowrap">
             <thead>

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Pages/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateScope/Index.cshtml

@@ -13,6 +13,8 @@
 @{
     PageLayout.Content.Title = L["CouponTemplateScope"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:CouponTemplate"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:CouponManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = CouponsMenus.CouponTemplate;
 }
 
@@ -24,28 +26,23 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateScope/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(CouponsPermissions.CouponTemplate.Update))
+    {
+        <abp-button id="NewCouponTemplateScopeButton"
+                    text="@L["CreateCouponTemplateScope"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <script>
     let couponTemplateId = '@Model.CouponTemplateId';
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["CouponTemplateScope"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(CouponsPermissions.CouponTemplate.Update))
-                {
-                <abp-button id="NewCouponTemplateScopeButton"
-                            text="@L["CreateCouponTemplateScope"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="CouponTemplateScopeTable" class="nowrap">
             <thead>

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Pages/EShop/Plugins/Coupons/Coupons/Coupon/Index.cshtml

@@ -11,8 +11,9 @@
 @inject IHtmlLocalizer<CouponsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Coupon"].Value;
+    PageLayout.Content.Title = L["Menu:Coupon"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Coupon"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:CouponManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = CouponsMenus.Coupon;
 }
 
@@ -24,24 +25,19 @@
 {
     <abp-style src="/Pages/EShop/Plugins/Coupons/Coupons/Coupon/index.css"/>
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(CouponsPermissions.Coupon.Create))
+    {
+        <abp-button id="NewCouponButton"
+                    text="@L["CreateCoupon"].Value"
+                    icon="plus"
+                    size="Small"
+                    button-type="Primary" />
+    }
+}
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["Coupon"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-			    @if (await Authorization.IsGrantedAsync(CouponsPermissions.Coupon.Create))
-                {
-                <abp-button id="NewCouponButton"
-                            text="@L["CreateCoupon"].Value"
-                            icon="plus"
-                            button-type="Primary" />
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="CouponTable" class="nowrap">
             <thead>

plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/Index.cshtml

@@ -13,8 +13,9 @@
 @inject IHtmlLocalizer<FlashSalesResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["FlashSalePlan"].Value;
+    PageLayout.Content.Title = L["Menu:FlashSalePlan"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalePlan"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalesManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSalePlan;
 }
 
@@ -26,24 +27,19 @@
 {
     <abp-style src="/Pages/EShop/Plugins/FlashSales/FlashSalePlans/FlashSalePlan/index.css" />
 }
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(FlashSalesPermissions.FlashSalePlan.Create))
+    {
+        <abp-button id="NewFlashSalePlanButton"
+                text="@L["CreateFlashSalePlan"].Value"
+                icon="plus"
+                size="Small"
+                button-type="Primary" />
+    }
+}
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["FlashSalePlan"]</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-            @if (await Authorization.IsGrantedAsync(FlashSalesPermissions.FlashSalePlan.Create))
-            {
-                <abp-button id="NewFlashSalePlanButton"
-                        text="@L["CreateFlashSalePlan"].Value"
-                        icon="plus"
-                        button-type="Primary" />
-            }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="FlashSalePlanTable" class="nowrap" />
     </abp-card-body>

plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Pages/EShop/Plugins/FlashSales/FlashSaleResults/FlashSaleResult/Index.cshtml

@@ -13,8 +13,9 @@
 @inject IHtmlLocalizer<FlashSalesResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["FlashSaleResult"].Value;
+    PageLayout.Content.Title = L["Menu:FlashSaleResult"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSaleResult"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:FlashSalesManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
     PageLayout.Content.MenuItemName = FlashSalesMenus.FlashSaleResult;
 }
 
@@ -28,13 +29,6 @@
 }
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@L["FlashSaleResult"]</abp-card-title>
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-table striped-rows="true" id="FlashSaleResultTable" class="nowrap" />
     </abp-card-body>

plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Pages/EShop/Plugins/Promotions/Promotions/Promotion/Index.cshtml

@@ -10,16 +10,17 @@
 @inject IHtmlLocalizer<PromotionsResource> L
 @inject IAuthorizationService Authorization
 @{
-    PageLayout.Content.Title = L["Promotion"].Value;
+    var title = L["Promotion"].Value;
-    PageLayout.Content.BreadCrumb.Add(L["Menu:Promotion"].Value);
-    PageLayout.Content.MenuItemName = PromotionsMenus.Promotion;
-
-    var cardTitle = L["Promotion"].Value;
 
     if (Model.StoreName != null)
     {
-        cardTitle += $" - {Model.StoreName}";
+        title += $" - {Model.StoreName}";
     }
+
+    PageLayout.Content.Title = title;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:PromotionManagement"].Value);
+    PageLayout.Content.BreadCrumb.Add(L["Menu:EasyAbpEShop"].Value);
+    PageLayout.Content.MenuItemName = PromotionsMenus.Promotion;
 }
 
 @section scripts
@@ -32,32 +33,27 @@
     <abp-style src="/Pages/EShop/Plugins/Promotions/Promotions/Promotion/index.css"/>
 }
 
+@section content_toolbar
+{
+    @if (await Authorization.IsGrantedAsync(PromotionsPermissions.Promotion.Create))
+    {
+        <abp-dropdown>
+            <abp-dropdown-button text="@L["CreatePromotion"].Value" icon="plus" size="Small" button-type="Primary"/>
+            <abp-dropdown-menu>
+                @foreach (var promotionType in Model.PromotionTypes.Values)
+                {
+                    <abp-dropdown-item href="#" class="NewPromotionButton" promotion-type="@promotionType.Name">@promotionType.DisplayName</abp-dropdown-item>
+                }
+            </abp-dropdown-menu>
+        </abp-dropdown>
+    }
+}
+
 <script>
-let storeId = '@Model.StoreId'
+    let storeId = '@Model.StoreId'
 </script>
 
 <abp-card>
-    <abp-card-header>
-        <abp-row>
-            <abp-column size-md="_6">
-                <abp-card-title>@cardTitle</abp-card-title>
-            </abp-column>
-            <abp-column size-md="_6" class="text-end">
-                @if (await Authorization.IsGrantedAsync(PromotionsPermissions.Promotion.Create))
-                {
-                    <abp-dropdown>
-                        <abp-dropdown-button text="@L["CreatePromotion"].Value" icon="plus" button-type="Primary"/>
-                        <abp-dropdown-menu>
-                            @foreach (var promotionType in Model.PromotionTypes.Values)
-                            {
-                                <abp-dropdown-item href="#" class="NewPromotionButton" promotion-type="@promotionType.Name">@promotionType.DisplayName</abp-dropdown-item>
-                            }
-                        </abp-dropdown-menu>
-                    </abp-dropdown>
-                }
-            </abp-column>
-        </abp-row>
-    </abp-card-header>
     <abp-card-body>
         <abp-row class="mb-3">
             <a abp-collapse-id="PromotionCollapse" class="text-secondary">@L["TableFilter"] </a>