From 7e478282fc43ae3c2cfc50e371425f4574e8d9c3 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Thu, 12 Jun 2025 17:38:54 +0800
Subject: [PATCH] perf(account): Optimize the unregistered/logged-in prompt

- The redirect to register link is placed above the login button
- The redirect to login link is placed above the registration button
---
 .../Pages/Account/Login.cshtml                     | 14 +++++++-------
 .../Pages/Account/Register.cshtml                  |  9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml
index 06a4e0835..f69fe2973 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -25,13 +25,6 @@
 <div class="card mt-3 shadow-sm rounded">
     <div class="card-body p-5">
         <h4>@L["Login"]</h4>
-        @if (await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
-        {
-            <strong>
-                @L["AreYouANewUser"]
-                <a href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Register"]</a>
-            </strong>
-        }
         @if (Model.EnableLocalLogin)
         {
             <form method="post" class="mt-4">
@@ -57,6 +50,13 @@
                         <a href="@Url.Page("./ForgotPassword", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})">@L["ForgotPassword"]</a>
                     </abp-column>
                 </abp-row>
+                @if (await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
+                {
+                    <strong>
+                        @L["AreYouANewUser"]
+                        <a href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Register"]</a>
+                    </strong>
+                }
                 <div class="d-grid gap-2">
                     <abp-button type="submit" button-type="Primary" name="Action" value="Login" class="btn-lg mt-3">@L["Login"]</abp-button>
                     @if (Model.ShowCancelButton)
diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Register.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Register.cshtml
index 32bcd4e95..e72e79491 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Register.cshtml
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Register.cshtml
@@ -7,10 +7,6 @@
 <div class="card mt-3 shadow-sm rounded">
     <div class="card-body p-5">
         <h4>@L["Register"]</h4>
-        <strong>
-            @L["AlreadyRegistered"]
-            <a href="@Url.Page("./Login", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Login"]</a>
-        </strong>
         <form method="post" class="mt-4">
             @if (Model.EnableLocalRegister || Model.IsExternalLogin)
             {
@@ -27,6 +23,11 @@
                 <abp-input asp-for="Input.Password" />
             }
 
+            <strong>
+                @L["AlreadyRegistered"]
+                <a href="@Url.Page("./Login", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Login"]</a>
+            </strong>
+
             @if (Model.EnableLocalRegister || Model.IsExternalLogin)
             {
                 <div class="d-grid gap-2">