From 4bc8ba9af396a8db0ce8fa7536a626210a817921 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 31 Aug 2021 20:18:29 +0800 Subject: [PATCH] ui: custom badge --- packages/hydrooj/src/model/setting.ts | 4 +- packages/ui-default/package.json | 2 +- .../ui-default/templates/components/user.html | 10 +- .../ui-default/templates/contest_edit.html | 130 +++++++++--------- .../ui-default/templates/discussion_edit.html | 20 +-- 5 files changed, 86 insertions(+), 80 deletions(-) diff --git a/packages/hydrooj/src/model/setting.ts b/packages/hydrooj/src/model/setting.ts index 3644befeb..bacc039fa 100644 --- a/packages/hydrooj/src/model/setting.ts +++ b/packages/hydrooj/src/model/setting.ts @@ -133,6 +133,7 @@ AccountSetting( Setting('setting_storage', 'unreadMsg', 0, 'number', 'Unread Message Count', null, FLAG_DISABLED | FLAG_HIDDEN), Setting('setting_storage', 'checkincnt', 0, 'number', 'Check In Counter', null, FLAG_DISABLED | FLAG_HIDDEN), Setting('setting_storage', 'lastcheckin', 0, 'number', 'Last checkin time', null, FLAG_DISABLED | FLAG_HIDDEN), + Setting('setting_storage', 'badge', '', 'text', 'badge info', null, FLAG_DISABLED | FLAG_HIDDEN), ); DomainSetting( @@ -172,7 +173,6 @@ SystemSetting( Setting('setting_smtp', 'smtp.secure', false, 'boolean', 'smtp.secure', 'SSL'), Setting('setting_smtp', 'smtp.verify', true, 'boolean', 'smtp.verify', 'Verify register email'), Setting('setting_server', 'server.center', 'https://hydro.undefined.moe:8443/center', 'text', 'server.center', '', FLAG_HIDDEN), - Setting('setting_server', 'server.proxy', false, 'boolean', 'server.proxy', 'Use hydro center proxy to send problems'), Setting('setting_server', 'server.name', 'Hydro', 'text', 'server.name', 'Server Name'), Setting('setting_server', 'server.displayName', 'Hydro', 'text', 'server.name', 'Server Name (Global Display)', FLAG_PRO), Setting('setting_server', 'server.worker', 1, 'number', 'server.worker', 'Server Workers Number', FLAG_PRO), @@ -200,7 +200,7 @@ SystemSetting( Setting('setting_basic', 'pagination.training', 10, 'number', 'pagination.training', 'Trainings per page'), Setting('setting_basic', 'pagination.reply', 50, 'number', 'pagination.reply', 'Replies per page'), Setting('setting_session', 'session.keys', [String.random(32)], 'text', 'session.keys', 'session.keys', FLAG_HIDDEN), - Setting('setting_session', 'session.secure', false, 'boolean', 'session.secure', 'session.secure'), + Setting('setting_session', 'session.secure', false, 'boolean', 'session.secure', 'session.secure', FLAG_HIDDEN), Setting('setting_session', 'session.saved_expire_seconds', 3600 * 24 * 30, 'number', 'session.saved_expire_seconds', 'Saved session expire seconds'), Setting('setting_session', 'session.unsaved_expire_seconds', 3600 * 3, diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 0b6a1dee6..4b5264f63 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.18.13", + "version": "4.18.14", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/components/user.html b/packages/ui-default/templates/components/user.html index 52cbd2cb6..1efc92660 100644 --- a/packages/ui-default/templates/components/user.html +++ b/packages/ui-default/templates/components/user.html @@ -12,8 +12,14 @@ {% endif %} {% if badge %} - {% set level = udoc.level|default(0) %} - + {% if udoc.badge %} + {% set _badge = udoc.badge.split('#') %} + + {% endif %} + {% if udoc.level %} + {% set level = udoc.level %} + + {% endif %} {% if modbadge %} {% if udoc.hasPriv(PRIV.PRIV_MOD_BADGE) %} diff --git a/packages/ui-default/templates/contest_edit.html b/packages/ui-default/templates/contest_edit.html index c3b07ea43..e6a7bd315 100644 --- a/packages/ui-default/templates/contest_edit.html +++ b/packages/ui-default/templates/contest_edit.html @@ -7,96 +7,96 @@
{{ form.form_select({ - columns:3, - label:'Rule', - name:'rule', - options:rules, - value:tdoc['rule']|default(''), - row:false + columns:3, + label:'Rule', + name:'rule', + options:rules, + value:tdoc['rule']|default(''), + row:false }) }} {{ form.form_text({ - columns:4, - label:'Title', - name:'title', - placeholder:_('title'), - value:tdoc.title|default(''), - autofocus:true, - row:false + columns:4, + label:'Title', + name:'title', + placeholder:_('title'), + value:tdoc.title|default(''), + autofocus:true, + row:false }) }} {{ form.form_text({ - columns:3, - label:'Invitation Code', - name:'code', - placeholder:_('(leave blank if none)'), - value:tdoc._code|default(''), - row:false + columns:3, + label:'Invitation Code', + name:'code', + placeholder:_('(leave blank if none)'), + value:tdoc._code|default(''), + row:false }) }} {{ form.form_checkbox({ - columns:2, - label:'Rated', - name:'rated', - placeholder:_('Is rated'), - value:tdoc.rated|default(true), - row:false + columns:2, + label:'Rated', + name:'rated', + placeholder:_('Is rated'), + value:tdoc.rated|default(true), + row:false }) }}
{{ form.form_text({ - columns:4, - label:'Begin Date', - name:'beginAtDate', - placeholder:'YYYY-mm-dd', - value:date_text, - date:true, - row:false + columns:4, + label:'Begin Date', + name:'beginAtDate', + placeholder:'YYYY-mm-dd', + value:date_text, + date:true, + row:false }) }} {{ form.form_text({ - columns:4, - label:'Begin Time', - name:'beginAtTime', - placeholder:'HH:MM', - value:time_text, - time:true, - row:false + columns:4, + label:'Begin Time', + name:'beginAtTime', + placeholder:'HH:MM', + value:time_text, + time:true, + row:false }) }} {{ form.form_text({ - columns:4, - label:'Duration (hours)', - name:'duration', - value:duration|default('3'), - row:false + columns:4, + label:'Duration (hours)', + name:'duration', + value:duration|default('3'), + row:false }) }}
{{ form.form_text({ - columns:null, - label:'Problems', - name:'pids', - value:pids, - placeholder:_("Seperated with ','") + columns:null, + label:'Problems', + name:'pids', + value:pids, + placeholder:_("Seperated with ','") }) }} {{ form.form_textarea({ - columns:null, - label:'Content', - name:'content', - value:tdoc['content']|default(''), - markdown:true + columns:null, + label:'Content', + name:'content', + value:tdoc['content']|default(''), + markdown:true }) }}
{% if page_name == 'contest_edit' %} - - {% if handler.user.own(tdoc) or handler.user.hasPerm(perm.PERM_EDIT_CONTEST) %} - - {% endif %} + + {% if handler.user.own(tdoc) or handler.user.hasPerm(perm.PERM_EDIT_CONTEST) %} + + {% endif %} {% else %} - + {% endif %} - {% if handler.user.own(ddoc) or handler.user.hasPerm(perm.PERM_DELETE_DISCUSSION) %} - - {% endif %} +
+ + + {% if handler.user.own(ddoc) or handler.user.hasPerm(perm.PERM_DELETE_DISCUSSION) %} + + {% endif %}