From 983cb57b04451b838dfc646aac8643cc7970eeb5 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Fri, 2 Dec 2022 12:19:43 +0300 Subject: [PATCH 1/3] Align searchbox for blazor --- .../Pages/Identity/UserManagement.razor | 120 +++++++++--------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index fdd979b2a0..e72711c6ee 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -7,51 +7,41 @@ @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout @inject AbpBlazorMessageLocalizerHelper LH -@inherits AbpCrudPageBase +@inherits AbpCrudPageBase @* ************************* PAGE HEADER ************************* *@ - + - - - - - - - - - - - - + + + + @L["Search"] + + + + @* ************************* DATA GRID ************************* *@ - + @* ************************* CREATE MODAL ************************* *@ -@if ( HasCreatePermission ) +@if (HasCreatePermission) {
@L["NewUser"] - + @@ -67,7 +57,7 @@ @L["DisplayName:UserName"] - + @@ -77,7 +67,7 @@ @L["DisplayName:Name"] - + @@ -87,7 +77,7 @@ @L["DisplayName:Surname"] - + @@ -101,10 +91,13 @@ - + - + @@ -112,7 +105,7 @@ @L["DisplayName:Email"] - + @@ -122,26 +115,29 @@ @L["DisplayName:PhoneNumber"] - + - @L["DisplayName:IsActive"] + @L["DisplayName:IsActive"] + - @L["DisplayName:LockoutEnabled"] + + @L["DisplayName:LockoutEnabled"] - + - @if ( NewUserRoles != null ) + @if (NewUserRoles != null) { - @foreach ( var role in NewUserRoles ) + @foreach (var role in NewUserRoles) { - + @role.Name } @@ -153,7 +149,7 @@ - +
@@ -161,18 +157,18 @@ } @* ************************* EDIT MODAL ************************* *@ -@if ( HasUpdatePermission ) +@if (HasUpdatePermission) {
@L["Edit"] - + - + @@ -186,7 +182,7 @@ @L["DisplayName:UserName"] - + @@ -196,7 +192,7 @@ @L["DisplayName:Name"] - + @@ -206,7 +202,7 @@ @L["DisplayName:Surname"] - + @@ -220,10 +216,13 @@ - + - + @@ -231,7 +230,7 @@ @L["DisplayName:Email"] - + @@ -241,26 +240,29 @@ @L["DisplayName:PhoneNumber"] - + - @L["DisplayName:IsActive"] + + @L["DisplayName:IsActive"] - @L["DisplayName:LockoutEnabled"] + + @L["DisplayName:LockoutEnabled"] - + - @if ( EditUserRoles != null ) + @if (EditUserRoles != null) { - @foreach ( var role in EditUserRoles ) + @foreach (var role in EditUserRoles) { - + @role.Name } @@ -272,14 +274,14 @@ - +
} -@if ( HasManagePermissionsPermission ) +@if (HasManagePermissionsPermission) { - + } From eb93990c99e834dda9ac149cedf5459ab02e2869 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Fri, 2 Dec 2022 12:27:51 +0300 Subject: [PATCH 2/3] Revert auto-formatting --- .../Pages/Identity/UserManagement.razor | 95 +++++++++---------- 1 file changed, 44 insertions(+), 51 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index e72711c6ee..8546b00e7f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -26,22 +26,27 @@ IdentityUserUpdateDto> @* ************************* DATA GRID ************************* *@ - + @* ************************* CREATE MODAL ************************* *@ -@if (HasCreatePermission) +@if ( HasCreatePermission ) {
@L["NewUser"] - + @@ -57,7 +62,7 @@ IdentityUserUpdateDto> @L["DisplayName:UserName"] - + @@ -67,7 +72,7 @@ IdentityUserUpdateDto> @L["DisplayName:Name"] - + @@ -77,7 +82,7 @@ IdentityUserUpdateDto> @L["DisplayName:Surname"] - + @@ -91,13 +96,10 @@ IdentityUserUpdateDto> - + - + @@ -105,7 +107,7 @@ IdentityUserUpdateDto> @L["DisplayName:Email"] - + @@ -115,29 +117,26 @@ IdentityUserUpdateDto> @L["DisplayName:PhoneNumber"] - + - @L["DisplayName:IsActive"] - + @L["DisplayName:IsActive"] - - @L["DisplayName:LockoutEnabled"] + @L["DisplayName:LockoutEnabled"] - + - @if (NewUserRoles != null) + @if ( NewUserRoles != null ) { - @foreach (var role in NewUserRoles) + @foreach ( var role in NewUserRoles ) { - + @role.Name } @@ -149,7 +148,7 @@ IdentityUserUpdateDto> - +
@@ -157,18 +156,18 @@ IdentityUserUpdateDto> } @* ************************* EDIT MODAL ************************* *@ -@if (HasUpdatePermission) +@if ( HasUpdatePermission ) {
@L["Edit"] - + - + @@ -182,7 +181,7 @@ IdentityUserUpdateDto> @L["DisplayName:UserName"] - + @@ -192,7 +191,7 @@ IdentityUserUpdateDto> @L["DisplayName:Name"] - + @@ -202,7 +201,7 @@ IdentityUserUpdateDto> @L["DisplayName:Surname"] - + @@ -216,13 +215,10 @@ IdentityUserUpdateDto> - + - + @@ -230,7 +226,7 @@ IdentityUserUpdateDto> @L["DisplayName:Email"] - + @@ -240,29 +236,26 @@ IdentityUserUpdateDto> @L["DisplayName:PhoneNumber"] - + - - @L["DisplayName:IsActive"] + @L["DisplayName:IsActive"] - - @L["DisplayName:LockoutEnabled"] + @L["DisplayName:LockoutEnabled"] - + - @if (EditUserRoles != null) + @if ( EditUserRoles != null ) { - @foreach (var role in EditUserRoles) + @foreach ( var role in EditUserRoles ) { - + @role.Name } @@ -274,14 +267,14 @@ IdentityUserUpdateDto> - +
} -@if (HasManagePermissionsPermission) +@if ( HasManagePermissionsPermission ) { - -} + +} \ No newline at end of file From a8089b50ad31edba33645aae13e95c08833e1343 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Fri, 2 Dec 2022 12:30:14 +0300 Subject: [PATCH 3/3] Revert unnecessary changes --- .../Pages/Identity/UserManagement.razor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index 8546b00e7f..f04df90856 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -7,14 +7,14 @@ @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout @inject AbpBlazorMessageLocalizerHelper LH -@inherits AbpCrudPageBase +@inherits AbpCrudPageBase @* ************************* PAGE HEADER ************************* *@ - - + @@ -277,4 +277,4 @@ IdentityUserUpdateDto> @if ( HasManagePermissionsPermission ) { -} \ No newline at end of file +}