diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelper.cs index 3d5f94d18b..bbb6afd1ec 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelper.cs @@ -16,6 +16,8 @@ public class AbpColumnTagHelper : AbpTagHelper ProcessSizeClass(context, output, TagHelper.SizeMd, "-md"); ProcessSizeClass(context, output, TagHelper.SizeLg, "-lg"); ProcessSizeClass(context, output, TagHelper.SizeXl, "-xl"); + ProcessSizeClass(context, output, TagHelper.SizeXxl, "-xxl"); } protected virtual void ProcessOffsetClasses(TagHelperContext context, TagHelperOutput output) @@ -33,6 +34,7 @@ public class AbpColumnTagHelperService : AbpTagHelperService ProcessOffsetClass(context, output, TagHelper.OffsetMd, "-md"); ProcessOffsetClass(context, output, TagHelper.OffsetLg, "-lg"); ProcessOffsetClass(context, output, TagHelper.OffsetXl, "-xl"); + ProcessOffsetClass(context, output, TagHelper.OffsetXxl, "-xxl"); } protected virtual void ProcessSizeClass(TagHelperContext context, TagHelperOutput output, ColumnSize size, string breakpoint) diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json index 0a445a3b8c..19507eb2d6 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json @@ -39,6 +39,7 @@ "ExtraProperties": "Extra properties", "MaxDuration": "Max. Duration", "MinDuration": "Min. Duration", + "MinMaxDuration": "Duration (Min. - Max.)", "{0}Milliseconds": "{0} milliseconds", "ExecutionTime": "Time", "Parameters": "Parameters", diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 09dcdb1be3..af51baa372 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -1,48 +1,38 @@ -
-
-
-
-
{{ 'AbpIdentity::Roles' | abpLocalization }}
-
-
- -
+ +
+
+
-
- -
-
- - - -

{{ (selected?.id ? 'AbpIdentity::Edit' : 'AbpIdentity::NewRole') | abpLocalization }}

-
+ + +

{{ (selected?.id ? 'AbpIdentity::Edit' : 'AbpIdentity::NewRole') | abpLocalization }}

+
- -
- -
-
+ +
+ +
+
- - - {{ - 'AbpIdentity::Save' | abpLocalization - }} - -
+ + + {{ + 'AbpIdentity::Save' | abpLocalization + }} + +
- - + (abpInit)="init(abpPermissionManagement)" + > + + diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 7873adf6ea..0b7db30ace 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -1,89 +1,83 @@ -
-
-
-
-
{{ 'AbpIdentity::Users' | abpLocalization }}
-
-
- -
-
-
-
-
-
- + + +
+
+
+
+ +
-
- + +
-
- - -

{{ (selected?.id ? 'AbpIdentity::Edit' : 'AbpIdentity::NewUser') | abpLocalization }}

-
+ + +

{{ (selected?.id ? 'AbpIdentity::Edit' : 'AbpIdentity::NewUser') | abpLocalization }}

+
- -
+ + +
+
-
- -
-
-
+
+ +
- - - {{ - 'AbpIdentity::Save' | abpLocalization - }} - -
+ + + {{ + 'AbpIdentity::Save' | abpLocalization + }} + +
- - + [entityDisplayName]="entityDisplayName" + (abpInit)="init(abpPermissionManagement)" + > + + diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts index e217a710a0..e6c11d195e 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.module.ts @@ -17,6 +17,7 @@ import { IDENTITY_ENTITY_PROP_CONTRIBUTORS, IDENTITY_TOOLBAR_ACTION_CONTRIBUTORS, } from './tokens/extensions.token'; +import { PageModule } from '@abp/ng.components/page'; @NgModule({ declarations: [RolesComponent, UsersComponent], @@ -30,6 +31,7 @@ import { NgbDropdownModule, PermissionManagementModule, NgxValidateCoreModule, + PageModule, ], }) export class IdentityModule { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html index 8f6be17e4d..bb0a27a6b2 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html @@ -1,63 +1,55 @@ -
-
-
-
-
{{ 'AbpTenantManagement::Tenants' | abpLocalization }}
-
-
- -
-
-
+ -
-
-
- + +
+
+
+
+ +
-
- + +
-
- - -

- {{ + + +

+ {{ (selected?.id ? 'AbpTenantManagement::Edit' : 'AbpTenantManagement::NewTenant') | abpLocalization - }} -

-
+ }} +

+
- -
- -
-
+ +
+ +
+
- - - {{ - 'AbpTenantManagement::Save' | abpLocalization - }} - -
+ + + {{ + 'AbpTenantManagement::Save' | abpLocalization + }} + + - - + [(visible)]="visibleFeatures" + providerName="T" + [providerKey]="providerKey" + > + + diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts index 1aca283a29..535ee38aaa 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts @@ -16,6 +16,7 @@ import { TENANT_MANAGEMENT_ENTITY_PROP_CONTRIBUTORS, TENANT_MANAGEMENT_TOOLBAR_ACTION_CONTRIBUTORS, } from './tokens/extensions.token'; +import { PageModule } from '@abp/ng.components/page'; @NgModule({ declarations: [TenantsComponent], @@ -28,6 +29,7 @@ import { NgbDropdownModule, FeatureManagementModule, UiExtensionsModule, + PageModule, ], }) export class TenantManagementModule { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html index 649fb625ff..285e0aa94b 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html @@ -1,6 +1,6 @@