From c535ae4415e974e9a0eca02ef2ed1a8b93fb4cff Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 26 Sep 2023 13:05:00 -0500 Subject: [PATCH 01/51] Fix bug for without href --- resources/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/common.js b/resources/common.js index d34e259..185eb7c 100644 --- a/resources/common.js +++ b/resources/common.js @@ -387,7 +387,7 @@ function onWindowReady() { }); $('a').click(function() { var href = $(this).attr('href'); - if (href === '#' || href.startsWith("javascript")) { + if (!href || href === '#' || href.startsWith("javascript")) { return; } From cbcbbc5277829b32eb7b4c40cfdec6b4d230495f Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 27 Sep 2023 18:07:24 -0500 Subject: [PATCH 02/51] Add chunk upload dir to settings --- dmoj/settings.py | 3 +++ judge/utils/fine_uploader.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dmoj/settings.py b/dmoj/settings.py index d5cfa38..e136a4d 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -485,6 +485,9 @@ META_REMOTE_ADDRESS_KEY = "REMOTE_ADDR" DEFAULT_AUTO_FIELD = "django.db.models.AutoField" +# Chunk upload +CHUNK_UPLOAD_DIR = "/tmp/chunk_upload_tmp" + try: with open(os.path.join(os.path.dirname(__file__), "local_settings.py")) as f: exec(f.read(), globals()) diff --git a/judge/utils/fine_uploader.py b/judge/utils/fine_uploader.py index a9909a7..2a22ccf 100644 --- a/judge/utils/fine_uploader.py +++ b/judge/utils/fine_uploader.py @@ -35,7 +35,7 @@ def save_upload(f, path): # pass callback function to post_upload def handle_upload(f, fileattrs, upload_dir, post_upload=None): - chunks_dir = os.path.join(tempfile.gettempdir(), "chunk_upload_tmp") + chunks_dir = settings.CHUNK_UPLOAD_DIR if not os.path.exists(os.path.dirname(chunks_dir)): os.makedirs(os.path.dirname(chunks_dir)) chunked = False From 0e1a3992ebcec6343f371f80143282f4b422f250 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 28 Sep 2023 18:23:39 -0500 Subject: [PATCH 03/51] Comment page speed --- judge/comments.py | 7 ++++--- judge/views/comment.py | 15 ++++----------- templates/comments/content-list.html | 9 +++------ templates/comments/media-js.html | 2 +- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/judge/comments.py b/judge/comments.py index be33a4e..65d8f7e 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -168,7 +168,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): ) def _get_queryset(self, target_comment): - if target_comment != None: + if target_comment: queryset = target_comment.get_descendants(include_self=True) queryset = ( queryset.select_related("author__user") @@ -217,11 +217,11 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): context["has_comments"] = queryset.exists() context["comment_lock"] = self.is_comment_locked() - context["comment_list"] = queryset + context["comment_list"] = list(queryset) context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD if queryset.exists(): - context["comment_root_id"] = queryset[0].id + context["comment_root_id"] = context["comment_list"][0].id else: context["comment_root_id"] = 0 context["comment_parent_none"] = 1 @@ -234,4 +234,5 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): context["limit"] = DEFAULT_OFFSET context["comment_count"] = comment_count + context["profile"] = self.request.profile return context diff --git a/judge/views/comment.py b/judge/views/comment.py index 03285ad..58ba3fc 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -15,12 +15,11 @@ from django.http import ( HttpResponseBadRequest, HttpResponseForbidden, ) -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.utils.translation import gettext as _ from django.views.decorators.http import require_POST from django.views.generic import DetailView, UpdateView from django.urls import reverse_lazy -from django.template import loader from reversion import revisions from reversion.models import Version @@ -42,11 +41,6 @@ __all__ = [ @login_required - -# def get_more_reply(request, id): -# queryset = Comment.get_pk(id) - - def vote_comment(request, delta): if abs(delta) != 1: return HttpResponseBadRequest( @@ -164,10 +158,11 @@ def get_comments(request, limit=10): new_offset = offset + min(len(queryset), limit) - comment_html = loader.render_to_string( + return render( + request, "comments/content-list.html", { - "request": request, + "profile": profile, "comment_root_id": comment_root_id, "comment_list": queryset, "vote_hide_threshold": settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD, @@ -181,8 +176,6 @@ def get_comments(request, limit=10): }, ) - return HttpResponse(comment_html) - def get_show_more(request): return get_comments(request) diff --git a/templates/comments/content-list.html b/templates/comments/content-list.html index c08fd46..ebf0c31 100644 --- a/templates/comments/content-list.html +++ b/templates/comments/content-list.html @@ -1,13 +1,10 @@ -{% set logged_in = request.user.is_authenticated %} -{% set profile = request.profile if logged_in else None %} - {% for node in mptt_tree(comment_list) recursive %}
  • - {% if logged_in %} + {% if profile %} {% else %} @@ -16,7 +13,7 @@ {% endif %}
    {{ node.score }}
    - {% if logged_in %} + {% if profile %} {% else %} @@ -55,7 +52,7 @@ - {% if logged_in and not comment_lock %} + {% if profile and not comment_lock %} {% set can_edit = node.author.id == profile.id and not profile.mute %} {% if can_edit %} $(document).ready(function () { - let loading_gif = ""; + let loading_gif = ""; window.reply_comment = function (parent) { var $comment_reply = $('#comment-' + parent + '-reply'); var reply_id = 'reply-' + parent; From 21905fd1db60c3e4a6503f5ee2acd09ef1218477 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 29 Sep 2023 00:37:28 -0500 Subject: [PATCH 04/51] Fix local var error --- judge/views/comment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/judge/views/comment.py b/judge/views/comment.py index 58ba3fc..6965201 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -150,6 +150,7 @@ def get_comments(request, limit=10): revisions=Count("versions", distinct=True), )[offset : offset + limit] ) + profile = None if request.user.is_authenticated: profile = request.profile queryset = queryset.annotate( From 067214b587670e508f52cc5968ca0c4b7a5fcd05 Mon Sep 17 00:00:00 2001 From: Bao Le <127121163+BaoLe106@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:30:46 +0800 Subject: [PATCH 05/51] Markdown Editor (#85) --- dmoj/urls.py | 6 + judge/views/markdown_editor.py | 14 ++ locale/vi/LC_MESSAGES/django.po | 13 ++ locale/vi/LC_MESSAGES/dmoj-user.po | 7 + .../markdown_editor/markdown_editor.html | 134 ++++++++++++++++++ 5 files changed, 174 insertions(+) create mode 100644 judge/views/markdown_editor.py create mode 100644 templates/markdown_editor/markdown_editor.html diff --git a/dmoj/urls.py b/dmoj/urls.py index 402a569..4e0691e 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -44,6 +44,7 @@ from judge.views import ( language, license, mailgun, + markdown_editor, notification, organization, preview, @@ -405,6 +406,11 @@ urlpatterns = [ ] ), ), + url( + r"^markdown_editor/", + markdown_editor.MarkdownEditor.as_view(), + name="markdown_editor", + ), url( r"^submission_source_file/(?P(\w|\.)+)", submission.SubmissionSourceFileView.as_view(), diff --git a/judge/views/markdown_editor.py b/judge/views/markdown_editor.py new file mode 100644 index 0000000..a014ba6 --- /dev/null +++ b/judge/views/markdown_editor.py @@ -0,0 +1,14 @@ +from django.views import View +from django.shortcuts import render +from django.utils.translation import gettext_lazy as _ + + +class MarkdownEditor(View): + def get(self, request): + return render( + request, + "markdown_editor/markdown_editor.html", + { + "title": _("Markdown Editor"), + }, + ) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index a4dde83..4497f98 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -130,6 +130,18 @@ msgstr "Thể thức" msgid "Rating" msgstr "" +#: templates/markdown_editor/markdown_editor.html:107 +msgid "Insert Image" +msgstr "Chèn hình ảnh" + +#: templates/markdown_editor/markdown_editor.html:110 +msgid "From the web" +msgstr "Từ web" + +#: templates/markdown_editor/markdown_editor.html:116 +msgid "From your computer" +msgstr "Từ máy tính của bạn" + #: judge/admin/contest.py:201 msgid "Access" msgstr "Truy cập" @@ -6255,3 +6267,4 @@ msgstr "Chọn tất cả" #~ msgid "Hard" #~ msgstr "Khó" + diff --git a/locale/vi/LC_MESSAGES/dmoj-user.po b/locale/vi/LC_MESSAGES/dmoj-user.po index ffd36e9..4ea605c 100644 --- a/locale/vi/LC_MESSAGES/dmoj-user.po +++ b/locale/vi/LC_MESSAGES/dmoj-user.po @@ -39,6 +39,12 @@ msgstr "Đăng ký tên" msgid "Report" msgstr "Báo cáo" +msgid "Insert Image" +msgstr "Chèn hình ảnh" + +msgid "Save" +msgstr "Lưu" + msgid "2sat" msgstr "" @@ -593,3 +599,4 @@ msgstr "" msgid "z-function" msgstr "" + diff --git a/templates/markdown_editor/markdown_editor.html b/templates/markdown_editor/markdown_editor.html new file mode 100644 index 0000000..04418e4 --- /dev/null +++ b/templates/markdown_editor/markdown_editor.html @@ -0,0 +1,134 @@ +{% extends "base.html" %} + +{% block media %} + +{% endblock %} + +{% block js_media %} + + + + + + + + + + + + + + +{% endblock %} + +{% block title_row %} +{% endblock %} + +{% block body %} + + +
    +
    +
    +{% endblock %} + From c64baad181232dd4baacd17f490545fa708f7f5a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 5 Oct 2023 01:09:09 -0500 Subject: [PATCH 06/51] Fix xss --- templates/contest/list.html | 96 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/templates/contest/list.html b/templates/contest/list.html index 226b219..184a70e 100644 --- a/templates/contest/list.html +++ b/templates/contest/list.html @@ -112,56 +112,54 @@ {% endblock %} {% macro contest_head(contest) %} - {% spaceless %} - - {{- contest.name -}} - -
    -
    - {% if not contest.is_visible %} - - {{ _('hidden') }} - + + {{contest.name}} + +
    +
    + {% if not contest.is_visible %} + + {{ _('hidden') }} + + {% endif %} + {% if contest.is_editable %} + + + {{ _('Edit') }} + + + {% endif %} + {% if contest.is_private %} + + {{ _('private') }} + + {% endif %} + {% if not hide_contest_orgs %} + {% if contest.is_organization_private %} + {% for org in contest.organizations.all() %} + + + {{ org.name }} + + + {% endfor %} {% endif %} - {% if contest.is_editable %} - - - {{ _('Edit') }} - - - {% endif %} - {% if contest.is_private %} - - {{ _('private') }} - - {% endif %} - {% if not hide_contest_orgs %} - {% if contest.is_organization_private %} - {% for org in contest.organizations.all() %} - - - {{ org.name }} - - - {% endfor %} - {% endif %} - {% endif %} - {% if contest.is_rated %} - - {{ _('rated') }} - - {% endif %} - {% for tag in contest.tags.all() %} - - - {{- tag.name -}} - - - {% endfor %} -
    - {% endspaceless %} + {% endif %} + {% if contest.is_rated %} + + {{ _('rated') }} + + {% endif %} + {% for tag in contest.tags.all() %} + + + {{- tag.name -}} + + + {% endfor %} +
    {% endmacro %} {% macro time_left(contest, padding_top = true) %} From 458b9e425efd3e2a23f10dff589c73126b60b186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=B5=20Trung=20Ho=C3=A0ng=20H=C6=B0ng?= <89190591+HungBacktracking@users.noreply.github.com> Date: Fri, 6 Oct 2023 01:06:21 +0700 Subject: [PATCH 07/51] fix color in pagination of contest page (#86) --- resources/widgets.scss | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/resources/widgets.scss b/resources/widgets.scss index 3f2ea95..942b39e 100644 --- a/resources/widgets.scss +++ b/resources/widgets.scss @@ -322,7 +322,7 @@ input { // Bootstrap-y pagination ul.pagination a:hover { color: #FFF; - background: #0aa082; + background: #cc4e17; border: none; } @@ -338,22 +338,6 @@ ul.pagination { li { display: inline; - // &:first-child > { - // a, span { - // margin-left: 0; - // border-top-left-radius: $widget_border_radius; - // border-bottom-left-radius: $widget_border_radius; - // } - // } - - // &:last-child > { - // a, span { - // margin-left: 0; - // border-top-right-radius: $widget_border_radius; - // border-bottom-right-radius: $widget_border_radius; - // } - // } - > { a, span { position: relative; @@ -373,15 +357,15 @@ ul.pagination { .disabled-page > { a { - color: #888; - background-color: #04534380; - border-color: #04534380; + color: #f1efef; + background-color: #ab6247; + border-color: #6a240b; } span { - color: #888; - background-color: #04534380; - border-color: #04534380; + color: #f1efef; + background-color: #ab6247; + border-color: #6a240b; } } From 49d1bc2e1bbf1c7ac20ae970716e7a554b710e68 Mon Sep 17 00:00:00 2001 From: Bao Le <127121163+BaoLe106@users.noreply.github.com> Date: Fri, 6 Oct 2023 02:08:24 +0800 Subject: [PATCH 08/51] Markdown editor improvements (#87) --- .../markdown_editor/markdown_editor.html | 103 ++++++++++-------- 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/templates/markdown_editor/markdown_editor.html b/templates/markdown_editor/markdown_editor.html index 04418e4..c56a6c5 100644 --- a/templates/markdown_editor/markdown_editor.html +++ b/templates/markdown_editor/markdown_editor.html @@ -2,20 +2,19 @@ {% block media %} {% endblock %} @@ -49,13 +51,15 @@ preview: $(this).val() }, success: function(data) { - $('#display').html(data) + $('#display').html(data); + MathJax.typeset(); }, error: function(error) { alert(error); console.log(error.message) } }) + }); }); @@ -90,45 +94,50 @@ {% block title_row %} {% endblock %} -{% block body %} -
    - -
    -
    -
    -
    - -
    -
    -
    {{_('Update Preview')}}
    -
    -
    -
    -

    {{_('Insert Image')}}

    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - -

    {{_('Cancel')}}

    -
    -
    -
    -
    -
    +{% block title_ruler %} +{% endblock %} -
    -
    +{% block body %} +
    +
    + +
    +
    +
    +
    + +
    +
    +
    {{_('Update Preview')}}
    +
    +
    +
    +

    {{_('Insert Image')}}

    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + +

    {{_('Cancel')}}

    +
    +
    +
    +
    +
    + +
    +
    +
    {% endblock %} From 44aca3c2e56ab568badd264e077653eda857b2b9 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 5 Oct 2023 13:11:58 -0500 Subject: [PATCH 09/51] Add darkmode --- resources/darkmode.css | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/resources/darkmode.css b/resources/darkmode.css index 4947452..f9e4d3a 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -2552,7 +2552,7 @@ input[type="text"]:focus, input[type="password"]:focus { ul.pagination a:hover { color: rgb(232, 230, 227); background-image: initial; - background-color: rgb(8, 128, 104); + background-color: rgb(163, 62, 18); border-color: initial; } ul.pagination > li > a, @@ -2563,14 +2563,14 @@ ul.pagination > li > span { border-color: rgb(199, 70, 8); } ul.pagination > .disabled-page > a { - color: rgb(157, 148, 136); - background-color: rgba(3, 66, 54, 0.5); - border-color: rgba(126, 117, 103, 0.5); + color: rgb(223, 220, 215); + background-color: rgb(137, 78, 57); + border-color: rgb(199, 68, 21); } ul.pagination > .disabled-page > span { - color: rgb(157, 148, 136); - background-color: rgba(3, 66, 54, 0.5); - border-color: rgba(126, 117, 103, 0.5); + color: rgb(223, 220, 215); + background-color: rgb(137, 78, 57); + border-color: rgb(199, 68, 21); } ul.pagination > .active-page > a { color: rgb(232, 230, 227); @@ -3868,14 +3868,9 @@ mjx-merror { mjx-assistive-mml { border-color: initial !important; } -mjx-stretchy-v > mjx-ext { - border-color: transparent; -} -.recently-attempted ul { - list-style-image: initial; -} -.organization-row:last-child { - border-bottom-color: initial; +#users-table td:nth-child(2), +#users-table th:nth-child(2) { + border-right-color: initial; } /* Override Style */ From 9decd112186fdc662407920946c4e5cc221ec39d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 5 Oct 2023 14:00:20 -0500 Subject: [PATCH 10/51] Change textarea css --- resources/comments.scss | 2 +- resources/darkmode.css | 20 ++++++------- resources/dmmd-preview.css | 5 ++-- resources/pagedown_widget.css | 2 +- resources/pagedown_widget.scss | 54 +++++++++++++++++----------------- resources/widgets.scss | 10 +++---- 6 files changed, 46 insertions(+), 47 deletions(-) diff --git a/resources/comments.scss b/resources/comments.scss index c606f26..42dc90b 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -214,7 +214,7 @@ a { input, textarea { min-width: 100%; max-width: 100%; - font-size: 1em; + font-size: 15px; } } diff --git a/resources/darkmode.css b/resources/darkmode.css index f9e4d3a..f9a4884 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -2471,16 +2471,13 @@ input[type="text"], input[type="password"], input[type="email"], input[type="num box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 1px inset; } textarea { - color: rgb(178, 172, 162); background-image: none; background-color: rgb(24, 26, 27); border-color: rgb(62, 68, 70); box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 1px inset; } textarea:hover { - border-color: rgba(16, 87, 144, 0.8); - box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 1px inset, - rgba(16, 91, 150, 0.6) 0px 0px 4px; + border-color: rgb(140, 130, 115); } input[type="text"]:hover, input[type="password"]:hover { border-color: rgba(16, 87, 144, 0.8); @@ -2488,9 +2485,7 @@ input[type="text"]:hover, input[type="password"]:hover { rgba(16, 91, 150, 0.6) 0px 0px 4px; } textarea:focus { - border-color: rgba(16, 87, 144, 0.8); - box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 1px inset, - rgba(16, 91, 150, 0.6) 0px 0px 8px; outline-color: initial; + border-color: rgb(140, 130, 115); outline-color: initial; } input[type="text"]:focus, input[type="password"]:focus { border-color: rgba(16, 87, 144, 0.8); @@ -3868,9 +3863,14 @@ mjx-merror { mjx-assistive-mml { border-color: initial !important; } -#users-table td:nth-child(2), -#users-table th:nth-child(2) { - border-right-color: initial; +mjx-stretchy-v > mjx-ext { + border-color: transparent; +} +.recently-attempted ul { + list-style-image: initial; +} +.organization-row:last-child { + border-bottom-color: initial; } /* Override Style */ diff --git a/resources/dmmd-preview.css b/resources/dmmd-preview.css index 7a7fd1d..c768a0e 100644 --- a/resources/dmmd-preview.css +++ b/resources/dmmd-preview.css @@ -13,7 +13,7 @@ div.dmmd-preview-update { } div.dmmd-preview-content { - padding: 0 7px; + padding: 0 8px; } div.dmmd-preview.dmmd-preview-has-content div.dmmd-preview-update { @@ -21,7 +21,8 @@ div.dmmd-preview.dmmd-preview-has-content div.dmmd-preview-update { } div.dmmd-preview-has-content div.dmmd-preview-content { - padding-bottom: 7px; + padding-bottom: 8px; + padding-top: 8px; } div.dmmd-no-button div.dmmd-preview-update { diff --git a/resources/pagedown_widget.css b/resources/pagedown_widget.css index f20c5e2..3601240 100644 --- a/resources/pagedown_widget.css +++ b/resources/pagedown_widget.css @@ -14,7 +14,7 @@ width: 100%; background: #fff; border: 1px solid DarkGray; - font-family: Consolas, "Liberation Mono", Monaco, "Courier New", monospace !important; + font-family: "Noto Sans",Arial,"Lucida Grande",sans-serif !important; } .wmd-preview { diff --git a/resources/pagedown_widget.scss b/resources/pagedown_widget.scss index b6d2333..fa97abe 100644 --- a/resources/pagedown_widget.scss +++ b/resources/pagedown_widget.scss @@ -14,7 +14,7 @@ width: 100%; background: #fff; border: 1px solid DarkGray; - font-family: Consolas, "Liberation Mono", Monaco, "Courier New", monospace !important; + font-family: "Noto Sans",Arial,"Lucida Grande",sans-serif !important; } .wmd-preview { @@ -174,51 +174,51 @@ /* Extra styles to allow for image upload */ .pagedown-image-upload { - display: none; - z-index: 10001; - position: fixed; - background: white; - top: 50%; - left: 50%; - padding: 10px; - width: 400px; - max-width: 90%; - transform: translate3d(-50%, -50%, 0); - box-shadow: 2px 2px 10px 0px rgba(0, 0, 0, 0.5); + display: none; + z-index: 10001; + position: fixed; + background: white; + top: 50%; + left: 50%; + padding: 10px; + width: 400px; + max-width: 90%; + transform: translate3d(-50%, -50%, 0); + box-shadow: 2px 2px 10px 0px rgba(0, 0, 0, 0.5); } .pagedown-image-upload .submit-row { - margin: 10px 0 0 0; + margin: 10px 0 0 0; } .pagedown-image-upload.show { - display: block; + display: block; } .pagedown-image-upload .submit-loading { - display: none; - vertical-align: middle; - border: 4px solid #f3f3f3; /* Light grey */ - border-top: 4px solid #79aec8; /* Blue */ - border-radius: 50%; - width: 24px; - height: 24px; - animation: spin 1s linear infinite; + display: none; + vertical-align: middle; + border: 4px solid #f3f3f3; /* Light grey */ + border-top: 4px solid #79aec8; /* Blue */ + border-radius: 50%; + width: 24px; + height: 24px; + animation: spin 1s linear infinite; } .pagedown-image-upload .submit-loading.show { - display: inline-block; + display: inline-block; } .pagedown-image-upload .submit-input { - display: none; + display: none; } .pagedown-image-upload .submit-input.show { - display: inline-block; + display: inline-block; } @keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } } \ No newline at end of file diff --git a/resources/widgets.scss b/resources/widgets.scss index 942b39e..42e8c8e 100644 --- a/resources/widgets.scss +++ b/resources/widgets.scss @@ -161,8 +161,7 @@ input { } textarea { - padding: 4px 8px; - color: #555; + padding: 8px; background: #FFF none; border: 1px solid $border_gray; border-radius: $widget_border_radius; @@ -172,8 +171,7 @@ textarea { } textarea:hover { - border-color: rgba(82, 168, 236, 0.8); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.6); + border-color: black; } input { @@ -184,8 +182,8 @@ input { } textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + border-color: black; + border-width: unset; outline: 0; } From b4c162049786c348cbe908eade4b35fde71e7c12 Mon Sep 17 00:00:00 2001 From: Phuoc Anh Kha Le <76896393+anhkha2003@users.noreply.github.com> Date: Fri, 6 Oct 2023 03:54:37 -0500 Subject: [PATCH 11/51] GP Ranking (#90) --- dmoj/urls.py | 5 ++ judge/admin/__init__.py | 9 ++- judge/admin/contest.py | 16 +++++ judge/caching.py | 5 ++ judge/migrations/0170_contests_summary.py | 30 ++++++++++ judge/models/__init__.py | 1 + judge/models/contest.py | 22 +++++++ judge/views/contests.py | 65 +++++++++++++++++++++ templates/contest/contests_summary.html | 71 +++++++++++++++++++++++ 9 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 judge/migrations/0170_contests_summary.py create mode 100644 templates/contest/contests_summary.html diff --git a/dmoj/urls.py b/dmoj/urls.py index 4e0691e..e6610f8 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -517,6 +517,11 @@ urlpatterns = [ ), ), url(r"^contests/", paged_list_view(contests.ContestList, "contest_list")), + url( + r"^contests/summary/(?P\w+)$", + contests.contests_summary_view, + name="contests_summary", + ), url(r"^course/", paged_list_view(course.CourseList, "course_list")), url( r"^contests/(?P\d+)/(?P\d+)/$", diff --git a/judge/admin/__init__.py b/judge/admin/__init__.py index 94af5aa..05032d6 100644 --- a/judge/admin/__init__.py +++ b/judge/admin/__init__.py @@ -3,7 +3,12 @@ from django.contrib.admin.models import LogEntry from django.contrib.auth.models import User from judge.admin.comments import CommentAdmin -from judge.admin.contest import ContestAdmin, ContestParticipationAdmin, ContestTagAdmin +from judge.admin.contest import ( + ContestAdmin, + ContestParticipationAdmin, + ContestTagAdmin, + ContestsSummaryAdmin, +) from judge.admin.interface import ( BlogPostAdmin, LicenseAdmin, @@ -41,6 +46,7 @@ from judge.models import ( Ticket, VolunteerProblemVote, Course, + ContestsSummary, ) @@ -69,3 +75,4 @@ admin.site.register(VolunteerProblemVote, VolunteerProblemVoteAdmin) admin.site.register(Course) admin.site.unregister(User) admin.site.register(User, UserAdmin) +admin.site.register(ContestsSummary, ContestsSummaryAdmin) diff --git a/judge/admin/contest.py b/judge/admin/contest.py index a126e83..b7b5457 100644 --- a/judge/admin/contest.py +++ b/judge/admin/contest.py @@ -502,3 +502,19 @@ class ContestParticipationAdmin(admin.ModelAdmin): show_virtual.short_description = _("virtual") show_virtual.admin_order_field = "virtual" + + +class ContestsSummaryForm(ModelForm): + class Meta: + widgets = { + "contests": AdminHeavySelect2MultipleWidget( + data_view="contest_select2", attrs={"style": "width: 100%"} + ), + } + + +class ContestsSummaryAdmin(admin.ModelAdmin): + fields = ("key", "contests", "scores") + list_display = ("key",) + search_fields = ("key", "contests__key") + form = ContestsSummaryForm diff --git a/judge/caching.py b/judge/caching.py index 42e9311..70b5613 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -1,6 +1,7 @@ from inspect import signature from django.core.cache import cache from django.db.models.query import QuerySet +from django.core.handlers.wsgi import WSGIRequest import hashlib @@ -18,10 +19,14 @@ def cache_wrapper(prefix, timeout=None): return str(arg)[:MAX_NUM_CHAR] return str(arg) + def filter_args(args_list): + return [x for x in args_list if not isinstance(x, WSGIRequest)] + def get_key(func, *args, **kwargs): args_list = list(args) signature_args = list(signature(func).parameters.keys()) args_list += [kwargs.get(k) for k in signature_args[len(args) :]] + args_list = filter_args(args_list) args_list = [arg_to_str(i) for i in args_list] key = prefix + ":" + ":".join(args_list) key = key.replace(" ", "_") diff --git a/judge/migrations/0170_contests_summary.py b/judge/migrations/0170_contests_summary.py new file mode 100644 index 0000000..a2b19de --- /dev/null +++ b/judge/migrations/0170_contests_summary.py @@ -0,0 +1,30 @@ +# Generated by Django 3.2.21 on 2023-10-02 03:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0169_public_scoreboard"), + ] + + operations = [ + migrations.CreateModel( + name="ContestsSummary", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("scores", models.JSONField(blank=True, null=True)), + ("key", models.CharField(max_length=20, unique=True)), + ("contests", models.ManyToManyField(to="judge.Contest")), + ], + ), + ] diff --git a/judge/models/__init__.py b/judge/models/__init__.py index ee9d364..8226c96 100644 --- a/judge/models/__init__.py +++ b/judge/models/__init__.py @@ -16,6 +16,7 @@ from judge.models.contest import ( ContestTag, Rating, ContestProblemClarification, + ContestsSummary, ) from judge.models.interface import BlogPost, MiscConfig, NavigationBar, validate_regex from judge.models.message import PrivateMessage, PrivateMessageThread diff --git a/judge/models/contest.py b/judge/models/contest.py index a724f1a..5052399 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -33,6 +33,7 @@ __all__ = [ "ContestSubmission", "Rating", "ContestProblemClarification", + "ContestsSummary", ] @@ -900,3 +901,24 @@ class ContestProblemClarification(models.Model): date = models.DateTimeField( verbose_name=_("clarification timestamp"), auto_now_add=True ) + + +class ContestsSummary(models.Model): + contests = models.ManyToManyField( + Contest, + ) + scores = models.JSONField( + null=True, + blank=True, + ) + key = models.CharField( + max_length=20, + unique=True, + ) + + class Meta: + verbose_name = _("contests summary") + verbose_name_plural = _("contests summaries") + + def __str__(self): + return self.key diff --git a/judge/views/contests.py b/judge/views/contests.py index 97ff251..b6f7242 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -27,6 +27,8 @@ from django.db.models import ( Value, When, ) +from django.db.models.signals import post_save, post_delete +from django.dispatch import receiver from django.db.models.expressions import CombinedExpression from django.http import ( Http404, @@ -67,6 +69,7 @@ from judge.models import ( Profile, Submission, ContestProblemClarification, + ContestsSummary, ) from judge.tasks import run_moss from judge.utils.celery import redirect_to_task_status @@ -1380,3 +1383,65 @@ def update_contest_mode(request): old_mode = request.session.get("contest_mode", True) request.session["contest_mode"] = not old_mode return HttpResponse() + + +ContestsSummaryData = namedtuple( + "ContestsSummaryData", + "user points point_contests css_class", +) + + +def contests_summary_view(request, key): + try: + contests_summary = ContestsSummary.objects.get(key=key) + except: + raise Http404() + + cache_key = "csv:" + key + context = cache.get(cache_key) + if context: + return render(request, "contest/contests_summary.html", context) + + scores_system = contests_summary.scores + contests = contests_summary.contests.all() + total_points = defaultdict(int) + result_per_contest = defaultdict(lambda: [(0, 0)] * len(contests)) + user_css_class = {} + + for i in range(len(contests)): + contest = contests[i] + users, problems = get_contest_ranking_list(request, contest) + for rank, user in users: + curr_score = 0 + if rank - 1 < len(scores_system): + curr_score = scores_system[rank - 1] + total_points[user.user] += curr_score + result_per_contest[user.user][i] = (curr_score, rank) + user_css_class[user.user] = user.css_class + + sorted_total_points = [ + ContestsSummaryData( + user=user, + points=total_points[user], + point_contests=result_per_contest[user], + css_class=user_css_class[user], + ) + for user in total_points + ] + + sorted_total_points.sort(key=lambda x: x.points, reverse=True) + total_rank = ranker(sorted_total_points) + + context = { + "total_rank": list(total_rank), + "title": _("Contests Summary"), + "contests": contests, + } + cache.set(cache_key, context) + + return render(request, "contest/contests_summary.html", context) + + +@receiver([post_save, post_delete], sender=ContestsSummary) +def clear_cache(sender, instance, **kwargs): + cache.delete("csv:" + instance.key) diff --git a/templates/contest/contests_summary.html b/templates/contest/contests_summary.html new file mode 100644 index 0000000..a7fbe12 --- /dev/null +++ b/templates/contest/contests_summary.html @@ -0,0 +1,71 @@ +{% extends "base.html" %} + +{% block title_row %}{% endblock %} +{% block title_ruler %}{% endblock %} + +{% block media %} + +{% endblock %} + +{% block body %} + + + + + + {% for contest in contests %} + + {% endfor %} + + + + + {% for rank, item in total_rank %} + + + + {% for point_contest, rank_contest in item.point_contests %} + + {% endfor %} + + + {% endfor %} + +
    {{_('Rank')}}{{_('Name')}}{{ loop.index }}{{_('Points')}}
    + {{ rank }} + +
    + {{item.user.username}} +
    +
    {{item.user.first_name}}
    +     		+
    {{ point_contest }}
    + {% if rank_contest %} +
    (#{{ rank_contest }})
    + {% endif %} +     		+ {{ item.points }} +
    +{% endblock %} From 5f97491f0db22d706a473e62926ec1bb263d5102 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 6 Oct 2023 13:04:12 -0500 Subject: [PATCH 12/51] Add contest summary url --- judge/models/contest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/judge/models/contest.py b/judge/models/contest.py index 5052399..db1b3e6 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -922,3 +922,6 @@ class ContestsSummary(models.Model): def __str__(self): return self.key + + def get_absolute_url(self): + return reverse("contests_summary", args=[self.key]) From 7f854c40ddb5798bca43ae3aef554c9195ed4f21 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 17:38:48 -0500 Subject: [PATCH 13/51] Change notification backend --- chat_box/models.py | 8 +++ judge/admin/problem.py | 10 +-- judge/comments.py | 35 ++++------ judge/migrations/0171_update_notification.py | 68 ++++++++++++++++++++ judge/models/__init__.py | 3 +- judge/models/comment.py | 26 -------- judge/models/notification.py | 61 ++++++++++++++++++ judge/models/pagevote.py | 2 + judge/models/profile.py | 9 +-- judge/views/comment.py | 3 +- judge/views/notification.py | 32 +++------ judge/views/organization.py | 28 ++------ judge/views/pagevote.py | 6 ++ judge/views/ticket.py | 8 +-- templates/notification/list.html | 23 ++----- 15 files changed, 188 insertions(+), 134 deletions(-) create mode 100644 judge/migrations/0171_update_notification.py create mode 100644 judge/models/notification.py diff --git a/chat_box/models.py b/chat_box/models.py index fb3fd7b..fb6de76 100644 --- a/chat_box/models.py +++ b/chat_box/models.py @@ -18,6 +18,9 @@ class Room(models.Model): Profile, related_name="user_two", verbose_name="user 2", on_delete=CASCADE ) + class Meta: + app_label = "chat_box" + @cache_wrapper(prefix="Rc") def contain(self, profile): return self.user_one == profile or self.user_two == profile @@ -58,6 +61,7 @@ class Message(models.Model): indexes = [ models.Index(fields=["hidden", "room", "-id"]), ] + app_label = "chat_box" class UserRoom(models.Model): @@ -70,6 +74,7 @@ class UserRoom(models.Model): class Meta: unique_together = ("user", "room") + app_label = "chat_box" class Ignore(models.Model): @@ -82,6 +87,9 @@ class Ignore(models.Model): ) ignored_users = models.ManyToManyField(Profile) + class Meta: + app_label = "chat_box" + @classmethod def is_ignored(self, current_user, new_friend): try: diff --git a/judge/admin/problem.py b/judge/admin/problem.py index 49a145d..b5cd56f 100644 --- a/judge/admin/problem.py +++ b/judge/admin/problem.py @@ -25,6 +25,7 @@ from judge.models import ( Solution, Notification, ) +from judge.models.notification import make_notification from judge.widgets import ( AdminHeavySelect2MultipleWidget, AdminSelect2MultipleWidget, @@ -381,14 +382,7 @@ class ProblemAdmin(CompareVersionAdmin): category = "Problem public: " + str(obj.is_public) if orgs: category += " (" + ", ".join(orgs) + ")" - for user in users: - notification = Notification( - owner=user, - html_link=html, - category=category, - author=request.profile, - ) - notification.save() + make_notification(users, html, category, request.profile) def construct_change_message(self, request, form, *args, **kwargs): if form.cleaned_data.get("change_message"): diff --git a/judge/comments.py b/judge/comments.py index 65d8f7e..dde97a0 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -26,21 +26,20 @@ from judge.dblock import LockModel from judge.models import Comment, Notification from judge.widgets import HeavyPreviewPageDownWidget from judge.jinja2.reference import get_user_from_text +from judge.models.notification import make_notification DEFAULT_OFFSET = 10 +def _get_html_link_notification(comment): + return f'{comment.page_title}' + + def add_mention_notifications(comment): - user_referred = get_user_from_text(comment.body).exclude(id=comment.author.id) - for user in user_referred: - notification_ref = Notification(owner=user, comment=comment, category="Mention") - notification_ref.save() - - -def del_mention_notifications(comment): - query = {"comment": comment, "category": "Mention"} - Notification.objects.filter(**query).delete() + users_mentioned = get_user_from_text(comment.body).exclude(id=comment.author.id) + link = _get_html_link_notification(comment) + make_notification(users_mentioned, "Mention", link, comment.author) class CommentForm(ModelForm): @@ -124,23 +123,17 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): comment.save() # add notification for reply + comment_notif_link = _get_html_link_notification(comment) if comment.parent and comment.parent.author != comment.author: - notification_reply = Notification( - owner=comment.parent.author, comment=comment, category="Reply" + make_notification( + [comment.parent.author], "Reply", comment_notif_link, comment.author ) - notification_reply.save() # add notification for page authors page_authors = comment.linked_object.authors.all() - for user in page_authors: - if user == comment.author: - continue - notification = Notification( - owner=user, comment=comment, category="Comment" - ) - notification.save() - # except Exception: - # pass + make_notification( + page_authors, "Comment", comment_notif_link, comment.author + ) add_mention_notifications(comment) diff --git a/judge/migrations/0171_update_notification.py b/judge/migrations/0171_update_notification.py new file mode 100644 index 0000000..7803e4b --- /dev/null +++ b/judge/migrations/0171_update_notification.py @@ -0,0 +1,68 @@ +# Generated by Django 3.2.18 on 2023-10-10 21:17 + +from django.db import migrations, models +import django.db.models.deletion +from django.urls import reverse + +from collections import defaultdict + + +# Run this in shell +def migrate_notif(apps, schema_editor): + Notification = apps.get_model("judge", "Notification") + Profile = apps.get_model("judge", "Profile") + NotificationProfile = apps.get_model("judge", "NotificationProfile") + + unread_count = defaultdict(int) + for c in Notification.objects.all(): + if c.comment: + c.html_link = ( + f'{c.comment.page_title}' + ) + c.author = c.comment.author + c.save() + if c.read is False: + unread_count[c.author] += 1 + + for user in unread_count: + np = NotificationProfile(user=user) + np.unread_count = unread_count[user] + np.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0170_contests_summary"), + ] + + operations = [ + migrations.AlterModelOptions( + name="contestssummary", + options={ + "verbose_name": "contests summary", + "verbose_name_plural": "contests summaries", + }, + ), + migrations.CreateModel( + name="NotificationProfile", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("unread_count", models.IntegerField(default=0)), + ( + "user", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, to="judge.profile" + ), + ), + ], + ), + ] diff --git a/judge/models/__init__.py b/judge/models/__init__.py index 8226c96..2b1d706 100644 --- a/judge/models/__init__.py +++ b/judge/models/__init__.py @@ -6,7 +6,7 @@ from judge.models.choices import ( MATH_ENGINES_CHOICES, TIMEZONE, ) -from judge.models.comment import Comment, CommentLock, CommentVote, Notification +from judge.models.comment import Comment, CommentLock, CommentVote from judge.models.contest import ( Contest, ContestMoss, @@ -58,6 +58,7 @@ from judge.models.volunteer import VolunteerProblemVote from judge.models.pagevote import PageVote, PageVoteVoter from judge.models.bookmark import BookMark, MakeBookMark from judge.models.course import Course +from judge.models.notification import Notification, NotificationProfile revisions.register(Profile, exclude=["points", "last_access", "ip", "rating"]) revisions.register(Problem, follow=["language_limits"]) diff --git a/judge/models/comment.py b/judge/models/comment.py index 6058cf8..2cbe20a 100644 --- a/judge/models/comment.py +++ b/judge/models/comment.py @@ -177,29 +177,3 @@ class CommentLock(models.Model): def __str__(self): return str(self.page) - - -class Notification(models.Model): - owner = models.ForeignKey( - Profile, - verbose_name=_("owner"), - related_name="notifications", - on_delete=CASCADE, - ) - time = models.DateTimeField(verbose_name=_("posted time"), auto_now_add=True) - comment = models.ForeignKey( - Comment, null=True, verbose_name=_("comment"), on_delete=CASCADE - ) - read = models.BooleanField(verbose_name=_("read"), default=False) - category = models.CharField(verbose_name=_("category"), max_length=1000) - html_link = models.TextField( - default="", - verbose_name=_("html link to comments, used for non-comments"), - max_length=1000, - ) - author = models.ForeignKey( - Profile, - null=True, - verbose_name=_("who trigger, used for non-comment"), - on_delete=CASCADE, - ) diff --git a/judge/models/notification.py b/judge/models/notification.py new file mode 100644 index 0000000..01c5b0d --- /dev/null +++ b/judge/models/notification.py @@ -0,0 +1,61 @@ +from django.db import models +from django.utils.translation import gettext_lazy as _ +from django.db.models import CASCADE, F +from django.core.exceptions import ObjectDoesNotExist + +from judge.models import Profile, Comment +from judge.caching import cache_wrapper + + +class Notification(models.Model): + owner = models.ForeignKey( + Profile, + verbose_name=_("owner"), + related_name="notifications", + on_delete=CASCADE, + ) + time = models.DateTimeField(verbose_name=_("posted time"), auto_now_add=True) + category = models.CharField(verbose_name=_("category"), max_length=1000) + html_link = models.TextField( + default="", + verbose_name=_("html link to comments, used for non-comments"), + max_length=1000, + ) + author = models.ForeignKey( + Profile, + null=True, + verbose_name=_("who trigger, used for non-comment"), + on_delete=CASCADE, + ) + comment = models.ForeignKey( + Comment, null=True, verbose_name=_("comment"), on_delete=CASCADE + ) # deprecated + read = models.BooleanField(verbose_name=_("read"), default=False) # deprecated + + +class NotificationProfile(models.Model): + unread_count = models.IntegerField(default=0) + user = models.OneToOneField(Profile, on_delete=CASCADE) + + +def make_notification(to_users, category, html_link, author): + for user in to_users: + if user == author: + continue + notif = Notification( + owner=user, category=category, html_link=html_link, author=author + ) + notif.save() + NotificationProfile.objects.get_or_create(user=user) + NotificationProfile.objects.filter(user=user).update( + unread_count=F("unread_count") + 1 + ) + unseen_notifications_count.dirty(user) + + +@cache_wrapper(prefix="unc") +def unseen_notifications_count(profile): + try: + return NotificationProfile.objects.get(user=profile).unread_count + except ObjectDoesNotExist: + return 0 diff --git a/judge/models/pagevote.py b/judge/models/pagevote.py index 5e74c95..7accd01 100644 --- a/judge/models/pagevote.py +++ b/judge/models/pagevote.py @@ -5,6 +5,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from judge.models.profile import Profile +from judge.caching import cache_wrapper __all__ = ["PageVote", "PageVoteVoter"] @@ -28,6 +29,7 @@ class PageVote(models.Model): ] unique_together = ("content_type", "object_id") + @cache_wrapper(prefix="PVvs") def vote_score(self, user): page_vote = PageVoteVoter.objects.filter(pagevote=self, voter=user) if page_vote.exists(): diff --git a/judge/models/profile.py b/judge/models/profile.py index 96f3cfd..83bfc32 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -16,6 +16,7 @@ from sortedm2m.fields import SortedManyToManyField from judge.models.choices import ACE_THEMES, MATH_ENGINES_CHOICES, TIMEZONE from judge.models.runtime import Language from judge.ratings import rating_class +from judge.caching import cache_wrapper __all__ = ["Organization", "Profile", "OrganizationRequest", "Friend"] @@ -142,6 +143,7 @@ class Organization(models.Model): ) verbose_name = _("organization") verbose_name_plural = _("organizations") + app_label = "judge" class Profile(models.Model): @@ -266,10 +268,9 @@ class Profile(models.Model): @cached_property def count_unseen_notifications(self): - query = { - "read": False, - } - return self.notifications.filter(**query).count() + from judge.models.notification import unseen_notifications_count + + return unseen_notifications_count(self) @cached_property def count_unread_chat_boxes(self): diff --git a/judge/views/comment.py b/judge/views/comment.py index 6965201..caa4eb6 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -27,7 +27,7 @@ from judge.dblock import LockModel from judge.models import Comment, CommentVote, Notification, BlogPost from judge.utils.views import TitleMixin from judge.widgets import MathJaxPagedownWidget, HeavyPreviewPageDownWidget -from judge.comments import add_mention_notifications, del_mention_notifications +from judge.comments import add_mention_notifications import json @@ -240,7 +240,6 @@ class CommentEditAjax(LoginRequiredMixin, CommentMixin, UpdateView): def form_valid(self, form): # update notifications comment = form.instance - del_mention_notifications(comment) add_mention_notifications(comment) with transaction.atomic(), revisions.create_revision(): diff --git a/judge/views/notification.py b/judge/views/notification.py index 63f38c2..bb79317 100644 --- a/judge/views/notification.py +++ b/judge/views/notification.py @@ -2,10 +2,9 @@ from django.contrib.auth.decorators import login_required from django.views.generic import ListView from django.utils.translation import ugettext as _ from django.utils.timezone import now -from django.db.models import BooleanField, Value -from judge.utils.cachedict import CacheDict -from judge.models import Profile, Comment, Notification +from judge.models import Profile, Notification, NotificationProfile +from judge.models.notification import unseen_notifications_count __all__ = ["NotificationList"] @@ -16,24 +15,11 @@ class NotificationList(ListView): template_name = "notification/list.html" def get_queryset(self): - self.unseen_cnt = self.request.profile.count_unseen_notifications + self.unseen_cnt = unseen_notifications_count(self.request.profile) - query = { - "owner": self.request.profile, - } - - self.queryset = ( - Notification.objects.filter(**query) - .order_by("-time")[:100] - .annotate(seen=Value(True, output_field=BooleanField())) - ) - - # Mark the several first unseen - for cnt, q in enumerate(self.queryset): - if cnt < self.unseen_cnt: - q.seen = False - else: - break + self.queryset = Notification.objects.filter( + owner=self.request.profile + ).order_by("-id")[:100] return self.queryset @@ -46,8 +32,6 @@ class NotificationList(ListView): def get(self, request, *args, **kwargs): ret = super().get(request, *args, **kwargs) - - # update after rendering - Notification.objects.filter(owner=self.request.profile).update(read=True) - + NotificationProfile.objects.filter(user=request.profile).update(unread_count=0) + unseen_notifications_count.dirty(self.request.profile) return ret diff --git a/judge/views/organization.py b/judge/views/organization.py index 0576afe..be80203 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -56,10 +56,10 @@ from judge.models import ( Problem, Profile, Contest, - Notification, ContestProblem, OrganizationProfile, ) +from judge.models.notification import make_notification from judge import event_poster as event from judge.utils.ranker import ranker from judge.utils.views import ( @@ -1019,16 +1019,9 @@ class AddOrganizationBlog( html = ( f'{self.object.title} - {self.organization.name}' ) - for user in self.organization.admins.all(): - if user.id == self.request.profile.id: - continue - notification = Notification( - owner=user, - author=self.request.profile, - category="Add blog", - html_link=html, - ) - notification.save() + make_notification( + self.organization.admins.all(), "Add blog", html, self.request.profile + ) return res @@ -1104,17 +1097,8 @@ class EditOrganizationBlog( ) html = f'{blog.title} - {self.organization.name}' post_authors = blog.authors.all() - posible_user = self.organization.admins.all() | post_authors - for user in posible_user: - if user.id == self.request.profile.id: - continue - notification = Notification( - owner=user, - author=self.request.profile, - category=action, - html_link=html, - ) - notification.save() + posible_users = self.organization.admins.all() | post_authors + make_notification(posible_users, action, html, self.request.profile) def form_valid(self, form): with transaction.atomic(), revisions.create_revision(): diff --git a/judge/views/pagevote.py b/judge/views/pagevote.py index 9ae6d5b..988d355 100644 --- a/judge/views/pagevote.py +++ b/judge/views/pagevote.py @@ -80,6 +80,7 @@ def vote_page(request, delta): else: PageVote.objects.filter(id=pagevote_id).update(score=F("score") + delta) break + _dirty_vote_score(pagevote_id, request.profile) return HttpResponse("success", content_type="text/plain") @@ -103,3 +104,8 @@ class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View): context = super(PageVoteDetailView, self).get_context_data(**kwargs) context["pagevote"] = self.object.get_or_create_pagevote() return context + + +def _dirty_vote_score(pagevote_id, profile): + pv = PageVote(id=pagevote_id) + pv.vote_score.dirty(pv, profile) diff --git a/judge/views/ticket.py b/judge/views/ticket.py index 3d62235..f4bf97a 100644 --- a/judge/views/ticket.py +++ b/judge/views/ticket.py @@ -49,16 +49,10 @@ ticket_widget = ( def add_ticket_notifications(users, author, link, ticket): html = f'{ticket.linked_item}' - users = set(users) if author in users: users.remove(author) - - for user in users: - notification = Notification( - owner=user, html_link=html, category="Ticket", author=author - ) - notification.save() + make_notification(users, "Ticket", html, author) class TicketForm(forms.Form): diff --git a/templates/notification/list.html b/templates/notification/list.html index cd50e32..6aa7351 100644 --- a/templates/notification/list.html +++ b/templates/notification/list.html @@ -1,11 +1,8 @@ {% extends "base.html" %} {% block body %} - {% if not has_notifications %} -

    {{ _('You have no notifications') }}

    - {% else %} @@ -17,24 +14,15 @@ {% for notification in notifications %}
    - {% if notification.comment %} - {{ link_user(notification.comment.author) }} - {% else %} - {{ link_user(notification.author) }} - {% endif %} - + {{ link_user(notification.author) }} {{ notification.category }} - {% if notification.comment %} - {{ notification.comment.page_title }} - {% else %} - {% autoescape off %} - {{notification.html_link}} - {% endautoescape %} - {% endif %} + {% autoescape off %} + {{notification.html_link}} + {% endautoescape %} {{ relative_time(notification.time) }} @@ -43,8 +31,5 @@ {% endfor %}
    {% endif %} - {% endblock %} - \ No newline at end of file From ed287b6ff360ff687b296497ea7a0d1840cf8dd0 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 19:37:36 -0500 Subject: [PATCH 14/51] Add caching for user basic info --- chat_box/utils.py | 3 ++ chat_box/views.py | 6 ++- judge/admin/profile.py | 2 +- judge/caching.py | 2 +- judge/jinja2/gravatar.py | 8 ++-- judge/jinja2/reference.py | 6 +-- judge/migrations/0172_index_rating.py | 18 ++++++++ judge/models/profile.py | 57 ++++++++++++++++++++++++- judge/views/resolver.py | 7 ++- resources/comments.scss | 2 + templates/contest/contests_summary.html | 4 +- templates/contest/ranking-table.html | 8 ++-- templates/user/link.html | 2 +- templates/user/user-about.html | 8 ++-- templates/user/users-table.html | 10 ++--- 15 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 judge/migrations/0172_index_rating.py diff --git a/chat_box/utils.py b/chat_box/utils.py index dd59d98..f3f27b4 100644 --- a/chat_box/utils.py +++ b/chat_box/utils.py @@ -8,6 +8,8 @@ from django.db.models.functions import Coalesce from chat_box.models import Ignore, Message, UserRoom, Room +from judge.caching import cache_wrapper + secret_key = settings.CHAT_SECRET_KEY fernet = Fernet(secret_key) @@ -37,6 +39,7 @@ def encrypt_channel(channel): ) +@cache_wrapper(prefix="gub") def get_unread_boxes(profile): ignored_rooms = Ignore.get_ignored_rooms(profile) unread_boxes = ( diff --git a/chat_box/views.py b/chat_box/views.py index 5a15f74..48fa37a 100644 --- a/chat_box/views.py +++ b/chat_box/views.py @@ -36,7 +36,7 @@ from judge.jinja2.gravatar import gravatar from judge.models import Friend from chat_box.models import Message, Profile, Room, UserRoom, Ignore -from chat_box.utils import encrypt_url, decrypt_url, encrypt_channel +from chat_box.utils import encrypt_url, decrypt_url, encrypt_channel, get_unread_boxes import json @@ -208,6 +208,7 @@ def post_message(request): ) else: Room.last_message_body.dirty(room) + for user in room.users(): event.post( encrypt_channel("chat_" + str(user.id)), @@ -223,6 +224,7 @@ def post_message(request): UserRoom.objects.filter(user=user, room=room).update( unread_count=F("unread_count") + 1 ) + get_unread_boxes.dirty(user) return JsonResponse(ret) @@ -285,6 +287,8 @@ def update_last_seen(request, **kwargs): user_room.unread_count = 0 user_room.save() + get_unread_boxes.dirty(profile) + return JsonResponse({"msg": "updated"}) diff --git a/judge/admin/profile.py b/judge/admin/profile.py index 422fc5d..68ecee1 100644 --- a/judge/admin/profile.py +++ b/judge/admin/profile.py @@ -126,7 +126,7 @@ class ProfileAdmin(VersionAdmin): admin_user_admin.short_description = _("User") def email(self, obj): - return obj.user.email + return obj.email email.admin_order_field = "user__email" email.short_description = _("Email") diff --git a/judge/caching.py b/judge/caching.py index 70b5613..b8fb810 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -40,9 +40,9 @@ def cache_wrapper(prefix, timeout=None): if result == NONE_RESULT: result = None return result + result = func(*args, **kwargs) if result is None: result = NONE_RESULT - result = func(*args, **kwargs) cache.set(cache_key, result, timeout) return result diff --git a/judge/jinja2/gravatar.py b/judge/jinja2/gravatar.py index cffa413..373f685 100644 --- a/judge/jinja2/gravatar.py +++ b/judge/jinja2/gravatar.py @@ -12,12 +12,12 @@ from . import registry def gravatar(profile, size=80, default=None, profile_image=None, email=None): if profile_image: return profile_image - if profile and profile.profile_image: - return profile.profile_image.url + if profile and profile.cached_profile_image: + return profile.cached_profile_image.url if profile: - email = email or profile.user.email + email = email or profile.email if default is None: - default = profile.mute + default = profile.is_muted gravatar_url = ( "//www.gravatar.com/avatar/" + hashlib.md5(utf8bytes(email.strip().lower())).hexdigest() diff --git a/judge/jinja2/reference.py b/judge/jinja2/reference.py index 49a6ef2..312ac4f 100644 --- a/judge/jinja2/reference.py +++ b/judge/jinja2/reference.py @@ -157,14 +157,14 @@ def item_title(item): @registry.render_with("user/link.html") def link_user(user): if isinstance(user, Profile): - user, profile = user.user, user + profile = user elif isinstance(user, AbstractUser): profile = user.profile elif type(user).__name__ == "ContestRankingProfile": - user, profile = user.user, user + profile = user else: raise ValueError("Expected profile or user, got %s" % (type(user),)) - return {"user": user, "profile": profile} + return {"profile": profile} @registry.function diff --git a/judge/migrations/0172_index_rating.py b/judge/migrations/0172_index_rating.py new file mode 100644 index 0000000..157c005 --- /dev/null +++ b/judge/migrations/0172_index_rating.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.18 on 2023-10-10 23:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0171_update_notification"), + ] + + operations = [ + migrations.AlterField( + model_name="profile", + name="rating", + field=models.IntegerField(db_index=True, default=None, null=True), + ), + ] diff --git a/judge/models/profile.py b/judge/models/profile.py index 83bfc32..bcb6621 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -10,6 +10,9 @@ from django.urls import reverse from django.utils.functional import cached_property from django.utils.timezone import now from django.utils.translation import gettext_lazy as _ +from django.dispatch import receiver +from django.db.models.signals import post_save, pre_save + from fernet_fields import EncryptedCharField from sortedm2m.fields import SortedManyToManyField @@ -202,7 +205,7 @@ class Profile(models.Model): help_text=_("User will not be able to vote on problems' point values."), default=False, ) - rating = models.IntegerField(null=True, default=None) + rating = models.IntegerField(null=True, default=None, db_index=True) user_script = models.TextField( verbose_name=_("user script"), default="", @@ -256,6 +259,21 @@ class Profile(models.Model): max_length=300, ) + @cache_wrapper(prefix="Pgbi") + def _get_basic_info(self): + return { + "first_name": self.user.first_name, + "last_name": self.user.last_name, + "email": self.user.email, + "username": self.user.username, + "mute": self.mute, + "profile_image": self.profile_image, + } + + @cached_property + def _cached_info(self): + return self._get_basic_info() + @cached_property def organization(self): # We do this to take advantage of prefetch_related @@ -264,7 +282,27 @@ class Profile(models.Model): @cached_property def username(self): - return self.user.username + return self._cached_info["username"] + + @cached_property + def first_name(self): + return self._cached_info["first_name"] + + @cached_property + def last_name(self): + return self._cached_info["last_name"] + + @cached_property + def email(self): + return self._cached_info["email"] + + @cached_property + def is_muted(self): + return self._cached_info["mute"] + + @cached_property + def cached_profile_image(self): + return self._cached_info["profile_image"] @cached_property def count_unseen_notifications(self): @@ -499,3 +537,18 @@ class OrganizationProfile(models.Model): @classmethod def get_most_recent_organizations(self, users): return self.objects.filter(users=users).order_by("-last_visit")[:5] + + +@receiver([post_save], sender=User) +def on_user_save(sender, instance, **kwargs): + profile = instance.profile + profile._get_user.dirty(profile) + + +@receiver([pre_save], sender=Profile) +def on_profile_save(sender, instance, **kwargs): + if instance.id is None: + return + prev = sender.objects.get(id=instance.id) + if prev.mute != instance.mute or prev.profile_image != instance.profile_image: + instance._get_user.dirty(instance) diff --git a/judge/views/resolver.py b/judge/views/resolver.py index eade951..cf8a193 100644 --- a/judge/views/resolver.py +++ b/judge/views/resolver.py @@ -31,10 +31,9 @@ class Resolver(TemplateView): for participation in self.contest.users.filter(virtual=0): cnt_user += 1 users[str(cnt_user)] = { - "username": participation.user.user.username, - "name": participation.user.user.first_name - or participation.user.user.username, - "school": participation.user.user.last_name, + "username": participation.user.username, + "name": participation.user.first_name or participation.user.username, + "school": participation.user.last_name, "last_submission": participation.cumtime_final, "problems": {}, } diff --git a/resources/comments.scss b/resources/comments.scss index 42dc90b..05ef84f 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -40,6 +40,8 @@ a { .comment-img { display: flex; margin-right: 4px; + height: 1.5em; + width: 1.5em; } .new-comments .comment-display { diff --git a/templates/contest/contests_summary.html b/templates/contest/contests_summary.html index a7fbe12..a43fa65 100644 --- a/templates/contest/contests_summary.html +++ b/templates/contest/contests_summary.html @@ -49,9 +49,9 @@
    - {{item.user.username}} + {{item.username}}
    -
    {{item.user.first_name}}
    +
    {{item.first_name}}
    {% for point_contest, rank_contest in item.point_contests %} diff --git a/templates/contest/ranking-table.html b/templates/contest/ranking-table.html index e182717..18d64dd 100644 --- a/templates/contest/ranking-table.html +++ b/templates/contest/ranking-table.html @@ -13,14 +13,14 @@ {% endblock %} {% block user_footer %} - {% if user.user.first_name %} + {% if user.first_name %} {% endif %} - {% if user.user.last_name %} + {% if user.last_name %} {% endif %} {% endblock %} diff --git a/templates/user/link.html b/templates/user/link.html index f0a73bb..ea821fa 100644 --- a/templates/user/link.html +++ b/templates/user/link.html @@ -1 +1 @@ -{{ user.username }} +{{ profile.username }} diff --git a/templates/user/user-about.html b/templates/user/user-about.html index ee7f395..23c53b1 100644 --- a/templates/user/user-about.html +++ b/templates/user/user-about.html @@ -54,9 +54,9 @@
    - {% if user.user.first_name %} + {% if user.first_name %}

    - {{user.user.first_name}}{% if user.user.last_name %} ({{user.user.last_name}}){% endif %} + {{user.first_name}}{% if user.last_name %} ({{user.last_name}}){% endif %}

    {% endif %} {% if perms.judge.change_profile %} @@ -70,9 +70,7 @@ {% endif%} {% if user.about %}

    {{ _('About') }}

    - {% cache 86400 'user_about' user.id MATH_ENGINE %} - {{ user.about|markdown(lazy_load=True)|reference|str|safe }} - {% endcache %} + {{ user.about|markdown(lazy_load=True)|reference|str|safe }} {% else %} {% if user.user == request.user %} diff --git a/templates/user/users-table.html b/templates/user/users-table.html index 0eb95e0..606e374 100644 --- a/templates/user/users-table.html +++ b/templates/user/users-table.html @@ -10,7 +10,7 @@ {% block user_footer %} {% if user.rating %}{{ rating_number(user) }}{% endif %} -
    {{ user.user.first_name if user.user.first_name else ''}}
    +
    {{ user.first_name or ''}}
    {% endblock %} {% block after_point_head %} @@ -39,11 +39,11 @@ {{ user.problem_count }}
    - {% if user.about %} - {% cache 86400 'user_about' user.id MATH_ENGINE %} + {% cache 86400 'user_about' user.id MATH_ENGINE %} + {% if user.about %} {{ user.about|markdown(lazy_load=True)|reference|str|safe }} - {% endcache %} - {% endif %} + {% endif %} + {% endcache %}
    {% endblock %} From 56c2b6d9b9b972252cd8d5a853291a144aabebe4 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 19:46:48 -0500 Subject: [PATCH 15/51] Fix contest summary --- templates/contest/contests_summary.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/contest/contests_summary.html b/templates/contest/contests_summary.html index a43fa65..a7fbe12 100644 --- a/templates/contest/contests_summary.html +++ b/templates/contest/contests_summary.html @@ -49,9 +49,9 @@
    - {{item.username}} + {{item.user.username}}
    -
    {{item.first_name}}
    +
    {{item.user.first_name}}
    {% for point_contest, rank_contest in item.point_contests %} From 9940d9cc4c509668fedca42c0a4767fee7bb1e19 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 19:54:55 -0500 Subject: [PATCH 16/51] Add a temp fix --- judge/caching.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/judge/caching.py b/judge/caching.py index b8fb810..b8fec83 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -43,7 +43,10 @@ def cache_wrapper(prefix, timeout=None): result = func(*args, **kwargs) if result is None: result = NONE_RESULT - cache.set(cache_key, result, timeout) + try: + cache.set(cache_key, result, timeout) + except: + pass return result def dirty(*args, **kwargs): From 801738fea9bf9e86981a47b443eb48833f17ee78 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 20:09:05 -0500 Subject: [PATCH 17/51] Add another fix --- templates/problem/related_problems.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/problem/related_problems.html b/templates/problem/related_problems.html index 95ed05f..a92a75b 100644 --- a/templates/problem/related_problems.html +++ b/templates/problem/related_problems.html @@ -1,4 +1,4 @@ -{% if related_problems %} +{% if request.user.is_authenticated and related_problems %}

    {{_('Recommended problems')}}:

      From 5741866c07fd960212f6017543c7b7ea1a49f550 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 20:23:52 -0500 Subject: [PATCH 18/51] Remove try except --- judge/caching.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/judge/caching.py b/judge/caching.py index b8fec83..b8fb810 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -43,10 +43,7 @@ def cache_wrapper(prefix, timeout=None): result = func(*args, **kwargs) if result is None: result = NONE_RESULT - try: - cache.set(cache_key, result, timeout) - except: - pass + cache.set(cache_key, result, timeout) return result def dirty(*args, **kwargs): From 94395ae71aa6c91e07df4960401615e4f8db766a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 20:28:16 -0500 Subject: [PATCH 19/51] Fix registration --- judge/models/profile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/judge/models/profile.py b/judge/models/profile.py index bcb6621..8647206 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -541,6 +541,8 @@ class OrganizationProfile(models.Model): @receiver([post_save], sender=User) def on_user_save(sender, instance, **kwargs): + if instance.id is None: + return profile = instance.profile profile._get_user.dirty(profile) From a377f45e0bc2853430287c71089f0bcddad7442f Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 20:31:25 -0500 Subject: [PATCH 20/51] Another fix --- judge/models/profile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/judge/models/profile.py b/judge/models/profile.py index 8647206..05c5770 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -544,7 +544,7 @@ def on_user_save(sender, instance, **kwargs): if instance.id is None: return profile = instance.profile - profile._get_user.dirty(profile) + profile._get_basic_info.dirty(profile) @receiver([pre_save], sender=Profile) @@ -553,4 +553,4 @@ def on_profile_save(sender, instance, **kwargs): return prev = sender.objects.get(id=instance.id) if prev.mute != instance.mute or prev.profile_image != instance.profile_image: - instance._get_user.dirty(instance) + instance._get_basic_info.dirty(instance) From 8da03aebb0e2ff339800cbb28027c48c08f0ec20 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 20:49:23 -0500 Subject: [PATCH 21/51] Fix new notif --- judge/admin/problem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/admin/problem.py b/judge/admin/problem.py index b5cd56f..1a47d37 100644 --- a/judge/admin/problem.py +++ b/judge/admin/problem.py @@ -382,7 +382,7 @@ class ProblemAdmin(CompareVersionAdmin): category = "Problem public: " + str(obj.is_public) if orgs: category += " (" + ", ".join(orgs) + ")" - make_notification(users, html, category, request.profile) + make_notification(users, category, html, request.profile) def construct_change_message(self, request, form, *args, **kwargs): if form.cleaned_data.get("change_message"): From 67a3c7274e5dbef218683905731ad4469932304a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 10 Oct 2023 21:01:06 -0500 Subject: [PATCH 22/51] Try fixing memcache error --- judge/jinja2/gravatar.py | 4 ++-- judge/models/profile.py | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/judge/jinja2/gravatar.py b/judge/jinja2/gravatar.py index 373f685..b6e8a83 100644 --- a/judge/jinja2/gravatar.py +++ b/judge/jinja2/gravatar.py @@ -12,8 +12,8 @@ from . import registry def gravatar(profile, size=80, default=None, profile_image=None, email=None): if profile_image: return profile_image - if profile and profile.cached_profile_image: - return profile.cached_profile_image.url + if profile and profile.profile_image_url: + return profile.profile_image_url if profile: email = email or profile.email if default is None: diff --git a/judge/models/profile.py b/judge/models/profile.py index 05c5770..9f7b931 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -259,15 +259,18 @@ class Profile(models.Model): max_length=300, ) - @cache_wrapper(prefix="Pgbi") + @cache_wrapper(prefix="Pgbi2") def _get_basic_info(self): + profile_image_url = None + if self.profile_image: + profile_image_url = self.profile_image.url return { "first_name": self.user.first_name, "last_name": self.user.last_name, "email": self.user.email, "username": self.user.username, "mute": self.mute, - "profile_image": self.profile_image, + "profile_image_url": profile_image_url, } @cached_property @@ -301,8 +304,8 @@ class Profile(models.Model): return self._cached_info["mute"] @cached_property - def cached_profile_image(self): - return self._cached_info["profile_image"] + def profile_image_url(self): + return self._cached_info["profile_image_url"] @cached_property def count_unseen_notifications(self): From d4e0c5ca86406904d72c4bf3555e1fb00e2fa332 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 11 Oct 2023 00:08:26 -0500 Subject: [PATCH 23/51] Fix register --- judge/models/profile.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/judge/models/profile.py b/judge/models/profile.py index 9f7b931..00dbe3f 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -12,6 +12,8 @@ from django.utils.timezone import now from django.utils.translation import gettext_lazy as _ from django.dispatch import receiver from django.db.models.signals import post_save, pre_save +from django.core.exceptions import RelatedObjectDoesNotExist + from fernet_fields import EncryptedCharField from sortedm2m.fields import SortedManyToManyField @@ -544,10 +546,11 @@ class OrganizationProfile(models.Model): @receiver([post_save], sender=User) def on_user_save(sender, instance, **kwargs): - if instance.id is None: - return - profile = instance.profile - profile._get_basic_info.dirty(profile) + try: + profile = instance.profile + profile._get_basic_info.dirty(profile) + except RelatedObjectDoesNotExist: + pass @receiver([pre_save], sender=Profile) From 130c96a2fe17f1f50f0bf722a742d6c374dabffa Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 11 Oct 2023 00:21:21 -0500 Subject: [PATCH 24/51] Fix register --- judge/models/profile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/judge/models/profile.py b/judge/models/profile.py index 00dbe3f..3692e39 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -12,7 +12,6 @@ from django.utils.timezone import now from django.utils.translation import gettext_lazy as _ from django.dispatch import receiver from django.db.models.signals import post_save, pre_save -from django.core.exceptions import RelatedObjectDoesNotExist from fernet_fields import EncryptedCharField @@ -549,7 +548,7 @@ def on_user_save(sender, instance, **kwargs): try: profile = instance.profile profile._get_basic_info.dirty(profile) - except RelatedObjectDoesNotExist: + except: pass From c3cecb3f583a02cfe27828648ad369ea06b2c934 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 11 Oct 2023 20:33:48 -0500 Subject: [PATCH 25/51] Add more caching --- judge/caching.py | 55 ++++++++++++++++++++--------- judge/jinja2/__init__.py | 1 - judge/jinja2/submission.py | 41 --------------------- judge/models/submission.py | 41 +++++++++++++++++++++ judge/utils/problems.py | 46 +++++++++++++++++------- judge/views/submission.py | 52 ++------------------------- resources/blog.scss | 1 - templates/feed/has_next.html | 2 +- templates/submission/row.html | 2 +- templates/submission/user-ajax.html | 6 ++-- 10 files changed, 121 insertions(+), 126 deletions(-) delete mode 100644 judge/jinja2/submission.py diff --git a/judge/caching.py b/judge/caching.py index b8fb810..8f42d24 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -1,27 +1,32 @@ from inspect import signature -from django.core.cache import cache +from django.core.cache import cache, caches from django.db.models.query import QuerySet from django.core.handlers.wsgi import WSGIRequest import hashlib -MAX_NUM_CHAR = 15 +MAX_NUM_CHAR = 50 NONE_RESULT = "__None__" +def arg_to_str(arg): + if hasattr(arg, "id"): + return str(arg.id) + if isinstance(arg, list) or isinstance(arg, QuerySet): + return hashlib.sha1(str(list(arg)).encode()).hexdigest()[:MAX_NUM_CHAR] + if len(str(arg)) > MAX_NUM_CHAR: + return str(arg)[:MAX_NUM_CHAR] + return str(arg) + + +def filter_args(args_list): + return [x for x in args_list if not isinstance(x, WSGIRequest)] + + +l0_cache = caches["l0"] if "l0" in caches else None + + def cache_wrapper(prefix, timeout=None): - def arg_to_str(arg): - if hasattr(arg, "id"): - return str(arg.id) - if isinstance(arg, list) or isinstance(arg, QuerySet): - return hashlib.sha1(str(list(arg)).encode()).hexdigest()[:MAX_NUM_CHAR] - if len(str(arg)) > MAX_NUM_CHAR: - return str(arg)[:MAX_NUM_CHAR] - return str(arg) - - def filter_args(args_list): - return [x for x in args_list if not isinstance(x, WSGIRequest)] - def get_key(func, *args, **kwargs): args_list = list(args) signature_args = list(signature(func).parameters.keys()) @@ -32,23 +37,41 @@ def cache_wrapper(prefix, timeout=None): key = key.replace(" ", "_") return key + def _get(key): + if not l0_cache: + return cache.get(key) + print("GET", key, l0_cache.get(key)) + return l0_cache.get(key) or cache.get(key) + + def _set_l0(key, value): + if l0_cache: + print("SET", key, value) + l0_cache.set(key, value, 30) + + def _set(key, value, timeout): + _set_l0(key, value) + cache.set(key, value, timeout) + def decorator(func): def wrapper(*args, **kwargs): cache_key = get_key(func, *args, **kwargs) - result = cache.get(cache_key) + result = _get(cache_key) if result is not None: + _set_l0(cache_key, result) if result == NONE_RESULT: result = None return result result = func(*args, **kwargs) if result is None: result = NONE_RESULT - cache.set(cache_key, result, timeout) + _set(cache_key, result, timeout) return result def dirty(*args, **kwargs): cache_key = get_key(func, *args, **kwargs) cache.delete(cache_key) + if l0_cache: + l0_cache.delete(cache_key) wrapper.dirty = dirty diff --git a/judge/jinja2/__init__.py b/judge/jinja2/__init__.py index 93d0ed5..93ab0ad 100644 --- a/judge/jinja2/__init__.py +++ b/judge/jinja2/__init__.py @@ -21,7 +21,6 @@ from . import ( render, social, spaceless, - submission, timedelta, ) from . import registry diff --git a/judge/jinja2/submission.py b/judge/jinja2/submission.py deleted file mode 100644 index cdb3634..0000000 --- a/judge/jinja2/submission.py +++ /dev/null @@ -1,41 +0,0 @@ -from . import registry - - -@registry.function -def submission_layout( - submission, - profile_id, - user, - editable_problem_ids, - completed_problem_ids, - tester_problem_ids, -): - problem_id = submission.problem_id - - if problem_id in editable_problem_ids: - return True - - if problem_id in tester_problem_ids: - return True - - if profile_id == submission.user_id: - return True - - if user.has_perm("judge.change_submission"): - return True - - if user.has_perm("judge.view_all_submission"): - return True - - if submission.problem.is_public and user.has_perm("judge.view_public_submission"): - return True - - if hasattr(submission, "contest"): - contest = submission.contest.participation.contest - if contest.is_editable_by(user): - return True - - if submission.problem_id in completed_problem_ids and submission.problem.is_public: - return True - - return False diff --git a/judge/models/submission.py b/judge/models/submission.py index fea9b64..842b627 100644 --- a/judge/models/submission.py +++ b/judge/models/submission.py @@ -220,6 +220,47 @@ class Submission(models.Model): def id_secret(self): return self.get_id_secret(self.id) + def is_accessible_by(self, profile): + from judge.utils.problems import ( + user_completed_ids, + user_tester_ids, + user_editable_ids, + ) + + if not profile: + return False + + problem_id = self.problem_id + user = profile.user + + if profile.id == self.user_id: + return True + + if problem_id in user_editable_ids(profile): + return True + + if self.problem_id in user_completed_ids(profile): + if self.problem.is_public: + return True + if problem_id in user_tester_ids(profile): + return True + + if user.has_perm("judge.change_submission"): + return True + + if user.has_perm("judge.view_all_submission"): + return True + + if self.problem.is_public and user.has_perm("judge.view_public_submission"): + return True + + if hasattr( + self, "contest" + ) and self.contest.participation.contest.is_editable_by(user): + return True + + return False + class Meta: permissions = ( ("abort_any_submission", "Abort any submission"), diff --git a/judge/utils/problems.py b/judge/utils/problems.py index 6c351aa..5861fa7 100644 --- a/judge/utils/problems.py +++ b/judge/utils/problems.py @@ -10,6 +10,8 @@ from django.db.models import Case, Count, ExpressionWrapper, F, Max, Q, When from django.db.models.fields import FloatField from django.utils import timezone from django.utils.translation import gettext as _, gettext_noop +from django.db.models.signals import pre_save +from django.dispatch import receiver from judge.models import Problem, Submission from judge.ml.collab_filter import CollabFilter @@ -24,6 +26,7 @@ __all__ = [ ] +@cache_wrapper(prefix="user_tester") def user_tester_ids(profile): return set( Problem.testers.through.objects.filter(profile=profile).values_list( @@ -32,6 +35,7 @@ def user_tester_ids(profile): ) +@cache_wrapper(prefix="user_editable") def user_editable_ids(profile): result = set( ( @@ -42,22 +46,19 @@ def user_editable_ids(profile): return result +@cache_wrapper(prefix="contest_complete") def contest_completed_ids(participation): - key = "contest_complete:%d" % participation.id - result = cache.get(key) - if result is None: - result = set( - participation.submissions.filter( - submission__result="AC", points=F("problem__points") - ) - .values_list("problem__problem__id", flat=True) - .distinct() + result = set( + participation.submissions.filter( + submission__result="AC", points=F("problem__points") ) - cache.set(key, result, 86400) + .values_list("problem__problem__id", flat=True) + .distinct() + ) return result -@cache_wrapper(prefix="user_complete", timeout=86400) +@cache_wrapper(prefix="user_complete") def user_completed_ids(profile): result = set( Submission.objects.filter( @@ -69,7 +70,7 @@ def user_completed_ids(profile): return result -@cache_wrapper(prefix="contest_attempted", timeout=86400) +@cache_wrapper(prefix="contest_attempted") def contest_attempted_ids(participation): result = { id: {"achieved_points": points, "max_points": max_points} @@ -84,7 +85,7 @@ def contest_attempted_ids(participation): return result -@cache_wrapper(prefix="user_attempted", timeout=86400) +@cache_wrapper(prefix="user_attempted") def user_attempted_ids(profile): result = { id: { @@ -248,3 +249,22 @@ def finished_submission(sub): keys += ["contest_complete:%d" % participation.id] keys += ["contest_attempted:%d" % participation.id] cache.delete_many(keys) + + +@receiver([pre_save], sender=Problem) +def on_problem_save(sender, instance, **kwargs): + if instance.id is None: + return + prev_editors = list(sender.objects.get(id=instance.id).editor_ids) + new_editors = list(instance.editor_ids) + if prev_editors != new_editors: + all_editors = set(prev_editors + new_editors) + for profile_id in all_editors: + user_editable_ids.dirty(profile_id) + + prev_testers = list(sender.objects.get(id=instance.id).tester_ids) + new_testers = list(instance.tester_ids) + if prev_testers != new_testers: + all_testers = set(prev_testers + new_testers) + for profile_id in all_testers: + user_tester_ids.dirty(profile_id) diff --git a/judge/views/submission.py b/judge/views/submission.py index 1556dd9..eae961b 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -84,31 +84,7 @@ class SubmissionMixin(object): class SubmissionDetailBase(LoginRequiredMixin, TitleMixin, SubmissionMixin, DetailView): def get_object(self, queryset=None): submission = super(SubmissionDetailBase, self).get_object(queryset) - profile = self.request.profile - problem = submission.problem - if self.request.user.has_perm("judge.view_all_submission"): - return submission - if problem.is_public and self.request.user.has_perm( - "judge.view_public_submission" - ): - return submission - if submission.user_id == profile.id: - return submission - if problem.is_editor(profile): - return submission - if problem.is_public or problem.testers.filter(id=profile.id).exists(): - if Submission.objects.filter( - user_id=profile.id, - result="AC", - problem_id=problem.id, - points=problem.points, - ).exists(): - return submission - if hasattr( - submission, "contest" - ) and submission.contest.participation.contest.is_editable_by( - self.request.user - ): + if submission.is_accessible_by(self.request.profile): return submission raise PermissionDenied() @@ -483,19 +459,9 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): authenticated = self.request.user.is_authenticated context["dynamic_update"] = False context["show_problem"] = self.show_problem - context["completed_problem_ids"] = ( - user_completed_ids(self.request.profile) if authenticated else [] - ) - context["editable_problem_ids"] = ( - user_editable_ids(self.request.profile) if authenticated else [] - ) - context["tester_problem_ids"] = ( - user_tester_ids(self.request.profile) if authenticated else [] - ) - + context["profile"] = self.request.profile context["all_languages"] = Language.objects.all().values_list("key", "name") context["selected_languages"] = self.selected_languages - context["all_statuses"] = self.get_searchable_status_codes() context["selected_statuses"] = self.selected_statuses @@ -779,19 +745,10 @@ def single_submission(request, submission_id, show_problem=True): "submission/row.html", { "submission": submission, - "completed_problem_ids": user_completed_ids(request.profile) - if authenticated - else [], - "editable_problem_ids": user_editable_ids(request.profile) - if authenticated - else [], - "tester_problem_ids": user_tester_ids(request.profile) - if authenticated - else [], "show_problem": show_problem, "problem_name": show_problem and submission.problem.translated_name(request.LANGUAGE_CODE), - "profile_id": request.profile.id if authenticated else 0, + "profile": request.profile if authenticated else None, }, ) @@ -1010,9 +967,6 @@ class UserContestSubmissionsAjax(UserContestSubmissions): context["contest"] = self.contest context["problem"] = self.problem context["profile"] = self.profile - context["profile_id"] = ( - self.request.profile.id if self.request.profile else None - ) contest_problem = self.contest.contest_problems.get(problem=self.problem) filtered_submissions = [] diff --git a/resources/blog.scss b/resources/blog.scss index ad21448..4c57cfe 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -229,7 +229,6 @@ .show-more { display: flex; color: black; - font-style: italic; font-size: 16px; font-weight: 700; padding: 0px 12px; diff --git a/templates/feed/has_next.html b/templates/feed/has_next.html index 9cc45c9..f26caea 100644 --- a/templates/feed/has_next.html +++ b/templates/feed/has_next.html @@ -1,4 +1,4 @@ {% if has_next_page %} - + {% endif %} \ No newline at end of file diff --git a/templates/submission/row.html b/templates/submission/row.html index 1c4d8d7..73523f6 100644 --- a/templates/submission/row.html +++ b/templates/submission/row.html @@ -1,4 +1,4 @@ -{% set can_view = submission_layout(submission, profile_id, request.user, editable_problem_ids, completed_problem_ids, tester_problem_ids) %} +{% set can_view = submission.is_accessible_by(profile) %}
      {%- if submission.is_graded -%} diff --git a/templates/submission/user-ajax.html b/templates/submission/user-ajax.html index b03248a..d060ede 100644 --- a/templates/submission/user-ajax.html +++ b/templates/submission/user-ajax.html @@ -1,5 +1,5 @@

      - {{_('Contest submissions of')}} {{link_user(profile)}} # + {{_('Contest submissions of')}} {{link_user(profile)}} #

      {% if best_subtasks and subtasks %} @@ -19,7 +19,7 @@ {% endif %} {% if cur_subtask.submission %} - {% set can_view = submission_layout(cur_subtask.submission, profile_id, request.user, editable_problem_ids, completed_problem_ids, tester_problem_ids) %} + {% set can_view = cur_subtask.submission.is_accessible_by(profile) %} {% if can_view %} → {{ cur_subtask.submission.id }} @@ -43,7 +43,7 @@ {% for submission in submissions %} - {% set can_view = submission_layout(submission, profile_id, request.user, editable_problem_ids, completed_problem_ids, tester_problem_ids) %} + {% set can_view = submission.is_accessible_by(profile) %}
      {% if submission.contest_time %} {{submission.contest_time}} From e1a38d42c33923fd3a41dce4c371bc2f52945e16 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 11 Oct 2023 20:45:32 -0500 Subject: [PATCH 26/51] Use better field --- judge/models/submission.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/judge/models/submission.py b/judge/models/submission.py index 842b627..00c5941 100644 --- a/judge/models/submission.py +++ b/judge/models/submission.py @@ -254,9 +254,8 @@ class Submission(models.Model): if self.problem.is_public and user.has_perm("judge.view_public_submission"): return True - if hasattr( - self, "contest" - ) and self.contest.participation.contest.is_editable_by(user): + contest = self.contest_object + if contest and contest.is_editable_by(user): return True return False From 11bc57f2b153c194ca4c4fd689e704e25930b715 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 12 Oct 2023 08:56:53 -0500 Subject: [PATCH 27/51] Move dirty logic to admin --- judge/admin/problem.py | 22 +++++++++++++++++++++- judge/caching.py | 2 -- judge/models/problem.py | 14 +++++++++++--- judge/utils/problems.py | 31 ++++++------------------------- 4 files changed, 38 insertions(+), 31 deletions(-) diff --git a/judge/admin/problem.py b/judge/admin/problem.py index 1a47d37..7f0e473 100644 --- a/judge/admin/problem.py +++ b/judge/admin/problem.py @@ -33,6 +33,7 @@ from judge.widgets import ( CheckboxSelectMultipleWithSelectAll, HeavyPreviewAdminPageDownWidget, ) +from judge.utils.problems import user_editable_ids, user_tester_ids MEMORY_UNITS = (("KB", "KB"), ("MB", "MB")) @@ -359,12 +360,31 @@ class ProblemAdmin(CompareVersionAdmin): self._rescore(request, obj.id) def save_related(self, request, form, formsets, change): + editors = set() + testers = set() + if "curators" in form.changed_data or "authors" in form.changed_data: + editors = set(form.instance.editor_ids) + if "testers" in form.changed_data: + testers = set(form.instance.tester_ids) + super().save_related(request, form, formsets, change) - # Only rescored if we did not already do so in `save_model` obj = form.instance obj.curators.add(request.profile) obj.is_organization_private = obj.organizations.count() > 0 obj.save() + + if "curators" in form.changed_data or "authors" in form.changed_data: + del obj.editor_ids + editors = editors.union(set(obj.editor_ids)) + if "testers" in form.changed_data: + del obj.tester_ids + testers = testers.union(set(obj.tester_ids)) + + for editor in editors: + user_editable_ids.dirty(editor) + for tester in testers: + user_tester_ids.dirty(tester) + # Create notification if "is_public" in form.changed_data or "organizations" in form.changed_data: users = set(obj.authors.all()) diff --git a/judge/caching.py b/judge/caching.py index 8f42d24..43479da 100644 --- a/judge/caching.py +++ b/judge/caching.py @@ -40,12 +40,10 @@ def cache_wrapper(prefix, timeout=None): def _get(key): if not l0_cache: return cache.get(key) - print("GET", key, l0_cache.get(key)) return l0_cache.get(key) or cache.get(key) def _set_l0(key, value): if l0_cache: - print("SET", key, value) l0_cache.set(key, value, 30) def _set(key, value, timeout): diff --git a/judge/models/problem.py b/judge/models/problem.py index 3377b2d..baed1d8 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -436,15 +436,23 @@ class Problem(models.Model, PageVotable, Bookmarkable): @cached_property def author_ids(self): - return self.authors.values_list("id", flat=True) + return Problem.authors.through.objects.filter(problem=self).values_list( + "profile_id", flat=True + ) @cached_property def editor_ids(self): - return self.author_ids | self.curators.values_list("id", flat=True) + return self.author_ids.union( + Problem.curators.through.objects.filter(problem=self).values_list( + "profile_id", flat=True + ) + ) @cached_property def tester_ids(self): - return self.testers.values_list("id", flat=True) + return Problem.testers.through.objects.filter(problem=self).values_list( + "profile_id", flat=True + ) @cached_property def usable_common_names(self): diff --git a/judge/utils/problems.py b/judge/utils/problems.py index 5861fa7..67ef163 100644 --- a/judge/utils/problems.py +++ b/judge/utils/problems.py @@ -10,8 +10,6 @@ from django.db.models import Case, Count, ExpressionWrapper, F, Max, Q, When from django.db.models.fields import FloatField from django.utils import timezone from django.utils.translation import gettext as _, gettext_noop -from django.db.models.signals import pre_save -from django.dispatch import receiver from judge.models import Problem, Submission from judge.ml.collab_filter import CollabFilter @@ -29,9 +27,9 @@ __all__ = [ @cache_wrapper(prefix="user_tester") def user_tester_ids(profile): return set( - Problem.testers.through.objects.filter(profile=profile).values_list( - "problem_id", flat=True - ) + Problem.testers.through.objects.filter(profile=profile) + .values_list("problem_id", flat=True) + .distinct() ) @@ -41,7 +39,9 @@ def user_editable_ids(profile): ( Problem.objects.filter(authors=profile) | Problem.objects.filter(curators=profile) - ).values_list("id", flat=True) + ) + .values_list("id", flat=True) + .distinct() ) return result @@ -249,22 +249,3 @@ def finished_submission(sub): keys += ["contest_complete:%d" % participation.id] keys += ["contest_attempted:%d" % participation.id] cache.delete_many(keys) - - -@receiver([pre_save], sender=Problem) -def on_problem_save(sender, instance, **kwargs): - if instance.id is None: - return - prev_editors = list(sender.objects.get(id=instance.id).editor_ids) - new_editors = list(instance.editor_ids) - if prev_editors != new_editors: - all_editors = set(prev_editors + new_editors) - for profile_id in all_editors: - user_editable_ids.dirty(profile_id) - - prev_testers = list(sender.objects.get(id=instance.id).tester_ids) - new_testers = list(instance.tester_ids) - if prev_testers != new_testers: - all_testers = set(prev_testers + new_testers) - for profile_id in all_testers: - user_tester_ids.dirty(profile_id) From aa1b627e6fac434a303fcce8ea2183165e25ba61 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 13 Oct 2023 20:16:21 -0500 Subject: [PATCH 28/51] Fix import bug --- judge/views/ticket.py | 1 + 1 file changed, 1 insertion(+) diff --git a/judge/views/ticket.py b/judge/views/ticket.py index f4bf97a..60a151e 100644 --- a/judge/views/ticket.py +++ b/judge/views/ticket.py @@ -35,6 +35,7 @@ from judge.utils.tickets import filter_visible_tickets, own_ticket_filter from judge.utils.views import SingleObjectFormView, TitleMixin, paginate_query_context from judge.views.problem import ProblemMixin from judge.widgets import HeavyPreviewPageDownWidget +from judge.models.notification import make_notification ticket_widget = ( forms.Textarea() From 36e505952cb6993085b8ebaaba7563f8764ee6f0 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 14 Oct 2023 14:56:22 -0500 Subject: [PATCH 29/51] Add fulltext search --- judge/migrations/0173_fulltext.py | 25 ++++++ judge/models/contest.py | 2 + judge/models/problem.py | 4 +- judge/views/contests.py | 9 ++- judge/views/problem.py | 123 ++++++++++++++--------------- templates/problem/list-base.html | 2 +- templates/problem/search-form.html | 7 -- 7 files changed, 96 insertions(+), 76 deletions(-) create mode 100644 judge/migrations/0173_fulltext.py diff --git a/judge/migrations/0173_fulltext.py b/judge/migrations/0173_fulltext.py new file mode 100644 index 0000000..a47ef7b --- /dev/null +++ b/judge/migrations/0173_fulltext.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.18 on 2023-10-14 00:53 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0172_index_rating"), + ] + + operations = [ + migrations.RunSQL( + ( + "CREATE FULLTEXT INDEX IF NOT EXISTS code_name_index ON judge_problem (code, name)", + ), + reverse_sql=migrations.RunSQL.noop, + ), + migrations.RunSQL( + ( + "CREATE FULLTEXT INDEX IF NOT EXISTS key_name_index ON judge_contest (`key`, name)", + ), + reverse_sql=migrations.RunSQL.noop, + ), + ] diff --git a/judge/models/contest.py b/judge/models/contest.py index db1b3e6..bda262d 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -24,6 +24,7 @@ from judge.models.submission import Submission from judge.ratings import rate_contest from judge.models.pagevote import PageVotable from judge.models.bookmark import Bookmarkable +from judge.fulltext import SearchManager __all__ = [ "Contest", @@ -309,6 +310,7 @@ class Contest(models.Model, PageVotable, Bookmarkable): comments = GenericRelation("Comment") pagevote = GenericRelation("PageVote") bookmark = GenericRelation("BookMark") + objects = SearchManager(("key", "name")) @cached_property def format_class(self): diff --git a/judge/models/problem.py b/judge/models/problem.py index baed1d8..47741e9 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -107,9 +107,7 @@ class License(models.Model): class TranslatedProblemQuerySet(SearchQuerySet): def __init__(self, **kwargs): - super(TranslatedProblemQuerySet, self).__init__( - ("code", "name", "description"), **kwargs - ) + super(TranslatedProblemQuerySet, self).__init__(("code", "name"), **kwargs) def add_i18n_name(self, language): return self.annotate( diff --git a/judge/views/contests.py b/judge/views/contests.py index b6f7242..e1fe5ae 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -186,9 +186,16 @@ class ContestList( self.request.GET.getlist("contest") ).strip() if query: - queryset = queryset.filter( + substr_queryset = queryset.filter( Q(key__icontains=query) | Q(name__icontains=query) ) + if settings.ENABLE_FTS: + queryset = ( + queryset.search(query).extra(order_by=["-relevance"]) + | substr_queryset + ) + else: + queryset = substr_queryset if not self.org_query and self.request.organization: self.org_query = [self.request.organization.id] if self.show_orgs: diff --git a/judge/views/problem.py b/judge/views/problem.py index 2be9cb4..0bf304b 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -466,10 +466,14 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView manual_sort = frozenset(("name", "group", "solved", "type")) all_sorts = sql_sort | manual_sort default_desc = frozenset(("date", "points", "ac_rate", "user_count")) - default_sort = "-date" first_page_href = None filter_organization = False + def get_default_sort_order(self, request): + if "search" in request.GET and settings.ENABLE_FTS: + return "-relevance" + return "-date" + def get_paginator( self, queryset, per_page, orphans=0, allow_empty_first_page=True, **kwargs ): @@ -485,42 +489,46 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView ) if not self.in_contest: queryset = queryset.add_i18n_name(self.request.LANGUAGE_CODE) - sort_key = self.order.lstrip("-") - if sort_key in self.sql_sort: - queryset = queryset.order_by(self.order) - elif sort_key == "name": - queryset = queryset.order_by(self.order.replace("name", "i18n_name")) - elif sort_key == "group": - queryset = queryset.order_by(self.order + "__name") - elif sort_key == "solved": - if self.request.user.is_authenticated: - profile = self.request.profile - solved = user_completed_ids(profile) - attempted = user_attempted_ids(profile) - - def _solved_sort_order(problem): - if problem.id in solved: - return 1 - if problem.id in attempted: - return 0 - return -1 - - queryset = list(queryset) - queryset.sort( - key=_solved_sort_order, reverse=self.order.startswith("-") - ) - elif sort_key == "type": - if self.show_types: - queryset = list(queryset) - queryset.sort( - key=lambda problem: problem.types_list[0] - if problem.types_list - else "", - reverse=self.order.startswith("-"), - ) + queryset = self.sort_queryset(queryset) paginator.object_list = queryset return paginator + def sort_queryset(self, queryset): + sort_key = self.order.lstrip("-") + if sort_key in self.sql_sort: + queryset = queryset.order_by(self.order) + elif sort_key == "name": + queryset = queryset.order_by(self.order.replace("name", "i18n_name")) + elif sort_key == "group": + queryset = queryset.order_by(self.order + "__name") + elif sort_key == "solved": + if self.request.user.is_authenticated: + profile = self.request.profile + solved = user_completed_ids(profile) + attempted = user_attempted_ids(profile) + + def _solved_sort_order(problem): + if problem.id in solved: + return 1 + if problem.id in attempted: + return 0 + return -1 + + queryset = list(queryset) + queryset.sort( + key=_solved_sort_order, reverse=self.order.startswith("-") + ) + elif sort_key == "type": + if self.show_types: + queryset = list(queryset) + queryset.sort( + key=lambda problem: problem.types_list[0] + if problem.types_list + else "", + reverse=self.order.startswith("-"), + ) + return queryset + @cached_property def profile(self): if not self.request.user.is_authenticated: @@ -611,36 +619,28 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView self.request.GET.getlist("search") ).strip() if query: - if settings.ENABLE_FTS and self.full_text: - queryset = queryset.search(query, queryset.BOOLEAN).extra( - order_by=["-relevance"] + substr_queryset = queryset.filter( + Q(code__icontains=query) + | Q(name__icontains=query) + | Q( + translations__name__icontains=query, + translations__language=self.request.LANGUAGE_CODE, + ) + ) + if settings.ENABLE_FTS: + queryset = ( + queryset.search(query, queryset.BOOLEAN).extra( + order_by=["-relevance"] + ) + | substr_queryset ) else: - queryset = queryset.filter( - Q(code__icontains=query) - | Q(name__icontains=query) - | Q( - translations__name__icontains=query, - translations__language=self.request.LANGUAGE_CODE, - ) - ) + queryset = substr_queryset self.prepoint_queryset = queryset if self.point_start is not None: queryset = queryset.filter(points__gte=self.point_start) if self.point_end is not None: queryset = queryset.filter(points__lte=self.point_end) - queryset = queryset.annotate( - has_public_editorial=Case( - When( - solution__is_public=True, - solution__publish_on__lte=timezone.now(), - then=True, - ), - default=False, - output_field=BooleanField(), - ) - ) - return queryset.distinct() def get_queryset(self): @@ -658,7 +658,6 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView context["show_types"] = 0 if self.in_contest else int(self.show_types) context["full_text"] = 0 if self.in_contest else int(self.full_text) context["show_editorial"] = 0 if self.in_contest else int(self.show_editorial) - context["have_editorial"] = 0 if self.in_contest else int(self.have_editorial) context["show_solved_only"] = ( 0 if self.in_contest else int(self.show_solved_only) ) @@ -768,7 +767,6 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView self.show_types = self.GET_with_session(request, "show_types") self.full_text = self.GET_with_session(request, "full_text") self.show_editorial = self.GET_with_session(request, "show_editorial") - self.have_editorial = self.GET_with_session(request, "have_editorial") self.show_solved_only = self.GET_with_session(request, "show_solved_only") self.search_query = None @@ -816,7 +814,6 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView "show_types", "full_text", "show_editorial", - "have_editorial", "show_solved_only", ) for key in to_update: @@ -862,9 +859,6 @@ class ProblemFeed(ProblemList, FeedView): self.show_types = 1 queryset = super(ProblemFeed, self).get_queryset() - if self.have_editorial: - queryset = queryset.filter(has_public_editorial=1) - user = self.request.profile if self.feed_type == "new": @@ -886,6 +880,8 @@ class ProblemFeed(ProblemList, FeedView): .order_by("?") .add_i18n_name(self.request.LANGUAGE_CODE) ) + if "search" in self.request.GET: + return queryset.add_i18n_name(self.request.LANGUAGE_CODE) if not settings.ML_OUTPUT_PATH or not user: return queryset.order_by("?").add_i18n_name(self.request.LANGUAGE_CODE) @@ -946,7 +942,6 @@ class ProblemFeed(ProblemList, FeedView): context["title"] = self.title context["feed_type"] = self.feed_type context["has_show_editorial_option"] = False - context["has_have_editorial_option"] = False return context diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html index 722f6da..f49506d 100644 --- a/templates/problem/list-base.html +++ b/templates/problem/list-base.html @@ -114,7 +114,7 @@ $('#go').click(clean_submit); - $('input#full_text, input#hide_solved, input#show_types, input#show_editorial, input#have_editorial, input#show_solved_only').click(function () { + $('input#full_text, input#hide_solved, input#show_types, input#have_editorial, input#show_solved_only').click(function () { prep_form(); ($('
      ').attr('action', window.location.pathname + '?' + form_serialize()) .append($('').attr('type', 'hidden').attr('name', 'csrfmiddlewaretoken') diff --git a/templates/problem/search-form.html b/templates/problem/search-form.html index 24b4600..53c9e84 100644 --- a/templates/problem/search-form.html +++ b/templates/problem/search-form.html @@ -34,13 +34,6 @@ {% endif %} - {% if has_have_editorial_option %} -
      - - -
      - {% endif %} {% if organizations %}
      From edb0bf30d8625665b5ea97e5d6df4d1bd1d78178 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 14 Oct 2023 15:04:11 -0500 Subject: [PATCH 30/51] Sort contest by relevance --- judge/views/contests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/judge/views/contests.py b/judge/views/contests.py index e1fe5ae..a84d98b 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -236,9 +236,10 @@ class ContestList( active.append(participation) present.remove(participation.contest) - active.sort(key=attrgetter("end_time", "key")) - present.sort(key=attrgetter("end_time", "key")) - future.sort(key=attrgetter("start_time")) + if not ("contest" in self.request.GET and settings.ENABLE_FTS): + active.sort(key=attrgetter("end_time", "key")) + present.sort(key=attrgetter("end_time", "key")) + future.sort(key=attrgetter("start_time")) context["active_participations"] = active context["current_contests"] = present context["future_contests"] = future From eb6fd48e21290facd57d9d528070421ed9c57f93 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sun, 15 Oct 2023 18:19:56 -0500 Subject: [PATCH 31/51] Change admin css --- judge/widgets/pagedown.py | 2 +- resources/admin/css/pagedown.css | 5 ++++- resources/darkmode-svg.css | 6 ++++++ resources/wpadmin/css/wpadmin.site.css | 17 ++--------------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/judge/widgets/pagedown.py b/judge/widgets/pagedown.py index edc4bf1..c30940b 100644 --- a/judge/widgets/pagedown.py +++ b/judge/widgets/pagedown.py @@ -52,11 +52,11 @@ else: class Media: css = { "all": [ - "markdown.css", "pagedown_widget.css", "content-description.css", "admin/css/pagedown.css", "pagedown.css", + "https://fonts.googleapis.com/css2?family=Fira+Code&family=Noto+Sans&display=swap", ] } js = ["admin/js/pagedown.js"] diff --git a/resources/admin/css/pagedown.css b/resources/admin/css/pagedown.css index 27732de..ee29196 100644 --- a/resources/admin/css/pagedown.css +++ b/resources/admin/css/pagedown.css @@ -2,9 +2,12 @@ padding-right: 15px !important; } - .wmd-preview { margin-top: 15px; padding: 15px; word-wrap: break-word; } + +.md-typeset, .wmd-input { + line-height: 1.4em !important; +} diff --git a/resources/darkmode-svg.css b/resources/darkmode-svg.css index 83c1f21..7e8f329 100644 --- a/resources/darkmode-svg.css +++ b/resources/darkmode-svg.css @@ -14,3 +14,9 @@ .wmd-heading-button { background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgaGVpZ2h0PSIxNzkyIiB2aWV3Qm94PSIwIDAgMTc5MiAxNzkyIiB3aWR0aD0iMTc5MiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBzdHlsZT0iZmlsdGVyOmludmVydCgxMDAlKSIgZD0iTTE2ODIgMTY2NHEtNDQgMC0xMzIuNS0zLjV0LTEzMy41LTMuNXEtNDQgMC0xMzIgMy41dC0xMzIgMy41cS0yNCAwLTM3LTIwLjV0LTEzLTQ1LjVxMC0zMSAxNy00NnQzOS0xNyA1MS03IDQ1LTE1cTMzLTIxIDMzLTE0MGwtMS0zOTFxMC0yMS0xLTMxLTEzLTQtNTAtNGgtNjc1cS0zOCAwLTUxIDQtMSAxMC0xIDMxbC0xIDM3MXEwIDE0MiAzNyAxNjQgMTYgMTAgNDggMTN0NTcgMy41IDQ1IDE1IDIwIDQ1LjVxMCAyNi0xMi41IDQ4dC0zNi41IDIycS00NyAwLTEzOS41LTMuNXQtMTM4LjUtMy41cS00MyAwLTEyOCAzLjV0LTEyNyAzLjVxLTIzIDAtMzUuNS0yMXQtMTIuNS00NXEwLTMwIDE1LjUtNDV0MzYtMTcuNSA0Ny41LTcuNSA0Mi0xNXEzMy0yMyAzMy0xNDNsLTEtNTd2LTgxM3EwLTMgLjUtMjZ0MC0zNi41LTEuNS0zOC41LTMuNS00Mi02LjUtMzYuNS0xMS0zMS41LTE2LTE4cS0xNS0xMC00NS0xMnQtNTMtMi00MS0xNC0xOC00NXEwLTI2IDEyLTQ4dDM2LTIycTQ2IDAgMTM4LjUgMy41dDEzOC41IDMuNXE0MiAwIDEyNi41LTMuNXQxMjYuNS0zLjVxMjUgMCAzNy41IDIydDEyLjUgNDhxMCAzMC0xNyA0My41dC0zOC41IDE0LjUtNDkuNSA0LTQzIDEzcS0zNSAyMS0zNSAxNjBsMSAzMjBxMCAyMSAxIDMyIDEzIDMgMzkgM2g2OTlxMjUgMCAzOC0zIDEtMTEgMS0zMmwxLTMyMHEwLTEzOS0zNS0xNjAtMTgtMTEtNTguNS0xMi41dC02Ni0xMy0yNS41LTQ5LjVxMC0yNiAxMi41LTQ4dDM3LjUtMjJxNDQgMCAxMzIgMy41dDEzMiAzLjVxNDMgMCAxMjktMy41dDEyOS0zLjVxMjUgMCAzNy41IDIydDEyLjUgNDhxMCAzMC0xNy41IDQ0dC00MCAxNC41LTUxLjUgMy00NCAxMi41cS0zNSAyMy0zNSAxNjFsMSA5NDNxMCAxMTkgMzQgMTQwIDE2IDEwIDQ2IDEzLjV0NTMuNSA0LjUgNDEuNSAxNS41IDE4IDQ0LjVxMCAyNi0xMiA0OHQtMzYgMjJ6Ii8+PC9zdmc+"); } +.wmd-undo-button { + background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgaGVpZ2h0PSI0OHB4IiBpZD0ic3ZnMTEzMDAiIHdpZHRoPSI0OHB4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+PGRlZnMgaWQ9ImRlZnMzIj48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50MjMyNiI+PHN0b3AgaWQ9InN0b3AyMzI4IiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNmZmZmZmY7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3AyMzMwIiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiNmZmZmZmY7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50MjMxNiI+PHN0b3AgaWQ9InN0b3AyMzE4IiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNjNGEwMDA7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3AyMzIwIiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiNjNGEwMDA7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50MjMwOCI+PHN0b3AgaWQ9InN0b3AyMzEwIiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNlZGQ0MDA7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3AyMzEyIiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiNlZGQ0MDA7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50ODY2MiI+PHN0b3AgaWQ9InN0b3A4NjY0IiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiMwMDAwMDA7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3A4NjY2IiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiMwMDAwMDA7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48cmFkaWFsR3JhZGllbnQgY3g9IjI0LjgzNzEyNiIgY3k9IjM2LjQyMTEyNyIgZng9IjI0LjgzNzEyNiIgZnk9IjM2LjQyMTEyNyIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCgxLjAwMDAwMCwwLjAwMDAwMCwwLjAwMDAwMCwwLjUzNjcyMywtNi4yMjcyNjVlLTE0LDE2Ljg3MzA2KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJyYWRpYWxHcmFkaWVudDg2NjgiIHI9IjE1LjY0NDczNyIgeGxpbms6aHJlZj0iI2xpbmVhckdyYWRpZW50ODY2MiIvPjxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyR3JhZGllbnQyMTg3Ij48c3RvcCBpZD0ic3RvcDIxODkiIG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6I2ZmZmZmZjtzdG9wLW9wYWNpdHk6MTsiLz48c3RvcCBpZD0ic3RvcDIxOTEiIG9mZnNldD0iMSIgc3R5bGU9InN0b3AtY29sb3I6I2ZmZmZmZjtzdG9wLW9wYWNpdHk6MDsiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBncmFkaWVudFRyYW5zZm9ybT0ibWF0cml4KC0xLjgxMzQ3MWUtMTYsLTEuMTcxOTI2LC0xLjE3MTkyNiwxLjgxMzQ3MWUtMTYsNDYuMTc0NDAsNTQuMTAxMTEpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgaWQ9ImxpbmVhckdyYWRpZW50MTc2NCIgeDE9IjE3LjA2MDgwNiIgeDI9IjEyLjYyNDMzNyIgeGxpbms6aHJlZj0iI2xpbmVhckdyYWRpZW50MjE4NyIgeTE9IjExLjM5NTAyIiB5Mj0iMTIuNTgzNzY5Ii8+PGxpbmVhckdyYWRpZW50IGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiBpZD0ibGluZWFyR3JhZGllbnQyMzE0IiB4MT0iMjYuNSIgeDI9IjI2LjI1IiB4bGluazpocmVmPSIjbGluZWFyR3JhZGllbnQyMzA4IiB5MT0iMzQuMjUiIHkyPSI0My41NzE4MzEiLz48bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXJHcmFkaWVudDIzMjIiIHgxPSIyNi41IiB4Mj0iMjYuMjUiIHhsaW5rOmhyZWY9IiNsaW5lYXJHcmFkaWVudDIzMTYiIHkxPSIzNC4yNSIgeTI9IjQzLjU3MTgzMSIvPjxyYWRpYWxHcmFkaWVudCBjeD0iMTUuMDk0MDMiIGN5PSIxMy4yODI3MjEiIGZ4PSIxNS4wOTQwMyIgZnk9IjEzLjI4MjcyMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCgyLjQ5NjAzMSwtMS4xNTE5MDVlLTE2LDEuMDYxNzU2ZS0xNiwyLjMwMDY4OSwtMjUuMTI0MDIsLTE3LjgyNjM2KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJyYWRpYWxHcmFkaWVudDIzMzIiIHI9IjEwLjE2NDY2IiB4bGluazpocmVmPSIjbGluZWFyR3JhZGllbnQyMzI2Ii8+PC9kZWZzPjxnIGlkPSJsYXllcjEiPjxwYXRoIGQ9Ik0gNDAuNDgxODYzIDM2LjQyMTEyNyBBIDE1LjY0NDczNyA4LjM5Njg5MzUgMCAxIDEgIDkuMTkyMzg4NSwzNi40MjExMjcgQSAxNS42NDQ3MzcgOC4zOTY4OTM1IDAgMSAxICA0MC40ODE4NjMgMzYuNDIxMTI3IHoiIGlkPSJwYXRoODY2MCIgc3R5bGU9ImludmVydDoxMDAlO29wYWNpdHk6MC4xNDExNzY0Nztjb2xvcjojMDAwMDAwO2ZpbGw6dXJsKCNyYWRpYWxHcmFkaWVudDg2NjgpO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpldmVub2RkO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxO3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO21hcmtlcjpub25lO21hcmtlci1zdGFydDpub25lO21hcmtlci1taWQ6bm9uZTttYXJrZXItZW5kOm5vbmU7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLWRhc2hhcnJheTpub25lO3N0cm9rZS1kYXNob2Zmc2V0OjA7c3Ryb2tlLW9wYWNpdHk6MTt2aXNpYmlsaXR5OnZpc2libGU7ZGlzcGxheTppbmxpbmU7b3ZlcmZsb3c6dmlzaWJsZSIgdHJhbnNmb3JtPSJtYXRyaXgoLTEuNDg5NzM2LDAuMDAwMDAwLDAuMDAwMDAwLC0xLjAwMTI1Miw2MC42MDQzNiw3NS4zMTI2MCkiLz48cGF0aCBkPSJNIDkuNTgyNDQxLDQ1LjAzNDM2OSBDIDQ5LjYwODI0OSw0Ni4zNTU1MDkgNDMuMjgyNDA1LDEyLjI5MzU1IDIyLjQ2MjQxMSwxMi40OTc2NSBMIDIyLjQ2MjQxMSwzLjEyMjIzOTYgTCA1LjgxMzkyOTgsMTcuNzA4ODE5IEwgMjIuNDYyNDExLDMzLjAwNjM0OSBDIDIyLjQ2MjQxMSwzMy4wMDYzNDkgMjIuNDYyNDExLDIzLjMzNzk2OSAyMi40NjI0MTEsMjMuMzM3OTY5IEMgMzYuNTI1NTIxLDIyLjc1MTk5OSA0MC42Mzk5MzksNDQuNzcwNTQ5IDkuNTgyNDQxLDQ1LjAzNDM2OSB6ICIgaWQ9InBhdGgxNDMyIiBzdHlsZT0iaW52ZXJ0OjEwMCU7b3BhY2l0eToxO2NvbG9yOiMwMDAwMDA7ZmlsbDp1cmwoI2xpbmVhckdyYWRpZW50MjMxNCk7ZmlsbC1vcGFjaXR5OjEuMDtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6dXJsKCNsaW5lYXJHcmFkaWVudDIzMjIpO3N0cm9rZS13aWR0aDoxLjAwMDAwMDEyO3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO21hcmtlcjpub25lO21hcmtlci1zdGFydDpub25lO21hcmtlci1taWQ6bm9uZTttYXJrZXItZW5kOm5vbmU7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmJsb2NrO292ZXJmbG93OnZpc2libGUiLz48cGF0aCBkPSJNIDMxLjAzMjI4MSwzOS4zMTU1MTkgQyA0Mi43NTUzOCwzMy4yMzU4OTIgMzkuMjIwMDczLDEzLjA4NzQ4OSAyMS40NDg3MDEsMTMuNTQ5OTU5IEwgMjEuNDQ4NzAxLDUuNDUwODY3OCBDIDIxLjQ0ODcwMSw1LjQ1MDg2NzggNy40MDA5NjI4LDE3LjcxNDU4OSA3LjQwMDk2MjgsMTcuNzE0NTg5IEwgMjEuNDQ4NzAxLDMwLjY1ODYxNyBDIDIxLjQ0ODcwMSwzMC42NTg2MTcgMjEuNDQ4NzAxLDIyLjM4MDk3OSAyMS40NDg3MDEsMjIuMzgwOTc5IEMgMzYuMjg4NTUxLDIyLjAzMjcwOSAzNS42MDg2MTEsMzUuMTM4NTc5IDMxLjAzMjI4MSwzOS4zMTU1MTkgeiAiIGlkPSJwYXRoMjE3NyIgc3R5bGU9ImludmVydDoxMDAlO29wYWNpdHk6MC42OTg4NjM2MTtjb2xvcjojMDAwMDAwO2ZpbGw6bm9uZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6dXJsKCNsaW5lYXJHcmFkaWVudDE3NjQpO3N0cm9rZS13aWR0aDowLjk5OTk5OTc7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7bWFya2VyOm5vbmU7bWFya2VyLXN0YXJ0Om5vbmU7bWFya2VyLW1pZDpub25lO21hcmtlci1lbmQ6bm9uZTtzdHJva2UtbWl0ZXJsaW1pdDoxMDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmJsb2NrO292ZXJmbG93OnZpc2libGUiLz48cGF0aCBkPSJNIDYuNjI5MTI2MSwxNy42ODI3OTcgTCAxMi4yODU5OCwyMy4wNzQ0ODYgQyAxOC41NjE1NTMsMjIuODk3NzA5IDE1LjczMzEyNiwxNi43MTA1MjUgMjYuOTU4NDQ2LDEzLjYxNjkzMyBMIDIyLjAwODY5OSwxMi45OTgyMTQgTCAyMS45MjAzMSw0LjMzNjE1NjIgTCA2LjYyOTEyNjEsMTcuNjgyNzk3IHogIiBpZD0icGF0aDIzMjQiIHN0eWxlPSJpbnZlcnQ6MTAwJTtvcGFjaXR5OjAuNTExMzYzNjQ7Y29sb3I6IzAwMDAwMDtmaWxsOnVybCgjcmFkaWFsR3JhZGllbnQyMzMyKTtmaWxsLW9wYWNpdHk6MS4wO2ZpbGwtcnVsZTpldmVub2RkO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxO3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO21hcmtlcjpub25lO21hcmtlci1zdGFydDpub25lO21hcmtlci1taWQ6bm9uZTttYXJrZXItZW5kOm5vbmU7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmlubGluZTtvdmVyZmxvdzp2aXNpYmxlIi8+PC9nPjwvc3ZnPg=="); +} +.wmd-redo-button { + background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgaGVpZ2h0PSI0OHB4IiBpZD0ic3ZnMTEzMDAiIHdpZHRoPSI0OHB4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+PGRlZnMgaWQ9ImRlZnMzIj48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50MjI0MCI+PHN0b3AgaWQ9InN0b3AyMjQyIiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiM5OWIwMGI7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3AyMjQ0IiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiM5OWIwMGI7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50MjIzMiI+PHN0b3AgaWQ9InN0b3AyMjM0IiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiM3ODg2MDA7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3AyMjM2IiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiM3ODg2MDA7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50NDk5MSI+PHN0b3AgaWQ9InN0b3A0OTkzIiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiNmZmZmZmY7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3A0OTk1IiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiNmZmZmZmY7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhckdyYWRpZW50ODY2MiI+PHN0b3AgaWQ9InN0b3A4NjY0IiBvZmZzZXQ9IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiMwMDAwMDA7c3RvcC1vcGFjaXR5OjE7Ii8+PHN0b3AgaWQ9InN0b3A4NjY2IiBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiMwMDAwMDA7c3RvcC1vcGFjaXR5OjA7Ii8+PC9saW5lYXJHcmFkaWVudD48cmFkaWFsR3JhZGllbnQgY3g9IjI0LjgzNzEyNiIgY3k9IjM2LjQyMTEyNyIgZng9IjI0LjgzNzEyNiIgZnk9IjM2LjQyMTEyNyIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCgxLjAwMDAwMCwwLjAwMDAwMCwwLjAwMDAwMCwwLjUzNjcyMywtNS44MjUzMjllLTE0LDE2Ljg3MzA2KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJyYWRpYWxHcmFkaWVudDg2NjgiIHI9IjE1LjY0NDczNyIgeGxpbms6aHJlZj0iI2xpbmVhckdyYWRpZW50ODY2MiIvPjxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyR3JhZGllbnQyMTg3Ij48c3RvcCBpZD0ic3RvcDIxODkiIG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6I2ZmZmZmZjtzdG9wLW9wYWNpdHk6MTsiLz48c3RvcCBpZD0ic3RvcDIxOTEiIG9mZnNldD0iMSIgc3R5bGU9InN0b3AtY29sb3I6I2ZmZmZmZjtzdG9wLW9wYWNpdHk6MDsiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBncmFkaWVudFRyYW5zZm9ybT0ibWF0cml4KDEuODEzNDcxZS0xNiwtMS4xNzE5MjYsMS4xNzE5MjYsMS44MTM0NzFlLTE2LDEuNzgyODAxLDU0LjEwMTExKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXJHcmFkaWVudDE3NjQiIHgxPSIxNy4wNjA4MDYiIHgyPSIxMi42MjQzMzciIHhsaW5rOmhyZWY9IiNsaW5lYXJHcmFkaWVudDIxODciIHkxPSIxMS4zOTUwMiIgeTI9IjEyLjU4Mzc2OSIvPjxyYWRpYWxHcmFkaWVudCBjeD0iMTYuNTYzODM3IiBjeT0iMTEuMTMyMjM2IiBmeD0iMTYuNTYzODM3IiBmeT0iMTEuMTMyMjM2IiBncmFkaWVudFRyYW5zZm9ybT0ibWF0cml4KC0xLjI5MDEyN2UtMiwxLjY4NTE5NywxLjcxMzA4MiwxLjMxMTQ3NWUtMiwtMS4wNDE0OTksLTEwLjExNTcxKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJyYWRpYWxHcmFkaWVudDQ5OTciIHI9IjE5LjA2MjUiIHhsaW5rOmhyZWY9IiNsaW5lYXJHcmFkaWVudDQ5OTEiLz48bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXJHcmFkaWVudDIyMzgiIHgxPSIzMyIgeDI9IjMxLjUiIHhsaW5rOmhyZWY9IiNsaW5lYXJHcmFkaWVudDIyMzIiIHkxPSIzNS43NSIgeTI9IjQyLjUiLz48bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJsaW5lYXJHcmFkaWVudDIyNDYiIHgxPSIzMyIgeDI9IjMxLjUiIHhsaW5rOmhyZWY9IiNsaW5lYXJHcmFkaWVudDIyNDAiIHkxPSIzNS43NSIgeTI9IjQyLjUiLz48L2RlZnM+PGcgaWQ9ImxheWVyMSI+PHBhdGggZD0iTSA0MC40ODE4NjMgMzYuNDIxMTI3IEEgMTUuNjQ0NzM3IDguMzk2ODkzNSAwIDEgMSAgOS4xOTIzODg1LDM2LjQyMTEyNyBBIDE1LjY0NDczNyA4LjM5Njg5MzUgMCAxIDEgIDQwLjQ4MTg2MyAzNi40MjExMjcgeiIgaWQ9InBhdGg4NjYwIiBzdHlsZT0iZmlsdGVyOmludmVydCgxMDAlKTtvcGFjaXR5OjAuMTQxMTc2NDc7Y29sb3I6IzAwMDAwMDtmaWxsOnVybCgjcmFkaWFsR3JhZGllbnQ4NjY4KTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6ZXZlbm9kZDtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTtzdHJva2UtbGluZWNhcDpidXR0O3N0cm9rZS1saW5lam9pbjptaXRlcjttYXJrZXI6bm9uZTttYXJrZXItc3RhcnQ6bm9uZTttYXJrZXItbWlkOm5vbmU7bWFya2VyLWVuZDpub25lO3N0cm9rZS1taXRlcmxpbWl0OjEwO3N0cm9rZS1kYXNoYXJyYXk6bm9uZTtzdHJva2UtZGFzaG9mZnNldDowO3N0cm9rZS1vcGFjaXR5OjE7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGUiIHRyYW5zZm9ybT0ibWF0cml4KDEuNDg5NzM2LDAuMDAwMDAwLDAuMDAwMDAwLC0xLjAwMTI1MiwtMTIuNjQ3MTYsNzUuMzEyNjApIi8+PHBhdGggZD0iTSAzOC4zNzQ3Niw0NS4wMzQzNjkgQyAtMS42NTEwNDg2LDQ2LjM1NTUwOSA0LjY3NDc5NTQsMTIuMjkzNTUgMjUuNDk0NzksMTIuNDk3NjUgTCAyNS40OTQ3OSwzLjEyMjIzOTYgTCA0Mi4xNDMyNzEsMTcuNzA4ODE5IEwgMjUuNDk0NzksMzMuMDA2MzQ5IEMgMjUuNDk0NzksMzMuMDA2MzQ5IDI1LjQ5NDc5LDIzLjMzNzk2OSAyNS40OTQ3OSwyMy4zMzc5NjkgQyAxMS40MzE2OCwyMi43NTE5OTkgNy4zMTcyNjE0LDQ0Ljc3MDU0OSAzOC4zNzQ3Niw0NS4wMzQzNjkgeiAiIGlkPSJwYXRoMTQzMiIgc3R5bGU9ImZpbHRlcjppbnZlcnQoMTAwJSk7b3BhY2l0eToxO2NvbG9yOiMwMDAwMDA7ZmlsbDp1cmwoI2xpbmVhckdyYWRpZW50MjI0Nik7ZmlsbC1vcGFjaXR5OjEuMDtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6dXJsKCNsaW5lYXJHcmFkaWVudDIyMzgpO3N0cm9rZS13aWR0aDoxLjAwMDAwMDEyO3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO21hcmtlcjpub25lO21hcmtlci1zdGFydDpub25lO21hcmtlci1taWQ6bm9uZTttYXJrZXItZW5kOm5vbmU7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmJsb2NrO292ZXJmbG93OnZpc2libGUiLz48cGF0aCBkPSJNIDE2LjkyNDkyLDM5LjMxNTUxOSBDIDUuMjAxODIwNCwzMy4yMzU4OTIgOC43MzcxMjc0LDEzLjA4NzQ4OSAyNi41MDg1LDEzLjU0OTk1OSBMIDI2LjUwODUsNS40NTA4Njc4IEMgMjYuNTA4NSw1LjQ1MDg2NzggNDAuNTU2MjM4LDE3LjcxNDU4OSA0MC41NTYyMzgsMTcuNzE0NTg5IEwgMjYuNTA4NSwzMC42NTg2MTcgQyAyNi41MDg1LDMwLjY1ODYxNyAyNi41MDg1LDIyLjM4MDk3OSAyNi41MDg1LDIyLjM4MDk3OSBDIDExLjY2ODY1LDIyLjAzMjcwOSAxMi4zNDg1OSwzNS4xMzg1NzkgMTYuOTI0OTIsMzkuMzE1NTE5IHogIiBpZD0icGF0aDIxNzciIHN0eWxlPSJmaWx0ZXI6aW52ZXJ0KDEwMCUpO29wYWNpdHk6MC42OTg4NjM2MTtjb2xvcjojMDAwMDAwO2ZpbGw6bm9uZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6dXJsKCNsaW5lYXJHcmFkaWVudDE3NjQpO3N0cm9rZS13aWR0aDowLjk5OTk5OTc7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7bWFya2VyOm5vbmU7bWFya2VyLXN0YXJ0Om5vbmU7bWFya2VyLW1pZDpub25lO21hcmtlci1lbmQ6bm9uZTtzdHJva2UtbWl0ZXJsaW1pdDoxMDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmJsb2NrO292ZXJmbG93OnZpc2libGUiLz48cGF0aCBkPSJNIDI2LjAzNjk4OSw0LjU2ODYwOTUgTCAzNi43MjM3MjcsMTQuNzk4MjQxIEMgMjkuNzg2MjI3LDE0Ljc5ODI0IDMyLjAzNjk4OSwyMy43MzU0MjQgMjUuOTExOTg5LDI2LjYxMDQyNCBMIDI1Ljk3NDQ4OSwyMi45NDM2MDkgQyAxMC43ODY5ODksMjIuODgxMTA5IDExLjY2MTk4OSwzOC40NDM2MDkgMjIuNzI0NDg5LDQyLjY5MzYwOSBDIDMuNjM2MzQxNCwzNy44MTE2ODEgNi4yODY5OTA0LDEzLjM4MTEwOSAyNS45MTE5ODksMTIuODgxMTEgTCAyNi4wMzY5ODksNC41Njg2MDk1IHogIiBpZD0icGF0aDQ5ODkiIHN0eWxlPSJmaWx0ZXI6aW52ZXJ0KDEwMCUpO29wYWNpdHk6MC40OTQzMTgxNztjb2xvcjojMDAwMDAwO2ZpbGw6dXJsKCNyYWRpYWxHcmFkaWVudDQ5OTcpO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDowLjk5OTk5OTc7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7bWFya2VyOm5vbmU7bWFya2VyLXN0YXJ0Om5vbmU7bWFya2VyLW1pZDpub25lO21hcmtlci1lbmQ6bm9uZTtzdHJva2UtbWl0ZXJsaW1pdDoxMDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxO3Zpc2liaWxpdHk6dmlzaWJsZTtkaXNwbGF5OmlubGluZTtvdmVyZmxvdzp2aXNpYmxlIi8+PC9nPjwvc3ZnPg=="); +} \ No newline at end of file diff --git a/resources/wpadmin/css/wpadmin.site.css b/resources/wpadmin/css/wpadmin.site.css index d60064c..fad6797 100644 --- a/resources/wpadmin/css/wpadmin.site.css +++ b/resources/wpadmin/css/wpadmin.site.css @@ -18,20 +18,6 @@ width: 100% !important; } -#content .content-description h1, -#content .content-description h2, -#content .content-description h3, -#content .content-description h4, -#content .content-description h5, -#content .content-description h6 { - padding: 0; -} - -#content .content-description h5 { - letter-spacing: initial; - text-transform: initial; -} - #content input.select2-search__field { border: none; box-shadow: none !important; @@ -39,7 +25,8 @@ #content .content-description ul, #content .content-description ol { - margin: 0; + margin-left: 0; + margin-right: 0; } #content .content-description li { From af17ca9665d598ed0bc49283021ee3c4644fc61f Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sun, 15 Oct 2023 18:31:30 -0500 Subject: [PATCH 32/51] Admin css --- resources/wpadmin/css/wpadmin.site.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/resources/wpadmin/css/wpadmin.site.css b/resources/wpadmin/css/wpadmin.site.css index fad6797..d971f7c 100644 --- a/resources/wpadmin/css/wpadmin.site.css +++ b/resources/wpadmin/css/wpadmin.site.css @@ -23,6 +23,28 @@ box-shadow: none !important; } +#content .content-description h1, +#content .content-description h2, +#content .content-description h3, +#content .content-description h4, +#content .content-description h5, +#content .content-description h6 { + padding-left: 0; + padding-right: 0; + font-size: inherit; +} + +#content .content-description h5 { + letter-spacing: initial; + text-transform: initial; +} + +#content .content-description ul, +#content .content-description ol { + margin-left: 0; + margin-right: 0; +} + #content .content-description ul, #content .content-description ol { margin-left: 0; From ae3f1090bfbf2633603c98be7ef5b0fe27cb56a1 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 16 Oct 2023 16:36:56 -0500 Subject: [PATCH 33/51] Reformat --- .pre-commit-config.yaml | 4 + chat_box/views.py | 3 - dmoj/settings.py | 1 - judge/bridge/judge_handler.py | 1 - judge/management/commands/generate_data.py | 1 - .../migrations/0150_alter_profile_timezone.py | 666 +++++++++++++++++- judge/ml/collab_filter.py | 1 - judge/models/problem.py | 1 - judge/tasks/import_users.py | 1 - judge/utils/fine_uploader.py | 1 - judge/utils/problem_data.py | 1 - judge/utils/problems.py | 1 - judge/views/submission.py | 1 - resources/dmmd-preview.scss | 8 +- .../fine-uploader/templates/default.html | 108 +-- .../fine-uploader/templates/gallery.html | 146 ++-- .../templates/simple-thumbnails.html | 110 +-- resources/math.scss | 44 +- resources/users.scss | 4 +- templates/course/base.html | 10 +- templates/course/list.html | 12 +- 21 files changed, 887 insertions(+), 238 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fc3bd4b..8740838 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,3 +11,7 @@ repos: rev: 22.12.0 hooks: - id: black + - repo: https://github.com/hadialqattan/pycln + rev: 'v2.3.0' + hooks: + - id: pycln diff --git a/chat_box/views.py b/chat_box/views.py index 48fa37a..c4e871f 100644 --- a/chat_box/views.py +++ b/chat_box/views.py @@ -29,7 +29,6 @@ from django.utils import timezone from django.contrib.auth.decorators import login_required from django.urls import reverse -import datetime from judge import event_poster as event from judge.jinja2.gravatar import gravatar @@ -38,8 +37,6 @@ from judge.models import Friend from chat_box.models import Message, Profile, Room, UserRoom, Ignore from chat_box.utils import encrypt_url, decrypt_url, encrypt_channel, get_unread_boxes -import json - class ChatView(ListView): context_object_name = "message" diff --git a/dmoj/settings.py b/dmoj/settings.py index e136a4d..1035969 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -9,7 +9,6 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ """ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import datetime import os import tempfile diff --git a/judge/bridge/judge_handler.py b/judge/bridge/judge_handler.py index 2f13b8a..be21ebe 100644 --- a/judge/bridge/judge_handler.py +++ b/judge/bridge/judge_handler.py @@ -3,7 +3,6 @@ import json import logging import threading import time -import os from collections import deque, namedtuple from operator import itemgetter diff --git a/judge/management/commands/generate_data.py b/judge/management/commands/generate_data.py index 83827d9..4fcaa4e 100644 --- a/judge/management/commands/generate_data.py +++ b/judge/management/commands/generate_data.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from judge.models import * -from collections import defaultdict import csv import os from django.conf import settings diff --git a/judge/migrations/0150_alter_profile_timezone.py b/judge/migrations/0150_alter_profile_timezone.py index 94287b7..20b3e12 100644 --- a/judge/migrations/0150_alter_profile_timezone.py +++ b/judge/migrations/0150_alter_profile_timezone.py @@ -6,13 +6,671 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('judge', '0149_auto_20230202_0902'), + ("judge", "0149_auto_20230202_0902"), ] operations = [ migrations.AlterField( - model_name='profile', - name='timezone', - field=models.CharField(choices=[('Africa', [('Africa/Abidjan', 'Abidjan'), ('Africa/Accra', 'Accra'), ('Africa/Addis_Ababa', 'Addis_Ababa'), ('Africa/Algiers', 'Algiers'), ('Africa/Asmara', 'Asmara'), ('Africa/Asmera', 'Asmera'), ('Africa/Bamako', 'Bamako'), ('Africa/Bangui', 'Bangui'), ('Africa/Banjul', 'Banjul'), ('Africa/Bissau', 'Bissau'), ('Africa/Blantyre', 'Blantyre'), ('Africa/Brazzaville', 'Brazzaville'), ('Africa/Bujumbura', 'Bujumbura'), ('Africa/Cairo', 'Cairo'), ('Africa/Casablanca', 'Casablanca'), ('Africa/Ceuta', 'Ceuta'), ('Africa/Conakry', 'Conakry'), ('Africa/Dakar', 'Dakar'), ('Africa/Dar_es_Salaam', 'Dar_es_Salaam'), ('Africa/Djibouti', 'Djibouti'), ('Africa/Douala', 'Douala'), ('Africa/El_Aaiun', 'El_Aaiun'), ('Africa/Freetown', 'Freetown'), ('Africa/Gaborone', 'Gaborone'), ('Africa/Harare', 'Harare'), ('Africa/Johannesburg', 'Johannesburg'), ('Africa/Juba', 'Juba'), ('Africa/Kampala', 'Kampala'), ('Africa/Khartoum', 'Khartoum'), ('Africa/Kigali', 'Kigali'), ('Africa/Kinshasa', 'Kinshasa'), ('Africa/Lagos', 'Lagos'), ('Africa/Libreville', 'Libreville'), ('Africa/Lome', 'Lome'), ('Africa/Luanda', 'Luanda'), ('Africa/Lubumbashi', 'Lubumbashi'), ('Africa/Lusaka', 'Lusaka'), ('Africa/Malabo', 'Malabo'), ('Africa/Maputo', 'Maputo'), ('Africa/Maseru', 'Maseru'), ('Africa/Mbabane', 'Mbabane'), ('Africa/Mogadishu', 'Mogadishu'), ('Africa/Monrovia', 'Monrovia'), ('Africa/Nairobi', 'Nairobi'), ('Africa/Ndjamena', 'Ndjamena'), ('Africa/Niamey', 'Niamey'), ('Africa/Nouakchott', 'Nouakchott'), ('Africa/Ouagadougou', 'Ouagadougou'), ('Africa/Porto-Novo', 'Porto-Novo'), ('Africa/Sao_Tome', 'Sao_Tome'), ('Africa/Timbuktu', 'Timbuktu'), ('Africa/Tripoli', 'Tripoli'), ('Africa/Tunis', 'Tunis'), ('Africa/Windhoek', 'Windhoek')]), ('America', [('America/Adak', 'Adak'), ('America/Anchorage', 'Anchorage'), ('America/Anguilla', 'Anguilla'), ('America/Antigua', 'Antigua'), ('America/Araguaina', 'Araguaina'), ('America/Argentina/Buenos_Aires', 'Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'Argentina/Cordoba'), ('America/Argentina/Jujuy', 'Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'Argentina/Salta'), ('America/Argentina/San_Juan', 'Argentina/San_Juan'), ('America/Argentina/San_Luis', 'Argentina/San_Luis'), ('America/Argentina/Tucuman', 'Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'Argentina/Ushuaia'), ('America/Aruba', 'Aruba'), ('America/Asuncion', 'Asuncion'), ('America/Atikokan', 'Atikokan'), ('America/Atka', 'Atka'), ('America/Bahia', 'Bahia'), ('America/Bahia_Banderas', 'Bahia_Banderas'), ('America/Barbados', 'Barbados'), ('America/Belem', 'Belem'), ('America/Belize', 'Belize'), ('America/Blanc-Sablon', 'Blanc-Sablon'), ('America/Boa_Vista', 'Boa_Vista'), ('America/Bogota', 'Bogota'), ('America/Boise', 'Boise'), ('America/Buenos_Aires', 'Buenos_Aires'), ('America/Cambridge_Bay', 'Cambridge_Bay'), ('America/Campo_Grande', 'Campo_Grande'), ('America/Cancun', 'Cancun'), ('America/Caracas', 'Caracas'), ('America/Catamarca', 'Catamarca'), ('America/Cayenne', 'Cayenne'), ('America/Cayman', 'Cayman'), ('America/Chicago', 'Chicago'), ('America/Chihuahua', 'Chihuahua'), ('America/Coral_Harbour', 'Coral_Harbour'), ('America/Cordoba', 'Cordoba'), ('America/Costa_Rica', 'Costa_Rica'), ('America/Creston', 'Creston'), ('America/Cuiaba', 'Cuiaba'), ('America/Curacao', 'Curacao'), ('America/Danmarkshavn', 'Danmarkshavn'), ('America/Dawson', 'Dawson'), ('America/Dawson_Creek', 'Dawson_Creek'), ('America/Denver', 'Denver'), ('America/Detroit', 'Detroit'), ('America/Dominica', 'Dominica'), ('America/Edmonton', 'Edmonton'), ('America/Eirunepe', 'Eirunepe'), ('America/El_Salvador', 'El_Salvador'), ('America/Ensenada', 'Ensenada'), ('America/Fort_Nelson', 'Fort_Nelson'), ('America/Fort_Wayne', 'Fort_Wayne'), ('America/Fortaleza', 'Fortaleza'), ('America/Glace_Bay', 'Glace_Bay'), ('America/Godthab', 'Godthab'), ('America/Goose_Bay', 'Goose_Bay'), ('America/Grand_Turk', 'Grand_Turk'), ('America/Grenada', 'Grenada'), ('America/Guadeloupe', 'Guadeloupe'), ('America/Guatemala', 'Guatemala'), ('America/Guayaquil', 'Guayaquil'), ('America/Guyana', 'Guyana'), ('America/Halifax', 'Halifax'), ('America/Havana', 'Havana'), ('America/Hermosillo', 'Hermosillo'), ('America/Indiana/Indianapolis', 'Indiana/Indianapolis'), ('America/Indiana/Knox', 'Indiana/Knox'), ('America/Indiana/Marengo', 'Indiana/Marengo'), ('America/Indiana/Petersburg', 'Indiana/Petersburg'), ('America/Indiana/Tell_City', 'Indiana/Tell_City'), ('America/Indiana/Vevay', 'Indiana/Vevay'), ('America/Indiana/Vincennes', 'Indiana/Vincennes'), ('America/Indiana/Winamac', 'Indiana/Winamac'), ('America/Indianapolis', 'Indianapolis'), ('America/Inuvik', 'Inuvik'), ('America/Iqaluit', 'Iqaluit'), ('America/Jamaica', 'Jamaica'), ('America/Jujuy', 'Jujuy'), ('America/Juneau', 'Juneau'), ('America/Kentucky/Louisville', 'Kentucky/Louisville'), ('America/Kentucky/Monticello', 'Kentucky/Monticello'), ('America/Knox_IN', 'Knox_IN'), ('America/Kralendijk', 'Kralendijk'), ('America/La_Paz', 'La_Paz'), ('America/Lima', 'Lima'), ('America/Los_Angeles', 'Los_Angeles'), ('America/Louisville', 'Louisville'), ('America/Lower_Princes', 'Lower_Princes'), ('America/Maceio', 'Maceio'), ('America/Managua', 'Managua'), ('America/Manaus', 'Manaus'), ('America/Marigot', 'Marigot'), ('America/Martinique', 'Martinique'), ('America/Matamoros', 'Matamoros'), ('America/Mazatlan', 'Mazatlan'), ('America/Mendoza', 'Mendoza'), ('America/Menominee', 'Menominee'), ('America/Merida', 'Merida'), ('America/Metlakatla', 'Metlakatla'), ('America/Mexico_City', 'Mexico_City'), ('America/Miquelon', 'Miquelon'), ('America/Moncton', 'Moncton'), ('America/Monterrey', 'Monterrey'), ('America/Montevideo', 'Montevideo'), ('America/Montreal', 'Montreal'), ('America/Montserrat', 'Montserrat'), ('America/Nassau', 'Nassau'), ('America/New_York', 'New_York'), ('America/Nipigon', 'Nipigon'), ('America/Nome', 'Nome'), ('America/Noronha', 'Noronha'), ('America/North_Dakota/Beulah', 'North_Dakota/Beulah'), ('America/North_Dakota/Center', 'North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'North_Dakota/New_Salem'), ('America/Nuuk', 'Nuuk'), ('America/Ojinaga', 'Ojinaga'), ('America/Panama', 'Panama'), ('America/Pangnirtung', 'Pangnirtung'), ('America/Paramaribo', 'Paramaribo'), ('America/Phoenix', 'Phoenix'), ('America/Port-au-Prince', 'Port-au-Prince'), ('America/Port_of_Spain', 'Port_of_Spain'), ('America/Porto_Acre', 'Porto_Acre'), ('America/Porto_Velho', 'Porto_Velho'), ('America/Puerto_Rico', 'Puerto_Rico'), ('America/Punta_Arenas', 'Punta_Arenas'), ('America/Rainy_River', 'Rainy_River'), ('America/Rankin_Inlet', 'Rankin_Inlet'), ('America/Recife', 'Recife'), ('America/Regina', 'Regina'), ('America/Resolute', 'Resolute'), ('America/Rio_Branco', 'Rio_Branco'), ('America/Rosario', 'Rosario'), ('America/Santa_Isabel', 'Santa_Isabel'), ('America/Santarem', 'Santarem'), ('America/Santiago', 'Santiago'), ('America/Santo_Domingo', 'Santo_Domingo'), ('America/Sao_Paulo', 'Sao_Paulo'), ('America/Scoresbysund', 'Scoresbysund'), ('America/Shiprock', 'Shiprock'), ('America/Sitka', 'Sitka'), ('America/St_Barthelemy', 'St_Barthelemy'), ('America/St_Johns', 'St_Johns'), ('America/St_Kitts', 'St_Kitts'), ('America/St_Lucia', 'St_Lucia'), ('America/St_Thomas', 'St_Thomas'), ('America/St_Vincent', 'St_Vincent'), ('America/Swift_Current', 'Swift_Current'), ('America/Tegucigalpa', 'Tegucigalpa'), ('America/Thule', 'Thule'), ('America/Thunder_Bay', 'Thunder_Bay'), ('America/Tijuana', 'Tijuana'), ('America/Toronto', 'Toronto'), ('America/Tortola', 'Tortola'), ('America/Vancouver', 'Vancouver'), ('America/Virgin', 'Virgin'), ('America/Whitehorse', 'Whitehorse'), ('America/Winnipeg', 'Winnipeg'), ('America/Yakutat', 'Yakutat'), ('America/Yellowknife', 'Yellowknife')]), ('Antarctica', [('Antarctica/Casey', 'Casey'), ('Antarctica/Davis', 'Davis'), ('Antarctica/DumontDUrville', 'DumontDUrville'), ('Antarctica/Macquarie', 'Macquarie'), ('Antarctica/Mawson', 'Mawson'), ('Antarctica/McMurdo', 'McMurdo'), ('Antarctica/Palmer', 'Palmer'), ('Antarctica/Rothera', 'Rothera'), ('Antarctica/South_Pole', 'South_Pole'), ('Antarctica/Syowa', 'Syowa'), ('Antarctica/Troll', 'Troll'), ('Antarctica/Vostok', 'Vostok')]), ('Arctic', [('Arctic/Longyearbyen', 'Longyearbyen')]), ('Asia', [('Asia/Aden', 'Aden'), ('Asia/Almaty', 'Almaty'), ('Asia/Amman', 'Amman'), ('Asia/Anadyr', 'Anadyr'), ('Asia/Aqtau', 'Aqtau'), ('Asia/Aqtobe', 'Aqtobe'), ('Asia/Ashgabat', 'Ashgabat'), ('Asia/Ashkhabad', 'Ashkhabad'), ('Asia/Atyrau', 'Atyrau'), ('Asia/Baghdad', 'Baghdad'), ('Asia/Bahrain', 'Bahrain'), ('Asia/Baku', 'Baku'), ('Asia/Bangkok', 'Bangkok'), ('Asia/Barnaul', 'Barnaul'), ('Asia/Beirut', 'Beirut'), ('Asia/Bishkek', 'Bishkek'), ('Asia/Brunei', 'Brunei'), ('Asia/Calcutta', 'Calcutta'), ('Asia/Chita', 'Chita'), ('Asia/Choibalsan', 'Choibalsan'), ('Asia/Chongqing', 'Chongqing'), ('Asia/Chungking', 'Chungking'), ('Asia/Colombo', 'Colombo'), ('Asia/Dacca', 'Dacca'), ('Asia/Damascus', 'Damascus'), ('Asia/Dhaka', 'Dhaka'), ('Asia/Dili', 'Dili'), ('Asia/Dubai', 'Dubai'), ('Asia/Dushanbe', 'Dushanbe'), ('Asia/Famagusta', 'Famagusta'), ('Asia/Gaza', 'Gaza'), ('Asia/Harbin', 'Harbin'), ('Asia/Hebron', 'Hebron'), ('Asia/Ho_Chi_Minh', 'Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Hong_Kong'), ('Asia/Hovd', 'Hovd'), ('Asia/Irkutsk', 'Irkutsk'), ('Asia/Istanbul', 'Istanbul'), ('Asia/Jakarta', 'Jakarta'), ('Asia/Jayapura', 'Jayapura'), ('Asia/Jerusalem', 'Jerusalem'), ('Asia/Kabul', 'Kabul'), ('Asia/Kamchatka', 'Kamchatka'), ('Asia/Karachi', 'Karachi'), ('Asia/Kashgar', 'Kashgar'), ('Asia/Kathmandu', 'Kathmandu'), ('Asia/Katmandu', 'Katmandu'), ('Asia/Khandyga', 'Khandyga'), ('Asia/Kolkata', 'Kolkata'), ('Asia/Krasnoyarsk', 'Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Kuala_Lumpur'), ('Asia/Kuching', 'Kuching'), ('Asia/Kuwait', 'Kuwait'), ('Asia/Macao', 'Macao'), ('Asia/Macau', 'Macau'), ('Asia/Magadan', 'Magadan'), ('Asia/Makassar', 'Makassar'), ('Asia/Manila', 'Manila'), ('Asia/Muscat', 'Muscat'), ('Asia/Nicosia', 'Nicosia'), ('Asia/Novokuznetsk', 'Novokuznetsk'), ('Asia/Novosibirsk', 'Novosibirsk'), ('Asia/Omsk', 'Omsk'), ('Asia/Oral', 'Oral'), ('Asia/Phnom_Penh', 'Phnom_Penh'), ('Asia/Pontianak', 'Pontianak'), ('Asia/Pyongyang', 'Pyongyang'), ('Asia/Qatar', 'Qatar'), ('Asia/Qostanay', 'Qostanay'), ('Asia/Qyzylorda', 'Qyzylorda'), ('Asia/Rangoon', 'Rangoon'), ('Asia/Riyadh', 'Riyadh'), ('Asia/Saigon', 'Saigon'), ('Asia/Sakhalin', 'Sakhalin'), ('Asia/Samarkand', 'Samarkand'), ('Asia/Seoul', 'Seoul'), ('Asia/Shanghai', 'Shanghai'), ('Asia/Singapore', 'Singapore'), ('Asia/Srednekolymsk', 'Srednekolymsk'), ('Asia/Taipei', 'Taipei'), ('Asia/Tashkent', 'Tashkent'), ('Asia/Tbilisi', 'Tbilisi'), ('Asia/Tehran', 'Tehran'), ('Asia/Tel_Aviv', 'Tel_Aviv'), ('Asia/Thimbu', 'Thimbu'), ('Asia/Thimphu', 'Thimphu'), ('Asia/Tokyo', 'Tokyo'), ('Asia/Tomsk', 'Tomsk'), ('Asia/Ujung_Pandang', 'Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Ulaanbaatar'), ('Asia/Ulan_Bator', 'Ulan_Bator'), ('Asia/Urumqi', 'Urumqi'), ('Asia/Ust-Nera', 'Ust-Nera'), ('Asia/Vientiane', 'Vientiane'), ('Asia/Vladivostok', 'Vladivostok'), ('Asia/Yakutsk', 'Yakutsk'), ('Asia/Yangon', 'Yangon'), ('Asia/Yekaterinburg', 'Yekaterinburg'), ('Asia/Yerevan', 'Yerevan')]), ('Atlantic', [('Atlantic/Azores', 'Azores'), ('Atlantic/Bermuda', 'Bermuda'), ('Atlantic/Canary', 'Canary'), ('Atlantic/Cape_Verde', 'Cape_Verde'), ('Atlantic/Faeroe', 'Faeroe'), ('Atlantic/Faroe', 'Faroe'), ('Atlantic/Jan_Mayen', 'Jan_Mayen'), ('Atlantic/Madeira', 'Madeira'), ('Atlantic/Reykjavik', 'Reykjavik'), ('Atlantic/South_Georgia', 'South_Georgia'), ('Atlantic/St_Helena', 'St_Helena'), ('Atlantic/Stanley', 'Stanley')]), ('Australia', [('Australia/ACT', 'ACT'), ('Australia/Adelaide', 'Adelaide'), ('Australia/Brisbane', 'Brisbane'), ('Australia/Broken_Hill', 'Broken_Hill'), ('Australia/Canberra', 'Canberra'), ('Australia/Currie', 'Currie'), ('Australia/Darwin', 'Darwin'), ('Australia/Eucla', 'Eucla'), ('Australia/Hobart', 'Hobart'), ('Australia/LHI', 'LHI'), ('Australia/Lindeman', 'Lindeman'), ('Australia/Lord_Howe', 'Lord_Howe'), ('Australia/Melbourne', 'Melbourne'), ('Australia/NSW', 'NSW'), ('Australia/North', 'North'), ('Australia/Perth', 'Perth'), ('Australia/Queensland', 'Queensland'), ('Australia/South', 'South'), ('Australia/Sydney', 'Sydney'), ('Australia/Tasmania', 'Tasmania'), ('Australia/Victoria', 'Victoria'), ('Australia/West', 'West'), ('Australia/Yancowinna', 'Yancowinna')]), ('Brazil', [('Brazil/Acre', 'Acre'), ('Brazil/DeNoronha', 'DeNoronha'), ('Brazil/East', 'East'), ('Brazil/West', 'West')]), ('Canada', [('Canada/Atlantic', 'Atlantic'), ('Canada/Central', 'Central'), ('Canada/Eastern', 'Eastern'), ('Canada/Mountain', 'Mountain'), ('Canada/Newfoundland', 'Newfoundland'), ('Canada/Pacific', 'Pacific'), ('Canada/Saskatchewan', 'Saskatchewan'), ('Canada/Yukon', 'Yukon')]), ('Chile', [('Chile/Continental', 'Continental'), ('Chile/EasterIsland', 'EasterIsland')]), ('Etc', [('Etc/Greenwich', 'Greenwich'), ('Etc/UCT', 'UCT'), ('Etc/UTC', 'UTC'), ('Etc/Universal', 'Universal'), ('Etc/Zulu', 'Zulu')]), ('Europe', [('Europe/Amsterdam', 'Amsterdam'), ('Europe/Andorra', 'Andorra'), ('Europe/Astrakhan', 'Astrakhan'), ('Europe/Athens', 'Athens'), ('Europe/Belfast', 'Belfast'), ('Europe/Belgrade', 'Belgrade'), ('Europe/Berlin', 'Berlin'), ('Europe/Bratislava', 'Bratislava'), ('Europe/Brussels', 'Brussels'), ('Europe/Bucharest', 'Bucharest'), ('Europe/Budapest', 'Budapest'), ('Europe/Busingen', 'Busingen'), ('Europe/Chisinau', 'Chisinau'), ('Europe/Copenhagen', 'Copenhagen'), ('Europe/Dublin', 'Dublin'), ('Europe/Gibraltar', 'Gibraltar'), ('Europe/Guernsey', 'Guernsey'), ('Europe/Helsinki', 'Helsinki'), ('Europe/Isle_of_Man', 'Isle_of_Man'), ('Europe/Istanbul', 'Istanbul'), ('Europe/Jersey', 'Jersey'), ('Europe/Kaliningrad', 'Kaliningrad'), ('Europe/Kiev', 'Kiev'), ('Europe/Kirov', 'Kirov'), ('Europe/Lisbon', 'Lisbon'), ('Europe/Ljubljana', 'Ljubljana'), ('Europe/London', 'London'), ('Europe/Luxembourg', 'Luxembourg'), ('Europe/Madrid', 'Madrid'), ('Europe/Malta', 'Malta'), ('Europe/Mariehamn', 'Mariehamn'), ('Europe/Minsk', 'Minsk'), ('Europe/Monaco', 'Monaco'), ('Europe/Moscow', 'Moscow'), ('Europe/Nicosia', 'Nicosia'), ('Europe/Oslo', 'Oslo'), ('Europe/Paris', 'Paris'), ('Europe/Podgorica', 'Podgorica'), ('Europe/Prague', 'Prague'), ('Europe/Riga', 'Riga'), ('Europe/Rome', 'Rome'), ('Europe/Samara', 'Samara'), ('Europe/San_Marino', 'San_Marino'), ('Europe/Sarajevo', 'Sarajevo'), ('Europe/Saratov', 'Saratov'), ('Europe/Simferopol', 'Simferopol'), ('Europe/Skopje', 'Skopje'), ('Europe/Sofia', 'Sofia'), ('Europe/Stockholm', 'Stockholm'), ('Europe/Tallinn', 'Tallinn'), ('Europe/Tirane', 'Tirane'), ('Europe/Tiraspol', 'Tiraspol'), ('Europe/Ulyanovsk', 'Ulyanovsk'), ('Europe/Uzhgorod', 'Uzhgorod'), ('Europe/Vaduz', 'Vaduz'), ('Europe/Vatican', 'Vatican'), ('Europe/Vienna', 'Vienna'), ('Europe/Vilnius', 'Vilnius'), ('Europe/Volgograd', 'Volgograd'), ('Europe/Warsaw', 'Warsaw'), ('Europe/Zagreb', 'Zagreb'), ('Europe/Zaporozhye', 'Zaporozhye'), ('Europe/Zurich', 'Zurich')]), ('Indian', [('Indian/Antananarivo', 'Antananarivo'), ('Indian/Chagos', 'Chagos'), ('Indian/Christmas', 'Christmas'), ('Indian/Cocos', 'Cocos'), ('Indian/Comoro', 'Comoro'), ('Indian/Kerguelen', 'Kerguelen'), ('Indian/Mahe', 'Mahe'), ('Indian/Maldives', 'Maldives'), ('Indian/Mauritius', 'Mauritius'), ('Indian/Mayotte', 'Mayotte'), ('Indian/Reunion', 'Reunion')]), ('Mexico', [('Mexico/BajaNorte', 'BajaNorte'), ('Mexico/BajaSur', 'BajaSur'), ('Mexico/General', 'General')]), ('Other', [('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')]), ('Pacific', [('Pacific/Apia', 'Apia'), ('Pacific/Auckland', 'Auckland'), ('Pacific/Bougainville', 'Bougainville'), ('Pacific/Chatham', 'Chatham'), ('Pacific/Chuuk', 'Chuuk'), ('Pacific/Easter', 'Easter'), ('Pacific/Efate', 'Efate'), ('Pacific/Enderbury', 'Enderbury'), ('Pacific/Fakaofo', 'Fakaofo'), ('Pacific/Fiji', 'Fiji'), ('Pacific/Funafuti', 'Funafuti'), ('Pacific/Galapagos', 'Galapagos'), ('Pacific/Gambier', 'Gambier'), ('Pacific/Guadalcanal', 'Guadalcanal'), ('Pacific/Guam', 'Guam'), ('Pacific/Honolulu', 'Honolulu'), ('Pacific/Johnston', 'Johnston'), ('Pacific/Kanton', 'Kanton'), ('Pacific/Kiritimati', 'Kiritimati'), ('Pacific/Kosrae', 'Kosrae'), ('Pacific/Kwajalein', 'Kwajalein'), ('Pacific/Majuro', 'Majuro'), ('Pacific/Marquesas', 'Marquesas'), ('Pacific/Midway', 'Midway'), ('Pacific/Nauru', 'Nauru'), ('Pacific/Niue', 'Niue'), ('Pacific/Norfolk', 'Norfolk'), ('Pacific/Noumea', 'Noumea'), ('Pacific/Pago_Pago', 'Pago_Pago'), ('Pacific/Palau', 'Palau'), ('Pacific/Pitcairn', 'Pitcairn'), ('Pacific/Pohnpei', 'Pohnpei'), ('Pacific/Ponape', 'Ponape'), ('Pacific/Port_Moresby', 'Port_Moresby'), ('Pacific/Rarotonga', 'Rarotonga'), ('Pacific/Saipan', 'Saipan'), ('Pacific/Samoa', 'Samoa'), ('Pacific/Tahiti', 'Tahiti'), ('Pacific/Tarawa', 'Tarawa'), ('Pacific/Tongatapu', 'Tongatapu'), ('Pacific/Truk', 'Truk'), ('Pacific/Wake', 'Wake'), ('Pacific/Wallis', 'Wallis'), ('Pacific/Yap', 'Yap')]), ('US', [('US/Alaska', 'Alaska'), ('US/Aleutian', 'Aleutian'), ('US/Arizona', 'Arizona'), ('US/Central', 'Central'), ('US/East-Indiana', 'East-Indiana'), ('US/Eastern', 'Eastern'), ('US/Hawaii', 'Hawaii'), ('US/Indiana-Starke', 'Indiana-Starke'), ('US/Michigan', 'Michigan'), ('US/Mountain', 'Mountain'), ('US/Pacific', 'Pacific'), ('US/Samoa', 'Samoa')])], default='Asia/Ho_Chi_Minh', max_length=50, verbose_name='location'), + model_name="profile", + name="timezone", + field=models.CharField( + choices=[ + ( + "Africa", + [ + ("Africa/Abidjan", "Abidjan"), + ("Africa/Accra", "Accra"), + ("Africa/Addis_Ababa", "Addis_Ababa"), + ("Africa/Algiers", "Algiers"), + ("Africa/Asmara", "Asmara"), + ("Africa/Asmera", "Asmera"), + ("Africa/Bamako", "Bamako"), + ("Africa/Bangui", "Bangui"), + ("Africa/Banjul", "Banjul"), + ("Africa/Bissau", "Bissau"), + ("Africa/Blantyre", "Blantyre"), + ("Africa/Brazzaville", "Brazzaville"), + ("Africa/Bujumbura", "Bujumbura"), + ("Africa/Cairo", "Cairo"), + ("Africa/Casablanca", "Casablanca"), + ("Africa/Ceuta", "Ceuta"), + ("Africa/Conakry", "Conakry"), + ("Africa/Dakar", "Dakar"), + ("Africa/Dar_es_Salaam", "Dar_es_Salaam"), + ("Africa/Djibouti", "Djibouti"), + ("Africa/Douala", "Douala"), + ("Africa/El_Aaiun", "El_Aaiun"), + ("Africa/Freetown", "Freetown"), + ("Africa/Gaborone", "Gaborone"), + ("Africa/Harare", "Harare"), + ("Africa/Johannesburg", "Johannesburg"), + ("Africa/Juba", "Juba"), + ("Africa/Kampala", "Kampala"), + ("Africa/Khartoum", "Khartoum"), + ("Africa/Kigali", "Kigali"), + ("Africa/Kinshasa", "Kinshasa"), + ("Africa/Lagos", "Lagos"), + ("Africa/Libreville", "Libreville"), + ("Africa/Lome", "Lome"), + ("Africa/Luanda", "Luanda"), + ("Africa/Lubumbashi", "Lubumbashi"), + ("Africa/Lusaka", "Lusaka"), + ("Africa/Malabo", "Malabo"), + ("Africa/Maputo", "Maputo"), + ("Africa/Maseru", "Maseru"), + ("Africa/Mbabane", "Mbabane"), + ("Africa/Mogadishu", "Mogadishu"), + ("Africa/Monrovia", "Monrovia"), + ("Africa/Nairobi", "Nairobi"), + ("Africa/Ndjamena", "Ndjamena"), + ("Africa/Niamey", "Niamey"), + ("Africa/Nouakchott", "Nouakchott"), + ("Africa/Ouagadougou", "Ouagadougou"), + ("Africa/Porto-Novo", "Porto-Novo"), + ("Africa/Sao_Tome", "Sao_Tome"), + ("Africa/Timbuktu", "Timbuktu"), + ("Africa/Tripoli", "Tripoli"), + ("Africa/Tunis", "Tunis"), + ("Africa/Windhoek", "Windhoek"), + ], + ), + ( + "America", + [ + ("America/Adak", "Adak"), + ("America/Anchorage", "Anchorage"), + ("America/Anguilla", "Anguilla"), + ("America/Antigua", "Antigua"), + ("America/Araguaina", "Araguaina"), + ( + "America/Argentina/Buenos_Aires", + "Argentina/Buenos_Aires", + ), + ("America/Argentina/Catamarca", "Argentina/Catamarca"), + ( + "America/Argentina/ComodRivadavia", + "Argentina/ComodRivadavia", + ), + ("America/Argentina/Cordoba", "Argentina/Cordoba"), + ("America/Argentina/Jujuy", "Argentina/Jujuy"), + ("America/Argentina/La_Rioja", "Argentina/La_Rioja"), + ("America/Argentina/Mendoza", "Argentina/Mendoza"), + ( + "America/Argentina/Rio_Gallegos", + "Argentina/Rio_Gallegos", + ), + ("America/Argentina/Salta", "Argentina/Salta"), + ("America/Argentina/San_Juan", "Argentina/San_Juan"), + ("America/Argentina/San_Luis", "Argentina/San_Luis"), + ("America/Argentina/Tucuman", "Argentina/Tucuman"), + ("America/Argentina/Ushuaia", "Argentina/Ushuaia"), + ("America/Aruba", "Aruba"), + ("America/Asuncion", "Asuncion"), + ("America/Atikokan", "Atikokan"), + ("America/Atka", "Atka"), + ("America/Bahia", "Bahia"), + ("America/Bahia_Banderas", "Bahia_Banderas"), + ("America/Barbados", "Barbados"), + ("America/Belem", "Belem"), + ("America/Belize", "Belize"), + ("America/Blanc-Sablon", "Blanc-Sablon"), + ("America/Boa_Vista", "Boa_Vista"), + ("America/Bogota", "Bogota"), + ("America/Boise", "Boise"), + ("America/Buenos_Aires", "Buenos_Aires"), + ("America/Cambridge_Bay", "Cambridge_Bay"), + ("America/Campo_Grande", "Campo_Grande"), + ("America/Cancun", "Cancun"), + ("America/Caracas", "Caracas"), + ("America/Catamarca", "Catamarca"), + ("America/Cayenne", "Cayenne"), + ("America/Cayman", "Cayman"), + ("America/Chicago", "Chicago"), + ("America/Chihuahua", "Chihuahua"), + ("America/Coral_Harbour", "Coral_Harbour"), + ("America/Cordoba", "Cordoba"), + ("America/Costa_Rica", "Costa_Rica"), + ("America/Creston", "Creston"), + ("America/Cuiaba", "Cuiaba"), + ("America/Curacao", "Curacao"), + ("America/Danmarkshavn", "Danmarkshavn"), + ("America/Dawson", "Dawson"), + ("America/Dawson_Creek", "Dawson_Creek"), + ("America/Denver", "Denver"), + ("America/Detroit", "Detroit"), + ("America/Dominica", "Dominica"), + ("America/Edmonton", "Edmonton"), + ("America/Eirunepe", "Eirunepe"), + ("America/El_Salvador", "El_Salvador"), + ("America/Ensenada", "Ensenada"), + ("America/Fort_Nelson", "Fort_Nelson"), + ("America/Fort_Wayne", "Fort_Wayne"), + ("America/Fortaleza", "Fortaleza"), + ("America/Glace_Bay", "Glace_Bay"), + ("America/Godthab", "Godthab"), + ("America/Goose_Bay", "Goose_Bay"), + ("America/Grand_Turk", "Grand_Turk"), + ("America/Grenada", "Grenada"), + ("America/Guadeloupe", "Guadeloupe"), + ("America/Guatemala", "Guatemala"), + ("America/Guayaquil", "Guayaquil"), + ("America/Guyana", "Guyana"), + ("America/Halifax", "Halifax"), + ("America/Havana", "Havana"), + ("America/Hermosillo", "Hermosillo"), + ("America/Indiana/Indianapolis", "Indiana/Indianapolis"), + ("America/Indiana/Knox", "Indiana/Knox"), + ("America/Indiana/Marengo", "Indiana/Marengo"), + ("America/Indiana/Petersburg", "Indiana/Petersburg"), + ("America/Indiana/Tell_City", "Indiana/Tell_City"), + ("America/Indiana/Vevay", "Indiana/Vevay"), + ("America/Indiana/Vincennes", "Indiana/Vincennes"), + ("America/Indiana/Winamac", "Indiana/Winamac"), + ("America/Indianapolis", "Indianapolis"), + ("America/Inuvik", "Inuvik"), + ("America/Iqaluit", "Iqaluit"), + ("America/Jamaica", "Jamaica"), + ("America/Jujuy", "Jujuy"), + ("America/Juneau", "Juneau"), + ("America/Kentucky/Louisville", "Kentucky/Louisville"), + ("America/Kentucky/Monticello", "Kentucky/Monticello"), + ("America/Knox_IN", "Knox_IN"), + ("America/Kralendijk", "Kralendijk"), + ("America/La_Paz", "La_Paz"), + ("America/Lima", "Lima"), + ("America/Los_Angeles", "Los_Angeles"), + ("America/Louisville", "Louisville"), + ("America/Lower_Princes", "Lower_Princes"), + ("America/Maceio", "Maceio"), + ("America/Managua", "Managua"), + ("America/Manaus", "Manaus"), + ("America/Marigot", "Marigot"), + ("America/Martinique", "Martinique"), + ("America/Matamoros", "Matamoros"), + ("America/Mazatlan", "Mazatlan"), + ("America/Mendoza", "Mendoza"), + ("America/Menominee", "Menominee"), + ("America/Merida", "Merida"), + ("America/Metlakatla", "Metlakatla"), + ("America/Mexico_City", "Mexico_City"), + ("America/Miquelon", "Miquelon"), + ("America/Moncton", "Moncton"), + ("America/Monterrey", "Monterrey"), + ("America/Montevideo", "Montevideo"), + ("America/Montreal", "Montreal"), + ("America/Montserrat", "Montserrat"), + ("America/Nassau", "Nassau"), + ("America/New_York", "New_York"), + ("America/Nipigon", "Nipigon"), + ("America/Nome", "Nome"), + ("America/Noronha", "Noronha"), + ("America/North_Dakota/Beulah", "North_Dakota/Beulah"), + ("America/North_Dakota/Center", "North_Dakota/Center"), + ( + "America/North_Dakota/New_Salem", + "North_Dakota/New_Salem", + ), + ("America/Nuuk", "Nuuk"), + ("America/Ojinaga", "Ojinaga"), + ("America/Panama", "Panama"), + ("America/Pangnirtung", "Pangnirtung"), + ("America/Paramaribo", "Paramaribo"), + ("America/Phoenix", "Phoenix"), + ("America/Port-au-Prince", "Port-au-Prince"), + ("America/Port_of_Spain", "Port_of_Spain"), + ("America/Porto_Acre", "Porto_Acre"), + ("America/Porto_Velho", "Porto_Velho"), + ("America/Puerto_Rico", "Puerto_Rico"), + ("America/Punta_Arenas", "Punta_Arenas"), + ("America/Rainy_River", "Rainy_River"), + ("America/Rankin_Inlet", "Rankin_Inlet"), + ("America/Recife", "Recife"), + ("America/Regina", "Regina"), + ("America/Resolute", "Resolute"), + ("America/Rio_Branco", "Rio_Branco"), + ("America/Rosario", "Rosario"), + ("America/Santa_Isabel", "Santa_Isabel"), + ("America/Santarem", "Santarem"), + ("America/Santiago", "Santiago"), + ("America/Santo_Domingo", "Santo_Domingo"), + ("America/Sao_Paulo", "Sao_Paulo"), + ("America/Scoresbysund", "Scoresbysund"), + ("America/Shiprock", "Shiprock"), + ("America/Sitka", "Sitka"), + ("America/St_Barthelemy", "St_Barthelemy"), + ("America/St_Johns", "St_Johns"), + ("America/St_Kitts", "St_Kitts"), + ("America/St_Lucia", "St_Lucia"), + ("America/St_Thomas", "St_Thomas"), + ("America/St_Vincent", "St_Vincent"), + ("America/Swift_Current", "Swift_Current"), + ("America/Tegucigalpa", "Tegucigalpa"), + ("America/Thule", "Thule"), + ("America/Thunder_Bay", "Thunder_Bay"), + ("America/Tijuana", "Tijuana"), + ("America/Toronto", "Toronto"), + ("America/Tortola", "Tortola"), + ("America/Vancouver", "Vancouver"), + ("America/Virgin", "Virgin"), + ("America/Whitehorse", "Whitehorse"), + ("America/Winnipeg", "Winnipeg"), + ("America/Yakutat", "Yakutat"), + ("America/Yellowknife", "Yellowknife"), + ], + ), + ( + "Antarctica", + [ + ("Antarctica/Casey", "Casey"), + ("Antarctica/Davis", "Davis"), + ("Antarctica/DumontDUrville", "DumontDUrville"), + ("Antarctica/Macquarie", "Macquarie"), + ("Antarctica/Mawson", "Mawson"), + ("Antarctica/McMurdo", "McMurdo"), + ("Antarctica/Palmer", "Palmer"), + ("Antarctica/Rothera", "Rothera"), + ("Antarctica/South_Pole", "South_Pole"), + ("Antarctica/Syowa", "Syowa"), + ("Antarctica/Troll", "Troll"), + ("Antarctica/Vostok", "Vostok"), + ], + ), + ("Arctic", [("Arctic/Longyearbyen", "Longyearbyen")]), + ( + "Asia", + [ + ("Asia/Aden", "Aden"), + ("Asia/Almaty", "Almaty"), + ("Asia/Amman", "Amman"), + ("Asia/Anadyr", "Anadyr"), + ("Asia/Aqtau", "Aqtau"), + ("Asia/Aqtobe", "Aqtobe"), + ("Asia/Ashgabat", "Ashgabat"), + ("Asia/Ashkhabad", "Ashkhabad"), + ("Asia/Atyrau", "Atyrau"), + ("Asia/Baghdad", "Baghdad"), + ("Asia/Bahrain", "Bahrain"), + ("Asia/Baku", "Baku"), + ("Asia/Bangkok", "Bangkok"), + ("Asia/Barnaul", "Barnaul"), + ("Asia/Beirut", "Beirut"), + ("Asia/Bishkek", "Bishkek"), + ("Asia/Brunei", "Brunei"), + ("Asia/Calcutta", "Calcutta"), + ("Asia/Chita", "Chita"), + ("Asia/Choibalsan", "Choibalsan"), + ("Asia/Chongqing", "Chongqing"), + ("Asia/Chungking", "Chungking"), + ("Asia/Colombo", "Colombo"), + ("Asia/Dacca", "Dacca"), + ("Asia/Damascus", "Damascus"), + ("Asia/Dhaka", "Dhaka"), + ("Asia/Dili", "Dili"), + ("Asia/Dubai", "Dubai"), + ("Asia/Dushanbe", "Dushanbe"), + ("Asia/Famagusta", "Famagusta"), + ("Asia/Gaza", "Gaza"), + ("Asia/Harbin", "Harbin"), + ("Asia/Hebron", "Hebron"), + ("Asia/Ho_Chi_Minh", "Ho_Chi_Minh"), + ("Asia/Hong_Kong", "Hong_Kong"), + ("Asia/Hovd", "Hovd"), + ("Asia/Irkutsk", "Irkutsk"), + ("Asia/Istanbul", "Istanbul"), + ("Asia/Jakarta", "Jakarta"), + ("Asia/Jayapura", "Jayapura"), + ("Asia/Jerusalem", "Jerusalem"), + ("Asia/Kabul", "Kabul"), + ("Asia/Kamchatka", "Kamchatka"), + ("Asia/Karachi", "Karachi"), + ("Asia/Kashgar", "Kashgar"), + ("Asia/Kathmandu", "Kathmandu"), + ("Asia/Katmandu", "Katmandu"), + ("Asia/Khandyga", "Khandyga"), + ("Asia/Kolkata", "Kolkata"), + ("Asia/Krasnoyarsk", "Krasnoyarsk"), + ("Asia/Kuala_Lumpur", "Kuala_Lumpur"), + ("Asia/Kuching", "Kuching"), + ("Asia/Kuwait", "Kuwait"), + ("Asia/Macao", "Macao"), + ("Asia/Macau", "Macau"), + ("Asia/Magadan", "Magadan"), + ("Asia/Makassar", "Makassar"), + ("Asia/Manila", "Manila"), + ("Asia/Muscat", "Muscat"), + ("Asia/Nicosia", "Nicosia"), + ("Asia/Novokuznetsk", "Novokuznetsk"), + ("Asia/Novosibirsk", "Novosibirsk"), + ("Asia/Omsk", "Omsk"), + ("Asia/Oral", "Oral"), + ("Asia/Phnom_Penh", "Phnom_Penh"), + ("Asia/Pontianak", "Pontianak"), + ("Asia/Pyongyang", "Pyongyang"), + ("Asia/Qatar", "Qatar"), + ("Asia/Qostanay", "Qostanay"), + ("Asia/Qyzylorda", "Qyzylorda"), + ("Asia/Rangoon", "Rangoon"), + ("Asia/Riyadh", "Riyadh"), + ("Asia/Saigon", "Saigon"), + ("Asia/Sakhalin", "Sakhalin"), + ("Asia/Samarkand", "Samarkand"), + ("Asia/Seoul", "Seoul"), + ("Asia/Shanghai", "Shanghai"), + ("Asia/Singapore", "Singapore"), + ("Asia/Srednekolymsk", "Srednekolymsk"), + ("Asia/Taipei", "Taipei"), + ("Asia/Tashkent", "Tashkent"), + ("Asia/Tbilisi", "Tbilisi"), + ("Asia/Tehran", "Tehran"), + ("Asia/Tel_Aviv", "Tel_Aviv"), + ("Asia/Thimbu", "Thimbu"), + ("Asia/Thimphu", "Thimphu"), + ("Asia/Tokyo", "Tokyo"), + ("Asia/Tomsk", "Tomsk"), + ("Asia/Ujung_Pandang", "Ujung_Pandang"), + ("Asia/Ulaanbaatar", "Ulaanbaatar"), + ("Asia/Ulan_Bator", "Ulan_Bator"), + ("Asia/Urumqi", "Urumqi"), + ("Asia/Ust-Nera", "Ust-Nera"), + ("Asia/Vientiane", "Vientiane"), + ("Asia/Vladivostok", "Vladivostok"), + ("Asia/Yakutsk", "Yakutsk"), + ("Asia/Yangon", "Yangon"), + ("Asia/Yekaterinburg", "Yekaterinburg"), + ("Asia/Yerevan", "Yerevan"), + ], + ), + ( + "Atlantic", + [ + ("Atlantic/Azores", "Azores"), + ("Atlantic/Bermuda", "Bermuda"), + ("Atlantic/Canary", "Canary"), + ("Atlantic/Cape_Verde", "Cape_Verde"), + ("Atlantic/Faeroe", "Faeroe"), + ("Atlantic/Faroe", "Faroe"), + ("Atlantic/Jan_Mayen", "Jan_Mayen"), + ("Atlantic/Madeira", "Madeira"), + ("Atlantic/Reykjavik", "Reykjavik"), + ("Atlantic/South_Georgia", "South_Georgia"), + ("Atlantic/St_Helena", "St_Helena"), + ("Atlantic/Stanley", "Stanley"), + ], + ), + ( + "Australia", + [ + ("Australia/ACT", "ACT"), + ("Australia/Adelaide", "Adelaide"), + ("Australia/Brisbane", "Brisbane"), + ("Australia/Broken_Hill", "Broken_Hill"), + ("Australia/Canberra", "Canberra"), + ("Australia/Currie", "Currie"), + ("Australia/Darwin", "Darwin"), + ("Australia/Eucla", "Eucla"), + ("Australia/Hobart", "Hobart"), + ("Australia/LHI", "LHI"), + ("Australia/Lindeman", "Lindeman"), + ("Australia/Lord_Howe", "Lord_Howe"), + ("Australia/Melbourne", "Melbourne"), + ("Australia/NSW", "NSW"), + ("Australia/North", "North"), + ("Australia/Perth", "Perth"), + ("Australia/Queensland", "Queensland"), + ("Australia/South", "South"), + ("Australia/Sydney", "Sydney"), + ("Australia/Tasmania", "Tasmania"), + ("Australia/Victoria", "Victoria"), + ("Australia/West", "West"), + ("Australia/Yancowinna", "Yancowinna"), + ], + ), + ( + "Brazil", + [ + ("Brazil/Acre", "Acre"), + ("Brazil/DeNoronha", "DeNoronha"), + ("Brazil/East", "East"), + ("Brazil/West", "West"), + ], + ), + ( + "Canada", + [ + ("Canada/Atlantic", "Atlantic"), + ("Canada/Central", "Central"), + ("Canada/Eastern", "Eastern"), + ("Canada/Mountain", "Mountain"), + ("Canada/Newfoundland", "Newfoundland"), + ("Canada/Pacific", "Pacific"), + ("Canada/Saskatchewan", "Saskatchewan"), + ("Canada/Yukon", "Yukon"), + ], + ), + ( + "Chile", + [ + ("Chile/Continental", "Continental"), + ("Chile/EasterIsland", "EasterIsland"), + ], + ), + ( + "Etc", + [ + ("Etc/Greenwich", "Greenwich"), + ("Etc/UCT", "UCT"), + ("Etc/UTC", "UTC"), + ("Etc/Universal", "Universal"), + ("Etc/Zulu", "Zulu"), + ], + ), + ( + "Europe", + [ + ("Europe/Amsterdam", "Amsterdam"), + ("Europe/Andorra", "Andorra"), + ("Europe/Astrakhan", "Astrakhan"), + ("Europe/Athens", "Athens"), + ("Europe/Belfast", "Belfast"), + ("Europe/Belgrade", "Belgrade"), + ("Europe/Berlin", "Berlin"), + ("Europe/Bratislava", "Bratislava"), + ("Europe/Brussels", "Brussels"), + ("Europe/Bucharest", "Bucharest"), + ("Europe/Budapest", "Budapest"), + ("Europe/Busingen", "Busingen"), + ("Europe/Chisinau", "Chisinau"), + ("Europe/Copenhagen", "Copenhagen"), + ("Europe/Dublin", "Dublin"), + ("Europe/Gibraltar", "Gibraltar"), + ("Europe/Guernsey", "Guernsey"), + ("Europe/Helsinki", "Helsinki"), + ("Europe/Isle_of_Man", "Isle_of_Man"), + ("Europe/Istanbul", "Istanbul"), + ("Europe/Jersey", "Jersey"), + ("Europe/Kaliningrad", "Kaliningrad"), + ("Europe/Kiev", "Kiev"), + ("Europe/Kirov", "Kirov"), + ("Europe/Lisbon", "Lisbon"), + ("Europe/Ljubljana", "Ljubljana"), + ("Europe/London", "London"), + ("Europe/Luxembourg", "Luxembourg"), + ("Europe/Madrid", "Madrid"), + ("Europe/Malta", "Malta"), + ("Europe/Mariehamn", "Mariehamn"), + ("Europe/Minsk", "Minsk"), + ("Europe/Monaco", "Monaco"), + ("Europe/Moscow", "Moscow"), + ("Europe/Nicosia", "Nicosia"), + ("Europe/Oslo", "Oslo"), + ("Europe/Paris", "Paris"), + ("Europe/Podgorica", "Podgorica"), + ("Europe/Prague", "Prague"), + ("Europe/Riga", "Riga"), + ("Europe/Rome", "Rome"), + ("Europe/Samara", "Samara"), + ("Europe/San_Marino", "San_Marino"), + ("Europe/Sarajevo", "Sarajevo"), + ("Europe/Saratov", "Saratov"), + ("Europe/Simferopol", "Simferopol"), + ("Europe/Skopje", "Skopje"), + ("Europe/Sofia", "Sofia"), + ("Europe/Stockholm", "Stockholm"), + ("Europe/Tallinn", "Tallinn"), + ("Europe/Tirane", "Tirane"), + ("Europe/Tiraspol", "Tiraspol"), + ("Europe/Ulyanovsk", "Ulyanovsk"), + ("Europe/Uzhgorod", "Uzhgorod"), + ("Europe/Vaduz", "Vaduz"), + ("Europe/Vatican", "Vatican"), + ("Europe/Vienna", "Vienna"), + ("Europe/Vilnius", "Vilnius"), + ("Europe/Volgograd", "Volgograd"), + ("Europe/Warsaw", "Warsaw"), + ("Europe/Zagreb", "Zagreb"), + ("Europe/Zaporozhye", "Zaporozhye"), + ("Europe/Zurich", "Zurich"), + ], + ), + ( + "Indian", + [ + ("Indian/Antananarivo", "Antananarivo"), + ("Indian/Chagos", "Chagos"), + ("Indian/Christmas", "Christmas"), + ("Indian/Cocos", "Cocos"), + ("Indian/Comoro", "Comoro"), + ("Indian/Kerguelen", "Kerguelen"), + ("Indian/Mahe", "Mahe"), + ("Indian/Maldives", "Maldives"), + ("Indian/Mauritius", "Mauritius"), + ("Indian/Mayotte", "Mayotte"), + ("Indian/Reunion", "Reunion"), + ], + ), + ( + "Mexico", + [ + ("Mexico/BajaNorte", "BajaNorte"), + ("Mexico/BajaSur", "BajaSur"), + ("Mexico/General", "General"), + ], + ), + ( + "Other", + [ + ("CET", "CET"), + ("CST6CDT", "CST6CDT"), + ("Cuba", "Cuba"), + ("EET", "EET"), + ("EST", "EST"), + ("EST5EDT", "EST5EDT"), + ("Egypt", "Egypt"), + ("Eire", "Eire"), + ("GB", "GB"), + ("GB-Eire", "GB-Eire"), + ("Greenwich", "Greenwich"), + ("HST", "HST"), + ("Hongkong", "Hongkong"), + ("Iceland", "Iceland"), + ("Iran", "Iran"), + ("Israel", "Israel"), + ("Jamaica", "Jamaica"), + ("Japan", "Japan"), + ("Kwajalein", "Kwajalein"), + ("Libya", "Libya"), + ("MET", "MET"), + ("MST", "MST"), + ("MST7MDT", "MST7MDT"), + ("NZ", "NZ"), + ("NZ-CHAT", "NZ-CHAT"), + ("Navajo", "Navajo"), + ("PRC", "PRC"), + ("PST8PDT", "PST8PDT"), + ("Poland", "Poland"), + ("Portugal", "Portugal"), + ("ROC", "ROC"), + ("ROK", "ROK"), + ("Singapore", "Singapore"), + ("Turkey", "Turkey"), + ("UCT", "UCT"), + ("UTC", "UTC"), + ("Universal", "Universal"), + ("W-SU", "W-SU"), + ("WET", "WET"), + ("Zulu", "Zulu"), + ], + ), + ( + "Pacific", + [ + ("Pacific/Apia", "Apia"), + ("Pacific/Auckland", "Auckland"), + ("Pacific/Bougainville", "Bougainville"), + ("Pacific/Chatham", "Chatham"), + ("Pacific/Chuuk", "Chuuk"), + ("Pacific/Easter", "Easter"), + ("Pacific/Efate", "Efate"), + ("Pacific/Enderbury", "Enderbury"), + ("Pacific/Fakaofo", "Fakaofo"), + ("Pacific/Fiji", "Fiji"), + ("Pacific/Funafuti", "Funafuti"), + ("Pacific/Galapagos", "Galapagos"), + ("Pacific/Gambier", "Gambier"), + ("Pacific/Guadalcanal", "Guadalcanal"), + ("Pacific/Guam", "Guam"), + ("Pacific/Honolulu", "Honolulu"), + ("Pacific/Johnston", "Johnston"), + ("Pacific/Kanton", "Kanton"), + ("Pacific/Kiritimati", "Kiritimati"), + ("Pacific/Kosrae", "Kosrae"), + ("Pacific/Kwajalein", "Kwajalein"), + ("Pacific/Majuro", "Majuro"), + ("Pacific/Marquesas", "Marquesas"), + ("Pacific/Midway", "Midway"), + ("Pacific/Nauru", "Nauru"), + ("Pacific/Niue", "Niue"), + ("Pacific/Norfolk", "Norfolk"), + ("Pacific/Noumea", "Noumea"), + ("Pacific/Pago_Pago", "Pago_Pago"), + ("Pacific/Palau", "Palau"), + ("Pacific/Pitcairn", "Pitcairn"), + ("Pacific/Pohnpei", "Pohnpei"), + ("Pacific/Ponape", "Ponape"), + ("Pacific/Port_Moresby", "Port_Moresby"), + ("Pacific/Rarotonga", "Rarotonga"), + ("Pacific/Saipan", "Saipan"), + ("Pacific/Samoa", "Samoa"), + ("Pacific/Tahiti", "Tahiti"), + ("Pacific/Tarawa", "Tarawa"), + ("Pacific/Tongatapu", "Tongatapu"), + ("Pacific/Truk", "Truk"), + ("Pacific/Wake", "Wake"), + ("Pacific/Wallis", "Wallis"), + ("Pacific/Yap", "Yap"), + ], + ), + ( + "US", + [ + ("US/Alaska", "Alaska"), + ("US/Aleutian", "Aleutian"), + ("US/Arizona", "Arizona"), + ("US/Central", "Central"), + ("US/East-Indiana", "East-Indiana"), + ("US/Eastern", "Eastern"), + ("US/Hawaii", "Hawaii"), + ("US/Indiana-Starke", "Indiana-Starke"), + ("US/Michigan", "Michigan"), + ("US/Mountain", "Mountain"), + ("US/Pacific", "Pacific"), + ("US/Samoa", "Samoa"), + ], + ), + ], + default="Asia/Ho_Chi_Minh", + max_length=50, + verbose_name="location", + ), ), ] diff --git a/judge/ml/collab_filter.py b/judge/ml/collab_filter.py index 1b0a1db..6a5d183 100644 --- a/judge/ml/collab_filter.py +++ b/judge/ml/collab_filter.py @@ -2,7 +2,6 @@ import numpy as np from django.conf import settings import os from django.core.cache import cache -import hashlib from judge.caching import cache_wrapper diff --git a/judge/models/problem.py b/judge/models/problem.py index 47741e9..9560be8 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -1,6 +1,5 @@ import errno from operator import attrgetter -from math import sqrt from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation diff --git a/judge/tasks/import_users.py b/judge/tasks/import_users.py index 5584687..07acd4e 100644 --- a/judge/tasks/import_users.py +++ b/judge/tasks/import_users.py @@ -1,5 +1,4 @@ import csv -from tempfile import mktemp import re from django.conf import settings diff --git a/judge/utils/fine_uploader.py b/judge/utils/fine_uploader.py index 2a22ccf..8f64d78 100644 --- a/judge/utils/fine_uploader.py +++ b/judge/utils/fine_uploader.py @@ -5,7 +5,6 @@ from django import forms from django.forms import ClearableFileInput import os, os.path -import tempfile import shutil __all__ = ("handle_upload", "save_upload", "FineUploadForm", "FineUploadFileInput") diff --git a/judge/utils/problem_data.py b/judge/utils/problem_data.py index eb56229..954c213 100644 --- a/judge/utils/problem_data.py +++ b/judge/utils/problem_data.py @@ -2,7 +2,6 @@ import hashlib import json import os import re -import shutil import yaml import zipfile diff --git a/judge/utils/problems.py b/judge/utils/problems.py index 67ef163..f35b546 100644 --- a/judge/utils/problems.py +++ b/judge/utils/problems.py @@ -1,6 +1,5 @@ from collections import defaultdict from math import e -import os, zipfile from datetime import datetime import random diff --git a/judge/views/submission.py b/judge/views/submission.py index eae961b..61982cf 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -1,6 +1,5 @@ import json import os.path -import zipfile from operator import attrgetter from django.conf import settings diff --git a/resources/dmmd-preview.scss b/resources/dmmd-preview.scss index a3236b7..98cdbaa 100644 --- a/resources/dmmd-preview.scss +++ b/resources/dmmd-preview.scss @@ -25,17 +25,17 @@ div.dmmd-preview-has-content div.dmmd-preview-content { } div.dmmd-no-button div.dmmd-preview-update { - display: none; + display: none; } div.dmmd-no-button div.dmmd-preview-content { - padding-bottom: 0; + padding-bottom: 0; } div.dmmd-no-button:not(.dmmd-preview-has-content) { - display: none; + display: none; } div.dmmd-preview-stale { - background: repeating-linear-gradient(-45deg, #fff, #fff 10px, #f8f8f8 10px, #f8f8f8 20px); + background: repeating-linear-gradient(-45deg, #fff, #fff 10px, #f8f8f8 10px, #f8f8f8 20px); } diff --git a/resources/fine-uploader/templates/default.html b/resources/fine-uploader/templates/default.html index e3285ad..11c1502 100644 --- a/resources/fine-uploader/templates/default.html +++ b/resources/fine-uploader/templates/default.html @@ -4,59 +4,59 @@ if you are not yet familiar with Fine Uploader UI. --> diff --git a/resources/fine-uploader/templates/gallery.html b/resources/fine-uploader/templates/gallery.html index 3c7d69e..44827a6 100644 --- a/resources/fine-uploader/templates/gallery.html +++ b/resources/fine-uploader/templates/gallery.html @@ -5,78 +5,78 @@ on how to customize this template. --> diff --git a/resources/fine-uploader/templates/simple-thumbnails.html b/resources/fine-uploader/templates/simple-thumbnails.html index 668c0c0..767d2d1 100644 --- a/resources/fine-uploader/templates/simple-thumbnails.html +++ b/resources/fine-uploader/templates/simple-thumbnails.html @@ -5,60 +5,60 @@ on how to customize this template. --> diff --git a/resources/math.scss b/resources/math.scss index f3dae2d..dac4680 100644 --- a/resources/math.scss +++ b/resources/math.scss @@ -1,49 +1,49 @@ .mwe-math-mathml-inline { - display: inline !important; + display: inline !important; } .mwe-math-mathml-display { - display: block !important; - margin-left: auto; - margin-right: auto; + display: block !important; + margin-left: auto; + margin-right: auto; } .mwe-math-mathml-a11y { - clip: rect(1px, 1px, 1px, 1px); - overflow: hidden; - position: absolute; - width: 1px; - height: 1px; - opacity: 0; + clip: rect(1px, 1px, 1px, 1px); + overflow: hidden; + position: absolute; + width: 1px; + height: 1px; + opacity: 0; } .mwe-math-fallback-image-inline { - display: inline-block; - vertical-align: middle; + display: inline-block; + vertical-align: middle; } .mwe-math-fallback-image-display { - display: block; - margin-left: auto !important; - margin-right: auto !important; + display: block; + margin-left: auto !important; + margin-right: auto !important; } @font-face { - font-family: 'Latin Modern Math'; - src: url('libs/latinmodernmath/latinmodern-math.eot'); /* IE9 Compat Modes */ - src: local('Latin Modern Math'), local('LatinModernMath-Regular'), + font-family: 'Latin Modern Math'; + src: url('libs/latinmodernmath/latinmodern-math.eot'); /* IE9 Compat Modes */ + src: local('Latin Modern Math'), local('LatinModernMath-Regular'), url('libs/latinmodernmath/latinmodern-math.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('libs/latinmodernmath/latinmodern-math.woff2') format('woff2'), /* Modern Browsers */ url('libs/latinmodernmath/latinmodern-math.woff') format('woff'), /* Modern Browsers */ url('libs/latinmodernmath/latinmodern-math.ttf') format('truetype'); /* Safari, Android, iOS */ - font-weight: normal; - font-style: normal; + font-weight: normal; + font-style: normal; } math { - font-family: "Latin Modern Math"; + font-family: "Latin Modern Math"; } img.inline-math { - display: inline; + display: inline; } \ No newline at end of file diff --git a/resources/users.scss b/resources/users.scss index 152ffab..841e7bd 100644 --- a/resources/users.scss +++ b/resources/users.scss @@ -50,7 +50,7 @@ th.header.rank { th a:hover { color: #0F0; } - + .about-column { width: 30%; } @@ -362,7 +362,7 @@ a.edit-profile { } .follow { - background: green; + background: green; border-color: lightgreen; } .follow:hover { diff --git a/templates/course/base.html b/templates/course/base.html index a4992f9..cdcf0d4 100644 --- a/templates/course/base.html +++ b/templates/course/base.html @@ -1,12 +1,12 @@ - + Courses - - - - + + + + \ No newline at end of file diff --git a/templates/course/list.html b/templates/course/list.html index 5337724..4ea88a5 100644 --- a/templates/course/list.html +++ b/templates/course/list.html @@ -1,19 +1,19 @@ - + Document - - + +

      Enrolling

      {% for course in enrolling %} -

      {{ course }}

      +

      {{ course }}

      {% endfor %}

      Available

      {% for course in available %} -

      {{ course }}

      +

      {{ course }}

      {% endfor %} - + \ No newline at end of file From 6312f143f5b047725cb368d55928ffdd9f2a29fb Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 16 Oct 2023 16:38:23 -0500 Subject: [PATCH 34/51] Don't send error on judge disconnect --- judge/bridge/judge_handler.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/judge/bridge/judge_handler.py b/judge/bridge/judge_handler.py index be21ebe..8be69ea 100644 --- a/judge/bridge/judge_handler.py +++ b/judge/bridge/judge_handler.py @@ -93,13 +93,6 @@ class JudgeHandler(ZlibPacketHandler): def on_disconnect(self): self._stop_ping.set() - if self._working: - logger.error( - "Judge %s disconnected while handling submission %s", - self.name, - self._working, - ) - self.judges.remove(self) if self.name is not None: self._disconnected() logger.info( @@ -118,16 +111,6 @@ class JudgeHandler(ZlibPacketHandler): None, 0, ) - # Submission.objects.filter(id=self._working).update( - # status="IE", result="IE", error="" - # ) - # json_log.error( - # self._make_json_log( - # sub=self._working, - # action="close", - # info="IE due to shutdown on grading", - # ) - # ) def _authenticate(self, id, key): try: From 1291d750de4191183a1e0bd9f071d5d335846510 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 16 Oct 2023 16:48:44 -0500 Subject: [PATCH 35/51] Add trans --- locale/vi/LC_MESSAGES/django.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 4497f98..c232be2 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -1802,7 +1802,7 @@ msgstr "Số thực (chênh lệch tương đối)" #: judge/models/problem_data.py:36 msgid "Non-trailing spaces" -msgstr "Không cho phép dấu cách cuối dòng" +msgstr "Không xét dấu cách cuối dòng" #: judge/models/problem_data.py:37 msgid "Unordered" @@ -3116,10 +3116,8 @@ msgid "The user you are trying to kick is not in organization: %s." msgstr "" #: judge/views/organization.py:790 judge/views/organization.py:946 -#, fuzzy, python-format -#| msgid "Editing %s" msgid "Edit %s" -msgstr "Đang chỉnh sửa %s" +msgstr "Chỉnh sửa %s" #: judge/views/organization.py:818 templates/organization/list.html:45 msgid "Create group" @@ -5636,7 +5634,7 @@ msgstr "Người được ủy thác" #: templates/ticket/new_problem.html:7 msgid "Thanks for opening a ticket!" -msgstr "Cảm ơn đã báo cáo!" +msgstr "Cảm ơn bạn đã báo cáo!" #: templates/ticket/new_problem.html:9 msgid "" From 35756d2f1505d25e541e3b59c7fdb9e99fef6913 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 16 Oct 2023 17:37:52 -0500 Subject: [PATCH 36/51] Allow clone ended contests --- judge/views/contests.py | 24 +- locale/vi/LC_MESSAGES/django.po | 1228 ++++++++++++++------------- locale/vi/LC_MESSAGES/dmoj-user.po | 11 +- templates/base.html | 2 +- templates/contest/clone.html | 2 +- templates/contest/contest-tabs.html | 3 - templates/contest/contest.html | 9 +- 7 files changed, 659 insertions(+), 620 deletions(-) diff --git a/judge/views/contests.py b/judge/views/contests.py index a84d98b..80f66e5 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -441,16 +441,32 @@ class ContestDetail( .add_i18n_name(self.request.LANGUAGE_CODE) ) context["editable_organizations"] = self.get_editable_organizations() + context["is_clonable"] = is_contest_clonable(self.request, self.object) return context -class ContestClone( - ContestMixin, PermissionRequiredMixin, TitleMixin, SingleObjectFormView -): +def is_contest_clonable(request, contest): + if not request.profile: + return False + if not Organization.objects.filter(admins=request.profile).exists(): + return False + if request.user.has_perm("judge.clone_contest"): + return True + if contest.ended: + return True + return False + + +class ContestClone(ContestMixin, TitleMixin, SingleObjectFormView): title = _("Clone Contest") template_name = "contest/clone.html" form_class = ContestCloneForm - permission_required = "judge.clone_contest" + + def get_object(self, queryset=None): + contest = super().get_object(queryset) + if not is_contest_clonable(self.request, contest): + raise Http404() + return contest def get_form_kwargs(self): kwargs = super().get_form_kwargs() diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index c232be2..552f1a2 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: lqdoj2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-17 12:21+0700\n" +"POT-Creation-Date: 2023-10-17 05:01+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -18,58 +18,59 @@ msgstr "" "X-Crowdin-Project-ID: 466004\n" "X-Crowdin-File-ID: 5\n" -#: chat_box/models.py:39 chat_box/models.py:64 chat_box/models.py:79 -#: judge/admin/interface.py:150 judge/models/contest.py:641 -#: judge/models/contest.py:847 judge/models/course.py:115 -#: judge/models/profile.py:390 judge/models/profile.py:468 +#: chat_box/models.py:42 chat_box/models.py:68 chat_box/models.py:84 +#: judge/admin/interface.py:150 judge/models/contest.py:644 +#: judge/models/contest.py:850 judge/models/course.py:115 +#: judge/models/profile.py:433 judge/models/profile.py:511 msgid "user" msgstr "người dùng" -#: chat_box/models.py:41 judge/models/comment.py:44 judge/models/comment.py:189 +#: chat_box/models.py:44 judge/models/comment.py:44 +#: judge/models/notification.py:17 msgid "posted time" msgstr "thời gian đăng" -#: chat_box/models.py:43 judge/models/comment.py:49 +#: chat_box/models.py:46 judge/models/comment.py:49 msgid "body of comment" msgstr "nội dung bình luận" -#: chat_box/models.py:68 +#: chat_box/models.py:72 msgid "last seen" msgstr "xem lần cuối" -#: chat_box/views.py:47 +#: chat_box/views.py:44 msgid "LQDOJ Chat" msgstr "" -#: dmoj/settings.py:365 +#: dmoj/settings.py:364 msgid "Vietnamese" msgstr "Tiếng Việt" -#: dmoj/settings.py:366 +#: dmoj/settings.py:365 msgid "English" msgstr "" -#: dmoj/urls.py:108 +#: dmoj/urls.py:109 msgid "Activation key invalid" msgstr "Mã kích hoạt không hợp lệ" -#: dmoj/urls.py:113 +#: dmoj/urls.py:114 msgid "Register" msgstr "Đăng ký" -#: dmoj/urls.py:120 +#: dmoj/urls.py:121 msgid "Registration Completed" msgstr "Đăng ký hoàn thành" -#: dmoj/urls.py:128 +#: dmoj/urls.py:129 msgid "Registration not allowed" msgstr "Đăng ký không thành công" -#: dmoj/urls.py:136 +#: dmoj/urls.py:137 msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:224 templates/base.html:218 +#: dmoj/urls.py:225 templates/base.html:217 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -99,7 +100,7 @@ msgid "Included contests" msgstr "" #: judge/admin/contest.py:79 judge/admin/volunteer.py:54 -#: templates/contest/clarification.html:42 templates/contest/contest.html:100 +#: templates/contest/clarification.html:42 templates/contest/contest.html:103 #: templates/contest/moss.html:41 templates/internal/left-sidebar.html:2 #: templates/internal/problem.html:40 templates/problem/list.html:17 #: templates/problem/list.html:34 templates/problem/list.html:153 @@ -119,9 +120,9 @@ msgstr "" msgid "Details" msgstr "Chi tiết" -#: judge/admin/contest.py:185 templates/contest/list.html:265 -#: templates/contest/list.html:306 templates/contest/list.html:351 -#: templates/contest/list.html:388 +#: judge/admin/contest.py:185 templates/contest/list.html:263 +#: templates/contest/list.html:304 templates/contest/list.html:349 +#: templates/contest/list.html:386 msgid "Format" msgstr "Thể thức" @@ -130,23 +131,11 @@ msgstr "Thể thức" msgid "Rating" msgstr "" -#: templates/markdown_editor/markdown_editor.html:107 -msgid "Insert Image" -msgstr "Chèn hình ảnh" - -#: templates/markdown_editor/markdown_editor.html:110 -msgid "From the web" -msgstr "Từ web" - -#: templates/markdown_editor/markdown_editor.html:116 -msgid "From your computer" -msgstr "Từ máy tính của bạn" - #: judge/admin/contest.py:201 msgid "Access" msgstr "Truy cập" -#: judge/admin/contest.py:211 judge/admin/problem.py:218 +#: judge/admin/contest.py:211 judge/admin/problem.py:220 msgid "Justice" msgstr "Xử phạt" @@ -190,7 +179,7 @@ msgstr "Tính toán lại kết quả" msgid "username" msgstr "tên đăng nhập" -#: judge/admin/contest.py:503 templates/base.html:341 +#: judge/admin/contest.py:503 templates/base.html:345 msgid "virtual" msgstr "ảo" @@ -218,95 +207,96 @@ msgstr "" msgid "diff" msgstr "" -#: judge/admin/organization.py:61 judge/admin/problem.py:275 +#: judge/admin/organization.py:61 judge/admin/problem.py:277 #: judge/admin/profile.py:117 msgid "View on site" msgstr "Xem trên trang" -#: judge/admin/problem.py:53 +#: judge/admin/problem.py:55 msgid "Describe the changes you made (optional)" msgstr "Mô tả các thay đổi (tùy chọn)" -#: judge/admin/problem.py:109 +#: judge/admin/problem.py:111 msgid "Memory unit" msgstr "Đơn vị bộ nhớ" -#: judge/admin/problem.py:211 +#: judge/admin/problem.py:213 msgid "Social Media" msgstr "Mạng Xã Hội" -#: judge/admin/problem.py:214 +#: judge/admin/problem.py:216 msgid "Taxonomy" msgstr "" -#: judge/admin/problem.py:215 judge/admin/problem.py:438 -#: templates/contest/contest.html:101 templates/problem/data.html:533 +#: judge/admin/problem.py:217 judge/admin/problem.py:452 +#: templates/contest/contest.html:104 +#: templates/contest/contests_summary.html:41 templates/problem/data.html:533 #: templates/problem/list.html:22 templates/problem/list.html:48 #: templates/user/base-users-table.html:10 templates/user/user-about.html:36 #: templates/user/user-about.html:52 templates/user/user-problems.html:58 msgid "Points" msgstr "Điểm" -#: judge/admin/problem.py:216 +#: judge/admin/problem.py:218 msgid "Limits" msgstr "Giới hạn" -#: judge/admin/problem.py:217 judge/admin/submission.py:351 -#: templates/base.html:254 templates/stats/tab.html:4 +#: judge/admin/problem.py:219 judge/admin/submission.py:351 +#: templates/base.html:261 templates/stats/tab.html:4 #: templates/submission/list.html:347 msgid "Language" msgstr "Ngôn ngữ" -#: judge/admin/problem.py:219 +#: judge/admin/problem.py:221 msgid "History" msgstr "Lịch sử" -#: judge/admin/problem.py:271 templates/problem/list-base.html:99 +#: judge/admin/problem.py:273 templates/problem/list-base.html:99 msgid "Authors" msgstr "Các tác giả" -#: judge/admin/problem.py:292 +#: judge/admin/problem.py:294 #, python-format msgid "%d problem successfully marked as public." msgid_plural "%d problems successfully marked as public." msgstr[0] "%d bài tập đã được đánh dấu công khai." -#: judge/admin/problem.py:299 +#: judge/admin/problem.py:301 msgid "Mark problems as public" msgstr "Công khai bài tập" -#: judge/admin/problem.py:308 +#: judge/admin/problem.py:310 #, python-format msgid "%d problem successfully marked as private." msgid_plural "%d problems successfully marked as private." msgstr[0] "%d bài tập đã được đánh dấu riêng tư." -#: judge/admin/problem.py:315 +#: judge/admin/problem.py:317 msgid "Mark problems as private" msgstr "Đánh dấu các bài tập là riêng tư" -#: judge/admin/problem.py:432 judge/admin/submission.py:314 +#: judge/admin/problem.py:446 judge/admin/submission.py:314 #: templates/problem/list.html:18 templates/problem/list.html:37 msgid "Problem code" msgstr "Mã bài" -#: judge/admin/problem.py:444 judge/admin/submission.py:320 +#: judge/admin/problem.py:458 judge/admin/submission.py:320 msgid "Problem name" msgstr "Tên bài" -#: judge/admin/problem.py:450 +#: judge/admin/problem.py:464 #, fuzzy #| msgid "contest rating" msgid "Voter rating" msgstr "rating kỳ thi" -#: judge/admin/problem.py:456 +#: judge/admin/problem.py:470 #, fuzzy #| msgid "Total points" msgid "Voter point" msgstr "Tổng điểm" -#: judge/admin/problem.py:462 +#: judge/admin/problem.py:476 msgid "Vote" msgstr "" @@ -315,7 +305,7 @@ msgid "timezone" msgstr "múi giờ" #: judge/admin/profile.py:126 judge/admin/submission.py:327 -#: templates/notification/list.html:12 +#: templates/notification/list.html:9 #: templates/organization/requests/log.html:9 #: templates/organization/requests/pending.html:19 #: templates/ticket/list.html:263 @@ -412,9 +402,9 @@ msgstr[0] "%d bài nộp đã được tính điểm lại." msgid "Rescore the selected submissions" msgstr "Tính điểm lại cái bài nộp" -#: judge/admin/submission.py:332 templates/contest/list.html:250 -#: templates/contest/list.html:295 templates/contest/list.html:340 -#: templates/contest/list.html:382 templates/notification/list.html:15 +#: judge/admin/submission.py:332 templates/contest/list.html:248 +#: templates/contest/list.html:293 templates/contest/list.html:338 +#: templates/contest/list.html:380 templates/notification/list.html:12 #: templates/organization/requests/log.html:10 #: templates/organization/requests/pending.html:20 #: templates/problem/list.html:154 @@ -458,20 +448,20 @@ msgstr "Dạng" msgid "Online Judge" msgstr "" -#: judge/comments.py:64 +#: judge/comments.py:63 msgid "Comment body" msgstr "Nội dung bình luận" -#: judge/comments.py:70 judge/views/ticket.py:78 +#: judge/comments.py:69 judge/views/ticket.py:73 msgid "Your part is silent, little toad." msgstr "Bạn không được phép bình luận." -#: judge/comments.py:79 templates/comments/list.html:17 +#: judge/comments.py:78 templates/comments/list.html:17 msgid "" "You need to have solved at least one problem before your voice can be heard." msgstr "Bạn phải giải ít nhất một bài trước khi được phép bình luận." -#: judge/comments.py:123 +#: judge/comments.py:122 msgid "Posted comment" msgstr "Bình luận đã đăng" @@ -546,7 +536,7 @@ msgstr "Two Factor Authentication phải chứa 6 chữ số." msgid "Invalid Two Factor Authentication token." msgstr "Token Two Factor Authentication không hợp lệ." -#: judge/forms.py:477 judge/models/problem.py:133 +#: judge/forms.py:477 judge/models/problem.py:130 msgid "Problem code must be ^[a-z0-9]+$" msgstr "Mã bài phải có dạng ^[a-z0-9]+$" @@ -554,13 +544,14 @@ msgstr "Mã bài phải có dạng ^[a-z0-9]+$" msgid "Problem with code already exists." msgstr "Mã bài đã tồn tại." -#: judge/forms.py:491 judge/models/contest.py:93 +#: judge/forms.py:491 judge/models/contest.py:95 msgid "Contest id must be ^[a-z0-9]+$" msgstr "Mã kỳ thi phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:498 templates/problem/search-form.html:46 +#: judge/forms.py:498 templates/contest/clone.html:47 +#: templates/problem/search-form.html:39 msgid "Group" -msgstr "" +msgstr "Nhóm" #: judge/forms.py:506 msgid "Contest with key already exists." @@ -568,13 +559,11 @@ msgstr "Mã kỳ thi đã tồn tại." #: judge/forms.py:514 msgid "Group doesn't exist." -msgstr "" +msgstr "Nhóm không tồn tại." #: judge/forms.py:516 -#, fuzzy -#| msgid "You do not have the permission to rejudge submissions." msgid "You don't have permission in this group." -msgstr "Bạn không có quyền chấm lại bài." +msgstr "Bạn không có quyền trong nhóm này." #: judge/forms.py:566 msgid "This problem is duplicated." @@ -586,7 +575,7 @@ msgid "N j, Y, g:i a" msgstr "g:i a j b, Y" #: judge/jinja2/datetime.py:26 templates/chat/message.html:13 -#: templates/comments/content-list.html:36 +#: templates/comments/content-list.html:33 #, python-brace-format msgid "{time}" msgstr "{time}" @@ -609,12 +598,12 @@ msgid "No such group" msgstr "Nhóm không tồn tại" #: judge/models/bookmark.py:16 judge/models/comment.py:171 -#: judge/models/pagevote.py:15 +#: judge/models/pagevote.py:16 msgid "associated page" msgstr "trang tương ứng" #: judge/models/bookmark.py:19 judge/models/comment.py:48 -#: judge/models/pagevote.py:18 judge/models/problem.py:713 +#: judge/models/pagevote.py:19 judge/models/problem.py:718 msgid "votes" msgstr "bình chọn" @@ -674,7 +663,7 @@ msgstr "ẩn bình luận" msgid "parent" msgstr "" -#: judge/models/comment.py:63 judge/models/comment.py:191 +#: judge/models/comment.py:63 judge/models/notification.py:31 msgid "comment" msgstr "bình luận" @@ -700,124 +689,104 @@ msgstr "" msgid "Override comment lock" msgstr "" -#: judge/models/comment.py:185 -msgid "owner" -msgstr "" - -#: judge/models/comment.py:193 judge/models/message.py:28 -msgid "read" -msgstr "" - -#: judge/models/comment.py:194 -msgid "category" -msgstr "" - -#: judge/models/comment.py:197 -msgid "html link to comments, used for non-comments" -msgstr "" - -#: judge/models/comment.py:203 -msgid "who trigger, used for non-comment" -msgstr "" - -#: judge/models/contest.py:40 +#: judge/models/contest.py:42 msgid "Invalid colour." msgstr "" -#: judge/models/contest.py:44 +#: judge/models/contest.py:46 msgid "tag name" msgstr "" -#: judge/models/contest.py:48 +#: judge/models/contest.py:50 msgid "Lowercase letters and hyphens only." msgstr "" -#: judge/models/contest.py:53 +#: judge/models/contest.py:55 msgid "tag colour" msgstr "" -#: judge/models/contest.py:55 +#: judge/models/contest.py:57 msgid "tag description" msgstr "" -#: judge/models/contest.py:76 +#: judge/models/contest.py:78 msgid "contest tag" msgstr "" -#: judge/models/contest.py:77 judge/models/contest.py:250 +#: judge/models/contest.py:79 judge/models/contest.py:252 msgid "contest tags" msgstr "nhãn kỳ thi" -#: judge/models/contest.py:85 +#: judge/models/contest.py:87 msgid "Visible" msgstr "Hiển thị" -#: judge/models/contest.py:86 +#: judge/models/contest.py:88 msgid "Hidden for duration of contest" msgstr "Ẩn trong thời gian kỳ thi" -#: judge/models/contest.py:87 +#: judge/models/contest.py:89 msgid "Hidden for duration of participation" msgstr "Ẩn trong thời gian tham gia" -#: judge/models/contest.py:91 +#: judge/models/contest.py:93 msgid "contest id" msgstr "ID kỳ thi" -#: judge/models/contest.py:96 +#: judge/models/contest.py:98 msgid "contest name" msgstr "tên kỳ thi" -#: judge/models/contest.py:100 +#: judge/models/contest.py:102 msgid "These users will be able to edit the contest." msgstr "Những người dùng này có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:106 +#: judge/models/contest.py:108 msgid "" "These users will be able to edit the contest, but will not be listed as " "authors." msgstr "Những người dùng này là tác giả và có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:115 +#: judge/models/contest.py:117 msgid "These users will be able to view the contest, but not edit it." msgstr "" "Những người dùng này có thể thấy kỳ thi nhưng không có quyền chỉnh sửa." -#: judge/models/contest.py:120 judge/models/course.py:158 +#: judge/models/contest.py:122 judge/models/course.py:158 #: judge/models/runtime.py:211 msgid "description" msgstr "mô tả" -#: judge/models/contest.py:122 judge/models/problem.py:583 +#: judge/models/contest.py:124 judge/models/problem.py:588 #: judge/models/runtime.py:216 msgid "problems" msgstr "bài tập" -#: judge/models/contest.py:124 judge/models/contest.py:646 +#: judge/models/contest.py:126 judge/models/contest.py:649 msgid "start time" msgstr "thời gian bắt đầu" -#: judge/models/contest.py:125 +#: judge/models/contest.py:127 msgid "end time" msgstr "thời gian kết thúc" -#: judge/models/contest.py:127 judge/models/problem.py:186 -#: judge/models/problem.py:618 +#: judge/models/contest.py:129 judge/models/problem.py:183 +#: judge/models/problem.py:623 msgid "time limit" msgstr "giới hạn thời gian" -#: judge/models/contest.py:131 +#: judge/models/contest.py:133 msgid "" "Format hh:mm:ss. For example, if you want a 2-hour contest, enter 02:00:00" msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn tạo kỳ thi dài 2h, hãy " "nhập 02:00:00" -#: judge/models/contest.py:135 +#: judge/models/contest.py:137 msgid "freeze after" msgstr "đóng băng sau" -#: judge/models/contest.py:139 +#: judge/models/contest.py:141 msgid "" "Format hh:mm:ss. For example, if you want to freeze contest after 2 hours, " "enter 02:00:00" @@ -825,12 +794,12 @@ msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, " "hãy nhập 02:00:00" -#: judge/models/contest.py:143 judge/models/course.py:28 -#: judge/models/course.py:164 judge/models/problem.py:225 +#: judge/models/contest.py:145 judge/models/course.py:28 +#: judge/models/course.py:164 judge/models/problem.py:222 msgid "publicly visible" msgstr "công khai" -#: judge/models/contest.py:146 +#: judge/models/contest.py:148 msgid "" "Should be set even for organization-private contests, where it determines " "whether the contest is visible to members of the specified organizations." @@ -838,92 +807,92 @@ msgstr "" "Đánh dấu ngay cả với các kỳ thi riêng tư của nhóm, quyết định việc kỳ thi có " "được hiển thị với các thành viên hay không." -#: judge/models/contest.py:152 +#: judge/models/contest.py:154 msgid "contest rated" msgstr "kỳ thi được xếp hạng" -#: judge/models/contest.py:153 +#: judge/models/contest.py:155 msgid "Whether this contest can be rated." msgstr "Quyết định kỳ thi có được xếp hạng không." -#: judge/models/contest.py:157 +#: judge/models/contest.py:159 msgid "scoreboard visibility" msgstr "khả năng hiển thị của bảng điểm" -#: judge/models/contest.py:160 +#: judge/models/contest.py:162 msgid "Scoreboard visibility through the duration of the contest" msgstr "Khả năng hiển thị của bảng điểm trong thời gian kỳ thi" -#: judge/models/contest.py:165 +#: judge/models/contest.py:167 msgid "view contest scoreboard" msgstr "xem bảng điểm kỳ thi" -#: judge/models/contest.py:168 +#: judge/models/contest.py:170 msgid "These users will be able to view the scoreboard." msgstr "Những người dùng này được phép xem bảng điểm." -#: judge/models/contest.py:171 +#: judge/models/contest.py:173 msgid "public scoreboard" msgstr "công khai bảng điểm" -#: judge/models/contest.py:172 +#: judge/models/contest.py:174 msgid "Ranking page is public even for private contests." msgstr "Trang xếp hạng được công khai, kể cả cho kỳ thi riêng tư." -#: judge/models/contest.py:176 +#: judge/models/contest.py:178 msgid "no comments" msgstr "không bình luận" -#: judge/models/contest.py:177 +#: judge/models/contest.py:179 msgid "Use clarification system instead of comments." msgstr "Dùng hệ thống thông báo thay vì bình luận." -#: judge/models/contest.py:182 +#: judge/models/contest.py:184 msgid "Rating floor for contest" msgstr "Cận dưới rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:188 +#: judge/models/contest.py:190 msgid "Rating ceiling for contest" msgstr "Cận trên rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:193 +#: judge/models/contest.py:195 msgid "rate all" msgstr "xếp hạng tất cả" -#: judge/models/contest.py:194 +#: judge/models/contest.py:196 msgid "Rate all users who joined." msgstr "Xếp hạng tất cả người dùng đã tham gia (kể cả không nộp)." -#: judge/models/contest.py:199 +#: judge/models/contest.py:201 msgid "exclude from ratings" msgstr "không xếp hạng" -#: judge/models/contest.py:204 +#: judge/models/contest.py:206 msgid "private to specific users" msgstr "riêng tư với các người dùng này" -#: judge/models/contest.py:209 +#: judge/models/contest.py:211 msgid "private contestants" msgstr "thí sinh riêng tư" -#: judge/models/contest.py:210 +#: judge/models/contest.py:212 msgid "If private, only these users may see the contest" msgstr "Nếu riêng tư, chỉ những người dùng này mới thấy kỳ thi" -#: judge/models/contest.py:214 +#: judge/models/contest.py:216 msgid "hide problem tags" msgstr "ẩn nhãn kỳ thi" -#: judge/models/contest.py:215 +#: judge/models/contest.py:217 msgid "Whether problem tags should be hidden by default." msgstr "" "Quyết định việc nhãn bài tập (DP, Tham lam, ...) được ẩn trong kỳ thi không." -#: judge/models/contest.py:219 +#: judge/models/contest.py:221 msgid "run pretests only" msgstr "chỉ chạy pretests" -#: judge/models/contest.py:221 +#: judge/models/contest.py:223 msgid "" "Whether judges should grade pretests only, versus all testcases. Commonly " "set during a contest, then unset prior to rejudging user submissions when " @@ -932,51 +901,51 @@ msgstr "" "Quyết định việc các máy chấm chỉ chấm pretests thay vì tất cả các test. Sau " "kỳ thi, hãy bỏ đánh dấu ô này và chấm lại tất cả các bài." -#: judge/models/contest.py:228 judge/models/interface.py:96 -#: judge/models/problem.py:285 +#: judge/models/contest.py:230 judge/models/interface.py:96 +#: judge/models/problem.py:282 msgid "private to organizations" msgstr "riêng tư với các tổ chức" -#: judge/models/contest.py:233 judge/models/course.py:34 -#: judge/models/interface.py:92 judge/models/problem.py:281 -#: judge/models/profile.py:144 +#: judge/models/contest.py:235 judge/models/course.py:34 +#: judge/models/interface.py:92 judge/models/problem.py:278 +#: judge/models/profile.py:149 msgid "organizations" msgstr "tổ chức" -#: judge/models/contest.py:234 +#: judge/models/contest.py:236 msgid "If private, only these organizations may see the contest" msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được kỳ thi" -#: judge/models/contest.py:237 judge/models/problem.py:256 +#: judge/models/contest.py:239 judge/models/problem.py:253 msgid "OpenGraph image" msgstr "Hình ảnh OpenGraph" -#: judge/models/contest.py:240 judge/models/profile.py:92 +#: judge/models/contest.py:242 judge/models/profile.py:97 msgid "Logo override image" msgstr "Hình ảnh ghi đè logo" -#: judge/models/contest.py:245 +#: judge/models/contest.py:247 msgid "" "This image will replace the default site logo for users inside the contest." msgstr "Ảnh này sẽ thay thế cho logo mặc định trong kỳ thi." -#: judge/models/contest.py:253 +#: judge/models/contest.py:255 msgid "the amount of live participants" msgstr "số lượng thí sinh thi trực tiếp" -#: judge/models/contest.py:257 +#: judge/models/contest.py:259 msgid "contest summary" msgstr "tổng kết kỳ thi" -#: judge/models/contest.py:259 judge/models/problem.py:262 +#: judge/models/contest.py:261 judge/models/problem.py:259 msgid "Plain-text, shown in meta description tag, e.g. for social media." msgstr "" -#: judge/models/contest.py:263 judge/models/profile.py:87 +#: judge/models/contest.py:265 judge/models/profile.py:92 msgid "access code" msgstr "mật khẩu truy cập" -#: judge/models/contest.py:268 +#: judge/models/contest.py:270 msgid "" "An optional code to prompt contestants before they are allowed to join the " "contest. Leave it blank to disable." @@ -984,302 +953,314 @@ msgstr "" "Mật khẩu truy cập cho các thí sinh muốn tham gia kỳ thi. Để trống nếu không " "dùng." -#: judge/models/contest.py:274 judge/models/problem.py:244 +#: judge/models/contest.py:276 judge/models/problem.py:241 msgid "personae non gratae" msgstr "Chặn tham gia" -#: judge/models/contest.py:276 +#: judge/models/contest.py:278 msgid "Bans the selected users from joining this contest." msgstr "Cấm những người dùng được chọn tham gia kỳ thi." -#: judge/models/contest.py:279 +#: judge/models/contest.py:281 msgid "contest format" msgstr "format kỳ thi" -#: judge/models/contest.py:283 +#: judge/models/contest.py:285 msgid "The contest format module to use." msgstr "Format kỳ thi sử dụng." -#: judge/models/contest.py:286 +#: judge/models/contest.py:288 msgid "contest format configuration" msgstr "Tùy chỉnh format kỳ thi" -#: judge/models/contest.py:290 +#: judge/models/contest.py:292 msgid "" "A JSON object to serve as the configuration for the chosen contest format " "module. Leave empty to use None. Exact format depends on the contest format " "selected." msgstr "" -#: judge/models/contest.py:303 +#: judge/models/contest.py:305 msgid "precision points" msgstr "Hiển thị điểm" -#: judge/models/contest.py:306 +#: judge/models/contest.py:308 msgid "Number of digits to round points to." msgstr "Số chữ số thập phân trên bảng điểm." -#: judge/models/contest.py:614 +#: judge/models/contest.py:617 msgid "See private contests" msgstr "" -#: judge/models/contest.py:615 +#: judge/models/contest.py:618 msgid "Edit own contests" msgstr "" -#: judge/models/contest.py:616 +#: judge/models/contest.py:619 msgid "Edit all contests" msgstr "" -#: judge/models/contest.py:617 +#: judge/models/contest.py:620 msgid "Clone contest" msgstr "" -#: judge/models/contest.py:618 templates/contest/moss.html:72 +#: judge/models/contest.py:621 templates/contest/moss.html:72 msgid "MOSS contest" msgstr "" -#: judge/models/contest.py:619 +#: judge/models/contest.py:622 msgid "Rate contests" msgstr "" -#: judge/models/contest.py:620 +#: judge/models/contest.py:623 msgid "Contest access codes" msgstr "" -#: judge/models/contest.py:621 +#: judge/models/contest.py:624 msgid "Create private contests" msgstr "" -#: judge/models/contest.py:622 +#: judge/models/contest.py:625 msgid "Change contest visibility" msgstr "" -#: judge/models/contest.py:623 +#: judge/models/contest.py:626 msgid "Edit contest problem label script" msgstr "Cách hiển thị thứ tự bài tập" -#: judge/models/contest.py:625 judge/models/contest.py:772 -#: judge/models/contest.py:850 judge/models/contest.py:880 +#: judge/models/contest.py:628 judge/models/contest.py:775 +#: judge/models/contest.py:853 judge/models/contest.py:883 #: judge/models/course.py:178 judge/models/submission.py:116 msgid "contest" msgstr "kỳ thi" -#: judge/models/contest.py:626 +#: judge/models/contest.py:629 msgid "contests" msgstr "kỳ thi" -#: judge/models/contest.py:635 +#: judge/models/contest.py:638 msgid "associated contest" msgstr "" -#: judge/models/contest.py:648 +#: judge/models/contest.py:651 msgid "score" msgstr "điểm" -#: judge/models/contest.py:649 +#: judge/models/contest.py:652 msgid "cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:651 +#: judge/models/contest.py:654 msgid "is disqualified" msgstr "đã bị loại" -#: judge/models/contest.py:653 +#: judge/models/contest.py:656 msgid "Whether this participation is disqualified." msgstr "Quyết định thí sinh có bị loại không." -#: judge/models/contest.py:655 +#: judge/models/contest.py:658 msgid "tie-breaking field" msgstr "" -#: judge/models/contest.py:657 +#: judge/models/contest.py:660 msgid "virtual participation id" msgstr "id lần tham gia ảo" -#: judge/models/contest.py:659 +#: judge/models/contest.py:662 msgid "0 means non-virtual, otherwise the n-th virtual participation." msgstr "0 nghĩa là tham gia chính thức, ngược lại là lần tham gia ảo thứ n." -#: judge/models/contest.py:662 +#: judge/models/contest.py:665 msgid "contest format specific data" msgstr "" -#: judge/models/contest.py:665 +#: judge/models/contest.py:668 msgid "same as format_data, but including frozen results" msgstr "" -#: judge/models/contest.py:669 +#: judge/models/contest.py:672 #, fuzzy #| msgid "score" msgid "final score" msgstr "điểm" -#: judge/models/contest.py:671 +#: judge/models/contest.py:674 #, fuzzy #| msgid "cumulative time" msgid "final cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:747 +#: judge/models/contest.py:750 #, python-format msgid "%s spectating in %s" msgstr "%s đang theo dõi trong %s" -#: judge/models/contest.py:752 +#: judge/models/contest.py:755 #, python-format msgid "%s in %s, v%d" msgstr "%s trong %s, v%d" -#: judge/models/contest.py:757 +#: judge/models/contest.py:760 #, python-format msgid "%s in %s" msgstr "%s trong %s" -#: judge/models/contest.py:760 +#: judge/models/contest.py:763 msgid "contest participation" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:761 +#: judge/models/contest.py:764 msgid "contest participations" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:768 judge/models/contest.py:821 -#: judge/models/contest.py:883 judge/models/problem.py:582 -#: judge/models/problem.py:589 judge/models/problem.py:610 -#: judge/models/problem.py:641 judge/models/problem_data.py:50 +#: judge/models/contest.py:771 judge/models/contest.py:824 +#: judge/models/contest.py:886 judge/models/problem.py:587 +#: judge/models/problem.py:594 judge/models/problem.py:615 +#: judge/models/problem.py:646 judge/models/problem_data.py:50 msgid "problem" msgstr "bài tập" -#: judge/models/contest.py:776 judge/models/contest.py:833 -#: judge/models/course.py:182 judge/models/problem.py:209 +#: judge/models/contest.py:779 judge/models/contest.py:836 +#: judge/models/course.py:182 judge/models/problem.py:206 msgid "points" msgstr "điểm" -#: judge/models/contest.py:777 +#: judge/models/contest.py:780 msgid "partial" msgstr "thành phần" -#: judge/models/contest.py:778 judge/models/contest.py:835 +#: judge/models/contest.py:781 judge/models/contest.py:838 msgid "is pretested" msgstr "dùng pretest" -#: judge/models/contest.py:779 judge/models/interface.py:47 +#: judge/models/contest.py:782 judge/models/interface.py:47 msgid "order" msgstr "thứ tự" -#: judge/models/contest.py:781 +#: judge/models/contest.py:784 msgid "visible testcases" msgstr "hiển thị test" -#: judge/models/contest.py:786 +#: judge/models/contest.py:789 msgid "Maximum number of submissions for this problem, or 0 for no limit." msgstr "Số lần nộp tối đa, đặt là 0 nếu không có giới hạn." -#: judge/models/contest.py:788 +#: judge/models/contest.py:791 msgid "max submissions" msgstr "số lần nộp tối đa" -#: judge/models/contest.py:791 +#: judge/models/contest.py:794 msgid "Why include a problem you can't submit to?" msgstr "" -#: judge/models/contest.py:795 +#: judge/models/contest.py:798 #, fuzzy #| msgid "Only for format new IOI. Separated by commas, e.g: 2, 3" msgid "Separated by commas, e.g: 2, 3" msgstr "" "Chỉ dùng với format IOI mới. Các sub cách nhau bởi dấu phẩy. Ví dụ: 2, 3" -#: judge/models/contest.py:796 +#: judge/models/contest.py:799 #, fuzzy #| msgid "frozen subtasks" msgid "hidden subtasks" msgstr "Đóng băng subtasks" -#: judge/models/contest.py:808 +#: judge/models/contest.py:811 msgid "contest problem" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:809 +#: judge/models/contest.py:812 msgid "contest problems" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:815 judge/models/submission.py:233 +#: judge/models/contest.py:818 judge/models/submission.py:273 msgid "submission" msgstr "bài nộp" -#: judge/models/contest.py:828 judge/models/contest.py:854 +#: judge/models/contest.py:831 judge/models/contest.py:857 msgid "participation" msgstr "lần tham gia" -#: judge/models/contest.py:836 +#: judge/models/contest.py:839 msgid "Whether this submission was ran only on pretests." msgstr "Quyết định bài nộp chỉ được chạy trên pretest không." -#: judge/models/contest.py:841 +#: judge/models/contest.py:844 msgid "contest submission" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:842 +#: judge/models/contest.py:845 msgid "contest submissions" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:858 +#: judge/models/contest.py:861 msgid "rank" msgstr "rank" -#: judge/models/contest.py:859 +#: judge/models/contest.py:862 msgid "rating" msgstr "rating" -#: judge/models/contest.py:860 +#: judge/models/contest.py:863 msgid "raw rating" msgstr "rating thật" -#: judge/models/contest.py:861 +#: judge/models/contest.py:864 msgid "contest performance" msgstr "" -#: judge/models/contest.py:862 +#: judge/models/contest.py:865 msgid "last rated" msgstr "lần cuối được xếp hạng" -#: judge/models/contest.py:866 +#: judge/models/contest.py:869 msgid "contest rating" msgstr "rating kỳ thi" -#: judge/models/contest.py:867 +#: judge/models/contest.py:870 msgid "contest ratings" msgstr "rating kỳ thi" -#: judge/models/contest.py:891 +#: judge/models/contest.py:894 msgid "contest moss result" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:892 +#: judge/models/contest.py:895 msgid "contest moss results" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:897 +#: judge/models/contest.py:900 msgid "clarified problem" msgstr "" -#: judge/models/contest.py:899 +#: judge/models/contest.py:902 msgid "clarification body" msgstr "" -#: judge/models/contest.py:901 +#: judge/models/contest.py:904 msgid "clarification timestamp" msgstr "" +#: judge/models/contest.py:922 +#, fuzzy +#| msgid "contest summary" +msgid "contests summary" +msgstr "tổng kết kỳ thi" + +#: judge/models/contest.py:923 +#, fuzzy +#| msgid "contest summary" +msgid "contests summaries" +msgstr "tổng kết kỳ thi" + #: judge/models/course.py:21 #, fuzzy #| msgid "username" msgid "course name" msgstr "tên đăng nhập" -#: judge/models/course.py:23 judge/models/profile.py:53 +#: judge/models/course.py:23 judge/models/profile.py:58 msgid "organization description" msgstr "mô tả tổ chức" @@ -1305,7 +1286,7 @@ msgstr "" msgid "Course name shown in URL" msgstr "Tên được hiển thị trong đường dẫn" -#: judge/models/course.py:43 judge/models/profile.py:45 +#: judge/models/course.py:43 judge/models/profile.py:50 msgid "Only alphanumeric and hyphens" msgstr "" @@ -1382,7 +1363,7 @@ msgstr "mục cha" msgid "post title" msgstr "tiêu đề bài đăng" -#: judge/models/interface.py:79 judge/models/problem.py:667 +#: judge/models/interface.py:79 judge/models/problem.py:672 msgid "authors" msgstr "tác giả" @@ -1390,7 +1371,7 @@ msgstr "tác giả" msgid "slug" msgstr "slug" -#: judge/models/interface.py:81 judge/models/problem.py:665 +#: judge/models/interface.py:81 judge/models/problem.py:670 msgid "public visibility" msgstr "khả năng hiển thị công khai" @@ -1450,168 +1431,188 @@ msgstr "người nhận" msgid "message timestamp" msgstr "thời gian gửi" +#: judge/models/message.py:28 judge/models/notification.py:33 +msgid "read" +msgstr "" + #: judge/models/message.py:33 msgid "messages in the thread" msgstr "tin nhắn trong chuỗi" -#: judge/models/pagevote.py:24 +#: judge/models/notification.py:13 +msgid "owner" +msgstr "" + +#: judge/models/notification.py:18 +msgid "category" +msgstr "" + +#: judge/models/notification.py:21 +msgid "html link to comments, used for non-comments" +msgstr "" + +#: judge/models/notification.py:27 +msgid "who trigger, used for non-comment" +msgstr "" + +#: judge/models/pagevote.py:25 #, fuzzy #| msgid "votes" msgid "pagevote" msgstr "bình chọn" -#: judge/models/pagevote.py:25 +#: judge/models/pagevote.py:26 #, fuzzy #| msgid "votes" msgid "pagevotes" msgstr "bình chọn" -#: judge/models/pagevote.py:49 +#: judge/models/pagevote.py:51 #, fuzzy #| msgid "volunteer vote" msgid "pagevote vote" msgstr "vote từ TNV" -#: judge/models/pagevote.py:50 +#: judge/models/pagevote.py:52 #, fuzzy #| msgid "volunteer votes" msgid "pagevote votes" msgstr "vote từ TNV" -#: judge/models/problem.py:44 +#: judge/models/problem.py:43 msgid "problem category ID" msgstr "mã của nhóm bài" -#: judge/models/problem.py:47 +#: judge/models/problem.py:46 msgid "problem category name" msgstr "tên nhóm bài" -#: judge/models/problem.py:55 +#: judge/models/problem.py:54 msgid "problem type" msgstr "dạng bài" -#: judge/models/problem.py:56 judge/models/problem.py:176 +#: judge/models/problem.py:55 judge/models/problem.py:173 #: judge/models/volunteer.py:28 msgid "problem types" msgstr "dạng bài" -#: judge/models/problem.py:61 +#: judge/models/problem.py:60 msgid "problem group ID" msgstr "mã của nhóm bài" -#: judge/models/problem.py:63 +#: judge/models/problem.py:62 msgid "problem group name" msgstr "tên nhóm bài" -#: judge/models/problem.py:70 judge/models/problem.py:181 +#: judge/models/problem.py:69 judge/models/problem.py:178 msgid "problem group" msgstr "nhóm bài" -#: judge/models/problem.py:71 +#: judge/models/problem.py:70 msgid "problem groups" msgstr "nhóm bài" -#: judge/models/problem.py:78 +#: judge/models/problem.py:77 msgid "key" msgstr "" -#: judge/models/problem.py:81 +#: judge/models/problem.py:80 msgid "link" msgstr "đường dẫn" -#: judge/models/problem.py:82 +#: judge/models/problem.py:81 msgid "full name" msgstr "tên đầy đủ" -#: judge/models/problem.py:86 judge/models/profile.py:50 +#: judge/models/problem.py:85 judge/models/profile.py:55 #: judge/models/runtime.py:34 msgid "short name" msgstr "tên ngắn" -#: judge/models/problem.py:87 +#: judge/models/problem.py:86 msgid "Displayed on pages under this license" msgstr "Được hiển thị trên các trang theo giấy phép này" -#: judge/models/problem.py:92 +#: judge/models/problem.py:91 msgid "icon" msgstr "icon" -#: judge/models/problem.py:93 +#: judge/models/problem.py:92 msgid "URL to the icon" msgstr "Đường dẫn icon" -#: judge/models/problem.py:95 +#: judge/models/problem.py:94 msgid "license text" msgstr "văn bản giấy phép" -#: judge/models/problem.py:104 +#: judge/models/problem.py:103 msgid "license" msgstr "" -#: judge/models/problem.py:105 +#: judge/models/problem.py:104 msgid "licenses" msgstr "" -#: judge/models/problem.py:130 +#: judge/models/problem.py:127 msgid "problem code" msgstr "mã bài" -#: judge/models/problem.py:136 +#: judge/models/problem.py:133 msgid "A short, unique code for the problem, used in the url after /problem/" msgstr "Mã bài ngắn, độc nhất cho bài tập, được dùng trong url sau /problem/" -#: judge/models/problem.py:141 +#: judge/models/problem.py:138 msgid "problem name" msgstr "Tên bài" -#: judge/models/problem.py:143 +#: judge/models/problem.py:140 msgid "The full name of the problem, as shown in the problem list." msgstr "Tên đầy đủ của bài, như được hiển thị trên danh sách bài tập" -#: judge/models/problem.py:145 +#: judge/models/problem.py:142 msgid "problem body" msgstr "Nội dung" -#: judge/models/problem.py:148 +#: judge/models/problem.py:145 msgid "creators" msgstr "" -#: judge/models/problem.py:152 +#: judge/models/problem.py:149 msgid "These users will be able to edit the problem, and be listed as authors." msgstr "" "Những người dùng này sẽ có thể chỉnh sửa bài tập, và nằm trong danh sách các " "tác giả" -#: judge/models/problem.py:157 +#: judge/models/problem.py:154 msgid "curators" msgstr "" -#: judge/models/problem.py:161 +#: judge/models/problem.py:158 msgid "" "These users will be able to edit the problem, but not be listed as authors." msgstr "" "Những người dùng này sẽ có thể chỉnh sửa bài tập, nhưng không nằm trong danh " "sách các tác giả" -#: judge/models/problem.py:167 +#: judge/models/problem.py:164 msgid "testers" msgstr "" -#: judge/models/problem.py:171 +#: judge/models/problem.py:168 msgid "These users will be able to view the private problem, but not edit it." msgstr "" "Những người dùng này sẽ thấy được bài tập này (dù riêng tư), nhưng không " "chỉnh sửa được" -#: judge/models/problem.py:177 judge/models/volunteer.py:29 +#: judge/models/problem.py:174 judge/models/volunteer.py:29 msgid "The type of problem, as shown on the problem's page." msgstr "Dạng bài, giống như trên trang bài tập" -#: judge/models/problem.py:183 +#: judge/models/problem.py:180 msgid "The group of problem, shown under Category in the problem list." msgstr "Nhóm bài, hiện ở mục Nhóm bài trong danh sách bài tập" -#: judge/models/problem.py:188 +#: judge/models/problem.py:185 msgid "" "The time limit for this problem, in seconds. Fractional seconds (e.g. 1.5) " "are supported." @@ -1619,11 +1620,11 @@ msgstr "" "Giới hạn thời gian cho bài tập này, theo đơn vị giây. Có thể nhập số thực " "(ví dụ 1.5)" -#: judge/models/problem.py:197 judge/models/problem.py:625 +#: judge/models/problem.py:194 judge/models/problem.py:630 msgid "memory limit" msgstr "Giới hạn bộ nhớ" -#: judge/models/problem.py:199 +#: judge/models/problem.py:196 msgid "" "The memory limit for this problem, in kilobytes (e.g. 256mb = 262144 " "kilobytes)." @@ -1631,7 +1632,7 @@ msgstr "" "Giới hạn bộ nhớ cho bài này, theo đơn vị kilobytes (ví dụ 256mb = 262144 " "kilobytes)" -#: judge/models/problem.py:211 +#: judge/models/problem.py:208 msgid "" "Points awarded for problem completion. Points are displayed with a 'p' " "suffix if partial." @@ -1639,148 +1640,148 @@ msgstr "" "Điểm thưởng khi hoàn thành bài tập. Điểm có thêm chữ 'p' ở sau cùng nếu như " "chấp nhận cho điểm thành phần (có điểm ngay khi không đúng toàn bộ test)" -#: judge/models/problem.py:217 +#: judge/models/problem.py:214 msgid "allows partial points" msgstr "cho phép điểm thành phần" -#: judge/models/problem.py:221 +#: judge/models/problem.py:218 msgid "allowed languages" msgstr "các ngôn ngữ được cho phép" -#: judge/models/problem.py:222 +#: judge/models/problem.py:219 msgid "List of allowed submission languages." msgstr "Danh sách các ngôn ngữ lập trình cho phép" -#: judge/models/problem.py:228 +#: judge/models/problem.py:225 msgid "manually managed" msgstr "" -#: judge/models/problem.py:231 +#: judge/models/problem.py:228 msgid "Whether judges should be allowed to manage data or not." msgstr "" -#: judge/models/problem.py:234 +#: judge/models/problem.py:231 msgid "date of publishing" msgstr "Ngày công bố" -#: judge/models/problem.py:239 +#: judge/models/problem.py:236 msgid "" "Doesn't have magic ability to auto-publish due to backward compatibility" msgstr "" -#: judge/models/problem.py:246 +#: judge/models/problem.py:243 msgid "Bans the selected users from submitting to this problem." msgstr "Cấm những người dùng được chọn nộp bài tập này." -#: judge/models/problem.py:253 +#: judge/models/problem.py:250 msgid "The license under which this problem is published." msgstr "Giấy phép xuất bản bài tập" -#: judge/models/problem.py:260 +#: judge/models/problem.py:257 msgid "problem summary" msgstr "Tóm tắt bài tập" -#: judge/models/problem.py:266 +#: judge/models/problem.py:263 msgid "number of users" msgstr "" -#: judge/models/problem.py:268 +#: judge/models/problem.py:265 msgid "The number of users who solved the problem." msgstr "Số lượng người dùng đã giải được bài" -#: judge/models/problem.py:270 +#: judge/models/problem.py:267 msgid "solve rate" msgstr "Tỉ lệ giải đúng" -#: judge/models/problem.py:282 +#: judge/models/problem.py:279 msgid "If private, only these organizations may see the problem." msgstr "Nếu bài riêng tư, chỉ những tổ chức này thấy được" -#: judge/models/problem.py:288 +#: judge/models/problem.py:285 msgid "pdf statement" msgstr "Đề bài bằng file pdf" -#: judge/models/problem.py:594 judge/models/problem.py:615 -#: judge/models/problem.py:646 judge/models/runtime.py:161 +#: judge/models/problem.py:599 judge/models/problem.py:620 +#: judge/models/problem.py:651 judge/models/runtime.py:161 msgid "language" msgstr "" -#: judge/models/problem.py:597 +#: judge/models/problem.py:602 msgid "translated name" msgstr "" -#: judge/models/problem.py:599 +#: judge/models/problem.py:604 msgid "translated description" msgstr "" -#: judge/models/problem.py:603 +#: judge/models/problem.py:608 msgid "problem translation" msgstr "" -#: judge/models/problem.py:604 +#: judge/models/problem.py:609 msgid "problem translations" msgstr "" -#: judge/models/problem.py:634 +#: judge/models/problem.py:639 msgid "language-specific resource limit" msgstr "" -#: judge/models/problem.py:635 +#: judge/models/problem.py:640 msgid "language-specific resource limits" msgstr "" -#: judge/models/problem.py:648 judge/models/submission.py:249 +#: judge/models/problem.py:653 judge/models/submission.py:289 msgid "source code" msgstr "mã nguồn" -#: judge/models/problem.py:652 +#: judge/models/problem.py:657 msgid "language-specific template" msgstr "" -#: judge/models/problem.py:653 +#: judge/models/problem.py:658 msgid "language-specific templates" msgstr "" -#: judge/models/problem.py:660 +#: judge/models/problem.py:665 msgid "associated problem" msgstr "" -#: judge/models/problem.py:666 +#: judge/models/problem.py:671 msgid "publish date" msgstr "" -#: judge/models/problem.py:668 +#: judge/models/problem.py:673 msgid "editorial content" msgstr "nội dung lời giải" -#: judge/models/problem.py:681 +#: judge/models/problem.py:686 #, python-format msgid "Editorial for %s" msgstr "" -#: judge/models/problem.py:685 +#: judge/models/problem.py:690 msgid "solution" msgstr "lời giải" -#: judge/models/problem.py:686 +#: judge/models/problem.py:691 msgid "solutions" msgstr "lời giải" -#: judge/models/problem.py:691 +#: judge/models/problem.py:696 #, fuzzy #| msgid "point value" msgid "proposed point value" msgstr "điểm" -#: judge/models/problem.py:692 +#: judge/models/problem.py:697 msgid "The amount of points you think this problem deserves." msgstr "Bạn nghĩ bài này đáng bao nhiêu điểm?" -#: judge/models/problem.py:706 +#: judge/models/problem.py:711 msgid "The time this vote was cast" msgstr "" -#: judge/models/problem.py:712 +#: judge/models/problem.py:717 msgid "vote" msgstr "" @@ -1952,214 +1953,214 @@ msgstr "điểm" msgid "case is pretest?" msgstr "test là pretest?" -#: judge/models/profile.py:38 +#: judge/models/profile.py:43 msgid "organization title" msgstr "tiêu đề tổ chức" -#: judge/models/profile.py:41 +#: judge/models/profile.py:46 msgid "organization slug" msgstr "tên ngắn đường dẫn" -#: judge/models/profile.py:42 +#: judge/models/profile.py:47 msgid "Organization name shown in URL" msgstr "Tên được hiển thị trong đường dẫn" -#: judge/models/profile.py:51 +#: judge/models/profile.py:56 msgid "Displayed beside user name during contests" msgstr "Hiển thị bên cạnh tên người dùng trong kỳ thi" -#: judge/models/profile.py:56 +#: judge/models/profile.py:61 msgid "registrant" msgstr "người tạo" -#: judge/models/profile.py:59 +#: judge/models/profile.py:64 msgid "User who registered this organization" msgstr "Người tạo tổ chức" -#: judge/models/profile.py:63 +#: judge/models/profile.py:68 msgid "administrators" msgstr "người quản lý" -#: judge/models/profile.py:65 +#: judge/models/profile.py:70 msgid "Those who can edit this organization" msgstr "Những người có thể chỉnh sửa tổ chức" -#: judge/models/profile.py:68 +#: judge/models/profile.py:73 msgid "creation date" msgstr "ngày tạo" -#: judge/models/profile.py:71 +#: judge/models/profile.py:76 msgid "is open organization?" msgstr "tổ chức mở?" -#: judge/models/profile.py:72 +#: judge/models/profile.py:77 msgid "Allow joining organization" msgstr "Cho phép mọi người tham gia tổ chức" -#: judge/models/profile.py:76 +#: judge/models/profile.py:81 msgid "maximum size" msgstr "số lượng thành viên tối đa" -#: judge/models/profile.py:80 +#: judge/models/profile.py:85 msgid "" "Maximum amount of users in this organization, only applicable to private " "organizations" msgstr "Số người tối đa trong tổ chức, chỉ áp dụng với tổ chức riêng tư" -#: judge/models/profile.py:86 +#: judge/models/profile.py:91 msgid "Student access code" msgstr "Mã truy cập cho học sinh" -#: judge/models/profile.py:97 +#: judge/models/profile.py:102 msgid "" "This image will replace the default site logo for users viewing the " "organization." msgstr "Ảnh này sẽ thay thế logo mặc định khi ở trong tổ chức." -#: judge/models/profile.py:143 judge/models/profile.py:172 -#: judge/models/profile.py:396 judge/models/profile.py:475 +#: judge/models/profile.py:148 judge/models/profile.py:178 +#: judge/models/profile.py:439 judge/models/profile.py:518 msgid "organization" msgstr "" -#: judge/models/profile.py:149 +#: judge/models/profile.py:155 msgid "user associated" msgstr "" -#: judge/models/profile.py:151 +#: judge/models/profile.py:157 msgid "self-description" msgstr "" -#: judge/models/profile.py:154 +#: judge/models/profile.py:160 msgid "location" msgstr "" -#: judge/models/profile.py:160 +#: judge/models/profile.py:166 msgid "preferred language" msgstr "" -#: judge/models/profile.py:168 +#: judge/models/profile.py:174 msgid "last access time" msgstr "" -#: judge/models/profile.py:169 +#: judge/models/profile.py:175 msgid "last IP" msgstr "" -#: judge/models/profile.py:180 +#: judge/models/profile.py:186 msgid "display rank" msgstr "" -#: judge/models/profile.py:189 +#: judge/models/profile.py:195 msgid "comment mute" msgstr "" -#: judge/models/profile.py:190 +#: judge/models/profile.py:196 msgid "Some users are at their best when silent." msgstr "" -#: judge/models/profile.py:194 +#: judge/models/profile.py:200 msgid "unlisted user" msgstr "" -#: judge/models/profile.py:195 +#: judge/models/profile.py:201 msgid "User will not be ranked." msgstr "" -#: judge/models/profile.py:199 +#: judge/models/profile.py:205 #, fuzzy #| msgid "Banned from joining" msgid "banned from voting" msgstr "Bị cấm tham gia" -#: judge/models/profile.py:200 +#: judge/models/profile.py:206 msgid "User will not be able to vote on problems' point values." msgstr "" -#: judge/models/profile.py:205 +#: judge/models/profile.py:211 msgid "user script" msgstr "" -#: judge/models/profile.py:209 +#: judge/models/profile.py:215 msgid "User-defined JavaScript for site customization." msgstr "" -#: judge/models/profile.py:213 +#: judge/models/profile.py:219 msgid "current contest" msgstr "kỳ thi hiện tại" -#: judge/models/profile.py:220 +#: judge/models/profile.py:226 msgid "math engine" msgstr "" -#: judge/models/profile.py:224 +#: judge/models/profile.py:230 msgid "the rendering engine used to render math" msgstr "" -#: judge/models/profile.py:227 +#: judge/models/profile.py:233 msgid "2FA enabled" msgstr "" -#: judge/models/profile.py:229 +#: judge/models/profile.py:235 msgid "check to enable TOTP-based two factor authentication" msgstr "đánh dấu để sử dụng TOTP-based two factor authentication" -#: judge/models/profile.py:235 +#: judge/models/profile.py:241 msgid "TOTP key" msgstr "mã TOTP" -#: judge/models/profile.py:236 +#: judge/models/profile.py:242 msgid "32 character base32-encoded key for TOTP" msgstr "" -#: judge/models/profile.py:238 +#: judge/models/profile.py:244 msgid "TOTP key must be empty or base32" msgstr "" -#: judge/models/profile.py:242 +#: judge/models/profile.py:248 msgid "internal notes" msgstr "ghi chú nội bộ" -#: judge/models/profile.py:245 +#: judge/models/profile.py:251 msgid "Notes for administrators regarding this user." msgstr "Ghi chú riêng cho quản trị viên." -#: judge/models/profile.py:250 +#: judge/models/profile.py:256 msgid "Custom background" msgstr "Background tự chọn" -#: judge/models/profile.py:253 +#: judge/models/profile.py:259 msgid "CSS custom background properties: url(\"image_url\"), color, etc" msgstr "CSS background tự chọn. Ví dụ: url(\"image_url\"), white, ..." -#: judge/models/profile.py:383 +#: judge/models/profile.py:426 msgid "user profile" msgstr "thông tin người dùng" -#: judge/models/profile.py:384 +#: judge/models/profile.py:427 msgid "user profiles" msgstr "thông tin người dùng" -#: judge/models/profile.py:400 +#: judge/models/profile.py:443 msgid "request time" msgstr "thời gian đăng ký" -#: judge/models/profile.py:403 +#: judge/models/profile.py:446 msgid "state" msgstr "trạng thái" -#: judge/models/profile.py:410 +#: judge/models/profile.py:453 msgid "reason" msgstr "lý do" -#: judge/models/profile.py:413 +#: judge/models/profile.py:456 msgid "organization join request" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:414 +#: judge/models/profile.py:457 msgid "organization join requests" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:480 +#: judge/models/profile.py:523 #, fuzzy #| msgid "last seen" msgid "last visit" @@ -2401,15 +2402,15 @@ msgstr "Lỗi máy chấm" msgid "submission time" msgstr "thời gian bài nộp" -#: judge/models/submission.py:69 judge/models/submission.py:268 +#: judge/models/submission.py:69 judge/models/submission.py:308 msgid "execution time" msgstr "thời gian chạy" -#: judge/models/submission.py:70 judge/models/submission.py:269 +#: judge/models/submission.py:70 judge/models/submission.py:309 msgid "memory usage" msgstr "bộ nhớ sử dụng" -#: judge/models/submission.py:72 judge/models/submission.py:270 +#: judge/models/submission.py:72 judge/models/submission.py:310 msgid "points granted" msgstr "điểm" @@ -2457,47 +2458,47 @@ msgstr "được chấm lại bởi admin" msgid "was ran on pretests only" msgstr "chỉ chấm pretest" -#: judge/models/submission.py:234 templates/contest/moss.html:56 +#: judge/models/submission.py:274 templates/contest/moss.html:56 msgid "submissions" msgstr "bài nộp" -#: judge/models/submission.py:246 judge/models/submission.py:260 +#: judge/models/submission.py:286 judge/models/submission.py:300 msgid "associated submission" msgstr "bài nộp tương ứng" -#: judge/models/submission.py:264 +#: judge/models/submission.py:304 msgid "test case ID" msgstr "test case ID" -#: judge/models/submission.py:266 +#: judge/models/submission.py:306 msgid "status flag" msgstr "" -#: judge/models/submission.py:271 +#: judge/models/submission.py:311 msgid "points possible" msgstr "" -#: judge/models/submission.py:272 +#: judge/models/submission.py:312 msgid "batch number" msgstr "số thứ tự của nhóm" -#: judge/models/submission.py:274 +#: judge/models/submission.py:314 msgid "judging feedback" msgstr "phản hồi từ máy chấm" -#: judge/models/submission.py:277 +#: judge/models/submission.py:317 msgid "extended judging feedback" msgstr "phản hồi thêm từ máy chấm" -#: judge/models/submission.py:279 +#: judge/models/submission.py:319 msgid "program output" msgstr "output chương trình" -#: judge/models/submission.py:287 +#: judge/models/submission.py:327 msgid "submission test case" msgstr "cái testcase trong bài nộp" -#: judge/models/submission.py:288 +#: judge/models/submission.py:328 msgid "submission test cases" msgstr "cái testcase trong bài nộp" @@ -2603,59 +2604,59 @@ msgstr "Chỉnh sửa bài nộp" msgid "Recalculating user points" msgstr "Tính lại điểm người dùng" -#: judge/utils/problem_data.py:72 +#: judge/utils/problem_data.py:71 msgid "Empty batches not allowed." msgstr "Nhóm test trống là không hợp lệ." -#: judge/utils/problem_data.py:80 judge/utils/problem_data.py:88 -#: judge/utils/problem_data.py:103 +#: judge/utils/problem_data.py:79 judge/utils/problem_data.py:87 +#: judge/utils/problem_data.py:102 msgid "How did you corrupt the custom checker path?" msgstr "How did you corrupt the custom checker path?" -#: judge/utils/problem_data.py:131 +#: judge/utils/problem_data.py:130 #, python-format msgid "Points must be defined for non-batch case #%d." msgstr "Ô điểm số cho test #%d phải được điền." -#: judge/utils/problem_data.py:138 +#: judge/utils/problem_data.py:137 #, python-format msgid "Input file for case %d does not exist: %s" msgstr "File input cho test %d không tồn tại: %s" -#: judge/utils/problem_data.py:143 +#: judge/utils/problem_data.py:142 #, python-format msgid "Output file for case %d does not exist: %s" msgstr "File output cho test %d không tồn tại: %s" -#: judge/utils/problem_data.py:170 +#: judge/utils/problem_data.py:169 #, python-format msgid "Batch start case #%d requires points." msgstr "Nhóm test #%d cần được điền điểm số." -#: judge/utils/problem_data.py:193 +#: judge/utils/problem_data.py:192 #, python-format msgid "Attempt to end batch outside of one in case #%d" msgstr "Nhóm test #%d kết thúc không hợp lệ" -#: judge/utils/problem_data.py:212 +#: judge/utils/problem_data.py:211 msgid "How did you corrupt the zip path?" msgstr "" -#: judge/utils/problem_data.py:218 +#: judge/utils/problem_data.py:217 msgid "How did you corrupt the generator path?" msgstr "" -#: judge/utils/problem_data.py:236 +#: judge/utils/problem_data.py:235 msgid "Invalid interactor judge" msgstr "" -#: judge/utils/problem_data.py:260 +#: judge/utils/problem_data.py:259 #, fuzzy #| msgid "Invalid Return" msgid "Invalid signature handler" msgstr "Invalid Return" -#: judge/utils/problem_data.py:263 +#: judge/utils/problem_data.py:262 msgid "Invalid signature header" msgstr "" @@ -2735,165 +2736,171 @@ msgstr "Báo cáo" msgid "Comment feed" msgstr "Bình luận" -#: judge/views/comment.py:53 judge/views/pagevote.py:31 +#: judge/views/comment.py:47 judge/views/pagevote.py:31 msgid "Messing around, are we?" msgstr "Messing around, are we?" -#: judge/views/comment.py:69 judge/views/pagevote.py:47 +#: judge/views/comment.py:63 judge/views/pagevote.py:47 msgid "You must solve at least one problem before you can vote." msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote." -#: judge/views/comment.py:100 +#: judge/views/comment.py:94 msgid "You already voted." msgstr "Bạn đã vote." -#: judge/views/comment.py:253 judge/views/organization.py:807 -#: judge/views/organization.py:957 judge/views/organization.py:1122 +#: judge/views/comment.py:246 judge/views/organization.py:807 +#: judge/views/organization.py:957 judge/views/organization.py:1106 msgid "Edited from site" msgstr "Chỉnh sửa từ web" -#: judge/views/comment.py:274 +#: judge/views/comment.py:267 msgid "Editing comment" msgstr "Chỉnh sửa bình luận" -#: judge/views/contests.py:120 judge/views/contests.py:370 -#: judge/views/contests.py:375 judge/views/contests.py:646 +#: judge/views/contests.py:123 judge/views/contests.py:386 +#: judge/views/contests.py:391 judge/views/contests.py:661 msgid "No such contest" msgstr "Không có contest nào như vậy" -#: judge/views/contests.py:121 judge/views/contests.py:371 +#: judge/views/contests.py:124 judge/views/contests.py:387 #, python-format msgid "Could not find a contest with the key \"%s\"." msgstr "Không tìm thấy kỳ thi với mã \"%s\"." -#: judge/views/contests.py:140 judge/views/stats.py:178 -#: templates/contest/list.html:246 templates/contest/list.html:291 -#: templates/contest/list.html:336 templates/contest/list.html:378 +#: judge/views/contests.py:143 judge/views/stats.py:178 +#: templates/contest/list.html:244 templates/contest/list.html:289 +#: templates/contest/list.html:334 templates/contest/list.html:376 #: templates/organization/org-left-sidebar.html:5 templates/stats/site.html:21 #: templates/user/user-bookmarks.html:56 msgid "Contests" msgstr "Kỳ thi" -#: judge/views/contests.py:375 +#: judge/views/contests.py:391 msgid "Could not find such contest." msgstr "Không tìm thấy kỳ thi nào như vậy." -#: judge/views/contests.py:383 +#: judge/views/contests.py:399 #, python-format msgid "Access to contest \"%s\" denied" msgstr "Truy cập tới kỳ thi \"%s\" bị từ chối" -#: judge/views/contests.py:434 +#: judge/views/contests.py:450 msgid "Clone Contest" msgstr "Nhân bản kỳ thi" -#: judge/views/contests.py:520 +#: judge/views/contests.py:535 msgid "Contest not ongoing" msgstr "Kỳ thi đang không diễn ra" -#: judge/views/contests.py:521 +#: judge/views/contests.py:536 #, python-format msgid "\"%s\" is not currently ongoing." msgstr "\"%s\" kỳ thi đang không diễn ra." -#: judge/views/contests.py:528 +#: judge/views/contests.py:543 msgid "Already in contest" msgstr "Đã ở trong kỳ thi" -#: judge/views/contests.py:529 +#: judge/views/contests.py:544 #, python-format msgid "You are already in a contest: \"%s\"." msgstr "Bạn đã ở trong kỳ thi: \"%s\"." -#: judge/views/contests.py:539 +#: judge/views/contests.py:554 msgid "Banned from joining" msgstr "Bị cấm tham gia" -#: judge/views/contests.py:541 +#: judge/views/contests.py:556 msgid "" "You have been declared persona non grata for this contest. You are " "permanently barred from joining this contest." msgstr "Bạn không được phép tham gia kỳ thi này." -#: judge/views/contests.py:630 +#: judge/views/contests.py:645 #, python-format msgid "Enter access code for \"%s\"" msgstr "Nhập mật khẩu truy cập cho \"%s\"" -#: judge/views/contests.py:647 +#: judge/views/contests.py:662 #, python-format msgid "You are not in contest \"%s\"." msgstr "Bạn không ở trong kỳ thi \"%s\"." -#: judge/views/contests.py:670 +#: judge/views/contests.py:685 msgid "ContestCalendar requires integer year and month" msgstr "Lịch thi yêu cầu giá trị cho năm và tháng là số nguyên" -#: judge/views/contests.py:728 +#: judge/views/contests.py:743 #, python-format msgid "Contests in %(month)s" msgstr "Các kỳ thi trong %(month)s" -#: judge/views/contests.py:729 +#: judge/views/contests.py:744 msgid "F Y" msgstr "F Y" -#: judge/views/contests.py:789 +#: judge/views/contests.py:804 #, python-format msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1085 +#: judge/views/contests.py:1100 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1096 +#: judge/views/contests.py:1111 msgid "???" msgstr "???" -#: judge/views/contests.py:1123 +#: judge/views/contests.py:1138 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1124 +#: judge/views/contests.py:1139 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1138 +#: judge/views/contests.py:1153 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1157 templates/contest/contest-tabs.html:19 +#: judge/views/contests.py:1172 templates/contest/contest-tabs.html:21 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1206 +#: judge/views/contests.py:1221 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1242 +#: judge/views/contests.py:1257 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1265 +#: judge/views/contests.py:1280 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1280 judge/views/ticket.py:72 +#: judge/views/contests.py:1295 judge/views/ticket.py:67 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1323 +#: judge/views/contests.py:1338 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" +#: judge/views/contests.py:1444 +#, fuzzy +#| msgid "contest summary" +msgid "Contests Summary" +msgstr "tổng kết kỳ thi" + #: judge/views/email.py:21 msgid "New Email" msgstr "Email mới" @@ -2974,7 +2981,11 @@ msgstr "thời gian đăng ký" msgid "Runtimes" msgstr "Runtimes" -#: judge/views/notification.py:43 +#: judge/views/markdown_editor.py:12 +msgid "Markdown Editor" +msgstr "" + +#: judge/views/notification.py:29 #, python-format msgid "Notifications (%d unseen)" msgstr "Thông báo (%d chưa xem)" @@ -3116,6 +3127,7 @@ msgid "The user you are trying to kick is not in organization: %s." msgstr "" #: judge/views/organization.py:790 judge/views/organization.py:946 +#, python-format msgid "Edit %s" msgstr "Chỉnh sửa %s" @@ -3142,7 +3154,7 @@ msgstr "Thêm từ web" msgid "Add contest" msgstr "Thêm kỳ thi" -#: judge/views/organization.py:898 judge/views/organization.py:1064 +#: judge/views/organization.py:898 judge/views/organization.py:1057 msgid "Permission denied" msgstr "Truy cập bị từ chối" @@ -3157,16 +3169,16 @@ msgstr "Bạn không được phép chỉnh sửa tổ chức này." msgid "Add blog for %s" msgstr "Thêm bài đăng cho %s" -#: judge/views/organization.py:1065 +#: judge/views/organization.py:1058 msgid "Not allowed to edit this blog" msgstr "Bạn không được phép chỉnh sửa bài đăng này." -#: judge/views/organization.py:1097 +#: judge/views/organization.py:1090 #, python-format msgid "Edit blog %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:1148 +#: judge/views/organization.py:1132 #, python-format msgid "Pending blogs in %s" msgstr "Bài đang đợi duyệt trong %s" @@ -3190,41 +3202,41 @@ msgstr "Hướng dẫn cho {0}" msgid "Editorial for {0}" msgstr "Hướng dẫn cho {0}" -#: judge/views/problem.py:461 templates/contest/contest.html:96 +#: judge/views/problem.py:461 templates/contest/contest.html:99 #: templates/organization/org-left-sidebar.html:4 #: templates/user/user-about.html:28 templates/user/user-bookmarks.html:35 #: templates/user/user-tabs.html:5 templates/user/users-table.html:19 msgid "Problems" msgstr "Bài tập" -#: judge/views/problem.py:837 +#: judge/views/problem.py:834 msgid "Problem feed" msgstr "Bài tập" -#: judge/views/problem.py:1062 +#: judge/views/problem.py:1057 msgid "Banned from submitting" msgstr "Bị cấm nộp bài" -#: judge/views/problem.py:1064 +#: judge/views/problem.py:1059 msgid "" "You have been declared persona non grata for this problem. You are " "permanently barred from submitting this problem." msgstr "Bạn đã bị cấm nộp bài này." -#: judge/views/problem.py:1087 +#: judge/views/problem.py:1082 msgid "Too many submissions" msgstr "Quá nhiều lần nộp" -#: judge/views/problem.py:1089 +#: judge/views/problem.py:1084 msgid "You have exceeded the submission limit for this problem." msgstr "Bạn đã vượt quá số lần nộp cho bài này." -#: judge/views/problem.py:1168 judge/views/problem.py:1173 +#: judge/views/problem.py:1163 judge/views/problem.py:1168 #, python-format msgid "Submit to %(problem)s" msgstr "Nộp bài cho %(problem)s" -#: judge/views/problem.py:1199 +#: judge/views/problem.py:1194 msgid "Clone Problem" msgstr "Nhân bản bài tập" @@ -3328,7 +3340,7 @@ msgstr "Đăng ký" msgid "Authentication failure" msgstr "Xác thực thất bại" -#: judge/views/resolver.py:11 templates/contest/contest-tabs.html:26 +#: judge/views/resolver.py:11 templates/contest/contest-tabs.html:28 #, fuzzy #| msgid "solve rate" msgid "Resolver" @@ -3368,60 +3380,60 @@ msgstr "Kết quả chấm" msgid "Version matrix" msgstr "Ma trận phiên bản" -#: judge/views/submission.py:118 judge/views/submission.py:126 +#: judge/views/submission.py:93 judge/views/submission.py:101 #, python-format msgid "Submission of %(problem)s by %(user)s" msgstr "Bài nộp của %(user)s cho bài %(problem)s" -#: judge/views/submission.py:318 judge/views/submission.py:319 +#: judge/views/submission.py:293 judge/views/submission.py:294 #: templates/problem/problem.html:168 msgid "All submissions" msgstr "Tất cả bài nộp" -#: judge/views/submission.py:595 judge/views/submission.py:600 +#: judge/views/submission.py:560 judge/views/submission.py:565 msgid "All my submissions" msgstr "Tất cả bài nộp của tôi" -#: judge/views/submission.py:596 +#: judge/views/submission.py:561 #, python-format msgid "All submissions by %s" msgstr "Tất cả bài nộp của %s" -#: judge/views/submission.py:602 +#: judge/views/submission.py:567 #, python-brace-format msgid "All submissions by {0}" msgstr "Tất cả bài nộp của {0}" -#: judge/views/submission.py:623 +#: judge/views/submission.py:588 #, fuzzy #| msgid "All submissions" msgid "All friend submissions" msgstr "Tất cả bài nộp" -#: judge/views/submission.py:652 +#: judge/views/submission.py:617 #, python-format msgid "All submissions for %s" msgstr "Tất cả bài nộp cho %s" -#: judge/views/submission.py:680 +#: judge/views/submission.py:645 msgid "Must pass a problem" msgstr "Phải làm được một bài" -#: judge/views/submission.py:738 +#: judge/views/submission.py:703 #, python-format msgid "My submissions for %(problem)s" msgstr "Bài nộp của tôi cho %(problem)s" -#: judge/views/submission.py:739 +#: judge/views/submission.py:704 #, python-format msgid "%(user)s's submissions for %(problem)s" msgstr "Các bài nộp của %(user)s cho %(problem)s" -#: judge/views/submission.py:884 +#: judge/views/submission.py:840 msgid "Must pass a contest" msgstr "Phải qua một kỳ thi" -#: judge/views/submission.py:914 +#: judge/views/submission.py:870 #, python-brace-format msgid "" "{0}'s submissions for {2} in {0} cho {2} trong {4}" -#: judge/views/submission.py:926 +#: judge/views/submission.py:882 #, python-brace-format msgid "" "{0}'s submissions for problem {2} in {3}" @@ -3439,50 +3451,50 @@ msgstr "" "Các bài nộp của {0} cho bài {2} trong {3}" "" -#: judge/views/submission.py:1063 +#: judge/views/submission.py:1016 #, fuzzy #| msgid "You do not have the permission to rejudge submissions." msgid "You don't have permission to access." msgstr "Bạn không có quyền chấm lại bài." -#: judge/views/ticket.py:65 judge/views/ticket.py:71 +#: judge/views/ticket.py:60 judge/views/ticket.py:66 msgid "Ticket title" msgstr "Tiêu đề báo cáo" -#: judge/views/ticket.py:129 judge/views/ticket.py:133 +#: judge/views/ticket.py:124 judge/views/ticket.py:128 #, python-format msgid "New ticket for %s" msgstr "Báo cáo mới cho %s" -#: judge/views/ticket.py:210 +#: judge/views/ticket.py:205 #, python-format msgid "%(title)s - Ticket %(id)d" msgstr "%(title)s - Báo cáo %(id)d" -#: judge/views/ticket.py:339 +#: judge/views/ticket.py:334 #, python-format msgid "Tickets - Page %(number)d of %(total)d" msgstr "Báo cáo - Trang %(number)d trên %(total)d" -#: judge/views/ticket.py:405 +#: judge/views/ticket.py:400 #, python-format msgid "New Ticket: %s" msgstr "Báo cáo mới: %s" -#: judge/views/ticket.py:408 +#: judge/views/ticket.py:403 #, python-format msgid "#%(id)d, assigned to: %(users)s" msgstr "#%(id)d, được phân cho: %(users)s" -#: judge/views/ticket.py:412 +#: judge/views/ticket.py:407 msgid ", " msgstr ", " -#: judge/views/ticket.py:417 +#: judge/views/ticket.py:412 msgid "no one" msgstr "không người nào" -#: judge/views/ticket.py:444 +#: judge/views/ticket.py:439 #, python-format msgid "New Ticket Message For: %s" msgstr "Tin nhắn báo cáo mới cho: %s" @@ -3530,7 +3542,7 @@ msgid "Updated on site" msgstr "Được cập nhật trên web" #: judge/views/user.py:431 templates/admin/auth/user/change_form.html:14 -#: templates/admin/auth/user/change_form.html:17 templates/base.html:300 +#: templates/admin/auth/user/change_form.html:17 templates/base.html:305 #: templates/user/user-tabs.html:11 msgid "Edit profile" msgstr "Chỉnh sửa thông tin" @@ -3621,24 +3633,24 @@ msgstr "Chỉnh sửa thông tin" msgid "Rejudge" msgstr "Chấm lại" -#: templates/base.html:236 templates/chat/chat.html:65 +#: templates/base.html:243 msgid "Chat" msgstr "Chat" -#: templates/base.html:246 +#: templates/base.html:253 msgid "Notification" msgstr "Thông báo" -#: templates/base.html:267 +#: templates/base.html:279 msgid "Dark Mode" msgstr "" -#: templates/base.html:284 +#: templates/base.html:289 msgid "Profile" msgstr "Trang cá nhân" -#: templates/base.html:288 templates/chat/chat_js.html:5 -#: templates/comments/content-list.html:81 +#: templates/base.html:293 templates/chat/chat_js.html:5 +#: templates/comments/content-list.html:78 #: templates/contest/contest-list-tabs.html:4 #: templates/contest/ranking-table.html:47 templates/internal/problem.html:62 #: templates/organization/org-left-sidebar.html:12 @@ -3649,44 +3661,40 @@ msgstr "Trang cá nhân" msgid "Admin" msgstr "Admin" -#: templates/base.html:293 +#: templates/base.html:298 msgid "Internal" msgstr "Nội bộ" -#: templates/base.html:296 +#: templates/base.html:301 msgid "Stats" msgstr "Thống kê" -#: templates/base.html:309 +#: templates/base.html:314 msgid "Log out" msgstr "Đăng xuất" -#: templates/base.html:319 +#: templates/base.html:324 #: templates/registration/password_reset_complete.html:4 msgid "Log in" msgstr "Đăng nhập" -#: templates/base.html:320 templates/registration/registration_form.html:72 -msgid "or" -msgstr "hoặc" - -#: templates/base.html:321 +#: templates/base.html:325 msgid "Sign up" msgstr "Đăng ký" -#: templates/base.html:335 +#: templates/base.html:339 msgid "spectating" msgstr "đang theo dõi" -#: templates/base.html:347 +#: templates/base.html:351 msgid "Compete" msgstr "Thi" -#: templates/base.html:349 +#: templates/base.html:353 msgid "General" msgstr "Chung" -#: templates/base.html:356 +#: templates/base.html:360 msgid "This site works best with JavaScript enabled." msgstr "" @@ -3695,9 +3703,9 @@ msgstr "" msgid " posted on %(time)s" msgstr "đã đăng vào %(time)s" -#: templates/blog/blog.html:31 templates/comments/content-list.html:62 -#: templates/comments/content-list.html:76 -#: templates/contest/contest-tabs.html:35 templates/contest/list.html:129 +#: templates/blog/blog.html:31 templates/comments/content-list.html:59 +#: templates/comments/content-list.html:73 +#: templates/contest/contest-tabs.html:37 templates/contest/list.html:128 #: templates/contest/tag-title.html:9 templates/flatpages/admin_link.html:3 #: templates/license.html:10 templates/problem/editorial.html:15 #: templates/problem/feed/problems.html:50 @@ -3758,25 +3766,21 @@ msgstr "Thêm mới" msgid "No clarifications have been made at this time." msgstr "Không có thông báo nào." -#: templates/chat/chat.html:5 templates/chat/chat_js.html:548 +#: templates/chat/chat.html:5 templates/chat/chat_js.html:545 msgid "Chat Box" msgstr "Chat Box" -#: templates/chat/chat.html:67 -msgid "Online Users" -msgstr "Trực tuyến" - -#: templates/chat/chat.html:78 templates/chat/chat_js.html:510 +#: templates/chat/chat.html:69 templates/chat/chat_js.html:507 #: templates/user/base-users-js.html:10 #: templates/user/base-users-two-col.html:19 msgid "Search by handle..." msgstr "Tìm kiếm theo tên..." -#: templates/chat/chat.html:97 +#: templates/chat/chat.html:88 msgid "Enter your message" msgstr "Nhập tin nhắn" -#: templates/chat/chat.html:98 +#: templates/chat/chat.html:89 msgid "Emoji" msgstr "" @@ -3796,7 +3800,7 @@ msgstr "Thành viên khác" msgid "New message(s)" msgstr "Tin nhắn mới" -#: templates/chat/chat_js.html:401 +#: templates/chat/chat_js.html:418 msgid "Mute this user and delete all messages?" msgstr "Mute người dùng này và xóa tất cả tin nhắn chung?" @@ -3814,57 +3818,57 @@ msgid "You are connect now. Say something to start the conversation." msgstr "Các bạn đã kết nối. Nhắn gì đó để bắt đầu cuộc trò chuyện." #: templates/chat/online_status.html:6 -#: templates/chat/user_online_status.html:14 +#: templates/chat/user_online_status.html:21 msgid "Lobby" msgstr "Sảnh chung" -#: templates/chat/user_online_status.html:19 +#: templates/chat/user_online_status.html:26 #, python-brace-format msgid "Last online on {time}" msgstr "Trực tuyến vào {time}" -#: templates/chat/user_online_status.html:31 +#: templates/chat/user_online_status.html:38 msgid "Unignore" msgstr "Mở lại thông báo" -#: templates/chat/user_online_status.html:33 +#: templates/chat/user_online_status.html:40 msgid "Ignore" msgstr "Tắt thông báo" -#: templates/chat/user_online_status.html:40 +#: templates/chat/user_online_status.html:47 msgid "users are online" msgstr "người đang trực tuyến" -#: templates/comments/content-list.html:14 -#: templates/comments/content-list.html:15 -#: templates/comments/content-list.html:23 -#: templates/comments/content-list.html:24 +#: templates/comments/content-list.html:11 +#: templates/comments/content-list.html:12 +#: templates/comments/content-list.html:20 +#: templates/comments/content-list.html:21 msgid "Please login to vote" msgstr "Đăng nhập để vote" -#: templates/comments/content-list.html:44 +#: templates/comments/content-list.html:41 #, python-format msgid "edit %(edits)s" msgstr "chỉnh sửa %(edits)s" -#: templates/comments/content-list.html:46 templates/comments/media-js.html:97 +#: templates/comments/content-list.html:43 templates/comments/media-js.html:97 msgid "edited" msgstr "đã chỉnh sửa" -#: templates/comments/content-list.html:55 templates/notification/list.html:14 +#: templates/comments/content-list.html:52 templates/notification/list.html:11 msgid "Link" msgstr "Link" -#: templates/comments/content-list.html:66 -#: templates/comments/content-list.html:72 +#: templates/comments/content-list.html:63 +#: templates/comments/content-list.html:69 msgid "Reply" msgstr "Phản hồi" -#: templates/comments/content-list.html:79 +#: templates/comments/content-list.html:76 msgid "Hide" msgstr "Ẩn" -#: templates/comments/content-list.html:94 +#: templates/comments/content-list.html:91 #, python-format msgid "" "This comment is hidden due to too much negative feedback. Click đây để mở." -#: templates/comments/content-list.html:111 +#: templates/comments/content-list.html:108 msgid "reply" msgid_plural "replies" msgstr[0] "phản hồi" -#: templates/comments/content-list.html:136 +#: templates/comments/content-list.html:133 msgid "more comment" msgid_plural "more comments" msgstr[0] "bình luận nữa" @@ -3973,7 +3977,7 @@ msgstr "Thứ sáu" msgid "Saturday" msgstr "Thứ bảy" -#: templates/contest/clarification.html:52 templates/contest/list.html:232 +#: templates/contest/clarification.html:52 templates/contest/list.html:230 #: templates/organization/new.html:10 templates/ticket/new.html:38 msgid "Create" msgstr "Tạo mới" @@ -3982,12 +3986,6 @@ msgstr "Tạo mới" msgid "Enter a new key for the cloned contest:" msgstr "Nhập mã kỳ thi cho kỳ thi nhân bản:" -#: templates/contest/clone.html:47 -#, fuzzy -#| msgid "Groups" -msgid "Group:" -msgstr "Nhóm" - #: templates/contest/clone.html:55 templates/problem/clone.html:40 msgid "Clone!" msgstr "Nhân bản!" @@ -4067,39 +4065,35 @@ msgstr "Danh sách" msgid "Calendar" msgstr "Lịch" -#: templates/contest/contest-tabs.html:10 +#: templates/contest/contest-tabs.html:11 msgid "Info" msgstr "Thông tin" -#: templates/contest/contest-tabs.html:12 templates/submission/list.html:363 +#: templates/contest/contest-tabs.html:13 templates/submission/list.html:363 msgid "Statistics" msgstr "Thống kê" -#: templates/contest/contest-tabs.html:17 +#: templates/contest/contest-tabs.html:19 msgid "Rankings" msgstr "Bảng xếp hạng" -#: templates/contest/contest-tabs.html:22 +#: templates/contest/contest-tabs.html:24 msgid "Hidden Rankings" msgstr "Bảng xếp hạng ẩn" -#: templates/contest/contest-tabs.html:29 +#: templates/contest/contest-tabs.html:31 msgid "Final rankings" msgstr "BXH chung cuộc" -#: templates/contest/contest-tabs.html:33 +#: templates/contest/contest-tabs.html:35 msgid "MOSS" msgstr "MOSS" -#: templates/contest/contest-tabs.html:38 -msgid "Clone" -msgstr "Nhân bản" - #: templates/contest/contest.html:35 templates/contest/contest.html:55 msgid "Leave contest" msgstr "Rời kỳ thi" -#: templates/contest/contest.html:42 templates/contest/list.html:400 +#: templates/contest/contest.html:42 templates/contest/list.html:398 msgid "Virtual join" msgstr "Tham gia ảo" @@ -4119,21 +4113,36 @@ msgstr "Tham gia kỳ thi" msgid "Login to participate" msgstr "Đăng nhập để tham gia" -#: templates/contest/contest.html:102 +#: templates/contest/contest.html:91 +msgid "Clone" +msgstr "Nhân bản" + +#: templates/contest/contest.html:105 msgid "AC Rate" msgstr "Tỷ lệ AC" -#: templates/contest/contest.html:103 templates/contest/list.html:269 -#: templates/contest/list.html:310 templates/contest/list.html:392 +#: templates/contest/contest.html:106 templates/contest/list.html:267 +#: templates/contest/list.html:308 templates/contest/list.html:390 #: templates/problem/list.html:24 msgid "Users" msgstr "Người nộp" -#: templates/contest/contest.html:128 templates/problem/list.html:58 +#: templates/contest/contest.html:131 templates/problem/list.html:58 #: templates/problem/list.html:133 msgid "Editorial" msgstr "Hướng dẫn" +#: templates/contest/contests_summary.html:36 +#: templates/user/base-users-table.html:3 +msgid "Rank" +msgstr "Rank" + +#: templates/contest/contests_summary.html:37 +#: templates/status/language-list.html:34 +#: templates/user/import/table_csv.html:6 +msgid "Name" +msgstr "Tên" + #: templates/contest/list.html:89 templates/contest/media-js.html:152 msgid "Are you sure you want to join?" msgstr "Bạn có chắc tham gia?" @@ -4146,83 +4155,83 @@ msgstr "" "Tham gia kỳ thi lần đầu sẽ kích hoạt thời gian đếm ngược, không thể dừng lại " "sau đó." -#: templates/contest/list.html:123 +#: templates/contest/list.html:122 msgid "hidden" msgstr "ẩn" -#: templates/contest/list.html:135 +#: templates/contest/list.html:134 msgid "private" msgstr "riêng tư" -#: templates/contest/list.html:151 +#: templates/contest/list.html:150 msgid "rated" msgstr "rated" -#: templates/contest/list.html:177 +#: templates/contest/list.html:175 #, python-format msgid "%(time_limit)s window" msgstr "Cửa sổ thi dài %(time_limit)s" -#: templates/contest/list.html:179 +#: templates/contest/list.html:177 #, python-format msgid "%(duration)s long" msgstr "Kéo dài %(duration)s" -#: templates/contest/list.html:198 +#: templates/contest/list.html:196 msgid "Spectate" msgstr "Theo dõi" -#: templates/contest/list.html:204 templates/organization/home.html:30 +#: templates/contest/list.html:202 templates/organization/home.html:30 msgid "Join" msgstr "Tham gia" -#: templates/contest/list.html:214 +#: templates/contest/list.html:212 msgid "Search contests..." msgstr "Tìm kiếm kỳ thi..." -#: templates/contest/list.html:224 templates/internal/problem.html:33 +#: templates/contest/list.html:222 templates/internal/problem.html:33 msgid "Search" msgstr "Tìm kiếm" -#: templates/contest/list.html:228 +#: templates/contest/list.html:226 msgid "Hide organization contests" msgstr "Ẩn các kỳ thi riêng tư của nhóm" -#: templates/contest/list.html:238 +#: templates/contest/list.html:236 msgid "Active Contests" msgstr "Kỳ thi bạn đang tham gia" -#: templates/contest/list.html:255 +#: templates/contest/list.html:253 #, python-format msgid "Window ends in %(countdown)s" msgstr "Cửa số thi còn %(countdown)s" -#: templates/contest/list.html:258 templates/contest/list.html:299 +#: templates/contest/list.html:256 templates/contest/list.html:297 #, python-format msgid "Ends in %(countdown)s" msgstr "Kết thúc trong %(countdown)s" -#: templates/contest/list.html:284 +#: templates/contest/list.html:282 msgid "Ongoing Contests" msgstr "Kỳ thi đang diễn ra" -#: templates/contest/list.html:322 +#: templates/contest/list.html:320 msgid "There is no ongoing contest at this time." msgstr "Không có kỳ thi nào đang diễn ra hiện tại." -#: templates/contest/list.html:329 +#: templates/contest/list.html:327 msgid "Upcoming Contests" msgstr "Kỳ thi sắp tới" -#: templates/contest/list.html:359 +#: templates/contest/list.html:357 msgid "There is no scheduled contest at this time." msgstr "Không có kỳ thi nào được lên lịch hiện tại." -#: templates/contest/list.html:366 +#: templates/contest/list.html:364 msgid "Past Contests" msgstr "Kỳ thi trong quá khứ" -#: templates/contest/list.html:413 +#: templates/contest/list.html:411 msgid "There is no past contest." msgstr "Không có kỳ thi nào trong quá khứ." @@ -4393,6 +4402,7 @@ msgid "Upload file" msgstr "Tải file lên" #: templates/fine_uploader/script.html:23 +#: templates/markdown_editor/markdown_editor.html:131 msgid "Cancel" msgstr "Hủy" @@ -4456,14 +4466,23 @@ msgstr "Gợi ý" msgid "Source:" msgstr "Nguồn:" -#: templates/notification/list.html:7 -msgid "You have no notifications" -msgstr "Bạn không có thông báo" +#: templates/markdown_editor/markdown_editor.html:111 templates/pagedown.html:9 +msgid "Update Preview" +msgstr "Cập nhật xem trước" -#: templates/notification/list.html:13 -msgid "Activity" -msgstr "Hoạt động" +#: templates/markdown_editor/markdown_editor.html:115 +msgid "Insert Image" +msgstr "Chèn hình ảnh" +#: templates/markdown_editor/markdown_editor.html:118 +msgid "From the web" +msgstr "Từ web" + +#: templates/markdown_editor/markdown_editor.html:124 +msgid "From your computer" +msgstr "Từ máy tính của bạn" + +#: templates/markdown_editor/markdown_editor.html:130 #: templates/organization/blog/edit.html:36 #: templates/organization/contest/add.html:36 #: templates/organization/contest/edit.html:86 @@ -4471,12 +4490,20 @@ msgstr "Hoạt động" msgid "Save" msgstr "Lưu" +#: templates/notification/list.html:5 +msgid "You have no notifications" +msgstr "Bạn không có thông báo" + +#: templates/notification/list.html:10 +msgid "Activity" +msgstr "Hoạt động" + #: templates/organization/blog/pending.html:8 msgid "Blog" msgstr "" #: templates/organization/blog/pending.html:11 -#: templates/problem/search-form.html:57 +#: templates/problem/search-form.html:50 msgid "Author" msgstr "Tác giả" @@ -4630,10 +4657,6 @@ msgstr "Từ chối" msgid "Kick" msgstr "Đuổi" -#: templates/pagedown.html:9 -msgid "Update Preview" -msgstr "Cập nhật xem trước" - #: templates/problem/clone.html:37 msgid "Enter a new code for the cloned problem:" msgstr "Nhập mã bài mới cho bài tập được nhân bản:" @@ -4747,7 +4770,7 @@ msgid "Thinking point" msgstr "Độ khó nghĩ" #: templates/problem/feed/problems.html:83 -#: templates/problem/search-form.html:68 +#: templates/problem/search-form.html:61 msgid "Problem types" msgstr "Dạng bài" @@ -4775,7 +4798,7 @@ msgstr "Hệ thống lỗi!" msgid "Successful vote! Thank you!" msgstr "Đã gửi thành công! Cảm ơn bạn!" -#: templates/problem/list.html:40 templates/problem/search-form.html:79 +#: templates/problem/list.html:40 templates/problem/search-form.html:72 #: templates/user/user-problems.html:57 msgid "Category" msgstr "Nhóm bài" @@ -5039,26 +5062,22 @@ msgstr "Hiển thị dạng bài" msgid "Show editorial" msgstr "Hiển thị hướng dẫn" -#: templates/problem/search-form.html:41 -msgid "Have editorial" -msgstr "Có hướng dẫn" - -#: templates/problem/search-form.html:82 templates/problem/search-form.html:84 +#: templates/problem/search-form.html:75 templates/problem/search-form.html:77 #: templates/submission/list.html:381 #: templates/submission/submission-list-tabs.html:4 msgid "All" msgstr "Tất cả" -#: templates/problem/search-form.html:94 +#: templates/problem/search-form.html:87 msgid "Point range" msgstr "Mốc điểm" -#: templates/problem/search-form.html:100 templates/submission/list.html:356 +#: templates/problem/search-form.html:93 templates/submission/list.html:356 #: templates/ticket/list.html:248 msgid "Go" msgstr "Lọc" -#: templates/problem/search-form.html:101 +#: templates/problem/search-form.html:94 msgid "Random" msgstr "Ngẫu nhiên" @@ -5281,6 +5300,10 @@ msgstr "(một lần nữa)" msgid "(select your closest major city)" msgstr "(chọn thành phố gần nhất)" +#: templates/registration/registration_form.html:72 +msgid "or" +msgstr "hoặc" + #: templates/registration/registration_form.html:73 msgid "pick from map" msgstr "chọn từ bản đồ" @@ -5367,11 +5390,6 @@ msgstr "Không có máy chấm nào hoạt động." msgid "ID" msgstr "ID" -#: templates/status/language-list.html:34 -#: templates/user/import/table_csv.html:6 -msgid "Name" -msgstr "Tên" - #: templates/status/language-list.html:35 msgid "Runtime Info" msgstr "Thông tin Runtime" @@ -5681,10 +5699,6 @@ msgstr "Top Rating" msgid "Top Score" msgstr "Top Score" -#: templates/user/base-users-table.html:3 -msgid "Rank" -msgstr "Rank" - #: templates/user/edit-profile.html:111 msgid "Change your password" msgstr "Đổi mật khẩu" @@ -5798,72 +5812,72 @@ msgstr "Rank theo điểm" msgid "Admin Notes" msgstr "Lưu ý của admin" -#: templates/user/user-about.html:79 +#: templates/user/user-about.html:77 msgid "You have not shared any information." msgstr "Bạn chưa chia sẻ thông tin nào." -#: templates/user/user-about.html:81 +#: templates/user/user-about.html:79 msgid "This user has not shared any information." msgstr "Người dùng này chưa chia sẻ thông tin nào." -#: templates/user/user-about.html:90 +#: templates/user/user-about.html:88 msgid "Awards" msgstr "Thành tích" -#: templates/user/user-about.html:101 +#: templates/user/user-about.html:99 #, python-format msgid "%(label)s (%(date)s)" msgstr "%(label)s (%(date)s)" -#: templates/user/user-about.html:119 +#: templates/user/user-about.html:117 msgid "Mon" msgstr "Thứ 2" -#: templates/user/user-about.html:124 +#: templates/user/user-about.html:122 msgid "Tues" msgstr "Thứ 3" -#: templates/user/user-about.html:129 +#: templates/user/user-about.html:127 msgid "Wed" msgstr "Thứ 4" -#: templates/user/user-about.html:134 +#: templates/user/user-about.html:132 msgid "Thurs" msgstr "Thứ 5" -#: templates/user/user-about.html:139 +#: templates/user/user-about.html:137 msgid "Fri" msgstr "Thứ 6" -#: templates/user/user-about.html:144 +#: templates/user/user-about.html:142 msgid "Sat" msgstr "Thứ 7" -#: templates/user/user-about.html:149 +#: templates/user/user-about.html:147 msgid "Sun" msgstr "CN" -#: templates/user/user-about.html:158 +#: templates/user/user-about.html:156 msgid "Less" msgstr "Ít" -#: templates/user/user-about.html:164 +#: templates/user/user-about.html:162 msgid "More" msgstr "Nhiều" -#: templates/user/user-about.html:173 +#: templates/user/user-about.html:171 msgid "Rating History" msgstr "Các lần thi" -#: templates/user/user-about.html:244 +#: templates/user/user-about.html:242 msgid "past year" msgstr "năm ngoái" -#: templates/user/user-about.html:261 +#: templates/user/user-about.html:259 msgid "total submission(s)" msgstr "bài nộp" -#: templates/user/user-about.html:265 +#: templates/user/user-about.html:263 msgid "submissions in the last year" msgstr "bài nộp trong năm qua" @@ -5949,6 +5963,15 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "Online Users" +#~ msgstr "Trực tuyến" + +#~ msgid "Group:" +#~ msgstr "Nhóm:" + +#~ msgid "Have editorial" +#~ msgstr "Có hướng dẫn" + #~ msgid "Contest" #~ msgstr "Kỳ thi" @@ -6265,4 +6288,3 @@ msgstr "Chọn tất cả" #~ msgid "Hard" #~ msgstr "Khó" - diff --git a/locale/vi/LC_MESSAGES/dmoj-user.po b/locale/vi/LC_MESSAGES/dmoj-user.po index 4ea605c..d99d288 100644 --- a/locale/vi/LC_MESSAGES/dmoj-user.po +++ b/locale/vi/LC_MESSAGES/dmoj-user.po @@ -39,12 +39,6 @@ msgstr "Đăng ký tên" msgid "Report" msgstr "Báo cáo" -msgid "Insert Image" -msgstr "Chèn hình ảnh" - -msgid "Save" -msgstr "Lưu" - msgid "2sat" msgstr "" @@ -600,3 +594,8 @@ msgstr "" msgid "z-function" msgstr "" +#~ msgid "Insert Image" +#~ msgstr "Chèn hình ảnh" + +#~ msgid "Save" +#~ msgstr "Lưu" diff --git a/templates/base.html b/templates/base.html index e595387..f36cd30 100644 --- a/templates/base.html +++ b/templates/base.html @@ -383,7 +383,7 @@

      - proudly powered by DMOJ | developed by LQDJudge team | + proudly powered by DMOJ| developed by LQDJudge team {% if i18n_config.footer %} {{ i18n_config.footer|safe }} | {% endif %} diff --git a/templates/contest/clone.html b/templates/contest/clone.html index 2d3b4aa..73d01e5 100644 --- a/templates/contest/clone.html +++ b/templates/contest/clone.html @@ -44,7 +44,7 @@
      {{ form.key }}
      -
      +
      {{form.organization}} {% if form.organization.errors %}
      diff --git a/templates/contest/contest-tabs.html b/templates/contest/contest-tabs.html index 9baa4cc..607ee5d 100644 --- a/templates/contest/contest-tabs.html +++ b/templates/contest/contest-tabs.html @@ -36,7 +36,4 @@ {% endif %} {{ make_tab_item('edit', 'fa fa-edit', url('admin:judge_contest_change', contest.id), _('Edit')) }} {% endif %} - {% if perms.judge.clone_contest %} - {{ make_tab_item('clone', 'fa fa-copy', url('contest_clone', contest.key), _('Clone')) }} - {% endif %}
      diff --git a/templates/contest/contest.html b/templates/contest/contest.html index 901565b..e6df00a 100644 --- a/templates/contest/contest.html +++ b/templates/contest/contest.html @@ -82,11 +82,16 @@ {{ contest.description|markdown|reference|str|safe }} {% endcache %}
      - {% if editable_organizations %} -
      + {% if editable_organizations or is_clonable %} +
      {% for org in editable_organizations %} [{{ _('Edit in') }} {{org.slug}}] {% endfor %} + {% if is_clonable %} + + [{{_('Clone')}}] + + {% endif %}
      {% endif %} From 97d2029b5a2ed9f74d450411d0f1d73297a8a786 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 17 Oct 2023 11:45:52 -0500 Subject: [PATCH 37/51] Fix bridge --- judge/bridge/judge_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/judge/bridge/judge_handler.py b/judge/bridge/judge_handler.py index 8be69ea..1ff1af1 100644 --- a/judge/bridge/judge_handler.py +++ b/judge/bridge/judge_handler.py @@ -93,6 +93,7 @@ class JudgeHandler(ZlibPacketHandler): def on_disconnect(self): self._stop_ping.set() + self.judges.remove(self) if self.name is not None: self._disconnected() logger.info( From 93d032fc720a3060e15d9ee55d361fadfe1963e1 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 18 Oct 2023 14:21:38 -0500 Subject: [PATCH 38/51] Fix ranking filters --- templates/contest/ranking-table.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/contest/ranking-table.html b/templates/contest/ranking-table.html index 18d64dd..2ca38dc 100644 --- a/templates/contest/ranking-table.html +++ b/templates/contest/ranking-table.html @@ -13,15 +13,15 @@ {% endblock %} {% block user_footer %} - {% if user.first_name %} + {% if user.user.first_name %} {% endif %} - {% if user.last_name %} - + {% if user.user.last_name %} + {% endif %} {% endblock %} From 3a7d4d8f0a5bae748a64766334b91b535c3f8746 Mon Sep 17 00:00:00 2001 From: Phuoc Anh Kha Le <76896393+anhkha2003@users.noreply.github.com> Date: Wed, 25 Oct 2023 02:19:05 -0500 Subject: [PATCH 39/51] Fix Comment bugs (#93) --- judge/comments.py | 8 +++++--- templates/comments/media-js.html | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/judge/comments.py b/judge/comments.py index dde97a0..98434cf 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -144,14 +144,16 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get(self, request, *args, **kwargs): target_comment = None + self.object = self.get_object() if "comment-id" in request.GET: - comment_id = int(request.GET["comment-id"]) try: + comment_id = int(request.GET["comment-id"]) comment_obj = Comment.objects.get(id=comment_id) - except Comment.DoesNotExist: + except (Comment.DoesNotExist, ValueError): + raise Http404 + if comment_obj.linked_object != self.object: raise Http404 target_comment = comment_obj.get_root() - self.object = self.get_object() return self.render_to_response( self.get_context_data( object=self.object, diff --git a/templates/comments/media-js.html b/templates/comments/media-js.html index 862dbee..4c85ae4 100644 --- a/templates/comments/media-js.html +++ b/templates/comments/media-js.html @@ -145,6 +145,8 @@ $comment_loading.hide(); var $comment = $("#comment-" + id + "-children"); $comment.append(data); + MathJax.typeset($('#comments')[0]); + register_time($('.time-with-rel')); } }) } @@ -187,6 +189,7 @@ $comment.append(data); } MathJax.typeset($('#comments')[0]); + register_time($('.time-with-rel')); } }) } From 27586b25b82771efd44a41a76c2606e923df9e52 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 27 Oct 2023 16:49:28 -0500 Subject: [PATCH 40/51] Fix group contest m2m fields (authors, curators, etc) --- judge/forms.py | 11 +- judge/models/contest.py | 3 + judge/views/contests.py | 7 + judge/views/organization.py | 18 +- locale/vi/LC_MESSAGES/django.po | 486 ++++++++++++++++--------------- templates/problem/list-base.html | 6 - 6 files changed, 271 insertions(+), 260 deletions(-) diff --git a/judge/forms.py b/judge/forms.py index e6bbd67..35251ae 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -11,7 +11,6 @@ from django.contrib.auth.models import User from django.contrib.auth.forms import AuthenticationForm from django.core.exceptions import ValidationError, ObjectDoesNotExist from django.core.validators import RegexValidator -from django.db import transaction from django.db.models import Q from django.forms import ( CharField, @@ -52,7 +51,6 @@ from judge.widgets import ( DateTimePickerWidget, ImageWidget, ) -from judge.tasks import rescore_contest def fix_unicode(string, unsafe=tuple("\u202a\u202b\u202d\u202e")): @@ -282,16 +280,9 @@ class EditOrganizationContestForm(ModelForm): "view_contest_scoreboard", ]: self.fields[field].widget.data_url = ( - self.fields[field].widget.get_url() + "?org_id=1" + self.fields[field].widget.get_url() + f"?org_id={self.org_id}" ) - def save(self, commit=True): - res = super(EditOrganizationContestForm, self).save(commit=False) - if commit: - res.save() - transaction.on_commit(rescore_contest.s(res.key).delay) - return res - class Meta: model = Contest fields = ( diff --git a/judge/models/contest.py b/judge/models/contest.py index bda262d..1432d94 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -99,11 +99,13 @@ class Contest(models.Model, PageVotable, Bookmarkable): ) authors = models.ManyToManyField( Profile, + verbose_name=_("authors"), help_text=_("These users will be able to edit the contest."), related_name="authors+", ) curators = models.ManyToManyField( Profile, + verbose_name=_("curators"), help_text=_( "These users will be able to edit the contest, " "but will not be listed as authors." @@ -113,6 +115,7 @@ class Contest(models.Model, PageVotable, Bookmarkable): ) testers = models.ManyToManyField( Profile, + verbose_name=_("testers"), help_text=_( "These users will be able to view the contest, " "but not edit it." ), diff --git a/judge/views/contests.py b/judge/views/contests.py index 80f66e5..ae21e40 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -419,7 +419,14 @@ class ContestDetail( return [] res = [] for organization in self.object.organizations.all(): + can_edit = False if self.request.profile.can_edit_organization(organization): + can_edit = True + if self.request.profile in organization and self.object.is_editable_by( + self.request.user + ): + can_edit = True + if can_edit: res.append(organization) return res diff --git a/judge/views/organization.py b/judge/views/organization.py index be80203..eff02d4 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -73,6 +73,7 @@ from judge.views.problem import ProblemList from judge.views.contests import ContestList from judge.views.submission import AllSubmissions, SubmissionsListBase from judge.views.feed import FeedView +from judge.tasks import rescore_contest __all__ = [ "OrganizationList", @@ -394,7 +395,7 @@ class OrganizationContestMixin( model = Contest def is_contest_editable(self, request, contest): - return request.profile in contest.authors.all() or self.can_edit_organization( + return contest.is_editable_by(request.user) or self.can_edit_organization( self.organization ) @@ -947,7 +948,7 @@ class EditOrganizationContest( def get_content_title(self): href = reverse("contest_view", args=[self.contest.key]) - return mark_safe(f'Edit {self.contest.key}') + return mark_safe(_("Edit") + f' {self.contest.key}') def get_object(self): return self.contest @@ -960,6 +961,19 @@ class EditOrganizationContest( self.object.organizations.add(self.organization) self.object.is_organization_private = True self.object.save() + + if any( + f in form.changed_data + for f in ( + "start_time", + "end_time", + "time_limit", + "format_config", + "format_name", + "freeze_after", + ) + ): + transaction.on_commit(rescore_contest.s(self.object.key).delay) return res def get_problem_formset(self, post=False): diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 552f1a2..cca05b9 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: lqdoj2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-17 05:01+0700\n" +"POT-Creation-Date: 2023-10-28 04:45+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -19,8 +19,8 @@ msgstr "" "X-Crowdin-File-ID: 5\n" #: chat_box/models.py:42 chat_box/models.py:68 chat_box/models.py:84 -#: judge/admin/interface.py:150 judge/models/contest.py:644 -#: judge/models/contest.py:850 judge/models/course.py:115 +#: judge/admin/interface.py:150 judge/models/contest.py:647 +#: judge/models/contest.py:853 judge/models/course.py:115 #: judge/models/profile.py:433 judge/models/profile.py:511 msgid "user" msgstr "người dùng" @@ -100,7 +100,7 @@ msgid "Included contests" msgstr "" #: judge/admin/contest.py:79 judge/admin/volunteer.py:54 -#: templates/contest/clarification.html:42 templates/contest/contest.html:103 +#: templates/contest/clarification.html:42 templates/contest/contest.html:105 #: templates/contest/moss.html:41 templates/internal/left-sidebar.html:2 #: templates/internal/problem.html:40 templates/problem/list.html:17 #: templates/problem/list.html:34 templates/problem/list.html:153 @@ -229,7 +229,7 @@ msgid "Taxonomy" msgstr "" #: judge/admin/problem.py:217 judge/admin/problem.py:452 -#: templates/contest/contest.html:104 +#: templates/contest/contest.html:106 #: templates/contest/contests_summary.html:41 templates/problem/data.html:533 #: templates/problem/list.html:22 templates/problem/list.html:48 #: templates/user/base-users-table.html:10 templates/user/user-about.html:36 @@ -251,7 +251,7 @@ msgstr "Ngôn ngữ" msgid "History" msgstr "Lịch sử" -#: judge/admin/problem.py:273 templates/problem/list-base.html:99 +#: judge/admin/problem.py:273 templates/problem/list-base.html:93 msgid "Authors" msgstr "Các tác giả" @@ -493,79 +493,79 @@ msgstr "IOI mới" msgid "Ultimate" msgstr "" -#: judge/forms.py:115 +#: judge/forms.py:113 msgid "File size exceeds the maximum allowed limit of 5MB." msgstr "File tải lên không được quá 5MB." -#: judge/forms.py:146 +#: judge/forms.py:144 msgid "Any judge" msgstr "" -#: judge/forms.py:353 +#: judge/forms.py:344 msgid "Enter usernames separating by space" msgstr "Nhập các tên đăng nhập, cách nhau bởi dấu cách" -#: judge/forms.py:354 judge/views/stats.py:166 templates/stats/site.html:27 +#: judge/forms.py:345 judge/views/stats.py:166 templates/stats/site.html:27 msgid "New users" msgstr "Thành viên mới" -#: judge/forms.py:371 +#: judge/forms.py:362 #, python-brace-format msgid "These usernames don't exist: {usernames}" msgstr "Các tên đăng nhập này không tồn tại: {usernames}" -#: judge/forms.py:430 judge/views/register.py:30 +#: judge/forms.py:421 judge/views/register.py:30 #: templates/registration/registration_form.html:34 #: templates/user/base-users-table.html:5 #: templates/user/import/table_csv.html:4 msgid "Username" msgstr "Tên đăng nhập" -#: judge/forms.py:431 judge/views/email.py:22 +#: judge/forms.py:422 judge/views/email.py:22 #: templates/registration/registration_form.html:46 #: templates/registration/registration_form.html:60 #: templates/user/edit-profile.html:108 templates/user/import/table_csv.html:5 msgid "Password" msgstr "Mật khẩu" -#: judge/forms.py:457 +#: judge/forms.py:448 msgid "Two Factor Authentication tokens must be 6 decimal digits." msgstr "Two Factor Authentication phải chứa 6 chữ số." -#: judge/forms.py:470 templates/registration/totp_auth.html:32 +#: judge/forms.py:461 templates/registration/totp_auth.html:32 msgid "Invalid Two Factor Authentication token." msgstr "Token Two Factor Authentication không hợp lệ." -#: judge/forms.py:477 judge/models/problem.py:130 +#: judge/forms.py:468 judge/models/problem.py:130 msgid "Problem code must be ^[a-z0-9]+$" msgstr "Mã bài phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:484 +#: judge/forms.py:475 msgid "Problem with code already exists." msgstr "Mã bài đã tồn tại." -#: judge/forms.py:491 judge/models/contest.py:95 +#: judge/forms.py:482 judge/models/contest.py:95 msgid "Contest id must be ^[a-z0-9]+$" msgstr "Mã kỳ thi phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:498 templates/contest/clone.html:47 +#: judge/forms.py:489 templates/contest/clone.html:47 #: templates/problem/search-form.html:39 msgid "Group" msgstr "Nhóm" -#: judge/forms.py:506 +#: judge/forms.py:497 msgid "Contest with key already exists." msgstr "Mã kỳ thi đã tồn tại." -#: judge/forms.py:514 +#: judge/forms.py:505 msgid "Group doesn't exist." msgstr "Nhóm không tồn tại." -#: judge/forms.py:516 +#: judge/forms.py:507 msgid "You don't have permission in this group." msgstr "Bạn không có quyền trong nhóm này." -#: judge/forms.py:566 +#: judge/forms.py:557 msgid "This problem is duplicated." msgstr "Bài này bị lặp" @@ -713,7 +713,7 @@ msgstr "" msgid "contest tag" msgstr "" -#: judge/models/contest.py:79 judge/models/contest.py:252 +#: judge/models/contest.py:79 judge/models/contest.py:255 msgid "contest tags" msgstr "nhãn kỳ thi" @@ -737,56 +737,69 @@ msgstr "ID kỳ thi" msgid "contest name" msgstr "tên kỳ thi" -#: judge/models/contest.py:102 +#: judge/models/contest.py:102 judge/models/interface.py:79 +#: judge/models/problem.py:672 +msgid "authors" +msgstr "tác giả" + +#: judge/models/contest.py:103 msgid "These users will be able to edit the contest." msgstr "Những người dùng này có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:108 +#: judge/models/contest.py:108 judge/models/problem.py:154 +msgid "curators" +msgstr "quản lý" + +#: judge/models/contest.py:110 msgid "" "These users will be able to edit the contest, but will not be listed as " "authors." msgstr "Những người dùng này là tác giả và có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:117 +#: judge/models/contest.py:118 judge/models/problem.py:164 +msgid "testers" +msgstr "" + +#: judge/models/contest.py:120 msgid "These users will be able to view the contest, but not edit it." msgstr "" "Những người dùng này có thể thấy kỳ thi nhưng không có quyền chỉnh sửa." -#: judge/models/contest.py:122 judge/models/course.py:158 +#: judge/models/contest.py:125 judge/models/course.py:158 #: judge/models/runtime.py:211 msgid "description" msgstr "mô tả" -#: judge/models/contest.py:124 judge/models/problem.py:588 +#: judge/models/contest.py:127 judge/models/problem.py:588 #: judge/models/runtime.py:216 msgid "problems" msgstr "bài tập" -#: judge/models/contest.py:126 judge/models/contest.py:649 +#: judge/models/contest.py:129 judge/models/contest.py:652 msgid "start time" msgstr "thời gian bắt đầu" -#: judge/models/contest.py:127 +#: judge/models/contest.py:130 msgid "end time" msgstr "thời gian kết thúc" -#: judge/models/contest.py:129 judge/models/problem.py:183 +#: judge/models/contest.py:132 judge/models/problem.py:183 #: judge/models/problem.py:623 msgid "time limit" msgstr "giới hạn thời gian" -#: judge/models/contest.py:133 +#: judge/models/contest.py:136 msgid "" "Format hh:mm:ss. For example, if you want a 2-hour contest, enter 02:00:00" msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn tạo kỳ thi dài 2h, hãy " "nhập 02:00:00" -#: judge/models/contest.py:137 +#: judge/models/contest.py:140 msgid "freeze after" msgstr "đóng băng sau" -#: judge/models/contest.py:141 +#: judge/models/contest.py:144 msgid "" "Format hh:mm:ss. For example, if you want to freeze contest after 2 hours, " "enter 02:00:00" @@ -794,12 +807,12 @@ msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, " "hãy nhập 02:00:00" -#: judge/models/contest.py:145 judge/models/course.py:28 +#: judge/models/contest.py:148 judge/models/course.py:28 #: judge/models/course.py:164 judge/models/problem.py:222 msgid "publicly visible" msgstr "công khai" -#: judge/models/contest.py:148 +#: judge/models/contest.py:151 msgid "" "Should be set even for organization-private contests, where it determines " "whether the contest is visible to members of the specified organizations." @@ -807,92 +820,92 @@ msgstr "" "Đánh dấu ngay cả với các kỳ thi riêng tư của nhóm, quyết định việc kỳ thi có " "được hiển thị với các thành viên hay không." -#: judge/models/contest.py:154 +#: judge/models/contest.py:157 msgid "contest rated" msgstr "kỳ thi được xếp hạng" -#: judge/models/contest.py:155 +#: judge/models/contest.py:158 msgid "Whether this contest can be rated." msgstr "Quyết định kỳ thi có được xếp hạng không." -#: judge/models/contest.py:159 +#: judge/models/contest.py:162 msgid "scoreboard visibility" msgstr "khả năng hiển thị của bảng điểm" -#: judge/models/contest.py:162 +#: judge/models/contest.py:165 msgid "Scoreboard visibility through the duration of the contest" msgstr "Khả năng hiển thị của bảng điểm trong thời gian kỳ thi" -#: judge/models/contest.py:167 +#: judge/models/contest.py:170 msgid "view contest scoreboard" msgstr "xem bảng điểm kỳ thi" -#: judge/models/contest.py:170 +#: judge/models/contest.py:173 msgid "These users will be able to view the scoreboard." msgstr "Những người dùng này được phép xem bảng điểm." -#: judge/models/contest.py:173 +#: judge/models/contest.py:176 msgid "public scoreboard" msgstr "công khai bảng điểm" -#: judge/models/contest.py:174 +#: judge/models/contest.py:177 msgid "Ranking page is public even for private contests." msgstr "Trang xếp hạng được công khai, kể cả cho kỳ thi riêng tư." -#: judge/models/contest.py:178 +#: judge/models/contest.py:181 msgid "no comments" msgstr "không bình luận" -#: judge/models/contest.py:179 +#: judge/models/contest.py:182 msgid "Use clarification system instead of comments." msgstr "Dùng hệ thống thông báo thay vì bình luận." -#: judge/models/contest.py:184 +#: judge/models/contest.py:187 msgid "Rating floor for contest" msgstr "Cận dưới rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:190 +#: judge/models/contest.py:193 msgid "Rating ceiling for contest" msgstr "Cận trên rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:195 +#: judge/models/contest.py:198 msgid "rate all" msgstr "xếp hạng tất cả" -#: judge/models/contest.py:196 +#: judge/models/contest.py:199 msgid "Rate all users who joined." msgstr "Xếp hạng tất cả người dùng đã tham gia (kể cả không nộp)." -#: judge/models/contest.py:201 +#: judge/models/contest.py:204 msgid "exclude from ratings" msgstr "không xếp hạng" -#: judge/models/contest.py:206 +#: judge/models/contest.py:209 msgid "private to specific users" msgstr "riêng tư với các người dùng này" -#: judge/models/contest.py:211 +#: judge/models/contest.py:214 msgid "private contestants" msgstr "thí sinh riêng tư" -#: judge/models/contest.py:212 +#: judge/models/contest.py:215 msgid "If private, only these users may see the contest" msgstr "Nếu riêng tư, chỉ những người dùng này mới thấy kỳ thi" -#: judge/models/contest.py:216 +#: judge/models/contest.py:219 msgid "hide problem tags" msgstr "ẩn nhãn kỳ thi" -#: judge/models/contest.py:217 +#: judge/models/contest.py:220 msgid "Whether problem tags should be hidden by default." msgstr "" "Quyết định việc nhãn bài tập (DP, Tham lam, ...) được ẩn trong kỳ thi không." -#: judge/models/contest.py:221 +#: judge/models/contest.py:224 msgid "run pretests only" msgstr "chỉ chạy pretests" -#: judge/models/contest.py:223 +#: judge/models/contest.py:226 msgid "" "Whether judges should grade pretests only, versus all testcases. Commonly " "set during a contest, then unset prior to rejudging user submissions when " @@ -901,51 +914,51 @@ msgstr "" "Quyết định việc các máy chấm chỉ chấm pretests thay vì tất cả các test. Sau " "kỳ thi, hãy bỏ đánh dấu ô này và chấm lại tất cả các bài." -#: judge/models/contest.py:230 judge/models/interface.py:96 +#: judge/models/contest.py:233 judge/models/interface.py:96 #: judge/models/problem.py:282 msgid "private to organizations" msgstr "riêng tư với các tổ chức" -#: judge/models/contest.py:235 judge/models/course.py:34 +#: judge/models/contest.py:238 judge/models/course.py:34 #: judge/models/interface.py:92 judge/models/problem.py:278 #: judge/models/profile.py:149 msgid "organizations" msgstr "tổ chức" -#: judge/models/contest.py:236 +#: judge/models/contest.py:239 msgid "If private, only these organizations may see the contest" msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được kỳ thi" -#: judge/models/contest.py:239 judge/models/problem.py:253 +#: judge/models/contest.py:242 judge/models/problem.py:253 msgid "OpenGraph image" msgstr "Hình ảnh OpenGraph" -#: judge/models/contest.py:242 judge/models/profile.py:97 +#: judge/models/contest.py:245 judge/models/profile.py:97 msgid "Logo override image" msgstr "Hình ảnh ghi đè logo" -#: judge/models/contest.py:247 +#: judge/models/contest.py:250 msgid "" "This image will replace the default site logo for users inside the contest." msgstr "Ảnh này sẽ thay thế cho logo mặc định trong kỳ thi." -#: judge/models/contest.py:255 +#: judge/models/contest.py:258 msgid "the amount of live participants" msgstr "số lượng thí sinh thi trực tiếp" -#: judge/models/contest.py:259 +#: judge/models/contest.py:262 msgid "contest summary" msgstr "tổng kết kỳ thi" -#: judge/models/contest.py:261 judge/models/problem.py:259 +#: judge/models/contest.py:264 judge/models/problem.py:259 msgid "Plain-text, shown in meta description tag, e.g. for social media." msgstr "" -#: judge/models/contest.py:265 judge/models/profile.py:92 +#: judge/models/contest.py:268 judge/models/profile.py:92 msgid "access code" msgstr "mật khẩu truy cập" -#: judge/models/contest.py:270 +#: judge/models/contest.py:273 msgid "" "An optional code to prompt contestants before they are allowed to join the " "contest. Leave it blank to disable." @@ -953,302 +966,302 @@ msgstr "" "Mật khẩu truy cập cho các thí sinh muốn tham gia kỳ thi. Để trống nếu không " "dùng." -#: judge/models/contest.py:276 judge/models/problem.py:241 +#: judge/models/contest.py:279 judge/models/problem.py:241 msgid "personae non gratae" msgstr "Chặn tham gia" -#: judge/models/contest.py:278 +#: judge/models/contest.py:281 msgid "Bans the selected users from joining this contest." msgstr "Cấm những người dùng được chọn tham gia kỳ thi." -#: judge/models/contest.py:281 +#: judge/models/contest.py:284 msgid "contest format" msgstr "format kỳ thi" -#: judge/models/contest.py:285 +#: judge/models/contest.py:288 msgid "The contest format module to use." msgstr "Format kỳ thi sử dụng." -#: judge/models/contest.py:288 +#: judge/models/contest.py:291 msgid "contest format configuration" msgstr "Tùy chỉnh format kỳ thi" -#: judge/models/contest.py:292 +#: judge/models/contest.py:295 msgid "" "A JSON object to serve as the configuration for the chosen contest format " "module. Leave empty to use None. Exact format depends on the contest format " "selected." msgstr "" -#: judge/models/contest.py:305 +#: judge/models/contest.py:308 msgid "precision points" msgstr "Hiển thị điểm" -#: judge/models/contest.py:308 +#: judge/models/contest.py:311 msgid "Number of digits to round points to." msgstr "Số chữ số thập phân trên bảng điểm." -#: judge/models/contest.py:617 +#: judge/models/contest.py:620 msgid "See private contests" msgstr "" -#: judge/models/contest.py:618 +#: judge/models/contest.py:621 msgid "Edit own contests" msgstr "" -#: judge/models/contest.py:619 +#: judge/models/contest.py:622 msgid "Edit all contests" msgstr "" -#: judge/models/contest.py:620 +#: judge/models/contest.py:623 msgid "Clone contest" msgstr "" -#: judge/models/contest.py:621 templates/contest/moss.html:72 +#: judge/models/contest.py:624 templates/contest/moss.html:72 msgid "MOSS contest" msgstr "" -#: judge/models/contest.py:622 +#: judge/models/contest.py:625 msgid "Rate contests" msgstr "" -#: judge/models/contest.py:623 +#: judge/models/contest.py:626 msgid "Contest access codes" msgstr "" -#: judge/models/contest.py:624 +#: judge/models/contest.py:627 msgid "Create private contests" msgstr "" -#: judge/models/contest.py:625 +#: judge/models/contest.py:628 msgid "Change contest visibility" msgstr "" -#: judge/models/contest.py:626 +#: judge/models/contest.py:629 msgid "Edit contest problem label script" msgstr "Cách hiển thị thứ tự bài tập" -#: judge/models/contest.py:628 judge/models/contest.py:775 -#: judge/models/contest.py:853 judge/models/contest.py:883 +#: judge/models/contest.py:631 judge/models/contest.py:778 +#: judge/models/contest.py:856 judge/models/contest.py:886 #: judge/models/course.py:178 judge/models/submission.py:116 msgid "contest" msgstr "kỳ thi" -#: judge/models/contest.py:629 +#: judge/models/contest.py:632 msgid "contests" msgstr "kỳ thi" -#: judge/models/contest.py:638 +#: judge/models/contest.py:641 msgid "associated contest" msgstr "" -#: judge/models/contest.py:651 +#: judge/models/contest.py:654 msgid "score" msgstr "điểm" -#: judge/models/contest.py:652 +#: judge/models/contest.py:655 msgid "cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:654 +#: judge/models/contest.py:657 msgid "is disqualified" msgstr "đã bị loại" -#: judge/models/contest.py:656 +#: judge/models/contest.py:659 msgid "Whether this participation is disqualified." msgstr "Quyết định thí sinh có bị loại không." -#: judge/models/contest.py:658 +#: judge/models/contest.py:661 msgid "tie-breaking field" msgstr "" -#: judge/models/contest.py:660 +#: judge/models/contest.py:663 msgid "virtual participation id" msgstr "id lần tham gia ảo" -#: judge/models/contest.py:662 +#: judge/models/contest.py:665 msgid "0 means non-virtual, otherwise the n-th virtual participation." msgstr "0 nghĩa là tham gia chính thức, ngược lại là lần tham gia ảo thứ n." -#: judge/models/contest.py:665 +#: judge/models/contest.py:668 msgid "contest format specific data" msgstr "" -#: judge/models/contest.py:668 +#: judge/models/contest.py:671 msgid "same as format_data, but including frozen results" msgstr "" -#: judge/models/contest.py:672 +#: judge/models/contest.py:675 #, fuzzy #| msgid "score" msgid "final score" msgstr "điểm" -#: judge/models/contest.py:674 +#: judge/models/contest.py:677 #, fuzzy #| msgid "cumulative time" msgid "final cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:750 +#: judge/models/contest.py:753 #, python-format msgid "%s spectating in %s" msgstr "%s đang theo dõi trong %s" -#: judge/models/contest.py:755 +#: judge/models/contest.py:758 #, python-format msgid "%s in %s, v%d" msgstr "%s trong %s, v%d" -#: judge/models/contest.py:760 +#: judge/models/contest.py:763 #, python-format msgid "%s in %s" msgstr "%s trong %s" -#: judge/models/contest.py:763 +#: judge/models/contest.py:766 msgid "contest participation" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:764 +#: judge/models/contest.py:767 msgid "contest participations" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:771 judge/models/contest.py:824 -#: judge/models/contest.py:886 judge/models/problem.py:587 +#: judge/models/contest.py:774 judge/models/contest.py:827 +#: judge/models/contest.py:889 judge/models/problem.py:587 #: judge/models/problem.py:594 judge/models/problem.py:615 #: judge/models/problem.py:646 judge/models/problem_data.py:50 msgid "problem" msgstr "bài tập" -#: judge/models/contest.py:779 judge/models/contest.py:836 +#: judge/models/contest.py:782 judge/models/contest.py:839 #: judge/models/course.py:182 judge/models/problem.py:206 msgid "points" msgstr "điểm" -#: judge/models/contest.py:780 +#: judge/models/contest.py:783 msgid "partial" msgstr "thành phần" -#: judge/models/contest.py:781 judge/models/contest.py:838 +#: judge/models/contest.py:784 judge/models/contest.py:841 msgid "is pretested" msgstr "dùng pretest" -#: judge/models/contest.py:782 judge/models/interface.py:47 +#: judge/models/contest.py:785 judge/models/interface.py:47 msgid "order" msgstr "thứ tự" -#: judge/models/contest.py:784 +#: judge/models/contest.py:787 msgid "visible testcases" msgstr "hiển thị test" -#: judge/models/contest.py:789 +#: judge/models/contest.py:792 msgid "Maximum number of submissions for this problem, or 0 for no limit." msgstr "Số lần nộp tối đa, đặt là 0 nếu không có giới hạn." -#: judge/models/contest.py:791 +#: judge/models/contest.py:794 msgid "max submissions" msgstr "số lần nộp tối đa" -#: judge/models/contest.py:794 +#: judge/models/contest.py:797 msgid "Why include a problem you can't submit to?" msgstr "" -#: judge/models/contest.py:798 +#: judge/models/contest.py:801 #, fuzzy #| msgid "Only for format new IOI. Separated by commas, e.g: 2, 3" msgid "Separated by commas, e.g: 2, 3" msgstr "" "Chỉ dùng với format IOI mới. Các sub cách nhau bởi dấu phẩy. Ví dụ: 2, 3" -#: judge/models/contest.py:799 +#: judge/models/contest.py:802 #, fuzzy #| msgid "frozen subtasks" msgid "hidden subtasks" msgstr "Đóng băng subtasks" -#: judge/models/contest.py:811 +#: judge/models/contest.py:814 msgid "contest problem" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:812 +#: judge/models/contest.py:815 msgid "contest problems" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:818 judge/models/submission.py:273 +#: judge/models/contest.py:821 judge/models/submission.py:273 msgid "submission" msgstr "bài nộp" -#: judge/models/contest.py:831 judge/models/contest.py:857 +#: judge/models/contest.py:834 judge/models/contest.py:860 msgid "participation" msgstr "lần tham gia" -#: judge/models/contest.py:839 +#: judge/models/contest.py:842 msgid "Whether this submission was ran only on pretests." msgstr "Quyết định bài nộp chỉ được chạy trên pretest không." -#: judge/models/contest.py:844 +#: judge/models/contest.py:847 msgid "contest submission" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:845 +#: judge/models/contest.py:848 msgid "contest submissions" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:861 +#: judge/models/contest.py:864 msgid "rank" msgstr "rank" -#: judge/models/contest.py:862 +#: judge/models/contest.py:865 msgid "rating" msgstr "rating" -#: judge/models/contest.py:863 +#: judge/models/contest.py:866 msgid "raw rating" msgstr "rating thật" -#: judge/models/contest.py:864 +#: judge/models/contest.py:867 msgid "contest performance" msgstr "" -#: judge/models/contest.py:865 +#: judge/models/contest.py:868 msgid "last rated" msgstr "lần cuối được xếp hạng" -#: judge/models/contest.py:869 +#: judge/models/contest.py:872 msgid "contest rating" msgstr "rating kỳ thi" -#: judge/models/contest.py:870 +#: judge/models/contest.py:873 msgid "contest ratings" msgstr "rating kỳ thi" -#: judge/models/contest.py:894 +#: judge/models/contest.py:897 msgid "contest moss result" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:895 +#: judge/models/contest.py:898 msgid "contest moss results" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:900 +#: judge/models/contest.py:903 msgid "clarified problem" msgstr "" -#: judge/models/contest.py:902 +#: judge/models/contest.py:905 msgid "clarification body" msgstr "" -#: judge/models/contest.py:904 +#: judge/models/contest.py:907 msgid "clarification timestamp" msgstr "" -#: judge/models/contest.py:922 +#: judge/models/contest.py:925 #, fuzzy #| msgid "contest summary" msgid "contests summary" msgstr "tổng kết kỳ thi" -#: judge/models/contest.py:923 +#: judge/models/contest.py:926 #, fuzzy #| msgid "contest summary" msgid "contests summaries" @@ -1363,10 +1376,6 @@ msgstr "mục cha" msgid "post title" msgstr "tiêu đề bài đăng" -#: judge/models/interface.py:79 judge/models/problem.py:672 -msgid "authors" -msgstr "tác giả" - #: judge/models/interface.py:80 msgid "slug" msgstr "slug" @@ -1583,10 +1592,6 @@ msgstr "" "Những người dùng này sẽ có thể chỉnh sửa bài tập, và nằm trong danh sách các " "tác giả" -#: judge/models/problem.py:154 -msgid "curators" -msgstr "" - #: judge/models/problem.py:158 msgid "" "These users will be able to edit the problem, but not be listed as authors." @@ -1594,10 +1599,6 @@ msgstr "" "Những người dùng này sẽ có thể chỉnh sửa bài tập, nhưng không nằm trong danh " "sách các tác giả" -#: judge/models/problem.py:164 -msgid "testers" -msgstr "" - #: judge/models/problem.py:168 msgid "These users will be able to view the private problem, but not edit it." msgstr "" @@ -2748,8 +2749,8 @@ msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote." msgid "You already voted." msgstr "Bạn đã vote." -#: judge/views/comment.py:246 judge/views/organization.py:807 -#: judge/views/organization.py:957 judge/views/organization.py:1106 +#: judge/views/comment.py:246 judge/views/organization.py:808 +#: judge/views/organization.py:958 judge/views/organization.py:1120 msgid "Edited from site" msgstr "Chỉnh sửa từ web" @@ -2758,7 +2759,7 @@ msgid "Editing comment" msgstr "Chỉnh sửa bình luận" #: judge/views/contests.py:123 judge/views/contests.py:386 -#: judge/views/contests.py:391 judge/views/contests.py:661 +#: judge/views/contests.py:391 judge/views/contests.py:683 msgid "No such contest" msgstr "Không có contest nào như vậy" @@ -2784,118 +2785,118 @@ msgstr "Không tìm thấy kỳ thi nào như vậy." msgid "Access to contest \"%s\" denied" msgstr "Truy cập tới kỳ thi \"%s\" bị từ chối" -#: judge/views/contests.py:450 +#: judge/views/contests.py:466 msgid "Clone Contest" msgstr "Nhân bản kỳ thi" -#: judge/views/contests.py:535 +#: judge/views/contests.py:557 msgid "Contest not ongoing" msgstr "Kỳ thi đang không diễn ra" -#: judge/views/contests.py:536 +#: judge/views/contests.py:558 #, python-format msgid "\"%s\" is not currently ongoing." msgstr "\"%s\" kỳ thi đang không diễn ra." -#: judge/views/contests.py:543 +#: judge/views/contests.py:565 msgid "Already in contest" msgstr "Đã ở trong kỳ thi" -#: judge/views/contests.py:544 +#: judge/views/contests.py:566 #, python-format msgid "You are already in a contest: \"%s\"." msgstr "Bạn đã ở trong kỳ thi: \"%s\"." -#: judge/views/contests.py:554 +#: judge/views/contests.py:576 msgid "Banned from joining" msgstr "Bị cấm tham gia" -#: judge/views/contests.py:556 +#: judge/views/contests.py:578 msgid "" "You have been declared persona non grata for this contest. You are " "permanently barred from joining this contest." msgstr "Bạn không được phép tham gia kỳ thi này." -#: judge/views/contests.py:645 +#: judge/views/contests.py:667 #, python-format msgid "Enter access code for \"%s\"" msgstr "Nhập mật khẩu truy cập cho \"%s\"" -#: judge/views/contests.py:662 +#: judge/views/contests.py:684 #, python-format msgid "You are not in contest \"%s\"." msgstr "Bạn không ở trong kỳ thi \"%s\"." -#: judge/views/contests.py:685 +#: judge/views/contests.py:707 msgid "ContestCalendar requires integer year and month" msgstr "Lịch thi yêu cầu giá trị cho năm và tháng là số nguyên" -#: judge/views/contests.py:743 +#: judge/views/contests.py:765 #, python-format msgid "Contests in %(month)s" msgstr "Các kỳ thi trong %(month)s" -#: judge/views/contests.py:744 +#: judge/views/contests.py:766 msgid "F Y" msgstr "F Y" -#: judge/views/contests.py:804 +#: judge/views/contests.py:826 #, python-format msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1100 +#: judge/views/contests.py:1122 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1111 +#: judge/views/contests.py:1133 msgid "???" msgstr "???" -#: judge/views/contests.py:1138 +#: judge/views/contests.py:1160 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1139 +#: judge/views/contests.py:1161 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1153 +#: judge/views/contests.py:1175 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1172 templates/contest/contest-tabs.html:21 +#: judge/views/contests.py:1194 templates/contest/contest-tabs.html:21 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1221 +#: judge/views/contests.py:1243 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1257 +#: judge/views/contests.py:1279 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1280 +#: judge/views/contests.py:1302 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1295 judge/views/ticket.py:67 +#: judge/views/contests.py:1317 judge/views/ticket.py:67 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1338 +#: judge/views/contests.py:1360 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" -#: judge/views/contests.py:1444 +#: judge/views/contests.py:1466 #, fuzzy #| msgid "contest summary" msgid "Contests Summary" @@ -2990,98 +2991,98 @@ msgstr "" msgid "Notifications (%d unseen)" msgstr "Thông báo (%d chưa xem)" -#: judge/views/organization.py:148 judge/views/organization.py:155 +#: judge/views/organization.py:149 judge/views/organization.py:156 msgid "No such organization" msgstr "Không có tổ chức như vậy" -#: judge/views/organization.py:149 +#: judge/views/organization.py:150 #, python-format msgid "Could not find an organization with the key \"%s\"." msgstr "Không tìm thấy tổ chức với mã \"%s\"." -#: judge/views/organization.py:156 +#: judge/views/organization.py:157 msgid "Could not find such organization." msgstr "" -#: judge/views/organization.py:180 +#: judge/views/organization.py:181 msgid "Can't edit organization" msgstr "Không thể chỉnh sửa tổ chức" -#: judge/views/organization.py:181 +#: judge/views/organization.py:182 msgid "You are not allowed to edit this organization." msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:193 judge/views/organization.py:337 +#: judge/views/organization.py:194 judge/views/organization.py:338 msgid "Can't access organization" msgstr "Không thể truy cập nhóm" -#: judge/views/organization.py:194 judge/views/organization.py:338 +#: judge/views/organization.py:195 judge/views/organization.py:339 msgid "You are not allowed to access this organization." msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:230 judge/views/stats.py:184 -#: templates/contest/list.html:93 templates/problem/list-base.html:97 +#: judge/views/organization.py:231 judge/views/stats.py:184 +#: templates/contest/list.html:93 templates/problem/list-base.html:91 #: templates/stats/site.html:33 templates/user/user-left-sidebar.html:4 #: templates/user/user-list-tabs.html:6 msgid "Groups" msgstr "Nhóm" -#: judge/views/organization.py:344 +#: judge/views/organization.py:345 #, python-format msgid "%s Members" msgstr "%s Thành viên" -#: judge/views/organization.py:466 +#: judge/views/organization.py:467 #, python-brace-format msgid "All submissions in {0}" msgstr "Bài nộp trong {0}" -#: judge/views/organization.py:496 judge/views/organization.py:502 -#: judge/views/organization.py:509 +#: judge/views/organization.py:497 judge/views/organization.py:503 +#: judge/views/organization.py:510 msgid "Joining group" msgstr "Tham gia nhóm" -#: judge/views/organization.py:497 +#: judge/views/organization.py:498 msgid "You are already in the group." msgstr "Bạn đã ở trong nhóm." -#: judge/views/organization.py:502 +#: judge/views/organization.py:503 msgid "This group is not open." msgstr "Nhóm này là nhóm kín." -#: judge/views/organization.py:510 +#: judge/views/organization.py:511 #, python-brace-format msgid "You may not be part of more than {count} public groups." msgstr "Bạn không thể tham gia nhiều hơn {count} nhóm công khai." -#: judge/views/organization.py:525 +#: judge/views/organization.py:526 msgid "Leaving group" msgstr "Rời nhóm" -#: judge/views/organization.py:526 +#: judge/views/organization.py:527 #, python-format msgid "You are not in \"%s\"." msgstr "Bạn không ở trong \"%s\"." -#: judge/views/organization.py:551 +#: judge/views/organization.py:552 #, python-format msgid "Request to join %s" msgstr "Đăng ký tham gia %s" -#: judge/views/organization.py:581 +#: judge/views/organization.py:582 msgid "Join request detail" msgstr "Chi tiết đơn đăng ký" -#: judge/views/organization.py:623 +#: judge/views/organization.py:624 msgid "Manage join requests" msgstr "Quản lý đơn đăng ký" -#: judge/views/organization.py:627 +#: judge/views/organization.py:628 #, python-format msgid "Managing join requests for %s" msgstr "Quản lý đơn đăng ký cho %s" -#: judge/views/organization.py:667 +#: judge/views/organization.py:668 #, python-format msgid "" "Your organization can only receive %d more members. You cannot approve %d " @@ -3090,95 +3091,105 @@ msgstr "" "Tổ chức chỉ có thể chứa %d thành viên. Bạn không thể chấp thuận nhiều hơn %d " "người." -#: judge/views/organization.py:685 +#: judge/views/organization.py:686 #, python-format msgid "Approved %d user." msgid_plural "Approved %d users." msgstr[0] "Đã chấp thuận %d người." -#: judge/views/organization.py:688 +#: judge/views/organization.py:689 #, python-format msgid "Rejected %d user." msgid_plural "Rejected %d users." msgstr[0] "Đã từ chối %d người." -#: judge/views/organization.py:728 +#: judge/views/organization.py:729 #, python-format msgid "Add member for %s" msgstr "Thêm thành viên cho %s" -#: judge/views/organization.py:740 +#: judge/views/organization.py:741 #, fuzzy #| msgid "Edited from site" msgid "Added members from site" msgstr "Chỉnh sửa từ web" -#: judge/views/organization.py:760 judge/views/organization.py:768 +#: judge/views/organization.py:761 judge/views/organization.py:769 msgid "Can't kick user" msgstr "Không thể đuổi" -#: judge/views/organization.py:761 +#: judge/views/organization.py:762 msgid "The user you are trying to kick does not exist!" msgstr "" -#: judge/views/organization.py:769 +#: judge/views/organization.py:770 #, python-format msgid "The user you are trying to kick is not in organization: %s." msgstr "" -#: judge/views/organization.py:790 judge/views/organization.py:946 +#: judge/views/organization.py:791 judge/views/organization.py:947 #, python-format msgid "Edit %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:818 templates/organization/list.html:45 +#: judge/views/organization.py:819 templates/organization/list.html:45 msgid "Create group" msgstr "Tạo nhóm" -#: judge/views/organization.py:833 +#: judge/views/organization.py:834 msgid "Exceeded limit" msgstr "" -#: judge/views/organization.py:834 +#: judge/views/organization.py:835 #, python-format msgid "You created too many groups. You can only create at most %d groups" msgstr "" -#: judge/views/organization.py:839 judge/views/organization.py:864 -#: judge/views/organization.py:1012 +#: judge/views/organization.py:840 judge/views/organization.py:865 +#: judge/views/organization.py:1026 msgid "Added from site" msgstr "Thêm từ web" -#: judge/views/organization.py:855 +#: judge/views/organization.py:856 #: templates/organization/org-right-sidebar.html:52 msgid "Add contest" msgstr "Thêm kỳ thi" -#: judge/views/organization.py:898 judge/views/organization.py:1057 +#: judge/views/organization.py:899 judge/views/organization.py:1071 msgid "Permission denied" msgstr "Truy cập bị từ chối" -#: judge/views/organization.py:899 +#: judge/views/organization.py:900 #, fuzzy #| msgid "You are not allowed to edit this organization." msgid "You are not allowed to edit this contest" msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:1001 +#: judge/views/organization.py:951 templates/blog/blog.html:31 +#: templates/comments/content-list.html:59 +#: templates/comments/content-list.html:73 +#: templates/contest/contest-tabs.html:37 templates/contest/list.html:128 +#: templates/contest/tag-title.html:9 templates/flatpages/admin_link.html:3 +#: templates/license.html:10 templates/problem/editorial.html:15 +#: templates/problem/feed/problems.html:50 +msgid "Edit" +msgstr "Chỉnh sửa" + +#: judge/views/organization.py:1015 #, python-format msgid "Add blog for %s" msgstr "Thêm bài đăng cho %s" -#: judge/views/organization.py:1058 +#: judge/views/organization.py:1072 msgid "Not allowed to edit this blog" msgstr "Bạn không được phép chỉnh sửa bài đăng này." -#: judge/views/organization.py:1090 +#: judge/views/organization.py:1104 #, python-format msgid "Edit blog %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:1132 +#: judge/views/organization.py:1146 #, python-format msgid "Pending blogs in %s" msgstr "Bài đang đợi duyệt trong %s" @@ -3202,7 +3213,7 @@ msgstr "Hướng dẫn cho {0}" msgid "Editorial for {0}" msgstr "Hướng dẫn cho {0}" -#: judge/views/problem.py:461 templates/contest/contest.html:99 +#: judge/views/problem.py:461 templates/contest/contest.html:101 #: templates/organization/org-left-sidebar.html:4 #: templates/user/user-about.html:28 templates/user/user-bookmarks.html:35 #: templates/user/user-tabs.html:5 templates/user/users-table.html:19 @@ -3703,15 +3714,6 @@ msgstr "" msgid " posted on %(time)s" msgstr "đã đăng vào %(time)s" -#: templates/blog/blog.html:31 templates/comments/content-list.html:59 -#: templates/comments/content-list.html:73 -#: templates/contest/contest-tabs.html:37 templates/contest/list.html:128 -#: templates/contest/tag-title.html:9 templates/flatpages/admin_link.html:3 -#: templates/license.html:10 templates/problem/editorial.html:15 -#: templates/problem/feed/problems.html:50 -msgid "Edit" -msgstr "Chỉnh sửa" - #: templates/blog/blog.html:35 templates/contest/contest.html:88 msgid "Edit in" msgstr "Chỉnh sửa trong" @@ -4113,21 +4115,21 @@ msgstr "Tham gia kỳ thi" msgid "Login to participate" msgstr "Đăng nhập để tham gia" -#: templates/contest/contest.html:91 +#: templates/contest/contest.html:92 msgid "Clone" msgstr "Nhân bản" -#: templates/contest/contest.html:105 +#: templates/contest/contest.html:107 msgid "AC Rate" msgstr "Tỷ lệ AC" -#: templates/contest/contest.html:106 templates/contest/list.html:267 +#: templates/contest/contest.html:108 templates/contest/list.html:267 #: templates/contest/list.html:308 templates/contest/list.html:390 #: templates/problem/list.html:24 msgid "Users" msgstr "Người nộp" -#: templates/contest/contest.html:131 templates/problem/list.html:58 +#: templates/contest/contest.html:133 templates/problem/list.html:58 #: templates/problem/list.html:133 msgid "Editorial" msgstr "Hướng dẫn" @@ -4782,19 +4784,19 @@ msgstr "Lưu ý thêm cho admin" msgid "Feed" msgstr "Gợi ý" -#: templates/problem/list-base.html:95 +#: templates/problem/list-base.html:89 msgid "Filter by type..." msgstr "Lọc theo dạng..." -#: templates/problem/list-base.html:158 templates/problem/list-base.html:184 +#: templates/problem/list-base.html:152 templates/problem/list-base.html:178 msgid "Add types..." msgstr "Thêm dạng" -#: templates/problem/list-base.html:200 +#: templates/problem/list-base.html:194 msgid "Fail to vote!" msgstr "Hệ thống lỗi!" -#: templates/problem/list-base.html:203 +#: templates/problem/list-base.html:197 msgid "Successful vote! Thank you!" msgstr "Đã gửi thành công! Cảm ơn bạn!" diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html index f49506d..181a48a 100644 --- a/templates/problem/list-base.html +++ b/templates/problem/list-base.html @@ -29,12 +29,6 @@ height: 2em; padding-top: 4px; } - @media(min-width: 800px) { - #content { - width: 99%; - margin-left: 0; - } - } @media(max-width: 799px) { #content { width: 100%; From 7a05ad1c3bd4a6d2188c82677a0a245131d3987d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 27 Oct 2023 18:02:02 -0500 Subject: [PATCH 41/51] Fix problem code change bug --- judge/logging.py | 7 +++++++ judge/models/problem.py | 2 +- judge/models/problem_data.py | 6 +++--- judge/utils/problem_data.py | 8 ++++++-- judge/views/problem_data.py | 4 ++++ judge/views/submission.py | 4 ++-- 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 judge/logging.py diff --git a/judge/logging.py b/judge/logging.py new file mode 100644 index 0000000..8d9f154 --- /dev/null +++ b/judge/logging.py @@ -0,0 +1,7 @@ +import logging + +error_log = logging.getLogger("judge.errors") + + +def log_exception(msg): + error_log.exception(msg) diff --git a/judge/models/problem.py b/judge/models/problem.py index 9560be8..98e477b 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -556,7 +556,7 @@ class Problem(models.Model, PageVotable, Bookmarkable): def save(self, *args, **kwargs): super(Problem, self).save(*args, **kwargs) - if self.code != self.__original_code: + if self.__original_code and self.code != self.__original_code: if hasattr(self, "data_files") or self.pdf_description: try: problem_data_storage.rename(self.__original_code, self.code) diff --git a/judge/models/problem_data.py b/judge/models/problem_data.py index d61b528..b04d2ab 100644 --- a/judge/models/problem_data.py +++ b/judge/models/problem_data.py @@ -162,10 +162,10 @@ class ProblemData(models.Model): get_file_cachekey(file), ) cache.delete(cache_key) - except BadZipFile: + except (BadZipFile, FileNotFoundError): pass - if self.zipfile != self.__original_zipfile and self.__original_zipfile: - self.__original_zipfile.delete(save=False) + if self.zipfile != self.__original_zipfile: + self.__original_zipfile.delete(save=False) return super(ProblemData, self).save(*args, **kwargs) def has_yml(self): diff --git a/judge/utils/problem_data.py b/judge/utils/problem_data.py index 954c213..023c0be 100644 --- a/judge/utils/problem_data.py +++ b/judge/utils/problem_data.py @@ -12,6 +12,8 @@ from django.urls import reverse from django.utils.translation import gettext as _ from django.core.cache import cache +from judge.logging import log_exception + if os.altsep: def split_path_first( @@ -323,11 +325,13 @@ def get_problem_case(problem, files): settings.DMOJ_PROBLEM_DATA_ROOT, str(problem.data_files.zipfile) ) if not os.path.exists(archive_path): - raise Exception('archive file "%s" does not exist' % archive_path) + log_exception('archive file "%s" does not exist' % archive_path) + return {} try: archive = zipfile.ZipFile(archive_path, "r") except zipfile.BadZipfile: - raise Exception('bad archive: "%s"' % archive_path) + log_exception('bad archive: "%s"' % archive_path) + return {} for file in uncached_files: cache_key = "problem_archive:%s:%s" % (problem.code, get_file_cachekey(file)) diff --git a/judge/views/problem_data.py b/judge/views/problem_data.py index 121d570..0525395 100644 --- a/judge/views/problem_data.py +++ b/judge/views/problem_data.py @@ -56,6 +56,7 @@ from judge.utils.fine_uploader import ( FineUploadForm, ) from judge.views.problem import ProblemMixin +from judge.logging import log_exception mimetypes.init() mimetypes.add_type("application/x-yaml", ".yml") @@ -249,6 +250,9 @@ class ProblemDataView(TitleMixin, ProblemManagerMixin): return ZipFile(data.zipfile.path).namelist() except BadZipfile: return [] + except FileNotFoundError as e: + log_exception(e) + return [] return [] def get_context_data(self, **kwargs): diff --git a/judge/views/submission.py b/judge/views/submission.py index 61982cf..26300b0 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -195,8 +195,8 @@ def get_cases_data(submission): continue count += 1 problem_data[count] = { - "input": case_data[case.input_file] if case.input_file else "", - "answer": case_data[case.output_file] if case.output_file else "", + "input": case_data.get(case.input_file, "") if case.input_file else "", + "answer": case_data.get(case.output_file, "") if case.output_file else "", } return problem_data From fcbf74ca97b7378015f87bf10dd67ec5be9b4f95 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 1 Nov 2023 02:08:36 -0500 Subject: [PATCH 42/51] Some css --- locale/vi/LC_MESSAGES/django.po | 100 ++++++++++++++++-------------- resources/blog.scss | 3 +- resources/comments.scss | 4 +- templates/actionbar/media-js.html | 2 +- templates/chat/chat_css.html | 14 ++++- templates/chat/chat_js.html | 2 +- 6 files changed, 70 insertions(+), 55 deletions(-) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index cca05b9..4b9e6d3 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: lqdoj2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-28 04:45+0700\n" +"POT-Creation-Date: 2023-11-01 13:59+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -2605,59 +2605,59 @@ msgstr "Chỉnh sửa bài nộp" msgid "Recalculating user points" msgstr "Tính lại điểm người dùng" -#: judge/utils/problem_data.py:71 +#: judge/utils/problem_data.py:73 msgid "Empty batches not allowed." msgstr "Nhóm test trống là không hợp lệ." -#: judge/utils/problem_data.py:79 judge/utils/problem_data.py:87 -#: judge/utils/problem_data.py:102 +#: judge/utils/problem_data.py:81 judge/utils/problem_data.py:89 +#: judge/utils/problem_data.py:104 msgid "How did you corrupt the custom checker path?" msgstr "How did you corrupt the custom checker path?" -#: judge/utils/problem_data.py:130 +#: judge/utils/problem_data.py:132 #, python-format msgid "Points must be defined for non-batch case #%d." msgstr "Ô điểm số cho test #%d phải được điền." -#: judge/utils/problem_data.py:137 +#: judge/utils/problem_data.py:139 #, python-format msgid "Input file for case %d does not exist: %s" msgstr "File input cho test %d không tồn tại: %s" -#: judge/utils/problem_data.py:142 +#: judge/utils/problem_data.py:144 #, python-format msgid "Output file for case %d does not exist: %s" msgstr "File output cho test %d không tồn tại: %s" -#: judge/utils/problem_data.py:169 +#: judge/utils/problem_data.py:171 #, python-format msgid "Batch start case #%d requires points." msgstr "Nhóm test #%d cần được điền điểm số." -#: judge/utils/problem_data.py:192 +#: judge/utils/problem_data.py:194 #, python-format msgid "Attempt to end batch outside of one in case #%d" msgstr "Nhóm test #%d kết thúc không hợp lệ" -#: judge/utils/problem_data.py:211 +#: judge/utils/problem_data.py:213 msgid "How did you corrupt the zip path?" msgstr "" -#: judge/utils/problem_data.py:217 +#: judge/utils/problem_data.py:219 msgid "How did you corrupt the generator path?" msgstr "" -#: judge/utils/problem_data.py:235 +#: judge/utils/problem_data.py:237 msgid "Invalid interactor judge" msgstr "" -#: judge/utils/problem_data.py:259 +#: judge/utils/problem_data.py:261 #, fuzzy #| msgid "Invalid Return" msgid "Invalid signature handler" msgstr "Invalid Return" -#: judge/utils/problem_data.py:262 +#: judge/utils/problem_data.py:264 msgid "Invalid signature header" msgstr "" @@ -2759,7 +2759,7 @@ msgid "Editing comment" msgstr "Chỉnh sửa bình luận" #: judge/views/contests.py:123 judge/views/contests.py:386 -#: judge/views/contests.py:391 judge/views/contests.py:683 +#: judge/views/contests.py:391 judge/views/contests.py:685 msgid "No such contest" msgstr "Không có contest nào như vậy" @@ -2785,118 +2785,118 @@ msgstr "Không tìm thấy kỳ thi nào như vậy." msgid "Access to contest \"%s\" denied" msgstr "Truy cập tới kỳ thi \"%s\" bị từ chối" -#: judge/views/contests.py:466 +#: judge/views/contests.py:468 msgid "Clone Contest" msgstr "Nhân bản kỳ thi" -#: judge/views/contests.py:557 +#: judge/views/contests.py:559 msgid "Contest not ongoing" msgstr "Kỳ thi đang không diễn ra" -#: judge/views/contests.py:558 +#: judge/views/contests.py:560 #, python-format msgid "\"%s\" is not currently ongoing." msgstr "\"%s\" kỳ thi đang không diễn ra." -#: judge/views/contests.py:565 +#: judge/views/contests.py:567 msgid "Already in contest" msgstr "Đã ở trong kỳ thi" -#: judge/views/contests.py:566 +#: judge/views/contests.py:568 #, python-format msgid "You are already in a contest: \"%s\"." msgstr "Bạn đã ở trong kỳ thi: \"%s\"." -#: judge/views/contests.py:576 +#: judge/views/contests.py:578 msgid "Banned from joining" msgstr "Bị cấm tham gia" -#: judge/views/contests.py:578 +#: judge/views/contests.py:580 msgid "" "You have been declared persona non grata for this contest. You are " "permanently barred from joining this contest." msgstr "Bạn không được phép tham gia kỳ thi này." -#: judge/views/contests.py:667 +#: judge/views/contests.py:669 #, python-format msgid "Enter access code for \"%s\"" msgstr "Nhập mật khẩu truy cập cho \"%s\"" -#: judge/views/contests.py:684 +#: judge/views/contests.py:686 #, python-format msgid "You are not in contest \"%s\"." msgstr "Bạn không ở trong kỳ thi \"%s\"." -#: judge/views/contests.py:707 +#: judge/views/contests.py:709 msgid "ContestCalendar requires integer year and month" msgstr "Lịch thi yêu cầu giá trị cho năm và tháng là số nguyên" -#: judge/views/contests.py:765 +#: judge/views/contests.py:767 #, python-format msgid "Contests in %(month)s" msgstr "Các kỳ thi trong %(month)s" -#: judge/views/contests.py:766 +#: judge/views/contests.py:768 msgid "F Y" msgstr "F Y" -#: judge/views/contests.py:826 +#: judge/views/contests.py:828 #, python-format msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1122 +#: judge/views/contests.py:1124 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1133 +#: judge/views/contests.py:1135 msgid "???" msgstr "???" -#: judge/views/contests.py:1160 +#: judge/views/contests.py:1162 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1161 +#: judge/views/contests.py:1163 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1175 +#: judge/views/contests.py:1177 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1194 templates/contest/contest-tabs.html:21 +#: judge/views/contests.py:1196 templates/contest/contest-tabs.html:21 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1243 +#: judge/views/contests.py:1245 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1279 +#: judge/views/contests.py:1281 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1302 +#: judge/views/contests.py:1304 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1317 judge/views/ticket.py:67 +#: judge/views/contests.py:1319 judge/views/ticket.py:67 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1360 +#: judge/views/contests.py:1362 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" -#: judge/views/contests.py:1466 +#: judge/views/contests.py:1468 #, fuzzy #| msgid "contest summary" msgid "Contests Summary" @@ -3251,39 +3251,39 @@ msgstr "Nộp bài cho %(problem)s" msgid "Clone Problem" msgstr "Nhân bản bài tập" -#: judge/views/problem_data.py:70 +#: judge/views/problem_data.py:71 msgid "Checker arguments must be a JSON object" msgstr "" -#: judge/views/problem_data.py:72 +#: judge/views/problem_data.py:73 msgid "Checker arguments is invalid JSON" msgstr "" -#: judge/views/problem_data.py:79 +#: judge/views/problem_data.py:80 msgid "Your zip file is invalid!" msgstr "File Zip không hợp lệ!" -#: judge/views/problem_data.py:169 +#: judge/views/problem_data.py:170 #, python-brace-format msgid "Comparing submissions for {0}" msgstr "So sánh các bài nộp cho {0}" -#: judge/views/problem_data.py:173 +#: judge/views/problem_data.py:174 #, python-brace-format msgid "Comparing submissions for {0}" msgstr "So sánh các bài nộp cho {0}" -#: judge/views/problem_data.py:210 +#: judge/views/problem_data.py:211 #, python-brace-format msgid "Editing data for {0}" msgstr "Chỉnh sửa dữ liệu cho {0}" -#: judge/views/problem_data.py:214 +#: judge/views/problem_data.py:215 #, python-format msgid "Editing data for %s" msgstr "Chỉnh sửa dữ liệu cho %s" -#: judge/views/problem_data.py:344 judge/views/problem_data.py:346 +#: judge/views/problem_data.py:348 judge/views/problem_data.py:350 #, python-format msgid "Generated init.yml for %s" msgstr "File init.yml cho %s" @@ -3596,6 +3596,10 @@ msgstr "Chia sẻ" msgid "Report" msgstr "Báo cáo" +#: templates/actionbar/media-js.html:116 +msgid "Copied link" +msgstr "Đã sao chép link" + #: templates/admin/judge/contest/change_form.html:9 msgid "Are you sure you want to rejudge ALL the submissions?" msgstr "Bạn có muốn chấm lại tất cả bài nộp?" diff --git a/resources/blog.scss b/resources/blog.scss index 4c57cfe..265ebb9 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -147,8 +147,9 @@ } } -.blog-box:hover { +.blog-box:hover, .blog-box:not(.pre-expand-blog) { border-color: #8a8a8a; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.1); } .blog-description { diff --git a/resources/comments.scss b/resources/comments.scss index 05ef84f..dd2fe50 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -269,10 +269,10 @@ a { .actionbar-button { cursor: pointer; padding: 0.8em; - border: 0.2px solid lightgray; border-radius: 5em; font-weight: bold; display: inherit; + background: lightgray; } .actionbar-block { display: flex; @@ -287,7 +287,7 @@ a { border-radius: 5em 0 0 5em; } .actionbar-button:hover { - background: lightgray; + background: darkgray; } .dislike-button { padding-left: 0.5em; diff --git a/templates/actionbar/media-js.html b/templates/actionbar/media-js.html index e4f281e..f1dec97 100644 --- a/templates/actionbar/media-js.html +++ b/templates/actionbar/media-js.html @@ -113,7 +113,7 @@ navigator.clipboard .writeText(link) .then(() => { - showTooltip(element, "Copied link", 'n'); + showTooltip(element, "{{_('Copied link')}}", 'n'); }); }; diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index a03d481..fa54ef8 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -10,7 +10,15 @@ } ::-webkit-scrollbar { - width: 20px; + width: 16px; + background-color: transparent !important; + } + + #chat-input::-webkit-scrollbar { + width: 22px; + } + #chat-input::-webkit-scrollbar-thumb { + border: 10px solid transparent; } ::-webkit-scrollbar-track { @@ -144,9 +152,11 @@ transition: box-shadow 0.3s ease-in-out; width: 80%; resize: none; - height: 80%; + height: 70%; max-height: 200px; overflow-y: auto; + margin-top: auto; + margin-bottom: 6px; } #chat-input:focus { box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); diff --git a/templates/chat/chat_js.html b/templates/chat/chat_js.html index 5c467f8..9d728a4 100644 --- a/templates/chat/chat_js.html +++ b/templates/chat/chat_js.html @@ -561,7 +561,7 @@ this.style.height = (this.scrollHeight) + 'px'; $(this).css('border-radius', '30px'); } else { - $(this).css('height', '80%'); + $(this).css('height', '70%'); } }); From df49a0e353db8892ee23af75665a2f1d9397ba6a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 1 Nov 2023 02:11:02 -0500 Subject: [PATCH 43/51] Update darkmode --- resources/darkmode.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/resources/darkmode.css b/resources/darkmode.css index f9a4884..c1839d7 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -1956,8 +1956,10 @@ input::placeholder { background-color: rgb(24, 26, 27); box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 5px; } -.blog-box:hover { +.blog-box:hover, +.blog-box:not(.pre-expand-blog) { border-color: rgb(81, 88, 91); + box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 2px; } .problem-feed-name a { color: rgb(102, 177, 250); @@ -2780,11 +2782,15 @@ a.voted { border-left-color: rgb(48, 52, 54); } .actionbar .actionbar-button { - border-color: rgb(60, 65, 68); + background-image: initial; + background-color: rgb(49, 53, 55); +} +.actionbar .actionbar-button a:hover { + color: inherit; } .actionbar .actionbar-button:hover { background-image: initial; - background-color: rgb(49, 53, 55); + background-color: rgb(73, 79, 82); } .actionbar .dislike-button { border-left-color: initial; From 58f3807b8d0de86f5fa902e4c5f04f7d1a48ebc9 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 1 Nov 2023 19:14:21 -0500 Subject: [PATCH 44/51] Try moving js to body end --- templates/base.html | 218 ++++++++++++++-------------- templates/chat/chat.html | 5 +- templates/chat/message_list.html | 6 +- templates/three-column-content.html | 6 +- 4 files changed, 120 insertions(+), 115 deletions(-) diff --git a/templates/base.html b/templates/base.html index f36cd30..be290a7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -75,112 +75,6 @@ {% endcompress %} {% endif %} - {% if not INLINE_JQUERY %} - - {% endif %} - - {% compress js %} - - {% if INLINE_JQUERY %} - - {% endif %} - - - - - - - {% include "extra_js.html" %} - - - - {% endcompress %} - - {% block js_media %}{% endblock %} - {% if request.in_contest %} - - {% endif %} - - {% if request.user.is_authenticated %} - - {% else %} - - {% endif %} - - {% if misc_config.analytics %} - {{ misc_config.analytics|safe }} - {% endif %} - - {# Don't run userscript since it may be malicious #} - {% if request.user.is_authenticated and request.profile.user_script and not request.user.is_impersonate %} - - {% endif %}