Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-17 17:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #887 from hydro-dev/remove-union

Browse Source
This commit is contained in:
undefined authored and GitHub committed 2024-10-23 14:18:28 +01:00
2 parents 25a24eda9d eb26feb655
commit 965b18d8a6
12 files changed
+88 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/templates/components/problem.html
+7 -9
View File
@@ -1,17 +1,15 @@
{% macro render_problem_title(pdoc, tdoc=none, show_tags=true, show_invisible_flag=true, invalid=false, inline=false, small=false, alphabetic=false) %}
{% macro render_problem_title(pdoc, tdoc=none, show_tags=true, show_invisible_flag=true, invalid=false, inline=false, show_pid=true, small=false, alphabetic=false) %}
{%- if not invalid -%}
{% set _linkArgs = { pid:pdoc.pid|default(pdoc.docId) } %}
{% if tdoc %}{{ set(_linkArgs, 'query', {tid:tdoc.docId}) }}{% endif %}
{% if pdoc.domainId !== handler.args.domainId %}{{ set(_linkArgs, 'domainId', pdoc.domainId) }}{% endif %}
<a href="{{ url('problem_detail', _linkArgs) }}"{% if small %} data-tooltip="{{ pdoc.title }}"{% endif %}>
{%- endif -%}
{%- if pdoc.domainId !== handler.args.domainId -%}<b>{{ pdoc.domainId }}#</b>{%- endif -%}
{%- if tdoc and alphabetic -%}
<b>{{ String.fromCharCode(65 + tdoc.pids.indexOf(pdoc.docId)) if tdoc.pids.includes(pdoc.docId) else '#' }}</b>
{%- else -%}
<b>{{ pdoc.pid or ('P'+pdoc.docId if pdoc.domainId === handler.args.domainId else pdoc.docId) }}</b>
{%- endif -%}
{%- if not small -%}&nbsp;&nbsp;{{ pdoc.title }}{%- endif -%}
{% if show_pid %}
<b>{%- if tdoc and alphabetic -%}{{ String.fromCharCode(65+tdoc.pids.indexOf(pdoc.docId)) }}
{%- elif pdoc.pid and pdoc.pid.includes('-') -%}{{ pdoc.pid.split('-').join('#') }}
{%- else -%}{{ pdoc.pid|default(pdoc.docId) }}{%- endif -%}</b>
{% endif %}
{%- if not small -%}{% if show_pid %}&nbsp;&nbsp;{% endif %}{{ pdoc.title }}{%- endif -%}
{%- if not invalid -%}
</a>
{%- endif -%}
packages/ui-default/templates/partials/homepage/recent_problems.html
+1 -1
View File
@@ -8,7 +8,7 @@
<div class="section__body typo no-media col--problem-name">
{%- for pdoc in pdocs -%}
<p>
{{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}
{{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false, show_pid=false) }}
<span style="float: right">{{ datetimeSpan(pdoc._id)|safe }}</span>
</p>
{%- endfor -%}
packages/ui-default/templates/problem_detail.html
+7 -1
View File
@@ -45,7 +45,13 @@
</button>
</form>
{% endif %}
#{{ String.fromCharCode(65+tdoc.pids.indexOf(pdoc.docId)) if tdoc else pdoc.pid|default(pdoc.docId) }}. {{ pdoc.title }}
{%- if tdoc -%}
{{ String.fromCharCode(65+tdoc.pids.indexOf(pdoc.docId)) }}
{%- elif pdoc.pid and pdoc.pid.includes('-') -%}
{{ pdoc.pid.split('-').join('#') }}
{%- else -%}
#{{ pdoc.pid|default(pdoc.docId) }}
{%- endif -%}. {{ pdoc.title }}
</h1>
{% if tdoc and tdoc.pids|length <= 26 %}
<div class="section__tools contest-problems">