diff --git a/framework/src/Volo.Abp.MudBlazorUI/wwwroot/volo.abp.mudblazorui.css b/framework/src/Volo.Abp.MudBlazorUI/wwwroot/volo.abp.mudblazorui.css index 5fa2c86435..61601954a9 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/wwwroot/volo.abp.mudblazorui.css +++ b/framework/src/Volo.Abp.MudBlazorUI/wwwroot/volo.abp.mudblazorui.css @@ -110,3 +110,24 @@ padding-inline-end: 16px; } + + +/* Password visibility toggle: MudBlazor renders the input end-adornment with a hard-coded + tabindex="-1", so a toggle placed there can never be reached by keyboard. The toggle is + rendered as a normal MudIconButton next to the field and pinned over the input row instead. + The offset is measured from the top of the control because the label sits above the input row + and validation text is rendered below it, so the control's own height is not a stable anchor. */ +.abp-password-field { + position: relative; +} + +.abp-password-field .abp-password-visibility-toggle { + position: absolute; + inset-inline-end: 0; + top: 38px; + transform: translateY(-50%); +} + +.abp-password-field .mud-input:not(.mud-select-input) .mud-input-slot.mud-input-root { + padding-inline-end: 40px !important; +} diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json index eb32a44fa2..8d5370f95e 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json @@ -62,6 +62,7 @@ "Theme": "سمة", "NotAssigned": "غيرمعتمد", "EntityActionsDisabledTooltip": "ليس لديك إذن لتنفيذ أي إجراء.", - "ResourcePermissions": "أذونات" + "ResourcePermissions": "أذونات", + "ShowPassword": "عرض كلمة المرور" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json index 27a174cb49..5d50dc3163 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json @@ -62,6 +62,7 @@ "Theme": "Téma", "NotAssigned": "Nepřiřazena", "EntityActionsDisabledTooltip": "Nemáte oprávnění provést žádnou akci.", - "ResourcePermissions": "Oprávnění" + "ResourcePermissions": "Oprávnění", + "ShowPassword": "Zobrazit heslo" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json index 869d049be1..e2e4c9a47c 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json @@ -62,6 +62,7 @@ "Theme": "Thema", "NotAssigned": "Nicht zugeordnet", "EntityActionsDisabledTooltip": "Sie haben keine Berechtigung, Aktionen auszuführen.", - "ResourcePermissions": "Berechtigungen" + "ResourcePermissions": "Berechtigungen", + "ShowPassword": "Passwort anzeigen" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json index 8c2dc2be1d..a930666e39 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json @@ -57,5 +57,6 @@ "Apply": "Ισχύουν", "EntityActionsDisabledTooltip": "Δεν έχετε δικαίωμα να εκτελέσετε καμία ενέργεια.", "ResourcePermissions": "Δικαιώματα", + "ShowPassword": "Εμφάνιση κωδικού πρόσβασης" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json index ce9d962d5e..f1a2bf02c5 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json @@ -57,6 +57,7 @@ "Today": "Today", "Apply": "Apply", "EntityActionsDisabledTooltip": "You do not have permission to perform any action.", - "ResourcePermissions": "Permissions" + "ResourcePermissions": "Permissions", + "ShowPassword": "Show password" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json index f328765a39..0bf0a49a17 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json @@ -62,6 +62,7 @@ "Theme": "Theme", "NotAssigned": "Not Assigned", "EntityActionsDisabledTooltip": "You do not have permission to perform any action.", - "ResourcePermissions": "Permissions" + "ResourcePermissions": "Permissions", + "ShowPassword": "Show password" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json index 9d341cb88f..fd8a9006ea 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "No asignado", "EntityActionsDisabledTooltip": "No tienes permisos para realizar ninguna acción.", - "ResourcePermissions": "Permisos" + "ResourcePermissions": "Permisos", + "ShowPassword": "Mostrar contraseña" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json index 5862eab90e..07ca9e5f9b 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json @@ -56,6 +56,7 @@ "Today": "امروز", "Apply": "درخواست دادن", "EntityActionsDisabledTooltip": "شما دسترسی به انجام هر گونه عملیات ندارید.", - "ResourcePermissions": "مجوزها" + "ResourcePermissions": "مجوزها", + "ShowPassword": "نمایش رمز عبور" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json index 51e356559b..bc7ed9c5a2 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json @@ -62,6 +62,7 @@ "Theme": "Teema", "NotAssigned": "Ei määritetty", "EntityActionsDisabledTooltip": "Sinulla ei ole oikeutta suorittaa mitään toimintoa.", - "ResourcePermissions": "Käyttöoikeudet" + "ResourcePermissions": "Käyttöoikeudet", + "ShowPassword": "Näytä salasana" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json index 79a40c57f9..0098158a0a 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json @@ -62,6 +62,7 @@ "Theme": "Thème", "NotAssigned": "Non attribué", "EntityActionsDisabledTooltip": "Vous n'avez pas les permissions pour effectuer une action.", - "ResourcePermissions": "Autorisations" + "ResourcePermissions": "Autorisations", + "ShowPassword": "Afficher le mot de passe" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json index 10c1e426c1..a0c0a7f233 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json @@ -62,6 +62,7 @@ "Theme": "विषय", "NotAssigned": "सौंपा नहीं गया है", "EntityActionsDisabledTooltip": "आपके पास कोई कार्रवाई नहीं है जो करने के लिए है।", - "ResourcePermissions": "अनुमतियाँ" + "ResourcePermissions": "अनुमतियाँ", + "ShowPassword": "पासवर्ड दिखाएं" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json index c36751828c..ea35dfa8ec 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "Nije dodijeljeno", "EntityActionsDisabledTooltip": "Nemate dozvolu za izvođenje bilo kakve akcije.", - "ResourcePermissions": "Dozvole" + "ResourcePermissions": "Dozvole", + "ShowPassword": "Pokaži lozinku" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json index e162a2c6c8..cdc71838f5 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json @@ -62,6 +62,7 @@ "Theme": "Téma", "NotAssigned": "Nem kijelölt", "EntityActionsDisabledTooltip": "Nincs jogosultsága bármely művelethez.", - "ResourcePermissions": "Engedélyek" + "ResourcePermissions": "Engedélyek", + "ShowPassword": "Jelszó megjelenítése" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json index 3d88d70d97..df5123de9e 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json @@ -62,6 +62,7 @@ "Theme": "Þema", "NotAssigned": "Ekki skráður", "EntityActionsDisabledTooltip": "Þú hefur ekki aðgang að þessum aðgerðum.", - "ResourcePermissions": "Aðgangsheimildir" + "ResourcePermissions": "Aðgangsheimildir", + "ShowPassword": "Sýna lykilorð" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json index 9bfffe181e..d866284043 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "Non assegnato", "EntityActionsDisabledTooltip": "Non hai i permessi per eseguire alcuna azione.", - "ResourcePermissions": "Autorizzazioni" + "ResourcePermissions": "Autorizzazioni", + "ShowPassword": "Mostra password" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ko.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ko.json index f8e160ff51..0be3c1219a 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ko.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ko.json @@ -62,6 +62,7 @@ "Theme": "테마", "NotAssigned": "할당되지 않음", "EntityActionsDisabledTooltip": "작업을 수행할 권한이 없습니다.", - "ResourcePermissions": "권한" + "ResourcePermissions": "권한", + "ShowPassword": "비밀번호 표시" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json index 51ab0bcd31..22366cf991 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json @@ -62,6 +62,7 @@ "Theme": "Thema", "NotAssigned": "Niet toegekend", "EntityActionsDisabledTooltip": "U hebt geen toegang tot deze acties.", - "ResourcePermissions": "Machtigingen" + "ResourcePermissions": "Machtigingen", + "ShowPassword": "Wachtwoord tonen" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json index 20b4daf7f0..be79d9849c 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json @@ -62,6 +62,7 @@ "Theme": "Temat", "NotAssigned": "Nie przypisano", "EntityActionsDisabledTooltip": "Nie masz uprawnień do wykonania żadnej akcji.", - "ResourcePermissions": "Uprawnienia" + "ResourcePermissions": "Uprawnienia", + "ShowPassword": "Pokaż hasło" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json index 9764d99fe6..f6d66e07c3 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "Não atribuído", "EntityActionsDisabledTooltip": "Você não tem permissão para executar qualquer ação.", - "ResourcePermissions": "Permissões" + "ResourcePermissions": "Permissões", + "ShowPassword": "Mostrar senha" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json index 6b7367994c..f70b0f4a6b 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json @@ -62,6 +62,7 @@ "Theme": "Temă", "NotAssigned": "Nealocat", "EntityActionsDisabledTooltip": "Nu aveți permisiune să efectuați nicio acțiune.", - "ResourcePermissions": "Permisiuni" + "ResourcePermissions": "Permisiuni", + "ShowPassword": "Afișează parola" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json index d4f4acf5d6..baaf43bcb8 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json @@ -62,6 +62,7 @@ "Theme": "Тема", "NotAssigned": "Не назначен", "EntityActionsDisabledTooltip": "У вас нет прав на выполнение каких-либо действий.", - "ResourcePermissions": "Разрешения" + "ResourcePermissions": "Разрешения", + "ShowPassword": "Показать пароль" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json index 59d8aecef4..1e6c09fd51 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json @@ -62,6 +62,7 @@ "Theme": "Téma", "NotAssigned": "Nepridelené", "EntityActionsDisabledTooltip": "Nemáte oprávnenie vykonávať žiadnu akciu.", - "ResourcePermissions": "Oprávnenia" + "ResourcePermissions": "Oprávnenia", + "ShowPassword": "Zobraziť heslo" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json index 89f2691a11..3be6d1d83c 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "Ni dodeljena", "EntityActionsDisabledTooltip": "Nimate pravic za izvajanje kakršne koli dejanje.", - "ResourcePermissions": "Dovoljenja" + "ResourcePermissions": "Dovoljenja", + "ShowPassword": "Pokaži geslo" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sv.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sv.json index fe4b692cdf..b44d00d22f 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sv.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sv.json @@ -61,6 +61,7 @@ "Theme": "Tema", "NotAssigned": "Ej tilldelad", "EntityActionsDisabledTooltip": "Du har inte tillgång till dessa åtgärder.", - "ResourcePermissions": "Behörigheter" + "ResourcePermissions": "Behörigheter", + "ShowPassword": "Visa lösenord" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json index 73a4bb5cb4..a998d72c41 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json @@ -62,6 +62,7 @@ "Theme": "Tema", "NotAssigned": "Atanmadı", "EntityActionsDisabledTooltip": "Bu işlemi gerçekleştirmek için yeterli yetkiniz yok.", - "ResourcePermissions": "İzinler" + "ResourcePermissions": "İzinler", + "ShowPassword": "Şifreyi göster" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json index 015ed883d3..40ba15446d 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json @@ -62,6 +62,7 @@ "Theme": "chủ đề", "NotAssigned": "Không được chỉ định", "EntityActionsDisabledTooltip": "Bạn không có quyền thực hiện bất kỳ hành động nào.", - "ResourcePermissions": "Quyền" + "ResourcePermissions": "Quyền", + "ShowPassword": "Hiện mật khẩu" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json index b0759d7da9..bf0481cfc8 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json @@ -62,6 +62,7 @@ "Theme": "主题", "NotAssigned": "未分配", "EntityActionsDisabledTooltip": "您没有权限执行任何操作。", - "ResourcePermissions": "权限" + "ResourcePermissions": "权限", + "ShowPassword": "显示密码" } } diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json index e35bae3610..c534300915 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json @@ -62,6 +62,7 @@ "Theme": "主題", "NotAssigned": "未分配", "EntityActionsDisabledTooltip": "您沒有權限執行任何操作。", - "ResourcePermissions": "權限" + "ResourcePermissions": "權限", + "ShowPassword": "顯示密碼" } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml index e012bdd3f4..75c9c472e9 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml @@ -1,7 +1,9 @@ -@using Volo.Abp.Account.Localization +@using Localization.Resources.AbpUi +@using Volo.Abp.Account.Localization @using Volo.Abp.Users @using Microsoft.AspNetCore.Mvc.Localization @inject IHtmlLocalizer L +@inject IHtmlLocalizer UiL @inject ICurrentUser CurrentUser @model Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.Password.AccountProfilePasswordManagementGroupViewComponent.ChangePasswordInfoModel @@ -13,21 +15,21 @@
- +

}
- +

- +
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js index ec23761729..ca89718adb 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js @@ -6,12 +6,9 @@ return; } - if (passwordInput.attr("type") === "password") { - passwordInput.attr("type", "text"); - } - else { - passwordInput.attr("type", "password"); - } + let isRevealing = passwordInput.attr("type") === "password"; + passwordInput.attr("type", isRevealing ? "text" : "password"); + button.attr("aria-pressed", isRevealing); let icon = button.find("i"); if (icon) { diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml index 1c883936b4..4fd5e6d5c3 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml @@ -1,4 +1,5 @@ @page +@using Localization.Resources.AbpUi @using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.Account.Localization @using Volo.Abp.Account.Settings @@ -8,6 +9,7 @@ @using Volo.Abp.Settings @model Volo.Abp.Account.Web.Pages.Account.LoginModel @inject IHtmlLocalizer L +@inject IHtmlLocalizer UiL @inject IThemeManager ThemeManager @inject Volo.Abp.Settings.ISettingProvider SettingProvider @@ -53,7 +55,7 @@
- +
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js index 56934f4fef..381f414305 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.js @@ -6,12 +6,9 @@ $(function () { return; } - if (passwordInput.attr("type") === "password") { - passwordInput.attr("type", "text"); - } - else { - passwordInput.attr("type", "password"); - } + let isRevealing = passwordInput.attr("type") === "password"; + passwordInput.attr("type", isRevealing ? "text" : "password"); + button.attr("aria-pressed", isRevealing); let icon = button.find("i"); if (icon) { diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor index 061a1e33b6..1759acf5d2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor @@ -62,14 +62,18 @@ Label="@L["DisplayName:Name"]" /> - +
+ + +
- +
+ + +
- @@ -228,8 +229,9 @@ - diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml index d1c845e550..f3216de2fe 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml @@ -1,4 +1,5 @@ @page +@using Localization.Resources.AbpUi @using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.Extensions.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @@ -10,6 +11,7 @@ @using Volo.Abp.Identity @model CreateModalModel @inject IHtmlLocalizer L +@inject IHtmlLocalizer UiL @inject IStringLocalizerFactory StringLocalizerFactory @{ @@ -30,7 +32,7 @@
- +
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml index b60978f32e..bef5e53a1e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml @@ -1,4 +1,5 @@ @page +@using Localization.Resources.AbpUi @using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.Extensions.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @@ -10,6 +11,7 @@ @using Volo.Abp.Identity @model EditModalModel @inject IHtmlLocalizer L +@inject IHtmlLocalizer UiL @inject IStringLocalizerFactory StringLocalizerFactory @{ Layout = null; @@ -30,7 +32,7 @@
-
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js index fa63b96af4..9445cd33c8 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js @@ -11,12 +11,9 @@ return; } - if(passwordInput.attr("type") === "password") { - passwordInput.attr("type", "text"); - } - else { - passwordInput.attr("type", "password"); - } + var isRevealing = passwordInput.attr("type") === "password"; + passwordInput.attr("type", isRevealing ? "text" : "password"); + button.attr("aria-pressed", isRevealing); var icon = button.find("i"); if(icon) { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor index e2211914f4..26e7969ade 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor @@ -48,14 +48,18 @@ Required="true" RequiredError="@L["ThisFieldIsRequired."]" InputType="InputType.Email" /> - +
+ + +
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index 49e4c64822..57b9b7844f 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -77,8 +77,9 @@ - diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js index b19f44be46..8a8c8bc859 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Create.js @@ -6,12 +6,9 @@ $(document).ready(function () { return; } - if (passwordInput.attr("type") === "password") { - passwordInput.attr("type", "text"); - } - else { - passwordInput.attr("type", "password"); - } + let isRevealing = passwordInput.attr("type") === "password"; + passwordInput.attr("type", isRevealing ? "text" : "password"); + button.attr("aria-pressed", isRevealing); let icon = button.find("i"); if (icon) { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml index bcbda372e2..bb4ec71f3c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml @@ -1,4 +1,5 @@ @page +@using Localization.Resources.AbpUi @using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.Extensions.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @@ -10,6 +11,7 @@ @using Volo.Abp.TenantManagement; @model CreateModalModel @inject IHtmlLocalizer L +@inject IHtmlLocalizer UiL @inject IStringLocalizerFactory StringLocalizerFactory @{ Layout = null; @@ -27,7 +29,7 @@ *
-