From 293e26e03f026b082d4b5ac3dd6ed8f8b24eefc2 Mon Sep 17 00:00:00 2001
From: Leo Q <LeoQuote@users.noreply.github.com>
Date: Wed, 16 Aug 2023 20:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E7=99=BB=E5=BD=95=20(#2241)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/templates/login.html          | 27 ++++++++++-----------------
 sql/templates/legacy_login_form.html | 13 +++++++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 sql/templates/legacy_login_form.html

diff --git a/common/templates/login.html b/common/templates/login.html
index f244a9f37e..72d6917ddb 100644
--- a/common/templates/login.html
+++ b/common/templates/login.html
@@ -31,24 +31,17 @@ <h3 class="text-center">用户登录
                     <a class="btn btn-primary btn-block" role="button" href="/oidc/authenticate/">以OIDC登录</a>
                 </div>
             {% endif %}
-            <h4 class="text-center">传统登录</h4>
-            <div class="form-group is-focused">
-                <label class="control-label" for="inputUsername">Username</label>
-                <input class="form-control ng-valid ng-dirty ng-touched" id="inputUsername" name="username" type="text"
-                       required>
-            </div>
-            <div class="form-group is-focused">
-                <label class="control-label" for="inputPassword">Password</label>
-                <input class="form-control ng-valid ng-dirty ng-touched" id="inputPassword" name="password"
-                       type="password" required>
-            </div>
-            <div class="form-group">
-                <button class="btn btn-primary btn-block" id="btnLogin" type="button"><i class="fa-lock"></i>登录</button>
-            </div>
-            {% if sign_up_enabled %}
-                <div class="form-group">
-                    <a href="#" data-toggle="modal" data-target="#sign-up">注册用户</a>
+            {% if dingding_enabled or oidc_enabled %}
+                <a data-toggle="collapse" href="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
+                  显示传统登录
+                </a>
+                <div class="collapse" id="collapseExample">
+                  <div>
+                    {% include 'legacy_login_form.html' %}
+                  </div>
                 </div>
+            {% else %}
+                {% include 'legacy_login_form.html' %}
             {% endif %}
         </form>
     </div>
diff --git a/sql/templates/legacy_login_form.html b/sql/templates/legacy_login_form.html
new file mode 100644
index 0000000000..ba26d56468
--- /dev/null
+++ b/sql/templates/legacy_login_form.html
@@ -0,0 +1,13 @@
+<div class="form-group is-focused">
+    <label class="control-label" for="inputUsername">Username</label>
+    <input class="form-control ng-valid ng-dirty ng-touched" id="inputUsername" name="username" type="text"
+           required>
+</div>
+<div class="form-group is-focused">
+    <label class="control-label" for="inputPassword">Password</label>
+    <input class="form-control ng-valid ng-dirty ng-touched" id="inputPassword" name="password"
+           type="password" required>
+</div>
+<div class="form-group">
+    <button class="btn btn-primary btn-block" id="btnLogin" type="button"><i class="fa-lock"></i>登录</button>
+</div>
\ No newline at end of file