]> source.dussan.org Git - gitea.git/commitdiff
fix link account ui (#14763)
authora1012112796 <1012112796@qq.com>
Mon, 22 Feb 2021 01:14:27 +0000 (09:14 +0800)
committerGitHub <noreply@github.com>
Mon, 22 Feb 2021 01:14:27 +0000 (20:14 -0500)
Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
templates/user/auth/link_account.tmpl
web_src/js/index.js

index 183c16aa127a4b57a0ae582d5a061c25e58c33a3..39e312bd66bb9819219f00382af01478319f2179 100644 (file)
                                {{.i18n.Tr "auth.oauth_signin_tab"}}
                        </a>
                </div>
-
-               <div class="ui middle very relaxed page grid">
-                       <div class="column">
-                               <div class="ui tab {{if not .user_exists}}active{{end}}"
-                                       data-tab="auth-link-signup-tab">
-                                       {{template "user/auth/signup_inner" .}}
-                               </div>
-                               <div class="ui tab {{if .user_exists}}active{{end}}"
-                                       data-tab="auth-link-signin-tab">
-                                       <div class="ui user signin container icon">
-                                               {{template "user/auth/signin_inner" .}}
-                                       </div>
+       </div>
+       <div class="ui middle very relaxed page grid">
+               <div class="column">
+                       <div class="ui tab {{if not .user_exists}}active{{end}}"
+                               data-tab="auth-link-signup-tab">
+                               {{template "user/auth/signup_inner" .}}
+                       </div>
+                       <div class="ui tab {{if .user_exists}}active{{end}}"
+                               data-tab="auth-link-signin-tab">
+                               <div class="ui user signin container icon">
+                                       {{template "user/auth/signin_inner" .}}
                                </div>
                        </div>
                </div>
index f5e3c705e82a330291bbbb5816eb9191717be203..7bfe12e3ca16c41695cb45f71fd63a0221a2573e 100644 (file)
@@ -2397,6 +2397,33 @@ function initIssueReferenceRepositorySearch() {
     });
 }
 
+function initLinkAccountView() {
+  const $lnkUserPage = $('.page-content.user.link-account');
+  if ($lnkUserPage.length === 0) {
+    return false;
+  }
+
+  const $signinTab = $lnkUserPage.find('.item[data-tab="auth-link-signin-tab"]');
+  const $signUpTab = $lnkUserPage.find('.item[data-tab="auth-link-signup-tab"]');
+  const $signInView = $lnkUserPage.find('.tab[data-tab="auth-link-signin-tab"]');
+  const $signUpView = $lnkUserPage.find('.tab[data-tab="auth-link-signup-tab"]');
+
+  $signUpTab.on('click', () => {
+    $signinTab.removeClass('active');
+    $signInView.removeClass('active');
+    $signUpTab.addClass('active');
+    $signUpView.addClass('active');
+    return false;
+  });
+
+  $signinTab.on('click', () => {
+    $signUpTab.removeClass('active');
+    $signUpView.removeClass('active');
+    $signinTab.addClass('active');
+    $signInView.addClass('active');
+  });
+}
+
 $(document).ready(async () => {
   // Show exact time
   $('.time-since').each(function () {
@@ -2456,6 +2483,9 @@ $(document).ready(async () => {
     window.location = $(this).data('href');
   });
 
+  // link-account tab handle
+  initLinkAccountView();
+
   // Dropzone
   const $dropzone = $('#dropzone');
   if ($dropzone.length > 0) {