From 132b3199b1daaa2ae6686820ea6ad4e121cc2737 Mon Sep 17 00:00:00 2001 From: zhangke <691259026@qq.com> Date: Fri, 8 Sep 2023 15:23:10 +0800 Subject: [PATCH 1/2] Modify contest detail style --- packages/ui-default/pages/contest.page.styl | 3 +++ packages/ui-default/templates/contest_detail.html | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/ui-default/pages/contest.page.styl b/packages/ui-default/pages/contest.page.styl index 1b00388..8e937c2 100644 --- a/packages/ui-default/pages/contest.page.styl +++ b/packages/ui-default/pages/contest.page.styl @@ -195,3 +195,6 @@ $highlight-button-color = #F6DF45 .page--contest_user .col--uid width: rem(100px) + +.problem__tag-item a + color: white \ No newline at end of file diff --git a/packages/ui-default/templates/contest_detail.html b/packages/ui-default/templates/contest_detail.html index 1a8ee82..f95f44c 100644 --- a/packages/ui-default/templates/contest_detail.html +++ b/packages/ui-default/templates/contest_detail.html @@ -12,14 +12,14 @@

{{ tdoc.title }}

- {{ _(model.contest.statusText(tdoc, tsdoc)) }} - {{ _(model.contest.RULES[tdoc.rule].TEXT) }} - {{ _('Start at') }}: {{ contest.render_time(tsdoc.startAt or tdoc.beginAt) }} - {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }} - {{ _('Host') }}: {{ user.render_inline(udict[tdoc.owner], badge=false) }} - {{ tdoc['attend']|default(0) }} + {{ _(model.contest.statusText(tdoc, tsdoc)) }} + {{ _(model.contest.RULES[tdoc.rule].TEXT) }} + {{ _('Start at') }}: {{ contest.render_time(tsdoc.startAt or tdoc.beginAt) }} + {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }} + {{ _('Host') }}: {{ user.render_inline(udict[tdoc.owner], badge=false) }} + {{ tdoc['attend']|default(0) }} {% if tsdoc.attend %} - {{ _('Attended') }} + {{ _('Attended') }} {% endif %}
From c602191feb8968f4dbfe1452adb3cb5e350838c0 Mon Sep 17 00:00:00 2001 From: zhangke <691259026@qq.com> Date: Fri, 8 Sep 2023 18:16:38 +0800 Subject: [PATCH 2/2] Add User studo style and Add empty state icon --- .../components/signin/signin_dialog.page.styl | 12 ++++++++++ packages/ui-default/locales/zh.yaml | 6 +++++ packages/ui-default/misc/empty_state.svg | 9 ++++++++ packages/ui-default/misc/nothing.styl | 5 +++-- packages/ui-default/templates/user_sudo.html | 22 +++++++++---------- 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 packages/ui-default/misc/empty_state.svg diff --git a/packages/ui-default/components/signin/signin_dialog.page.styl b/packages/ui-default/components/signin/signin_dialog.page.styl index a2b1d47..4db597e 100644 --- a/packages/ui-default/components/signin/signin_dialog.page.styl +++ b/packages/ui-default/components/signin/signin_dialog.page.styl @@ -26,6 +26,18 @@ $signin_dialog_expand_h = 30px border: 1px solid #DDD // box-shadow: 0 0 30px rgba(#000, 0.6) +.user_sudo_main + background: #FFF + width: 25em + // padding: rem($signin_form_gap_v $signin_form_gap_h) + padding-bottom: 2em + // margin-right: rem($signin_form_width - $signin_dialog_expand_h) + position: relative + z-index: 2 + border-radius: 22px + border: 1px solid #DDD + // box-shadow: 0 0 30px rgba(#000, 0.6) + .dialog--signin__side position: absolute right: 0 diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index 8277731..60d150d 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -102,6 +102,7 @@ Attend Contest: 参加比赛 Attend contests: 参加比赛 Attended: 已参加 Attendee Manage: 参赛者管理 +After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity. : 在您执行了受sudo保护的操作后，只有在几个小时不活动后，才会要求您再次进行身份验证。 Authenticator: 认证器 Authenticators: 认证器 author: 作者 @@ -167,6 +168,8 @@ Compilers' Version and Parameters: 编译器版本及参数 Complete: 完成 Completed: 已完成 Config: 配置 +Confirm: 确认 +Confirm Access: 确认访问 Confirm deleting the selected roles?: 您确定删除所选角色吗？ Confirm deleting this comment? Its replies will be deleted as well.: 确认删除这个评论吗？回复会被同时删除。 Confirm deleting this reply?: 确认删除这个回复吗？ @@ -845,6 +848,7 @@ SuperUser: 超级管理员 SuperUser's Password: 超级管理员的密码 Support: 支持 Switch account: 切换账户 +sudo mode: sudo 模式 Tags: 标签 Task Settings: 任务设置 tasks_list: 任务列表 @@ -888,6 +892,7 @@ Time Extension: 延期 Time: 时间 timeago_locale: zh_CN Timezone: 时区 +Tip: 提示 title: 标题 Title: 标题 To get a better editing experience, with code highlighting and test runs, please go back to the problem detail page and use 'Open Scratchpad' button.: 为了获得更好的编辑体验，包括代码高亮和测试运行功能，请返回题目详情页面并点击“进入在线编程模式”按钮。 @@ -1010,6 +1015,7 @@ Write Your Solution: 发表您的题解 Year: 年 You are currently in legacy mode. Some additional features will be unavailable. We strongly recommend switching to standard mode on a modern browser.: 您当前处于兼容模式。某些功能在此模式下不可用。我们强烈建议在现代浏览器上切换为标准模式以获得更好的体验。 You are not allowed to join the domain. The link is either invalid or expired.: 您无法加入该网站，链接无效或已过期。 +You are entering: 您正在进入 You can also upload your avatar to Gravatar and it will be automatically updated here.: 你也可以将头像上传到 Gravatar，本站的头像将自动更新。 You can create your own training plans and share them with others.: 您可以创建您自己的训练计划并且与他人分享。 You cannot submit for this problem because the contest is ended. You can click "Open in Problem Set" to view this problem in normal mode.: 该比赛已结束，您无法在比赛模式下递交该题目。您可以点击“在题库中打开”以普通模式查看和递交本题。 diff --git a/packages/ui-default/misc/empty_state.svg b/packages/ui-default/misc/empty_state.svg new file mode 100644 index 0000000..4e3e7c8 --- /dev/null +++ b/packages/ui-default/misc/empty_state.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/ui-default/misc/nothing.styl b/packages/ui-default/misc/nothing.styl index e75004b..e667bfc 100644 --- a/packages/ui-default/misc/nothing.styl +++ b/packages/ui-default/misc/nothing.styl @@ -8,6 +8,7 @@ padding: rem(20px 0) .nothing-icon - background: url(./puzzled_twd2.svg) no-repeat center center - height: 184px + height: 180px; + background: url('./empty_state.svg') no-repeat center center; + background-size: contain; margin-bottom: rem(20px) diff --git a/packages/ui-default/templates/user_sudo.html b/packages/ui-default/templates/user_sudo.html index 100bb3e..6b8d22c 100644 --- a/packages/ui-default/templates/user_sudo.html +++ b/packages/ui-default/templates/user_sudo.html @@ -1,8 +1,8 @@ {% extends "layout/immersive.html" %} {% block content %} -
-
-

{{ _('Confirm Access') }}

+
+
+

{{ _('Confirm Access') }}

{% if UserContext.authn %}
@@ -19,27 +19,27 @@

{{ _('Confirm Access') }}

{% endif %}
-
- +
-
-

Tip: You are entering sudo mode.

-

After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity.

+
+

{{_('Tip')}}: {{_('You are entering')}} {{_('sudo mode')}}

+

{{_("After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity.")}}

{% if UserContext.authn or UserContext.tfa %}
-
+

{{ _('Or use other methods:') }}

    {% if UserContext.authn %}
  1. {{ _('Use Authenticator') }}
    2. {% endif %}