- @if (Model.AssociatedExternalAuthRecords.Count > 0)
+ }
+
+ @if (customerSettings.TwoFactorAuthenticationEnabled)
+ {
+
+
+ @if (Model.Is2faEnabled)
{
- //existing associated external records
-
-
-
-
-
-
-
-
-
- |
- @Loc["Account.AssociatedExternalAuth.AuthMethodName"]
- |
-
- @Loc["Account.AssociatedExternalAuth.Email"]
- |
-
- @Loc["Account.AssociatedExternalAuth.ExternalIdentifier"]
- |
-
- @Loc["Account.AssociatedExternalAuth.Remove"]
- |
-
-
-
- @foreach (var item in Model.AssociatedExternalAuthRecords)
- {
-
- |
- @item.AuthMethodName
- |
-
- @item.Email
- |
-
- @CommonHelper.EnsureMaximumLength(item.ExternalIdentifier, 40, "...")
- |
-
- @Loc["Account.AssociatedExternalAuth.Remove"]
- |
-
- }
-
-
-
+ @Html.ActionLink(Loc["Account.TwoFactorAuth.Disable"], "DisableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })
}
- @if (Model.NumberOfExternalAuthenticationProviders > Model.AssociatedExternalAuthRecords.Count)
+ else
{
- //we can add more external records
-
+ @Html.ActionLink(Loc["Account.TwoFactorAuth.Enable"], "EnableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })
}
+ }
+
+
- }
-
- @if (customerSettings.TwoFactorAuthenticationEnabled)
- {
-
-
- @if (Model.Is2faEnabled)
- {
- @Html.ActionLink(Loc["Account.TwoFactorAuth.Disable"], "DisableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })
- }
- else
- {
- @Html.ActionLink(Loc["Account.TwoFactorAuth.Enable"], "EnableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })
- }
-
- }
-
-
-
-
+
+
-
-
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml b/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
index 3fb34dbb3..de86a1254 100644
--- a/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
+++ b/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
@@ -17,32 +17,43 @@
}
@if (!Model.Send)
{
-