From 48e8c7b3fd826ce60c38afc2a320893a0ddd27ac Mon Sep 17 00:00:00 2001 From: panda Date: Fri, 8 Mar 2024 17:17:36 +0800 Subject: [PATCH] ui: only render extra content on richmedia class (#743) --- packages/ui-default/components/discussion/history.page.tsx | 2 +- .../ui-default/components/highlighter/highlighter.page.ts | 2 +- packages/ui-default/components/katex/katex.page.js | 4 ++-- packages/ui-default/templates/about.html | 2 +- .../ui-default/templates/components/comments_discussion.html | 4 ++-- .../ui-default/templates/components/comments_solution.html | 4 ++-- packages/ui-default/templates/contest_detail.html | 2 +- packages/ui-default/templates/contest_manage.html | 4 ++-- packages/ui-default/templates/contest_problemlist.html | 4 ++-- packages/ui-default/templates/discussion_detail.html | 2 +- packages/ui-default/templates/domain_dashboard.html | 2 +- packages/ui-default/templates/homework_detail.html | 2 +- packages/ui-default/templates/partials/homepage/bulletin.html | 2 +- packages/ui-default/templates/partials/training_detail.html | 2 +- packages/ui-default/templates/training_detail.html | 2 +- packages/ui-default/templates/user_detail.html | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/ui-default/components/discussion/history.page.tsx b/packages/ui-default/components/discussion/history.page.tsx index 8715a39fb..891cdc4a6 100644 --- a/packages/ui-default/components/discussion/history.page.tsx +++ b/packages/ui-default/components/discussion/history.page.tsx @@ -12,7 +12,7 @@ async function historyDialog(payload, time, uid) { const rawHtml = await fetch(`${payload}?time=${ts}&render=1`).then((res) => res.text()); new InfoDialog({ $body: tpl` -
+

${uid}
${i18n('Edited at')} ${time}

${{ templateRaw: true, html: rawHtml }}
`, diff --git a/packages/ui-default/components/highlighter/highlighter.page.ts b/packages/ui-default/components/highlighter/highlighter.page.ts index c9a2db8ce..7ae2b41b8 100644 --- a/packages/ui-default/components/highlighter/highlighter.page.ts +++ b/packages/ui-default/components/highlighter/highlighter.page.ts @@ -17,7 +17,7 @@ const highlighterPage = new AutoloadPage('highlighterPage', () => { $container.find('pre code').get().forEach((code) => { const $code = $(code); const $root = $code.parent().parent(); - const $typo = $code.closest('.typo'); + const $typo = $code.closest('.richmedia'); const language = ($(code).attr('class') || '').trim(); const m = language.match(/language-input([0-9]+)/); if (m?.[1]) { diff --git a/packages/ui-default/components/katex/katex.page.js b/packages/ui-default/components/katex/katex.page.js index 8ee0eb23a..283224b4c 100644 --- a/packages/ui-default/components/katex/katex.page.js +++ b/packages/ui-default/components/katex/katex.page.js @@ -18,8 +18,8 @@ const katexPage = new AutoloadPage('katexPage', () => { ], })); } - runKatex($('.typo')); - $(document).on('vjContentNew', (e) => runKatex($(e.target).find('.typo').addBack('.typo'))); + runKatex($('.richmedia')); + $(document).on('vjContentNew', (e) => runKatex($(e.target).find('.richmedia').addBack('.richmedia'))); }); }); diff --git a/packages/ui-default/templates/about.html b/packages/ui-default/templates/about.html index 2970e081b..33c861c6c 100644 --- a/packages/ui-default/templates/about.html +++ b/packages/ui-default/templates/about.html @@ -6,7 +6,7 @@

{{ section.title }}

-
+
{{ section.content|markdown|safe }}
diff --git a/packages/ui-default/templates/components/comments_discussion.html b/packages/ui-default/templates/components/comments_discussion.html index f3c166d5c..5c5d2e501 100644 --- a/packages/ui-default/templates/components/comments_discussion.html +++ b/packages/ui-default/templates/components/comments_discussion.html @@ -110,7 +110,7 @@ {% endif %}
-
+
{{ doc['content']|markdown|safe }}
{% for e in Object.entries(doc.react or {})|sort(true, false, 1)|selectattr(1) %} @@ -148,7 +148,7 @@ {% endif %}
-
+
{{ rdoc.content|markdown|safe }}
diff --git a/packages/ui-default/templates/components/comments_solution.html b/packages/ui-default/templates/components/comments_solution.html index 02651254a..2e41b7fc1 100644 --- a/packages/ui-default/templates/components/comments_solution.html +++ b/packages/ui-default/templates/components/comments_solution.html @@ -122,7 +122,7 @@ {% endif %}
-
+
{{ doc['content']|markdown|safe }}
@@ -152,7 +152,7 @@ {% endif %}
-
+
{{ rdoc['content']|markdown|safe }}
diff --git a/packages/ui-default/templates/contest_detail.html b/packages/ui-default/templates/contest_detail.html index 190ecfdd7..b2b8d2e6e 100644 --- a/packages/ui-default/templates/contest_detail.html +++ b/packages/ui-default/templates/contest_detail.html @@ -24,7 +24,7 @@
-
+
{{ tdoc['content']|markdown|safe }} {% if model.contest.isOngoing(tdoc, tsdoc) %}
diff --git a/packages/ui-default/templates/contest_manage.html b/packages/ui-default/templates/contest_manage.html index 228bf9aaf..a330cc626 100644 --- a/packages/ui-default/templates/contest_manage.html +++ b/packages/ui-default/templates/contest_manage.html @@ -74,7 +74,7 @@
{% endif %}
-
+
{{ doc['content']|markdown|safe }}
@@ -90,7 +90,7 @@ {{ _('Jury') }}
-
+
{{ rdoc['content']|markdown|safe }}
diff --git a/packages/ui-default/templates/contest_problemlist.html b/packages/ui-default/templates/contest_problemlist.html index 73495ad15..956e4dd66 100644 --- a/packages/ui-default/templates/contest_problemlist.html +++ b/packages/ui-default/templates/contest_problemlist.html @@ -117,7 +117,7 @@ {{_('Subject') }}: {{ contest.render_clarification_subject(tdoc,pdict,doc.subject) }} | {% if doc.owner == 0 %}{{ _('Jury') }}{% else %}{{ user.render_inline(udict[doc.owner], badge=false) }}{% endif %} @ {{ datetimeSpan(doc._id)|safe }} -
+
{{ doc['content']|markdown|safe }}
@@ -133,7 +133,7 @@ {{ _('Jury') }} @ {{ datetimeSpan(rdoc['_id'])|safe }} -
+
{{ rdoc['content']|markdown|safe }}
diff --git a/packages/ui-default/templates/discussion_detail.html b/packages/ui-default/templates/discussion_detail.html index d2c548d13..3eadcbfa8 100644 --- a/packages/ui-default/templates/discussion_detail.html +++ b/packages/ui-default/templates/discussion_detail.html @@ -25,7 +25,7 @@ {{ datetimeSpan(ddoc._id)|safe }} -
+
{{ ddoc['content']|markdown|safe }}
diff --git a/packages/ui-default/templates/domain_dashboard.html b/packages/ui-default/templates/domain_dashboard.html index f771df3b6..3c4dc0bbd 100644 --- a/packages/ui-default/templates/domain_dashboard.html +++ b/packages/ui-default/templates/domain_dashboard.html @@ -3,7 +3,7 @@ {% block domain_content %} {% if domain.bulletin %}
-
+
{{ domain.bulletin|markdown|safe }}
diff --git a/packages/ui-default/templates/homework_detail.html b/packages/ui-default/templates/homework_detail.html index b7af9b7d6..735d32c8f 100644 --- a/packages/ui-default/templates/homework_detail.html +++ b/packages/ui-default/templates/homework_detail.html @@ -8,7 +8,7 @@

{{ _('Homework Introduction') }}

-
+
{{ tdoc['content']|markdown|safe }}
diff --git a/packages/ui-default/templates/partials/homepage/bulletin.html b/packages/ui-default/templates/partials/homepage/bulletin.html index 2c1707e8e..767e2c13b 100644 --- a/packages/ui-default/templates/partials/homepage/bulletin.html +++ b/packages/ui-default/templates/partials/homepage/bulletin.html @@ -1,6 +1,6 @@ {% if domain.bulletin %}
-
+
{{ domain.bulletin|markdown|safe }}
diff --git a/packages/ui-default/templates/partials/training_detail.html b/packages/ui-default/templates/partials/training_detail.html index f835df3b6..a0e9c2797 100644 --- a/packages/ui-default/templates/partials/training_detail.html +++ b/packages/ui-default/templates/partials/training_detail.html @@ -60,7 +60,7 @@
{% endif %} {% if node['content'] %} -
+
{{ node['content']|markdown|safe }}
{% endif %} diff --git a/packages/ui-default/templates/training_detail.html b/packages/ui-default/templates/training_detail.html index 495c998a5..34d1f8861 100644 --- a/packages/ui-default/templates/training_detail.html +++ b/packages/ui-default/templates/training_detail.html @@ -45,7 +45,7 @@
{{ tdoc['content'] }}
-
+
{% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}

{{ _('Login to join training plan') }}

diff --git a/packages/ui-default/templates/user_detail.html b/packages/ui-default/templates/user_detail.html index 2afb65fd3..a24a95ce9 100644 --- a/packages/ui-default/templates/user_detail.html +++ b/packages/ui-default/templates/user_detail.html @@ -97,7 +97,7 @@ {% if not udoc.bio %} {{ nothing.render("This person is lazy and didn't write anything.") }} {% else %} -
+
{{ udoc.bio|default('')|markdown|safe }}
{% endif %}