From 1ecdc55aff223048c9a469c38966378d785fbd31 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 22 Feb 2021 09:14:27 +0800 Subject: [PATCH] fix link account ui (#14763) Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: techknowlogick --- templates/user/auth/link_account.tmpl | 23 ++++++++++---------- web_src/js/index.js | 30 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl index 183c16aa12..39e312bd66 100644 --- a/templates/user/auth/link_account.tmpl +++ b/templates/user/auth/link_account.tmpl @@ -12,18 +12,17 @@ {{.i18n.Tr "auth.oauth_signin_tab"}} - -
-
-
- {{template "user/auth/signup_inner" .}} -
-
- +
+
+
+
+ {{template "user/auth/signup_inner" .}} +
+
+
diff --git a/web_src/js/index.js b/web_src/js/index.js index f5e3c705e8..7bfe12e3ca 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -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) {