diff --git a/BTCPayServer/Views/Account/LoginWith2fa.cshtml b/BTCPayServer/Views/Account/LoginWith2fa.cshtml index 2759e8378..b145b3b33 100644 --- a/BTCPayServer/Views/Account/LoginWith2fa.cshtml +++ b/BTCPayServer/Views/Account/LoginWith2fa.cshtml @@ -1,20 +1,20 @@ @model LoginWith2faViewModel -
-
+
+

Two-factor authentication

-
+
- +
@@ -28,14 +28,14 @@
-
-

- Don't have access to your authenticator device? You can - log in with a recovery code. +

+ Don't have access to your authenticator device? +
+ You can log in with a recovery code.

diff --git a/BTCPayServer/Views/Account/LoginWithU2F.cshtml b/BTCPayServer/Views/Account/LoginWithU2F.cshtml index 682854b98..d98eb838f 100644 --- a/BTCPayServer/Views/Account/LoginWithU2F.cshtml +++ b/BTCPayServer/Views/Account/LoginWithU2F.cshtml @@ -13,19 +13,22 @@ -
-
+
+
-

U2F Authentication

+

+ U2F Authentication +

+
+ +

Insert your U2F device or hardware wallet into your computer's USB port. If it has a button, tap on it.

+
-

Insert your U2F device or a hardware wallet into your computer's USB port. If it has a button, tap on it.

+
-
- -
diff --git a/BTCPayServer/Views/Account/SecondaryLogin.cshtml b/BTCPayServer/Views/Account/SecondaryLogin.cshtml index 1d985d167..9b2760645 100644 --- a/BTCPayServer/Views/Account/SecondaryLogin.cshtml +++ b/BTCPayServer/Views/Account/SecondaryLogin.cshtml @@ -7,15 +7,9 @@
@if (Model.LoginWith2FaViewModel != null && Model.LoginWithU2FViewModel != null) { -
-
-

@ViewData["Title"]

-
- -
-
-
- }else if (Model.LoginWith2FaViewModel == null && Model.LoginWithU2FViewModel == null) +
+ } + else if (Model.LoginWith2FaViewModel == null && Model.LoginWithU2FViewModel == null) {
diff --git a/BTCPayServer/Views/Manage/APIKeys.cshtml b/BTCPayServer/Views/Manage/APIKeys.cshtml index ff8caa7e1..aad4ae50d 100644 --- a/BTCPayServer/Views/Manage/APIKeys.cshtml +++ b/BTCPayServer/Views/Manage/APIKeys.cshtml @@ -5,7 +5,7 @@ } -

API Keys

+ @@ -20,18 +20,23 @@ { - + } - - -
@keyData.Label@keyData.Id@keyData.Id @{ var permissions = keyData.GetBlob().Permissions; } @if (!permissions.Any()) { - No permissions + No permissions } else { - @string.Join(", ", Permission.ToPermissions(permissions).Select(c => c.ToString()).Distinct().ToArray()) +
    + @foreach (var permission in Permission.ToPermissions(permissions).Select(c => c.ToString()).Distinct().ToArray()) + { +
  • @permission
    • + } +
} 		@@ -47,10 +52,9 @@
- Generate new key -
+ + + Generate new key + diff --git a/BTCPayServer/Views/Manage/ChangePassword.cshtml b/BTCPayServer/Views/Manage/ChangePassword.cshtml index 4628e035c..5e06d1a14 100644 --- a/BTCPayServer/Views/Manage/ChangePassword.cshtml +++ b/BTCPayServer/Views/Manage/ChangePassword.cshtml @@ -4,10 +4,19 @@ } + +@if (!this.ViewContext.ModelState.IsValid) +{ +
+
+
+
+
+} +
-
diff --git a/BTCPayServer/Views/Manage/Disable2fa.cshtml b/BTCPayServer/Views/Manage/Disable2fa.cshtml index dd887ef5e..0e6db3466 100644 --- a/BTCPayServer/Views/Manage/Disable2fa.cshtml +++ b/BTCPayServer/Views/Manage/Disable2fa.cshtml @@ -2,18 +2,16 @@ ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Disable two-factor authentication (2FA)"); } -

@ViewData["Title"]

- diff --git a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml index 54c0d7e7d..69be42229 100644 --- a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml +++ b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml @@ -1,31 +1,40 @@ @model EnableAuthenticatorViewModel @{ - ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Enable authenticator"); + ViewData.SetActivePageAndTitle(ManageNavPages.TwoFactorAuthentication, "Enable authenticator app"); }

To use an authenticator app go through the following steps:

    -
  1. -

    - Download a two-factor authenticator app like Microsoft Authenticator for - Android and - iOS or - Google Authenticator for - Android and - iOS. -

    +
  2. +
    Download a two-factor authenticator app like …
    +
      +
    • + Microsoft Authenticator for + Android or + iOS +
      • +
    • + Google Authenticator for + Android or + iOS +
      • +
    3. -
  3. -

    Scan the QR Code or enter this key @Model.SharedKey into your two factor authenticator app. Spaces and casing do not matter.

    +
  4. +

    Scan the QR Code or enter the following key into your two factor authenticator app:

    +

    + @Model.SharedKey + (spaces and casing do not matter) +

    -

  5. - Once you have scanned the QR code or input the key above, your two factor authentication app will provide you - with a unique code. Enter the code in the confirmation box below. + Your two factor authenticator app will provide you with a unique code. +
    + Enter the code in the confirmation box below.

    diff --git a/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml b/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml index 20d7f58e7..0e1b83dc1 100644 --- a/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml +++ b/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml @@ -4,11 +4,11 @@ } diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml index eb0a258f5..65146ccdc 100644 --- a/BTCPayServer/Views/Manage/Index.cshtml +++ b/BTCPayServer/Views/Manage/Index.cshtml @@ -6,38 +6,43 @@ -
    -
    -
    +@if (!this.ViewContext.ModelState.IsValid) +{ +
    +
    +
    +
    -
    -
    -
    - -
    - - -
    -
    - - @if(Model.IsEmailConfirmed) - { -
    - - -
    - } - else - { - - - } - -
    - - +} +
    +
    +
    + + +
    -
    +
    +
    + + + +
    +
    + @if(Model.IsEmailConfirmed) + { + + + confirmed + + } + else + { + + } +
    +
    + + @section Scripts { @await Html.PartialAsync("_ValidationScriptsPartial") diff --git a/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml b/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml index 350def4eb..027811e12 100644 --- a/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml +++ b/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml @@ -3,12 +3,14 @@ } diff --git a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml index e599b2b92..53bb2567e 100644 --- a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml +++ b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml @@ -8,39 +8,53 @@ if(Model.RecoveryCodesLeft == 0) {
    - You have no recovery codes left. -

    You must generate a new set of recovery codes before you can log in with a recovery code.

    +

    + + You have no recovery codes left. +

    +

    You must generate a new set of recovery codes before you can log in with a recovery code.

    } else if(Model.RecoveryCodesLeft == 1) {
    - You have 1 recovery code left. -

    You can generate a new set of recovery codes.

    +

    + + You have 1 recovery code left. +

    +

    You can generate a new set of recovery codes.

    } else if(Model.RecoveryCodesLeft <= 3) {
    - You have @Model.RecoveryCodesLeft recovery codes left. -

    You should generate a new set of recovery codes.

    +

    + + You have @Model.RecoveryCodesLeft recovery codes left. +

    +

    You should generate a new set of recovery codes.

    } - - Disable 2FA - Reset recovery codes +
    Your current 2FA
    + }
    Authenticator app
    -@if(!Model.HasAuthenticator) -{ - Add authenticator app -} -else -{ - Configure authenticator app - Reset authenticator key -} + @section Scripts { @await Html.PartialAsync("_ValidationScriptsPartial") diff --git a/BTCPayServer/Views/Manage/U2FAuthentication.cshtml b/BTCPayServer/Views/Manage/U2FAuthentication.cshtml index 674802f15..26c6d6d07 100644 --- a/BTCPayServer/Views/Manage/U2FAuthentication.cshtml +++ b/BTCPayServer/Views/Manage/U2FAuthentication.cshtml @@ -1,17 +1,17 @@ @model BTCPayServer.U2F.Models.U2FAuthenticationViewModel @{ - ViewData.SetActivePageAndTitle(ManageNavPages.U2F, "Manage your registered U2F devices"); + ViewData.SetActivePageAndTitle(ManageNavPages.U2F, "Registered U2F devices"); } -

    Registered U2F Devices

    +
    - +
    - - - - + + + + @foreach (var device in Model.Devices) @@ -19,8 +19,7 @@ } @@ -32,16 +31,16 @@ } - - - - +
    NameActions
    NameActions
    @device.Name - Remove - + Remove
    - - -
    - -
    -
    +
    +
    + + +
    +
    diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css index 01e555937..330e8644f 100644 --- a/BTCPayServer/wwwroot/main/site.css +++ b/BTCPayServer/wwwroot/main/site.css @@ -47,6 +47,10 @@ a { transition-property: background, color; } +ol { + padding-left: 1.125em; +} + ul { padding-left: 1em; }