From a532f3d7a6b0cc6bedcf4976b091902fc7ece398 Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 16 May 2021 00:05:58 +0800 Subject: [PATCH] ui: fix tag --- .../ui-default/components/problem/tag.page.styl | 6 ++++++ packages/ui-default/package.json | 1 + packages/ui-default/pages/record_main.page.js | 6 +++++- packages/ui-default/templates/layout/basic.html | 4 ---- .../templates/partials/problem_sidebar_normal.html | 3 ++- packages/ui-default/templates/problem_detail.html | 13 +++++++------ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/ui-default/components/problem/tag.page.styl b/packages/ui-default/components/problem/tag.page.styl index 7de01b07f..f3f7e2b9f 100644 --- a/packages/ui-default/components/problem/tag.page.styl +++ b/packages/ui-default/components/problem/tag.page.styl @@ -11,6 +11,12 @@ margin: rem(0 2px 2px 0) !important padding: 0 !important +.problem__tag-item + padding: rem(0px) + margin-left: rem(3px) + &:hover + text-decoration: none + .problem__tag-link display: inline-block padding: rem(0 7px) diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 6841f7734..bc8882512 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -24,6 +24,7 @@ "@babel/runtime-corejs3": "^7.14.0", "@blueprintjs/core": "^3.44.2", "@blueprintjs/icons": "^3.26.0", + "@blueprintjs/select": "^3.16.2", "@hydrooj/utils": "^1.0.15", "@undefined-moe/monaco-yaml": "^2.5.0", "ansi_up": "^5.0.1", diff --git a/packages/ui-default/pages/record_main.page.js b/packages/ui-default/pages/record_main.page.js index f02c17457..895ea6544 100644 --- a/packages/ui-default/pages/record_main.page.js +++ b/packages/ui-default/pages/record_main.page.js @@ -1,5 +1,6 @@ import { NamedPage } from 'vj/misc/Page'; import UserSelectAutoComplete from 'vj/components/autocomplete/UserSelectAutoComplete'; +import ProblemSelectAutoComplete from 'vj/components/autocomplete/ProblemSelectAutoComplete'; const page = new NamedPage('record_main', async () => { const { default: SockJs } = await import('../components/socket'); @@ -24,7 +25,10 @@ const page = new NamedPage('record_main', async () => { $newTr.trigger('vjContentNew'); } }; - UserSelectAutoComplete.getOrConstruct($('.filter-user [name="uidOrName"]'), { + UserSelectAutoComplete.getOrConstruct($('[name="uidOrName"]'), { + clearDefaultValue: false, + }); + ProblemSelectAutoComplete.getOrConstruct($('[name="pid"]'), { clearDefaultValue: false, }); }); diff --git a/packages/ui-default/templates/layout/basic.html b/packages/ui-default/templates/layout/basic.html index ef8bf6116..5c07aca4a 100644 --- a/packages/ui-default/templates/layout/basic.html +++ b/packages/ui-default/templates/layout/basic.html @@ -1,9 +1,7 @@ {% set layout_name = "basic" %} {% extends "layout/html5.html" %} {% block body %} - {% include "partials/nav.html" %} -
{% include "partials/header_mobile.html" %} @@ -13,7 +11,5 @@
{% include "partials/footer.html" %} - {% include "partials/login_dialog.html" %} - {% endblock %} diff --git a/packages/ui-default/templates/partials/problem_sidebar_normal.html b/packages/ui-default/templates/partials/problem_sidebar_normal.html index f0fad50f1..f05fae301 100644 --- a/packages/ui-default/templates/partials/problem_sidebar_normal.html +++ b/packages/ui-default/templates/partials/problem_sidebar_normal.html @@ -105,13 +105,14 @@ - +{% if pagename != 'problem_detail' %}

{{ _('Information') }}

{% include "partials/problem-sidebar-information.html" %}
+{% endif %} {% if page_name == 'problem_detail' and (tdocs or ctdocs) %}
diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index 2f3051aba..814c1d44e 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -39,12 +39,13 @@
    -

  • {{ _('Time') }}: {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms

    • -

  • {{ _('Memory') }}: {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB

    • -

  • {{ _('Accepted') }}: {{ pdoc.nAccept }}

    • -

  • {{ _('Accepted Ratio') }}: {% if pdoc.nSubmit > 0 %}{{ (100 * pdoc.nAccept / pdoc.nSubmit)|round|int }}%{% else %}{{ _('?') }}{% endif %}

    • -

  • {{ _('Difficulty') }}: {{ pdoc['difficulty'] or _('(None)') }}

    • -

  • {{ _('Uploaded By') }}: {{ user.render_inline(owner_udoc, badge=false) }}

    • + {{ _('Time') }}: {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms + {{ _('Memory') }}: {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB + {{ _('Submitted') }}: {{ pdoc.nSubmit }} + {{ _('Accepted') }}: {{ pdoc.nAccept }} + {{ _('Accepted Ratio') }}: {% if pdoc.nSubmit > 0 %}{{ (100 * pdoc.nAccept / pdoc.nSubmit)|round|int }}%{% else %}{{ _('?') }}{% endif %} + {{ _('Difficulty') }}: {{ pdoc['difficulty'] or _('(None)') }} + {{ _('Uploaded By') }}: {{ user.render_inline(udoc, badge=false) }}