ui: custom badge

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,

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.18.13",
+  "version": "4.18.14",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",

packages/ui-default/templates/components/user.html

@@ -12,8 +12,14 @@
     {% endif %}
   </a>
   {% if badge %}
-    {% set level = udoc.level|default(0) %}
-    <a class="user-profile-badge v-center badge--lv{{ level }}" href="{{ url('user_detail', uid=udoc._id) }}" data-tooltip="LV {{ level }}: Top {{ model.builtin.LEVELS[level]|default('N/A') }}%">LV {{ level }}</a>
+    {% if udoc.badge %}
+      {% set _badge = udoc.badge.split('#') %}
+      <span class="user-profile-badge v-center" style="background-color:#{{ _badge[1] }}{% if _badge[2] %};color:#{{ _badge[2] }}{% endif %}">{{ _badge[0] }}</span>
+    {% endif %}
+    {% if udoc.level %}
+      {% set level = udoc.level %}
+      <a class="user-profile-badge v-center badge--lv{{ level }}" href="{{ url('user_detail', uid=udoc._id) }}" data-tooltip="LV {{ level }}: Top {{ model.builtin.LEVELS[level]|default('N/A') }}%">LV {{ level }}</a>
+    {% endif %}
     {% if modbadge %}
       {% if udoc.hasPriv(PRIV.PRIV_MOD_BADGE) %}
         <span class="user-profile-badge v-center badge--su" data-tooltip="{{ _('SuperUser') }}">SU</span>

packages/ui-default/templates/contest_edit.html

@@ -7,96 +7,96 @@
         <form method="post">
           <div class="row">
             {{ 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
             }) }}
           </div>
           <div class="row">
             {{ 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
             }) }}
           </div>
           {{ 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
           }) }}
           <div class="row">
             <div class="columns">
               <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
               {% if page_name == 'contest_edit' %}
-              <button type="submit" class="rounded primary button">
-                {{ _('Update') }}
-              </button>
-              {% if handler.user.own(tdoc) or handler.user.hasPerm(perm.PERM_EDIT_CONTEST) %}
-              <button name="operation" value="delete" type="submit" class="rounded button">
-                {{ _('Delete') }}
-              </button>
-              {% endif %}
+                <button type="submit" class="rounded primary button">
+                  {{ _('Update') }}
+                </button>
+                {% if handler.user.own(tdoc) or handler.user.hasPerm(perm.PERM_EDIT_CONTEST) %}
+                  <button name="operation" value="delete" type="submit" class="rounded button">
+                    {{ _('Delete') }}
+                  </button>
+                {% endif %}
               {% else %}
-              <button type="submit" class="rounded primary button">
-                {{ _('Create') }}
-              </button>
+                <button type="submit" class="rounded primary button">
+                  {{ _('Create') }}
+                </button>
               {% endif %}
               <button type="button" class="rounded button" onclick="window.history.go(-1)">
                 {{ _('Cancel') }}

packages/ui-default/templates/discussion_edit.html

@@ -6,16 +6,16 @@
       <div class="section__body">
         <form method="post">
           {% include "partials/discussion_edit_form.html" %}
-          <div class="row"><div class="columns">
-            <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
-            <button name="operation" value="update" type="submit" class="rounded primary button">
-              {{ _('Update') }} (Ctrl+Enter)
-            </button>
-          {% if handler.user.own(ddoc) or handler.user.hasPerm(perm.PERM_DELETE_DISCUSSION) %}
-            <button name="operation" value="delete" type="submit" class="rounded button">
-              {{ _('Delete') }}
-            </button>
-          {% endif %}
+            <div class="row"><div class="columns">
+              <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
+              <button name="operation" value="update" type="submit" class="rounded primary button">
+                {{ _('Update') }} (Ctrl+Enter)
+              </button>
+            {% if handler.user.own(ddoc) or handler.user.hasPerm(perm.PERM_DELETE_DISCUSSION) %}
+              <button name="operation" value="delete" type="submit" class="rounded button">
+                {{ _('Delete') }}
+              </button>
+            {% endif %}
             <button type="button" class="rounded button" onclick="window.history.go(-1)">
               {{ _('Cancel') }}
             </button>