options/locale/locale_en-US.ini

@@ -2788,6 +2788,7 @@ users.new_account = Create User Account
 users.name = Username
 users.full_name = Full Name
 users.activated = Activated
+users.email_activated = Email Activated
 users.bind_phone = Bind Phone
 users.subscriber = Subscriber
 users.admin = Admin
@@ -2809,6 +2810,7 @@ users.edit_account = Edit User Account
 users.max_repo_creation = Maximum Number of Repositories
 users.max_repo_creation_desc = (Enter -1 to use the global default limit.)
 users.is_activated = User Account Is Activated
+users.is_email_activated=User Email Is Activated
 users.prohibit_login = Disable Sign-In
 users.is_admin = Is Administrator
 users.is_restricted = Is Restricted

options/locale/locale_zh-CN.ini

@@ -2805,6 +2805,7 @@ users.new_account=创建新帐户
 users.name=用户名
 users.full_name=全名
 users.activated=已激活
+users.email_activated=邮箱激活
 users.bind_phone=手机验证
 users.subscriber=付费用户
 users.admin=管理员
@@ -2826,6 +2827,7 @@ users.edit_account=编辑帐号
 users.max_repo_creation=最大项目数
 users.max_repo_creation_desc=（设置为 -1 表示使用全局默认值）
 users.is_activated=该用户已被激活
+users.is_email_activated=该用户邮箱已激活
 users.prohibit_login=禁用登录
 users.is_admin=是管理员
 users.is_restricted=受限

templates/admin/user/edit.tmpl

@@ -67,7 +67,7 @@
 
 				<div class="inline field">
 					<div class="ui checkbox">
-						<label><strong>{{.i18n.Tr "admin.users.is_activated"}}</strong></label>
+						<label><strong>{{.i18n.Tr "admin.users.is_email_activated"}}</strong></label>
 						<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
 					</div>
 				</div>

templates/admin/user/list.tmpl

@@ -67,7 +67,8 @@
 						<th>ID</th>
 						<th>{{.i18n.Tr "admin.users.name"}}</th>
 						<th>{{.i18n.Tr "email"}}</th>
-						<th>{{.i18n.Tr "admin.users.activated"}}</th>
+						<th>{{.i18n.Tr "admin.users.email_activated"}}</th>
+						<th>{{.i18n.Tr "settings.bind_wechat"}}</th>
 						<th>{{.i18n.Tr "admin.users.bind_phone"}}</th>
 						<th>{{.i18n.Tr "admin.users.subscriber"}}</th>
 						<th>{{.i18n.Tr "admin.users.admin"}}</th>
@@ -85,6 +86,7 @@
 							<td><a href="{{AppSubUrl}}/{{.Name}}">{{.Name}}</a></td>
 							<td><span class="text truncate email">{{.Email}}</span></td>
 							<td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td>
+							<td><i class="fa fa{{if .WechatOpenId}}-check{{end}}-square-o"></i></td>
 							<td><i class="fa fa{{if .PhoneNumber}}-check{{end}}-square-o"></i></td>
 							<td><i class="fa fa{{if .IsSubscriber}}-check{{end}}-square-o"></i></td>
 							<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>

templates/user/auth/link_account_new.tmpl

@@ -54,13 +54,16 @@
 								<h2 class="ui header">
 								{{.i18n.Tr "auth.oauth_signup_add_info_title"}}
 								</h2>
-							</div>							
+							</div>
 						</div>
 						<div class="ui grid">
 							<div class="column">
 								<form id="submitForm" class="ui form" action="{{.SignUpLink }}" method="post">
 									{{.CsrfTokenHtml}}
 									{{template "base/alert" .}}
+									<div class="ui negative message" style="display:none;">
+										<p></p>
+									</div>
                   <div class="field {{if .Err_UserName }}error{{end}}">
                     <input id="user_name" name="user_name" value="{{.user_name}}" placeholder="{{.i18n.Tr "username"}}" autofocus required>
                   </div>

templates/user/auth/signin_thirdparty.tmpl

@@ -4,7 +4,7 @@
 			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>
+    	font-size:14px;">{{.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>

web_src/js/index.js

@@ -5492,4 +5492,4 @@ function initAddUsageAgreement() {
     showLoginProtocolDialog($('meta[name="_uid"]').attr('content-ext'))
   }
 }
-initAddUsageAgreement()
+// initAddUsageAgreement()

web_src/less/_form.less

@@ -74,7 +74,7 @@
             display: inline-block;
 
             p {
-                margin: 7px 5px 0 0;
+                margin: 10px 5px 0 0;
                 float: left;
             }
         }
@@ -88,8 +88,8 @@
         }
 
         img {
-            width: 32px;
-            height: 32px;
+            width: 36px;
+            height: 36px;
 
             &.openidConnect {
                 width: auto;

web_src/vuepages/const/index.js

@@ -26,7 +26,8 @@ export const COMPUTER_RESOURCES_COLORS = {
   'ILUVATAR-GPGPU': '#0038bd',
   'METAX-GPGPU': '#5c246a',
 };
-export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'ASCEND-D910B', v: 'Ascend-D910B' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: '3090', v: '3090' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }, { k: 'BI-V100', v: 'BI-V100' }, { k: 'MR-V100', v: 'MR-V100' }, { k: 'N100', v: 'N100' }];
+export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'ASCEND-D910B', v: 'Ascend-D910B' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: '3090', v: '3090' }, { k: '4090', v: '4090' },
+{ k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'ENFLAME-I20', v: 'ENFLAME-I20' }, { k: 'DCU', v: 'DCU' }, { k: 'BI-V100', v: 'BI-V100' }, { k: 'MR-V100', v: 'MR-V100' }, { k: 'N100', v: 'N100' }, { k: 'L20', v: 'L20' }];
 export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }];
 export const NETWORK_TYPE = [{ k: 1, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.noInternet')})` }, { k: 2, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.hasInternet')})` }];
 export const NETWORK_TYPE_VALUE = [{ k: 1, v: i18n.t('cloudbrainObj.noInternet') }, { k: 2, v: i18n.t('cloudbrainObj.hasInternet') }];