From 34c75c94fdba2191eacfab145c6955766e0b0671 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 4 Feb 2022 01:37:30 +0800 Subject: [PATCH] ui: fix homework status display --- packages/ui-default/package.json | 2 +- packages/ui-default/templates/homework_main.html | 8 ++------ .../ui-default/templates/partials/homepage/homework.html | 4 +--- .../ui-default/templates/partials/homework_sidebar.html | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index a6a570e88..c10822060 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.31.1", + "version": "4.31.2", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/homework_main.html b/packages/ui-default/templates/homework_main.html index 6f023df56..e256332ab 100644 --- a/packages/ui-default/templates/homework_main.html +++ b/packages/ui-default/templates/homework_main.html @@ -36,12 +36,8 @@

{{ tdoc.title }}

    -
  • - {{ _('Status') }}: {{ _(model.contest.statusText(tdoc)) }} -
  • -
  • - {{ _('Open Since') }}: {{ datetimeSpan(tdoc['beginAt'])|safe }} -
  • +
  • {{ _('Status') }}: {{ _(model.contest.statusText(tdoc)) }}
  • +
  • {{ _('Open Since') }}: {{ datetimeSpan(tdoc['beginAt'])|safe }}
  • {% if model.contest.isExtended(tdoc) or model.contest.isDone(tdoc) %} {{ _('Hard Deadline') }}: {{ datetimeSpan(tdoc['endAt'])|safe }} diff --git a/packages/ui-default/templates/partials/homepage/homework.html b/packages/ui-default/templates/partials/homepage/homework.html index dd946c9b3..ae6350576 100644 --- a/packages/ui-default/templates/partials/homepage/homework.html +++ b/packages/ui-default/templates/partials/homepage/homework.html @@ -16,9 +16,7 @@

    {{ tdoc['title'] }}

      -
    • - {{ _('Status') }}: {{ _(model.contest.statusText(tdoc)) }} -
    • +
    • {{ _('Status') }}: {{ _(model.contest.statusText(tdoc)) }}
    • {{ _('Open Since') }}: {{ datetimeSpan(tdoc['beginAt'])|safe }}
    • {% if model.contest.isExtended(tdoc) or model.contest.isDone(tdoc) %} diff --git a/packages/ui-default/templates/partials/homework_sidebar.html b/packages/ui-default/templates/partials/homework_sidebar.html index 6fda72599..0ef7e5ad8 100644 --- a/packages/ui-default/templates/partials/homework_sidebar.html +++ b/packages/ui-default/templates/partials/homework_sidebar.html @@ -75,7 +75,7 @@
    -
    {{ _('Status') }}
    {{ _(model.contest.statusText(tdoc)) }}
    +
    {{ _('Status') }}
    {{ _(model.contest.statusText(tdoc)) }}
    {{ _('Problem') }}
    {{ tdoc['pids']|length }}
    {{ _('Open Since') }}
    {{ homework.render_time(tdoc['beginAt']) }}
    {{ _('Deadline') }}
    {{ homework.render_time(tdoc['penaltySince']) }}