options/locale/locale_en-US.ini

@@ -461,6 +461,7 @@ wechat_login=WeChat login
 wechat_login_msg=Scan WeChat QR code to log in
 cloud_brain_user_login=Cloud brain user login
 modify_phone_number=Modify phone number
+other_login_methods=Other login methods
 
 
 [mail]

options/locale/locale_zh-CN.ini

@@ -460,11 +460,11 @@ email_retrieve_password=邮箱找回密码
 mobile_number_retrieve_password=手机号找回密码
 mobile_login=手机登录
 account_password_login=账号密码登录
-wechat_login=微信登录
+wechat_login=微信扫码登录
 wechat_login_msg=微信扫码进行登录
 cloud_brain_user_login=云脑1用户登录
 modify_phone_number=修改手机号
-
+other_login_methods=其它登录方式
 
 [mail]
 activate_account=请激活您的帐户

routers/user/auth.go

@@ -314,6 +314,14 @@ func SignInCloudBrain(ctx *context.Context) {
 		return
 	}
 	setRSAContext(ctx)
+	
+	orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers()
+	if err != nil {
+		ctx.ServerError("UserSignIn", err)
+		return
+	}
+	ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names
+	ctx.Data["OAuth2Providers"] = oauth2Providers
 	ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login/cloud_brain"
 	ctx.Data["PageIsSignIn"] = true
 	ctx.Data["PageIsCloudBrainLogin"] = true
@@ -330,7 +338,13 @@ func SignInWeChat(ctx *context.Context) {
 	if checkAutoLogin(ctx) {
 		return
 	}
-
+	orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers()
+	if err != nil {
+		ctx.ServerError("UserSignIn", err)
+		return
+	}
+	ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names
+	ctx.Data["OAuth2Providers"] = oauth2Providers
 	ctx.Data["PageIsWeChatLogin"] = true
 	ctx.Data["WechatSignUpRequired"] = setting.WechatSignUpRequired
 	ctx.Data["ActivityTpl"] = getActivityTpl()
@@ -344,7 +358,13 @@ func SignInPhone(ctx *context.Context) {
 	if checkAutoLogin(ctx) {
 		return
 	}
-
+	orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers()
+	if err != nil {
+		ctx.ServerError("UserSignIn", err)
+		return
+	}
+	ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names
+	ctx.Data["OAuth2Providers"] = oauth2Providers
 	ctx.Data["PageIsPhoneLogin"] = true
 	ctx.Data["WechatSignUpRequired"] = setting.WechatSignUpRequired
 	ctx.Data["ActivityTpl"] = getActivityTpl()

templates/user/auth/signin_inner.tmpl

@@ -74,33 +74,8 @@
 								{{end}}
 							</button>
 						</div>
-
-						{{if and .OrderedOAuth2Names .OAuth2Providers}}						
-						<div class="ui divider"></div>
-						<div class="ui centered grid">
-							<div class="sixteen wide mobile ten wide tablet ten wide computer column">
-								<div class="oauth2 center">
-									<div id="oauth2-login-loader" class="ui disabled centered  loader"></div>
-									<div>
-										<div id="oauth2-login-navigator">
-											<p>{{.i18n.Tr "sign_in_with"}}</p>
-											{{range $key := .OrderedOAuth2Names}}
-												{{$provider := index $.OAuth2Providers $key}}
-												<a href="{{AppSubUrl}}/user/oauth2/{{$key}}">
-													<img
-														alt="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
-														title="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
-														class="{{$provider.Name}}"
-														src="{{AppSubUrl}}{{$provider.Image}}"
-														onclick="window.onOAuthLoginClick()"
-													></a>
-											{{end}}
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-						{{end}}
+						
+						{{template "user/auth/signin_thirdparty" .}}
 						</form>
 					</div>
 				</div>

templates/user/auth/signin_phone.tmpl

@@ -98,6 +98,8 @@
 											{{.i18n.Tr "sign_in"}}
 										</button>
 									</div>
+									
+									{{template "user/auth/signin_thirdparty" .}}
 									</form>
 								</div>
 							</div>

templates/user/auth/signin_thirdparty.tmpl

@@ -0,0 +1,35 @@
+{{if and .OrderedOAuth2Names .OAuth2Providers}}
+	<div style="display:flex;align-items:center;margin:22px 0 16px 0">
+		<div style="flex:1;height:1px;
+			border-top: 1px solid rgba(34, 36, 38, .15);
+			border-bottom: 1px solid rgba(255, 255, 255, .1);"></div>
+		<div style="margin:0 12px;color: rgba(136, 136, 136, 1);
+    	font-size: 13px;">{{.i18n.Tr "phone.other_login_methods"}}</div>
+		<div style="flex:1;height:1px;
+			border-top: 1px solid rgba(34, 36, 38, .15);
+			border-bottom: 1px solid rgba(255, 255, 255, .1);"></div>
+	</div>
+	<div class="ui centered grid">
+		<div class="sixteen wide mobile ten wide tablet ten wide computer column">
+			<div class="oauth2 center">
+				<div id="oauth2-login-loader" class="ui disabled centered  loader"></div>
+				<div>
+					<div id="oauth2-login-navigator">
+						<p style="display:none">{{.i18n.Tr "sign_in_with"}}</p>
+						{{range $key := .OrderedOAuth2Names}}
+							{{$provider := index $.OAuth2Providers $key}}
+							<a href="{{AppSubUrl}}/user/oauth2/{{$key}}">
+								<img
+									alt="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
+									title="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
+									class="{{$provider.Name}}"
+									src="{{AppSubUrl}}{{$provider.Image}}"
+									onclick="window.onOAuthLoginClick()"
+								></a>
+						{{end}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+{{end}}

templates/user/auth/signin_wechat.tmpl

@@ -14,12 +14,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    height: 130px;
-    margin: 0px 0 20px 0;
+    height: 150px;
+    margin: 0px 0 18px 0;
   }
   .qrcode {
-    width: 150px;
-    height: 150px;
+    width: 148px;
+    height: 148px;
     position: relative;
   }
   .qrcode-img,
@@ -124,6 +124,8 @@
 									<div class="qrcode-tips">
 										<i class="ri-wechat-fill"></i></i><span>{{.i18n.Tr "phone.wechat_login_msg"}}</span>
 									</div>
+                
+						      {{template "user/auth/signin_thirdparty" .}}
 									</form>
 								</div>
 							</div>