diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index d5e547cc8..7bcdefb86 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.30.5", + "version": "2.30.6", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/model/builtin.ts b/packages/hydrooj/src/model/builtin.ts index fcd1efe28..08e32ff88 100644 --- a/packages/hydrooj/src/model/builtin.ts +++ b/packages/hydrooj/src/model/builtin.ts @@ -226,6 +226,7 @@ PERM.PERM_ADMIN = PERM.PERM_ALL; export const PRIV = { PRIV_NONE: 0, + PRIV_MOD_BADGE: 1 << 25, PRIV_EDIT_SYSTEM: 1 << 0, // renamed from PRIV_SET_PRIV PRIV_SET_PERM: 1 << 1, PRIV_USER_PROFILE: 1 << 2, diff --git a/packages/ui-default/common/variables.inc.styl b/packages/ui-default/common/variables.inc.styl index 26887d177..b4e94bf13 100644 --- a/packages/ui-default/common/variables.inc.styl +++ b/packages/ui-default/common/variables.inc.styl @@ -175,6 +175,7 @@ $notification-icon = { // Badge $badge-text-color = { 'mod': #FFF, + 'su': #FFF, 'lv0': #727171, 'lv1': #FFF, 'lv2': #FFF, @@ -189,6 +190,7 @@ $badge-text-color = { } $badge-bg-color = { 'mod': #cf70ab, + 'su': #ff0000, 'lv0': #efefef, 'lv1': #9db4bd, 'lv2': #9db4bd, diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index 9a335753d..70bb59793 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -440,6 +440,7 @@ Memory: 内存 Message {0} not found.: 消息 {0} 不存在。 Messages: 消息 Method: 方法 +Moderator: 管理员 Month: 月 Monthly Popular: 月度最受欢迎 Most Upvoted Solutions: 最被赞同的题解 @@ -557,8 +558,8 @@ problem_submit: 递交代码 problem_type.default: 传统题 problem_type.fileio: '文件IO ({0})' problem_type.interactive: 交互题 -problem_type.remote_judge: 远端评测题 problem_type.objective: 客观题 +problem_type.remote_judge: 远端评测题 problem_type.submit_answer: 提交答案题 problem-category-delim: '|' problem-subcategory-delim: 、 @@ -710,6 +711,7 @@ Submit to Judge: 递交以评测 Submit Your Code: 递交代码进行正式评测 Submit: 递交 Submitted: 已递交 +SuperUser: 超级管理员 Support: 支持 Tags: 标签 tasks_list: 任务列表 diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 5acd06db7..c74db4497 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.14.4", + "version": "4.14.5", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/pages/user_detail.page.styl b/packages/ui-default/pages/user_detail.page.styl index d9d584549..b37ec25c3 100644 --- a/packages/ui-default/pages/user_detail.page.styl +++ b/packages/ui-default/pages/user_detail.page.styl @@ -59,6 +59,10 @@ color: rgba(#FFF, 1) text-decoration: none + &.badge--su + background-color: rgba(#FFF, 0.8) !important + color: rgba(#000, 0.8) !important + &.badge--mod background-color: rgba(#FFF, 0.8) !important color: rgba(#000, 0.8) !important diff --git a/packages/ui-default/templates/components/user.html b/packages/ui-default/templates/components/user.html index 2d60503df..52cbd2cb6 100644 --- a/packages/ui-default/templates/components/user.html +++ b/packages/ui-default/templates/components/user.html @@ -13,9 +13,13 @@ {% if badge %} {% set level = udoc.level|default(0) %} - LV {{ level }} - {% if modbadge and udoc.hasPerm(perm.PERM_MOD_BADGE) %} - + LV {{ level }} + {% if modbadge %} + {% if udoc.hasPriv(PRIV.PRIV_MOD_BADGE) %} + + {% elif udoc.hasPerm(perm.PERM_MOD_BADGE) %} + + {% endif %} {% endif %} {% endif %} diff --git a/packages/ui-default/templates/domain_permission.html b/packages/ui-default/templates/domain_permission.html index f3fe341b3..39a2ecb94 100644 --- a/packages/ui-default/templates/domain_permission.html +++ b/packages/ui-default/templates/domain_permission.html @@ -30,7 +30,7 @@ {%- for role in roles -%}