diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index a47dc66ac..58b04d41e 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.30.3", + "version": "2.30.4", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 0cf054f97..4ba26e7a1 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -311,8 +311,9 @@ export class HandlerCommon { } renderTitle(str: string) { - if (this.extraTitleContent) return `${this.translate(str)} - ${this.extraTitleContent} - ${system.get('server.name')}`; - return `${this.translate(str)} - ${system.get('server.name')}`; + const name = this.domain.ui?.name || system.get('server.name'); + if (this.extraTitleContent) return `${this.translate(str)} - ${this.extraTitleContent} - ${name}`; + return `${this.translate(str)} - ${name}`; } checkPerm(...args: bigint[]) { diff --git a/packages/ui-default/components/navigation/navigation.page.styl b/packages/ui-default/components/navigation/navigation.page.styl index 659f51784..70893030c 100644 --- a/packages/ui-default/components/navigation/navigation.page.styl +++ b/packages/ui-default/components/navigation/navigation.page.styl @@ -143,6 +143,7 @@ .nav__logo display: block + background-size:100% 100%; width: 0 opacity: 0 height: rem($nav-logo-height) @@ -150,8 +151,6 @@ background: no-repeat transition: width .3s, opacity .3s transition-timing-function: ease-out-cubic - +retina() - background-size: $nav-logo-width $nav-logo-height &:hover text-decoration: none diff --git a/packages/ui-default/handler.js b/packages/ui-default/handler.js index b7a68af79..d8f9bfc3e 100644 --- a/packages/ui-default/handler.js +++ b/packages/ui-default/handler.js @@ -71,7 +71,7 @@ class UiSettingsHandler extends Handler { this.response.body = await this.renderHTML('extra.css', { nav_logo_dark, nav_logo_dark_2x, - ...ddoc, + ...(ddoc.ui || {}), }); this.response.type = 'text/css'; this.ctx.set('nolog', '1'); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 17cb56107..5acd06db7 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.14.3", + "version": "4.14.4", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/about.html b/packages/ui-default/templates/about.html index 283e947d2..24cd9a1b4 100644 --- a/packages/ui-default/templates/about.html +++ b/packages/ui-default/templates/about.html @@ -1,6 +1,6 @@ {% extends "layout/wiki_base.html" %} {% block wiki_content %} -{% set name = model.system.get('server.name') %} +{% set name = handler.domain.ui.name|default(model.system.get('server.name')) %}

{{ _('About {0}').format(name) }}

diff --git a/packages/ui-default/templates/layout/html5.html b/packages/ui-default/templates/layout/html5.html index 6fa4fadb7..84a483026 100644 --- a/packages/ui-default/templates/layout/html5.html +++ b/packages/ui-default/templates/layout/html5.html @@ -19,7 +19,7 @@ {% block ogp %} - + diff --git a/packages/ui-default/templates/layout/mail.html b/packages/ui-default/templates/layout/mail.html index d1c4c07b5..62f4df2c5 100644 --- a/packages/ui-default/templates/layout/mail.html +++ b/packages/ui-default/templates/layout/mail.html @@ -18,7 +18,7 @@ body, .hydro { margin:0;color:#333;font-size:14px;font-family:"Tahoma","Segoe UI
-
{% block title %}{% endblock %} - {{ model.system.get('server.name') }}
+
{% block title %}{% endblock %} - {{ handler.domain.ui.name|default(model.system.get('server.name')) }}
{% block content %}{% endblock %}
diff --git a/packages/ui-default/templates/partials/login_dialog.html b/packages/ui-default/templates/partials/login_dialog.html index ecfb2c4c0..b1a5cef7c 100644 --- a/packages/ui-default/templates/partials/login_dialog.html +++ b/packages/ui-default/templates/partials/login_dialog.html @@ -3,7 +3,7 @@ diff --git a/packages/ui-default/templates/record_detail_status.html b/packages/ui-default/templates/record_detail_status.html index 1d289ede0..d39f09fc9 100644 --- a/packages/ui-default/templates/record_detail_status.html +++ b/packages/ui-default/templates/record_detail_status.html @@ -46,7 +46,11 @@ {{ model.builtin.STATUS_TEXTS[rcdoc['status']] }} - {{ formatJudgeTexts([rcdoc.message]) if rcdoc.message else '' }} + {% if rdoc.domainId=='bzoj' and rcdoc.status!=STATUS.STATUS_ACCEPTED and not dl %} + {% set dl=true %} + input + output + {% endif %}{{ formatJudgeTexts([rcdoc.message]) if rcdoc.message else '' }} {% if rcdoc['status'] == STATUS.STATUS_TIME_LIMIT_EXCEEDED or rcdoc['status'] == STATUS.STATUS_MEMORY_LIMIT_EXCEEDED or rcdoc['status'] == STATUS.STATUS_OUTPUT_LIMIT_EXCEEDED %}≥{% endif %}{{ rcdoc.time|round|int }}ms diff --git a/packages/ui-default/templates/user_changemail_mail.html b/packages/ui-default/templates/user_changemail_mail.html index 01445338f..f80d5318a 100644 --- a/packages/ui-default/templates/user_changemail_mail.html +++ b/packages/ui-default/templates/user_changemail_mail.html @@ -1,6 +1,6 @@ {% extends "layout/mail.html" %} {% block title %}{{ _('Change Email') }}{% endblock %} {% block content %} -

{{ _('Hello, {0}! You can click following link to active your new email of your {1} account:').format(uname, model.system.get('server.name')) }}

+

{{ _('Hello, {0}! You can click following link to active your new email of your {1} account:').format(uname, handler.domain.ui.name|default(model.system.get('server.name'))) }}

{{ url_prefix }}{{ path }}

{% endblock %} diff --git a/packages/ui-default/templates/user_lostpass_mail.html b/packages/ui-default/templates/user_lostpass_mail.html index 9e4702717..0a9ab14a6 100644 --- a/packages/ui-default/templates/user_lostpass_mail.html +++ b/packages/ui-default/templates/user_lostpass_mail.html @@ -1,6 +1,6 @@ {% extends "layout/mail.html" %} {% block title %}{{ _('Lost Password') }}{% endblock %} {% block content %} -

{{ _('Hello, {0}! You can click following link to reset the password of your {1} account:').format(uname, model.system.get('server.name')) }}

+

{{ _('Hello, {0}! You can click following link to reset the password of your {1} account:').format(uname, handler.domain.ui.name|default(model.system.get('server.name'))) }}

{{ url_prefix }}{{ url }}

{% endblock %} diff --git a/packages/ui-default/templates/user_register_mail.html b/packages/ui-default/templates/user_register_mail.html index 30de809d8..c5052f131 100644 --- a/packages/ui-default/templates/user_register_mail.html +++ b/packages/ui-default/templates/user_register_mail.html @@ -1,6 +1,6 @@ {% extends "layout/mail.html" %} {% block title %}{{ _('Sign Up') }}{% endblock %} {% block content %} -

{{ _('Hello! You can click following link to sign up your {0} account:').format(model.system.get('server.name')) }}

+

{{ _('Hello! You can click following link to sign up your {0} account:').format(handler.domain.ui.name|default(model.system.get('server.name'))) }}

{{ url_prefix|safe }}{{ path|safe }}

{% endblock %} diff --git a/packages/ui-default/templates/wiki_help.html b/packages/ui-default/templates/wiki_help.html index eaa0a0b77..ec76adb53 100644 --- a/packages/ui-default/templates/wiki_help.html +++ b/packages/ui-default/templates/wiki_help.html @@ -1,6 +1,6 @@ {% extends "layout/wiki_base.html" %} {% block wiki_content %} -{% set name = model.system.get('server.name') %} +{% set name = handler.domain.ui.name|default(model.system.get('server.name')) %}

{{ _('Domain') }}