From 2259596ef760efc696953c52a6923b1ed877397a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 21 Jan 2023 12:51:45 -0600 Subject: [PATCH 01/83] Fix blog edit --- templates/blog/blog.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/blog/blog.html b/templates/blog/blog.html index 213a291..4b1abcd 100644 --- a/templates/blog/blog.html +++ b/templates/blog/blog.html @@ -29,8 +29,9 @@ {% trans time=post.publish_on|date(_("N j, Y, g:i a")) %} posted on {{ time }}{% endtrans %} {% if post.is_editable_by(request.user) %} - [{{ _('Edit') }}] - {% elif valid_user_to_show_edit %} + [{{ _('Edit') }}] + {% endif %} + {% if valid_user_to_show_edit %} {% for org in valid_org_to_show_edit %} [{{ _('Edit in') }} {{org.slug}}] {% endfor %} From dea24f7f71a6f7cd8e2f56b2150dc84be1a4c4d5 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sun, 22 Jan 2023 19:18:14 -0600 Subject: [PATCH 02/83] Fix editor bug --- resources/dmmd-preview.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/dmmd-preview.js b/resources/dmmd-preview.js index 4c16839..2450ea8 100644 --- a/resources/dmmd-preview.js +++ b/resources/dmmd-preview.js @@ -23,6 +23,12 @@ $(function () { csrfmiddlewaretoken: $.cookie('csrftoken') }, function (result) { $content.html(result); + $(".dmmd-preview-content [data-src]img").each(function() { + $(this).attr("src", $(this).attr("data-src")); + }) + $(".dmmd-preview-content [data-src]iframe").each(function() { + $(this).attr("src", $(this).attr("data-src")); + }) $preview.addClass('dmmd-preview-has-content').removeClass('dmmd-preview-stale'); var $jax = $content.find('.require-mathjax-support'); From 1628e63084c242a957b34e04e8861bbdc10f533d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 20:36:44 -0600 Subject: [PATCH 03/83] Initial subdomain implementation --- dmoj/settings.py | 1 + judge/middleware.py | 31 ++++++++++++++++ .../0145_alter_organization_slug.py | 36 +++++++++++++++++++ judge/models/comment.py | 5 ++- judge/models/profile.py | 11 ++++++ judge/views/blog.py | 18 ++++++++-- judge/views/contests.py | 12 +++++++ judge/views/organization.py | 33 +++++++---------- judge/views/problem.py | 22 ++++++++++-- judge/views/submission.py | 15 +++++++- judge/views/user.py | 10 +++--- templates/about/about.html | 8 ++++- templates/contest/contest.html | 11 ++++-- templates/organization/home.html | 9 ++++- templates/problem/left-sidebar.html | 4 ++- templates/problem/list-base.html | 8 +---- templates/site-logo-fragment.html | 6 ++-- 17 files changed, 194 insertions(+), 46 deletions(-) create mode 100644 judge/migrations/0145_alter_organization_slug.py diff --git a/dmoj/settings.py b/dmoj/settings.py index 076ab39..80f42bc 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -262,6 +262,7 @@ MIDDLEWARE = ( "judge.middleware.DMOJImpersonationMiddleware", "judge.middleware.ContestMiddleware", "judge.middleware.DarkModeMiddleware", + "judge.middleware.SubdomainMiddleware", "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware", "judge.social_auth.SocialAuthExceptionMiddleware", "django.contrib.redirects.middleware.RedirectFallbackMiddleware", diff --git a/judge/middleware.py b/judge/middleware.py index 940b486..cf2d37f 100644 --- a/judge/middleware.py +++ b/judge/middleware.py @@ -2,6 +2,10 @@ from django.conf import settings from django.http import HttpResponseRedirect from django.urls import Resolver404, resolve, reverse from django.utils.http import urlquote +from django.contrib.sites.shortcuts import get_current_site +from django.core.exceptions import ObjectDoesNotExist + +from judge.models import Organization class ShortCircuitMiddleware: @@ -82,3 +86,30 @@ class DarkModeMiddleware(object): reverse("toggle_darkmode") + "?next=" + urlquote(request.path) ) return self.get_response(request) + + +class SubdomainMiddleware(object): + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + domain = request.get_host() + site = get_current_site(request).domain + subdomain = domain[: len(domain) - len(site)] + request.organization = None + if len(subdomain) > 1: + subdomain = subdomain[:-1] + try: + organization = Organization.objects.get(slug=subdomain) + if ( + request.profile + and organization in request.profile.organizations.all() + ): + request.organization = organization + elif not request.GET.get("next", None): + return HttpResponseRedirect( + reverse("auth_login") + "?next=" + urlquote(request.path) + ) + except ObjectDoesNotExist: + pass + return self.get_response(request) diff --git a/judge/migrations/0145_alter_organization_slug.py b/judge/migrations/0145_alter_organization_slug.py new file mode 100644 index 0000000..1cadbe2 --- /dev/null +++ b/judge/migrations/0145_alter_organization_slug.py @@ -0,0 +1,36 @@ +# Generated by Django 3.2.16 on 2023-01-23 23:39 + +from django.db import migrations, models + + +def make_slug_unique(apps, schema_editor): + Organization = apps.get_model("judge", "Organization") + slugs = Organization.objects.values_list("slug", flat=True) + slugs = set([i.lower() for i in slugs]) + for slug in slugs: + orgs = Organization.objects.filter(slug=slug) + if len(orgs) > 1: + for org in orgs: + org.slug += "-" + str(org.id) + org.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0144_auto_20230103_0523"), + ] + + operations = [ + migrations.RunPython(make_slug_unique, migrations.RunPython.noop, atomic=True), + migrations.AlterField( + model_name="organization", + name="slug", + field=models.SlugField( + help_text="Organization name shown in URL", + max_length=128, + unique=True, + verbose_name="organization slug", + ), + ), + ] diff --git a/judge/models/comment.py b/judge/models/comment.py index 9361434..64a94db 100644 --- a/judge/models/comment.py +++ b/judge/models/comment.py @@ -71,7 +71,7 @@ class Comment(MPTTModel): order_insertion_by = ["-time"] @classmethod - def most_recent(cls, user, n, batch=None): + def most_recent(cls, user, n, batch=None, organization=None): queryset = ( cls.objects.filter(hidden=False) .select_related("author__user") @@ -79,6 +79,9 @@ class Comment(MPTTModel): .order_by("-id") ) + if organization: + queryset = queryset.filter(author__in=organization.members.all()) + problem_access = CacheDict( lambda code: Problem.objects.get(code=code).is_accessible_by(user) ) diff --git a/judge/models/profile.py b/judge/models/profile.py index c8704cd..d14f9b8 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -33,6 +33,7 @@ class Organization(models.Model): max_length=128, verbose_name=_("organization slug"), help_text=_("Organization name shown in URL"), + unique=True, ) short_name = models.CharField( max_length=20, @@ -339,6 +340,16 @@ class Profile(models.Model): ret.add(self.username) return ret + def can_edit_organization(self, org): + if not self.user.is_authenticated: + return False + profile_id = self.id + return ( + org.admins.filter(id=profile_id).exists() + or org.registrant_id == profile_id + or self.user.is_superuser + ) + class Meta: permissions = ( ("test_site", "Shows in-progress development stuff"), diff --git a/judge/views/blog.py b/judge/views/blog.py index 2bcc0a6..66e55a9 100644 --- a/judge/views/blog.py +++ b/judge/views/blog.py @@ -76,6 +76,10 @@ class FeedView(ListView): .filter(is_visible=True) .order_by("start_time") ) + if self.request.organization: + visible_contests = visible_contests.filter( + is_organization_private=True, organizations=self.request.organization + ) context["current_contests"] = visible_contests.filter( start_time__lte=now, end_time__gt=now @@ -84,10 +88,14 @@ class FeedView(ListView): context[ "recent_organizations" ] = OrganizationProfile.get_most_recent_organizations(self.request.profile) - context["top_rated"] = Profile.objects.filter(is_unlisted=False).order_by( + + profile_queryset = Profile.objects + if self.request.organization: + profile_queryset = self.request.organization.members + context["top_rated"] = profile_queryset.filter(is_unlisted=False).order_by( "-rating" )[:10] - context["top_scorer"] = Profile.objects.filter(is_unlisted=False).order_by( + context["top_scorer"] = profile_queryset.filter(is_unlisted=False).order_by( "-performance_points" )[:10] @@ -108,6 +116,8 @@ class PostList(FeedView, PageVoteListView, BookMarkListView): filter = Q(is_organization_private=False) if self.request.user.is_authenticated: filter |= Q(organizations__in=self.request.profile.organizations.all()) + if self.request.organization: + filter &= Q(organizations=self.request.organization) queryset = queryset.filter(filter) return queryset @@ -184,7 +194,9 @@ class CommentFeed(FeedView): paginate_by = 50 def get_queryset(self): - return Comment.most_recent(self.request.user, 1000) + return Comment.most_recent( + self.request.user, 1000, organization=self.request.organization + ) def get_context_data(self, **kwargs): context = super(CommentFeed, self).get_context_data(**kwargs) diff --git a/judge/views/contests.py b/judge/views/contests.py index 65a8b36..381dfc4 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -179,6 +179,8 @@ class ContestList( queryset = queryset.filter( Q(key__icontains=query) | Q(name__icontains=query) ) + if not self.org_query and self.request.organization: + self.org_query = [self.request.organization.id] if self.org_query: queryset = queryset.filter(organizations__in=self.org_query) @@ -404,6 +406,15 @@ class ContestDetail( def get_title(self): return self.object.name + def get_editable_organizations(self): + if not self.request.profile: + return [] + res = [] + for organization in self.object.organizations.all(): + if self.request.profile.can_edit_organization(organization): + res.append(organization) + return res + def get_context_data(self, **kwargs): context = super(ContestDetail, self).get_context_data(**kwargs) context["contest_problems"] = ( @@ -421,6 +432,7 @@ class ContestDetail( ) .add_i18n_name(self.request.LANGUAGE_CODE) ) + context["editable_organizations"] = self.get_editable_organizations() return context diff --git a/judge/views/organization.py b/judge/views/organization.py index dd3eee7..1ea810b 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -35,6 +35,7 @@ from django.views.generic.detail import ( SingleObjectTemplateResponseMixin, ) from django.core.paginator import Paginator +from django.contrib.sites.shortcuts import get_current_site from reversion import revisions from judge.forms import ( @@ -68,12 +69,13 @@ from judge.utils.views import ( DiggPaginatorMixin, ) from judge.utils.problems import user_attempted_ids, user_completed_ids -from judge.views.problem import ProblemList +from judge.views.problem import ProblemList, get_problems_in_organization from judge.views.contests import ContestList from judge.views.submission import AllSubmissions, SubmissionsListBase from judge.views.pagevote import PageVoteListView from judge.views.bookmark import BookMarkListView + __all__ = [ "OrganizationList", "OrganizationHome", @@ -96,14 +98,9 @@ class OrganizationBase(object): def can_edit_organization(self, org=None): if org is None: org = self.object - if not self.request.user.is_authenticated: - return False - profile_id = self.request.profile.id - return ( - org.admins.filter(id=profile_id).exists() - or org.registrant_id == profile_id - or self.request.user.is_superuser - ) + if self.request.profile: + return self.request.profile.can_edit_organization(org) + return False def is_member(self, org=None): if org is None: @@ -293,6 +290,9 @@ class OrganizationHome(OrganizationDetailView, PageVoteListView, BookMarkListVie def get_context_data(self, **kwargs): context = super(OrganizationHome, self).get_context_data(**kwargs) context["title"] = self.object.name + context["organization_subdomain"] = ( + self.object.slug + "." + get_current_site(self.request).domain + ) context["posts"], context["page_obj"] = self.get_posts_and_page_obj() context = self.add_pagevote_context_data(context, "posts") context = self.add_bookmark_context_data(context, "posts") @@ -378,6 +378,7 @@ class OrganizationUsers(QueryStringSortMixin, OrganizationDetailView): class OrganizationProblems(LoginRequiredMixin, MemberOrganizationMixin, ProblemList): template_name = "organization/problems.html" + filter_organization = True def get_queryset(self): self.org_query = [self.organization_id] @@ -387,17 +388,6 @@ class OrganizationProblems(LoginRequiredMixin, MemberOrganizationMixin, ProblemL self.setup_problem_list(request) return super().get(request, *args, **kwargs) - def get_latest_attempted_problems(self, limit=None): - if not self.profile: - return () - problems = set(self.get_queryset().values_list("code", flat=True)) - result = list(user_attempted_ids(self.profile).values()) - result = [i for i in result if i["code"] in problems] - result = sorted(result, key=lambda d: -d["last_submission"]) - if limit: - result = result[:limit] - return result - def get_completed_problems(self): return user_completed_ids(self.profile) if self.profile is not None else () @@ -478,10 +468,11 @@ class OrganizationSubmissions( return None def _get_queryset(self): + problems = get_problems_in_organization(self.request, self.organization) return ( super() ._get_entire_queryset() - .filter(contest_object__organizations=self.organization) + .filter(user__organizations=self.organization, problem__in=problems) ) def get_context_data(self, **kwargs): diff --git a/judge/views/problem.py b/judge/views/problem.py index 2b309a1..320113d 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -105,6 +105,14 @@ def get_contest_submission_count(problem, profile, virtual): ) +def get_problems_in_organization(request, organization): + problem_list = ProblemList(request=request) + problem_list.setup_problem_list(request) + problem_list.org_query = [organization.id] + problems = problem_list.get_normal_queryset() + return problems + + class ProblemMixin(object): model = Problem slug_url_kwarg = "problem" @@ -145,10 +153,13 @@ class SolvedProblemMixin(object): else: return user_attempted_ids(self.profile) if self.profile is not None else () - def get_latest_attempted_problems(self, limit=None): + def get_latest_attempted_problems(self, limit=None, queryset=None): if self.in_contest or not self.profile: return () result = list(user_attempted_ids(self.profile).values()) + if queryset: + queryset_ids = set([i.code for i in queryset]) + result = filter(lambda i: i["code"] in queryset_ids, result) result = sorted(result, key=lambda d: -d["last_submission"]) if limit: result = result[:limit] @@ -454,6 +465,7 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView default_desc = frozenset(("date", "points", "ac_rate", "user_count")) default_sort = "-date" first_page_href = None + filter_organization = False def get_paginator( self, queryset, per_page, orphans=0, allow_empty_first_page=True, **kwargs @@ -592,6 +604,8 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView user=self.profile, points=F("problem__points") ).values_list("problem__id", flat=True) ) + if not self.org_query and self.request.organization: + self.org_query = [self.request.organization.id] if self.org_query: self.org_query = self.get_org_query(self.org_query) queryset = queryset.filter( @@ -652,6 +666,8 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView def get_context_data(self, **kwargs): context = super(ProblemList, self).get_context_data(**kwargs) + if self.request.organization: + self.filter_organization = True context["hide_solved"] = 0 if self.in_contest else int(self.hide_solved) 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) @@ -676,7 +692,9 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView context["search_query"] = self.search_query context["completed_problem_ids"] = self.get_completed_problems() context["attempted_problems"] = self.get_attempted_problems() - context["last_attempted_problems"] = self.get_latest_attempted_problems(15) + context["last_attempted_problems"] = self.get_latest_attempted_problems( + 15, context["problems"] if self.filter_organization else None + ) context["page_type"] = "list" context.update(self.get_sort_paginate_context()) if not self.in_contest: diff --git a/judge/views/submission.py b/judge/views/submission.py index 8ae921b..9f30fb2 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -49,6 +49,7 @@ from judge.utils.raw_sql import join_sql_subquery, use_straight_join from judge.utils.views import DiggPaginatorMixin from judge.utils.views import TitleMixin from judge.utils.timedelta import nice_repr +from judge.views.problem import get_problems_in_organization MAX_NUMBER_OF_QUERY_SUBMISSIONS = 50000 @@ -414,6 +415,13 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): def _get_queryset(self): queryset = self._get_entire_queryset() if not self.in_contest: + if self.request.organization: + problems = get_problems_in_organization( + self.request, self.request.organization + ) + queryset = queryset.filter( + user__organizations=self.request.organization, problem__in=problems + ) join_sql_subquery( queryset, subquery=str( @@ -785,7 +793,12 @@ class AllSubmissions(SubmissionsListBase): return context def _get_result_data(self): - if self.in_contest or self.selected_languages or self.selected_statuses: + if ( + self.request.organization + or self.in_contest + or self.selected_languages + or self.selected_statuses + ): return super(AllSubmissions, self)._get_result_data() key = "global_submission_result_data" diff --git a/judge/views/user.py b/judge/views/user.py index bd0d34b..80f9add 100644 --- a/judge/views/user.py +++ b/judge/views/user.py @@ -454,7 +454,7 @@ class UserList(QueryStringSortMixin, DiggPaginatorMixin, TitleMixin, ListView): return ret def get_queryset(self): - ret = ( + queryset = ( Profile.objects.filter(is_unlisted=False) .order_by(self.order, "id") .select_related("user") @@ -467,11 +467,13 @@ class UserList(QueryStringSortMixin, DiggPaginatorMixin, TitleMixin, ListView): "problem_count", ) ) - + if self.request.organization: + queryset = queryset.filter(organizations=self.request.organization) if (self.request.GET.get("friend") == "true") and self.request.profile: - ret = self.filter_friend_queryset(ret) + queryset = self.filter_friend_queryset(queryset) self.filter_friend = True - return ret + + return queryset def get_context_data(self, **kwargs): context = super(UserList, self).get_context_data(**kwargs) diff --git a/templates/about/about.html b/templates/about/about.html index 1fc305e..9547ce1 100644 --- a/templates/about/about.html +++ b/templates/about/about.html @@ -1,6 +1,11 @@ {% extends "base.html" %} {% block body %} +{% if request.organization %} + {% cache 3600 'organization_html' request.organization.id MATH_ENGINE %} + {{ request.organization.about|markdown|reference|str|safe }} + {% endcache %} +{% else %}

LQDOJ (Le Quy Don Online Judge) là một trang web chấm bài tự động được phát triển dựa trên nền tảng mã nguồn mở DMOJ. Được xây dựng với mục đích ban đầu là tạo ra một môi trường học tập cho học sinh khối chuyên Tin trường THPT chuyên Lê Quý Đôn (TP Đà Nẵng), hiện nay LQDOJ đã cho phép đăng ký tự do để trở thành một sân chơi rộng mở cho toàn bộ cộng đồng học sinh yêu Tin học. Trang web cung cấp lượng bài luyện tập đồ sộ từ các kỳ thi HSG Quốc Gia, ACM ICPC, Olympic Duyên Hải Bắc Bộ, etc. cho đến các contest định kỳ để xếp loại khả năng (rating) giúp các bạn có thêm động lực cạnh tranh và khí thế phấn đấu rèn luyện nâng cao trình độ lập trình. Các bạn có thể tham khảo mã nguồn của trang web tại Github repo chính thức. Mọi ý kiến đóng góp và thắc mắc xin gửi về: -

+ +{% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/contest/contest.html b/templates/contest/contest.html index 79c4ce3..c2242c6 100644 --- a/templates/contest/contest.html +++ b/templates/contest/contest.html @@ -31,7 +31,7 @@ {# Allow users to leave the virtual contest #} {% if in_contest %}
+ class="contest-join-pseudotab btn-red"> {% csrf_token %}
@@ -77,12 +77,19 @@ {% endif %} - +
{% cache 3600 'contest_html' contest.id MATH_ENGINE %} {{ contest.description|markdown|reference|str|safe }} {% endcache %}
+ {% if editable_organizations %} +
+ {% for org in editable_organizations %} + [{{ _('Edit in') }} {{org.slug}}] + {% endfor %} +
+ {% endif %} {% if contest.ended or request.user.is_superuser or is_editor or is_tester %}
diff --git a/templates/organization/home.html b/templates/organization/home.html index 8a0d5e5..5d481b9 100644 --- a/templates/organization/home.html +++ b/templates/organization/home.html @@ -13,7 +13,14 @@ {% block middle_title %}
-

{{title}}

+

+ {{title}} +

+ {% if is_member %} + + {% endif %} {% if request.user.is_authenticated %} diff --git a/templates/problem/left-sidebar.html b/templates/problem/left-sidebar.html index 0083b41..97f5f7b 100644 --- a/templates/problem/left-sidebar.html +++ b/templates/problem/left-sidebar.html @@ -1,7 +1,9 @@ -{% if not request.in_contest_mode %} +{% if not show_contest_mode %}
{{ make_tab_item('feed', 'fa fa-pagelines', url('problem_feed'), _('Feed')) }} {{ make_tab_item('list', 'fa fa-list', url('problem_list'), _('List')) }} + {% if request.user.is_superuser %} {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }} + {% endif %}
{% endif %} \ No newline at end of file diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html index d6cee15..0e44083 100644 --- a/templates/problem/list-base.html +++ b/templates/problem/list-base.html @@ -248,13 +248,7 @@ {% endblock %} {% block left_sidebar %} - {% if not show_contest_mode %} -
- {{ make_tab_item('feed', 'fa fa-pagelines', url('problem_feed'), _('Feed')) }} - {{ make_tab_item('list', 'fa fa-list', url('problem_list'), _('List')) }} - {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }} -
- {% endif %} + {% include "problem/left-sidebar.html" %} {% endblock %} {% block right_sidebar %} diff --git a/templates/site-logo-fragment.html b/templates/site-logo-fragment.html index f2099fc..b6a7698 100644 --- a/templates/site-logo-fragment.html +++ b/templates/site-logo-fragment.html @@ -1,7 +1,9 @@ {% if request.in_contest_mode and request.participation.contest.logo_override_image %} - {{ SITE_NAME }} + {{ SITE_NAME }} +{% elif request.organization %} + {{ SITE_NAME }} {% elif logo_override_image is defined and logo_override_image %} - {{ SITE_NAME }} + {{ SITE_NAME }} {% else %} {{ SITE_NAME }} From dc243dc136d7394c7989318a2dc4ed160817c8d6 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 20:46:17 -0600 Subject: [PATCH 04/83] Fix a tag --- judge/views/organization.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index 1ea810b..af06ee4 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -290,8 +290,13 @@ class OrganizationHome(OrganizationDetailView, PageVoteListView, BookMarkListVie def get_context_data(self, **kwargs): context = super(OrganizationHome, self).get_context_data(**kwargs) context["title"] = self.object.name + http = "http" if settings.DMOJ_SSL == 0 else "https" context["organization_subdomain"] = ( - self.object.slug + "." + get_current_site(self.request).domain + http + + "://" + + self.object.slug + + "." + + get_current_site(self.request).domain ) context["posts"], context["page_obj"] = self.get_posts_and_page_obj() context = self.add_pagevote_context_data(context, "posts") From 22707304076689a92d3dba32128d1fad85f20ea6 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 20:55:07 -0600 Subject: [PATCH 05/83] Optimize a query --- judge/views/organization.py | 2 +- judge/views/submission.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index af06ee4..051fe7a 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -477,7 +477,7 @@ class OrganizationSubmissions( return ( super() ._get_entire_queryset() - .filter(user__organizations=self.organization, problem__in=problems) + .filter(user__in=self.organization.members.all(), problem__in=problems) ) def get_context_data(self, **kwargs): diff --git a/judge/views/submission.py b/judge/views/submission.py index 9f30fb2..e2a091b 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -420,7 +420,8 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): self.request, self.request.organization ) queryset = queryset.filter( - user__organizations=self.request.organization, problem__in=problems + user__in=self.request.organization.members.all(), + problem__in=problems, ) join_sql_subquery( queryset, From 15913e51f3a5dc98c73731ddb6261958d8bf0d86 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 21:00:11 -0600 Subject: [PATCH 06/83] Back to old query --- judge/views/organization.py | 5 ++--- judge/views/submission.py | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index 051fe7a..d36e7ab 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -69,7 +69,7 @@ from judge.utils.views import ( DiggPaginatorMixin, ) from judge.utils.problems import user_attempted_ids, user_completed_ids -from judge.views.problem import ProblemList, get_problems_in_organization +from judge.views.problem import ProblemList from judge.views.contests import ContestList from judge.views.submission import AllSubmissions, SubmissionsListBase from judge.views.pagevote import PageVoteListView @@ -473,11 +473,10 @@ class OrganizationSubmissions( return None def _get_queryset(self): - problems = get_problems_in_organization(self.request, self.organization) return ( super() ._get_entire_queryset() - .filter(user__in=self.organization.members.all(), problem__in=problems) + .filter(contest_object__organizations=self.organization) ) def get_context_data(self, **kwargs): diff --git a/judge/views/submission.py b/judge/views/submission.py index e2a091b..484d23e 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -49,7 +49,6 @@ from judge.utils.raw_sql import join_sql_subquery, use_straight_join from judge.utils.views import DiggPaginatorMixin from judge.utils.views import TitleMixin from judge.utils.timedelta import nice_repr -from judge.views.problem import get_problems_in_organization MAX_NUMBER_OF_QUERY_SUBMISSIONS = 50000 @@ -416,12 +415,8 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): queryset = self._get_entire_queryset() if not self.in_contest: if self.request.organization: - problems = get_problems_in_organization( - self.request, self.request.organization - ) queryset = queryset.filter( - user__in=self.request.organization.members.all(), - problem__in=problems, + contest_object__organizations=self.request.organization ) join_sql_subquery( queryset, From 3791d2e90f7cd10ea98607a8e5ab21d05c32b62c Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 23 Jan 2023 21:08:11 -0600 Subject: [PATCH 07/83] Fix subdomain login --- judge/middleware.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/judge/middleware.py b/judge/middleware.py index cf2d37f..f04b708 100644 --- a/judge/middleware.py +++ b/judge/middleware.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, Http404 from django.urls import Resolver404, resolve, reverse from django.utils.http import urlquote from django.contrib.sites.shortcuts import get_current_site @@ -106,10 +106,13 @@ class SubdomainMiddleware(object): and organization in request.profile.organizations.all() ): request.organization = organization - elif not request.GET.get("next", None): - return HttpResponseRedirect( - reverse("auth_login") + "?next=" + urlquote(request.path) - ) + else: + if request.profile: + raise Http404 + if not request.GET.get("next", None): + return HttpResponseRedirect( + reverse("auth_login") + "?next=" + urlquote(request.path) + ) except ObjectDoesNotExist: pass return self.get_response(request) From 08fae0d0dcd7a95fc5603ff1f396075ed5a78a35 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 25 Jan 2023 13:13:42 -0600 Subject: [PATCH 08/83] Add slug validator for org --- .../0146_alter_organization_slug.py | 29 +++++++++++++++++++ judge/models/profile.py | 3 ++ 2 files changed, 32 insertions(+) create mode 100644 judge/migrations/0146_alter_organization_slug.py diff --git a/judge/migrations/0146_alter_organization_slug.py b/judge/migrations/0146_alter_organization_slug.py new file mode 100644 index 0000000..dbd475d --- /dev/null +++ b/judge/migrations/0146_alter_organization_slug.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.16 on 2023-01-25 19:12 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0145_alter_organization_slug"), + ] + + operations = [ + migrations.AlterField( + model_name="organization", + name="slug", + field=models.SlugField( + help_text="Organization name shown in URL", + max_length=128, + unique=True, + validators=[ + django.core.validators.RegexValidator( + "^[-a-zA-Z0-9]+$", "Only alphanumeric and hyphens" + ) + ], + verbose_name="organization slug", + ), + ), + ] diff --git a/judge/models/profile.py b/judge/models/profile.py index d14f9b8..79b6ad8 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -34,6 +34,9 @@ class Organization(models.Model): verbose_name=_("organization slug"), help_text=_("Organization name shown in URL"), unique=True, + validators=[ + RegexValidator("^[-a-zA-Z0-9]+$", _("Only alphanumeric and hyphens")) + ], ) short_name = models.CharField( max_length=20, From 840209b2cbf5d0dc3cea978352101254067afc0d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 26 Jan 2023 11:53:24 -0600 Subject: [PATCH 09/83] Add comment count to actionbar --- templates/actionbar/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html index d5ae2b1..06d6e29 100644 --- a/templates/actionbar/list.html +++ b/templates/actionbar/list.html @@ -20,7 +20,7 @@ - {{_("Comment")}} + {{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif %} {% endif %} From 65eb49a840b547f88bc9b766f90db4fbe4068e28 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 27 Jan 2023 16:26:28 -0600 Subject: [PATCH 10/83] Fix ticket page --- resources/ticket.scss | 1 + templates/ticket/ticket.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/ticket.scss b/resources/ticket.scss index bba44a7..d7f9143 100644 --- a/resources/ticket.scss +++ b/resources/ticket.scss @@ -1,4 +1,5 @@ .ticket-container { + display: flex; #content > h2:first-child small { color: #999; font-size: 0.9em; diff --git a/templates/ticket/ticket.html b/templates/ticket/ticket.html index 4fec301..0ba7a21 100644 --- a/templates/ticket/ticket.html +++ b/templates/ticket/ticket.html @@ -144,10 +144,10 @@ {% endblock %} {% block content_title %} -
+ -
-
{{ ticket.title }}
#{{ ticket.id }} + + {{ ticket.title }}#{{ ticket.id }} {% endblock %} {% block body %} From 9a208ca1087885348f062377213709b34a48dde5 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 27 Jan 2023 16:52:35 -0600 Subject: [PATCH 11/83] Fix submission page bug in subdomain --- judge/middleware.py | 3 ++- judge/views/submission.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/judge/middleware.py b/judge/middleware.py index f04b708..73fb2c9 100644 --- a/judge/middleware.py +++ b/judge/middleware.py @@ -114,5 +114,6 @@ class SubdomainMiddleware(object): reverse("auth_login") + "?next=" + urlquote(request.path) ) except ObjectDoesNotExist: - pass + scheme = "https" if settings.DMOJ_SSL > 0 else "http" + return HttpResponseRedirect(scheme + "://" + site) return self.get_response(request) diff --git a/judge/views/submission.py b/judge/views/submission.py index 484d23e..e8e6489 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -783,7 +783,10 @@ class AllSubmissions(SubmissionsListBase): def get_context_data(self, **kwargs): context = super(AllSubmissions, self).get_context_data(**kwargs) - context["dynamic_update"] = context["page_obj"].number == 1 + print(self.request.organization) + context["dynamic_update"] = ( + context["page_obj"].number == 1 + ) and not self.request.organization context["last_msg"] = event.last() context["stats_update_interval"] = self.stats_update_interval return context From 52f1e77fe10d6ec27209c93aee2fdc5f26981174 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 27 Jan 2023 17:11:10 -0600 Subject: [PATCH 12/83] Reformat html files --- .pre-commit-config.yaml | 9 + requirements.txt | 3 +- templates/about/about.html | 14 +- templates/about/custom-checker-sample.html | 318 ++--- templates/actionbar/list.html | 70 +- templates/actionbar/media-css.html | 8 +- templates/actionbar/media-js.html | 242 ++-- templates/admin/auth/user/change_form.html | 24 +- .../admin/judge/contest/change_form.html | 30 +- .../admin/judge/contest/change_list.html | 16 +- templates/admin/judge/judge/change_form.html | 36 +- .../admin/judge/problem/change_form.html | 34 +- .../admin/judge/profile/change_form.html | 24 +- .../admin/judge/submission/change_form.html | 24 +- templates/base.html | 538 ++++----- templates/blog/blog.html | 74 +- templates/blog/content.html | 94 +- templates/blog/dashboard.html | 62 +- templates/blog/list.html | 194 +-- templates/blog/media-css.html | 48 +- templates/chat/chat.html | 1020 ++++++++-------- templates/chat/chat_css.html | 244 ++-- templates/chat/message.html | 54 +- templates/chat/message_list.html | 10 +- templates/chat/online_status.html | 72 +- templates/chat/user_online_status.html | 44 +- templates/comments/edit-ajax.html | 24 +- templates/comments/edit.html | 10 +- templates/comments/feed.html | 34 +- templates/comments/list.html | 318 ++--- templates/comments/math.html | 2 +- templates/comments/media-css.html | 2 +- templates/comments/media-js.html | 450 +++---- templates/comments/preview.html | 2 +- templates/comments/revision-ajax.html | 2 +- templates/comments/votes.html | 20 +- templates/common-content.html | 130 +- templates/contest/access_code.html | 52 +- templates/contest/calendar.html | 96 +- templates/contest/clarification.html | 80 +- templates/contest/clone.html | 62 +- templates/contest/contest-datetime.html | 104 +- templates/contest/contest-list-tabs.html | 6 +- templates/contest/contest-tabs.html | 64 +- templates/contest/contest.html | 238 ++-- templates/contest/list.html | 724 +++++------ templates/contest/media-js.html | 378 +++--- templates/contest/moss.html | 142 +-- templates/contest/preview.html | 2 +- templates/contest/private.html | 28 +- templates/contest/ranking-css.html | 204 ++-- templates/contest/ranking-table.html | 104 +- templates/contest/ranking.html | 270 ++--- templates/contest/stats.html | 126 +- templates/contest/tag-ajax.html | 6 +- templates/contest/tag-title.html | 12 +- templates/contest/tag.html | 4 +- templates/contests-countdown.html | 70 +- templates/error.html | 48 +- templates/fine_uploader/script.html | 58 +- templates/flatpages/admin_link.html | 6 +- templates/flatpages/default.html | 6 +- templates/flatpages/markdown.html | 4 +- templates/flatpages/markdown_math.html | 4 +- templates/generic-message.html | 2 +- templates/home.html | 36 +- templates/internal/base.html | 182 +-- templates/license.html | 14 +- templates/list-pages.html | 48 +- templates/messages.html | 10 +- templates/notification/list.html | 52 +- templates/organization/add-member.html | 18 +- templates/organization/add.html | 36 +- templates/organization/blog/add.html | 26 +- templates/organization/blog/edit.html | 44 +- templates/organization/blog/pending.html | 54 +- templates/organization/contest/add.html | 74 +- templates/organization/contest/edit.html | 174 +-- templates/organization/contests.html | 6 +- templates/organization/edit.html | 46 +- templates/organization/form.html | 42 +- templates/organization/home-base.html | 42 +- templates/organization/home-js.html | 44 +- templates/organization/home.html | 92 +- templates/organization/list.html | 68 +- templates/organization/new.html | 10 +- templates/organization/org-left-sidebar.html | 26 +- templates/organization/org-right-sidebar.html | 164 +-- templates/organization/preview.html | 2 +- templates/organization/problems.html | 6 +- templates/organization/requests/detail.html | 44 +- templates/organization/requests/log.html | 50 +- templates/organization/requests/pending.html | 82 +- templates/organization/requests/request.html | 30 +- templates/organization/requests/tabs.html | 28 +- templates/organization/submissions.html | 6 +- templates/organization/users-table.html | 24 +- templates/organization/users.html | 68 +- templates/pagedown.html | 60 +- templates/pagedown/widgets/default.html | 14 +- templates/problem/clone.html | 62 +- templates/problem/data.html | 1070 ++++++++--------- templates/problem/editorial.html | 56 +- templates/problem/feed.html | 280 ++--- templates/problem/left-sidebar.html | 16 +- templates/problem/list-base.html | 520 ++++---- templates/problem/list.html | 334 ++--- templates/problem/manage_submission.html | 316 ++--- templates/problem/preview.html | 2 +- templates/problem/problem-list-tabs.html | 8 +- templates/problem/problem.html | 760 ++++++------ templates/problem/raw.html | 146 +-- templates/problem/recent-attempt.html | 42 +- templates/problem/search-form.html | 208 ++-- templates/problem/submission-diff.html | 164 +-- templates/problem/submit.html | 426 +++---- templates/problem/yaml.html | 32 +- templates/recent-organization.html | 44 +- templates/registration/activate.html | 2 +- .../registration/activation_complete.html | 2 +- templates/registration/activation_email.html | 10 +- templates/registration/login.html | 92 +- templates/registration/logout.html | 2 +- .../registration/password_change_done.html | 2 +- .../registration/password_change_form.html | 12 +- templates/registration/password_reset.html | 10 +- .../registration/password_reset_complete.html | 4 +- .../registration/password_reset_confirm.html | 20 +- .../registration/password_reset_done.html | 4 +- .../registration/password_reset_email.html | 28 +- templates/registration/profile_creation.html | 82 +- .../registration/registration_closed.html | 2 +- .../registration/registration_complete.html | 2 +- templates/registration/registration_form.html | 190 +-- templates/registration/totp_auth.html | 64 +- templates/registration/totp_disable.html | 80 +- templates/registration/totp_enable.html | 144 +-- templates/registration/username_select.html | 10 +- templates/resolver/media-js.html | 840 ++++++------- templates/resolver/resolver.html | 24 +- templates/runtime-version-fragment.html | 16 +- templates/site-logo-fragment.html | 10 +- templates/solution-preview.html | 2 +- templates/stats/base.html | 10 +- templates/stats/language.html | 64 +- templates/stats/media-js.html | 204 ++-- templates/stats/site.html | 130 +- templates/stats/tab.html | 10 +- templates/status/judge-status-table.html | 120 +- templates/status/judge-status.html | 16 +- templates/status/language-list.html | 88 +- templates/status/media-css.html | 20 +- templates/status/media-js.html | 104 +- templates/status/status-tabs.html | 6 +- templates/status/versions.html | 64 +- templates/submission/info-base.html | 22 +- .../submission/internal-error-message.html | 26 +- templates/submission/list.html | 722 +++++------ templates/submission/row.html | 154 +-- templates/submission/source.html | 108 +- templates/submission/status-testcases.html | 342 +++--- templates/submission/status.html | 332 ++--- .../submission/submission-list-tabs.html | 26 +- templates/submission/user-ajax.html | 144 +-- templates/tabs-base.html | 26 +- templates/task_status.html | 146 +-- templates/three-column-content.html | 262 ++-- templates/ticket/edit-notes.html | 6 +- templates/ticket/feed.html | 48 +- templates/ticket/list.html | 496 ++++---- templates/ticket/message.html | 38 +- templates/ticket/new.html | 58 +- templates/ticket/new_problem.html | 16 +- templates/ticket/preview.html | 2 +- templates/ticket/row.html | 10 +- templates/ticket/ticket.html | 424 +++---- templates/time-remaining-fragment.html | 2 +- templates/timezone/media-css.html | 46 +- templates/timezone/media-js.html | 84 +- templates/top-users.html | 72 +- templates/two-column-content.html | 34 +- templates/user/base-users-js.html | 118 +- templates/user/base-users-table.html | 34 +- templates/user/base-users-two-col.html | 72 +- templates/user/edit-profile.html | 292 ++--- templates/user/import/index.html | 170 +-- templates/user/import/table_csv.html | 36 +- templates/user/link-list.html | 2 +- templates/user/list.html | 34 +- templates/user/pp-row.html | 46 +- templates/user/pp-table-body.html | 2 +- templates/user/preview.html | 2 +- templates/user/rating.html | 30 +- templates/user/user-about.html | 990 +++++++-------- templates/user/user-base.html | 236 ++-- templates/user/user-bookmarks.html | 156 +-- templates/user/user-left-sidebar.html | 14 +- templates/user/user-list-tabs.html | 12 +- templates/user/user-problems.html | 204 ++-- templates/user/user-tabs.html | 28 +- templates/user/users-table.html | 58 +- templates/widgets/datetimepicker.html | 40 +- templates/widgets/fine_uploader.html | 2 +- templates/widgets/relative-time.html | 8 +- templates/widgets/select_all.html | 52 +- 205 files changed, 11096 insertions(+), 11086 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..a46ebba --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,9 @@ +repos: + - repo: https://github.com/rtts/djhtml + rev: 'main' # replace with the latest tag on GitHub + hooks: + - id: djhtml + entry: djhtml -i -t 2 + files: templates/. + - id: djcss + types: [scss] diff --git a/requirements.txt b/requirements.txt index 5000705..82f5384 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,4 +41,5 @@ markdown bleach pymdown-extensions mdx-breakless-lists -beautifulsoup4 \ No newline at end of file +beautifulsoup4 +pre-commit \ No newline at end of file diff --git a/templates/about/about.html b/templates/about/about.html index 9547ce1..7924c6e 100644 --- a/templates/about/about.html +++ b/templates/about/about.html @@ -1,19 +1,19 @@ {% extends "base.html" %} {% block body %} -{% if request.organization %} + {% if request.organization %} {% cache 3600 'organization_html' request.organization.id MATH_ENGINE %} - {{ request.organization.about|markdown|reference|str|safe }} + {{ request.organization.about|markdown|reference|str|safe }} {% endcache %} -{% else %} + {% else %}

- LQDOJ (Le Quy Don Online Judge) là một trang web chấm bài tự động được phát triển dựa trên nền tảng mã nguồn mở DMOJ. Được xây dựng với mục đích ban đầu là tạo ra một môi trường học tập cho học sinh khối chuyên Tin trường THPT chuyên Lê Quý Đôn (TP Đà Nẵng), hiện nay LQDOJ đã cho phép đăng ký tự do để trở thành một sân chơi rộng mở cho toàn bộ cộng đồng học sinh yêu Tin học. Trang web cung cấp lượng bài luyện tập đồ sộ từ các kỳ thi HSG Quốc Gia, ACM ICPC, Olympic Duyên Hải Bắc Bộ, etc. cho đến các contest định kỳ để xếp loại khả năng (rating) giúp các bạn có thêm động lực cạnh tranh và khí thế phấn đấu rèn luyện nâng cao trình độ lập trình. Các bạn có thể tham khảo mã nguồn của trang web tại Github repo chính thức. Mọi ý kiến đóng góp và thắc mắc xin gửi về: -

-{% endif %} + {% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/about/custom-checker-sample.html b/templates/about/custom-checker-sample.html index 486e8bd..b6497df 100644 --- a/templates/about/custom-checker-sample.html +++ b/templates/about/custom-checker-sample.html @@ -1,62 +1,62 @@ {% extends "common-content.html" %} {% block description %} - -
-

1. Custom checker (PY)

-
-

- Đây là checker mặc định của website, cho phép người dùng cập nhật được nhiều thông tin nhất (chi tiết xem ở bên dưới). Chúng ta cần hoàn thành hàm check dưới đây: -

+ +
+

1. Custom checker (PY)

+
+

+ Đây là checker mặc định của website, cho phép người dùng cập nhật được nhiều thông tin nhất (chi tiết xem ở bên dưới). Chúng ta cần hoàn thành hàm check dưới đây: +

-{{ -""" -def check(process_output, judge_output, **kwargs): + {{ + """ + def check(process_output, judge_output, **kwargs): # return True/False -"""|highlight('py')}} - -

- Trong đó, **kwargs có thể chứa các biến sau: -

-
    -
  • process_output: output
    • -
  • judge_output: đáp án
    • -
  • submission_source: Code bài nộp
    • -
  • judge_input: input
    • -
  • point_value: điểm của test đang chấm
    • -
  • case_position: thứ tự của test
    • -
  • submission_language: ngôn ngữ của bài nộp
    • -
  • execution_time: thời gian chạy
    • -
-

Return:

-
    -
  • Cách 1: Trả về True/False
    • -
  • Cách 2: Trả về một object CheckerResult có thể được gọi như sau 
    CheckerResult(case_passed_bool, points_awarded, feedback='')
    • -
+ """|highlight('py')}} -

Ví dụ:

-

Dưới đây là ví dụ cho bài toán: Input gồm 1 số nguyên n. In ra 2 số nguyên a, b sao cho a + b = n. -

-{{ -""" -from dmoj.result import CheckerResult +

+ Trong đó, **kwargs có thể chứa các biến sau: +

+
    +
  • process_output: output
    • +
  • judge_output: đáp án
    • +
  • submission_source: Code bài nộp
    • +
  • judge_input: input
    • +
  • point_value: điểm của test đang chấm
    • +
  • case_position: thứ tự của test
    • +
  • submission_language: ngôn ngữ của bài nộp
    • +
  • execution_time: thời gian chạy
    • +
+

Return:

+
    +
  • Cách 1: Trả về True/False
    • +
  • Cách 2: Trả về một object CheckerResult có thể được gọi như sau 
    CheckerResult(case_passed_bool, points_awarded, feedback='')
    • +
+ +

Ví dụ:

+

Dưới đây là ví dụ cho bài toán: Input gồm 1 số nguyên n. In ra 2 số nguyên a, b sao cho a + b = n. +

+ {{ + """ + from dmoj.result import CheckerResult -def wa(feedback): + def wa(feedback): return CheckerResult(False, 0, feedback) -def check(process_output, judge_output, judge_input, **kwargs): + def check(process_output, judge_output, judge_input, **kwargs): # process the input input_arr = judge_input.split() assert(len(input_arr) == 1) @@ -66,143 +66,143 @@ def check(process_output, judge_output, judge_input, **kwargs): output_arr = process_output.split() if (len(output_arr) != 2): - return wa('Wrong output format') + return wa('Wrong output format') try: - a, b = int(output_arr[0]), int(output_arr[1]) + a, b = int(output_arr[0]), int(output_arr[1]) except: - return wa('Wrong output format') + return wa('Wrong output format') if (n == a + b): - return True + return True return wa('a + b != n') -"""| highlight('py')}} -
-
-

2. Custom validator (CPP)

-
-

- Để sử dụng chức năng này, cần viết một chương trình C++ pass vào 3 arguments theo thứ tự input_file, output_file, ans_file tương ứng với các file input, output, đáp án. -

-

- Để test chương trình trên máy tính, có thể dùng lệnh như sau (Windows): - 

+    """| highlight('py')}}
+
+
+

2. Custom validator (CPP)

+
+

+ Để sử dụng chức năng này, cần viết một chương trình C++ pass vào 3 arguments theo thứ tự input_file, output_file, ans_file tương ứng với các file input, output, đáp án. +

+

+ Để test chương trình trên máy tính, có thể dùng lệnh như sau (Windows): + 

 main.exe [input_file] [output_file] [ans_file]
- hoặc thay bằng ./main trên Linux/MacOS. -

-

Return:

-

- Chương trình trả về giá trị: -

    -
  • 0 nếu AC (100% điểm)
    • -
  • 1 nếu WA (0 điểm)
    • -
  • 2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC.
    • -
- Những thông tin được viết ra stdout (bằng cout) sẽ được in ra màn hình cho người nộp bài(feedback) -

+ hoặc thay bằng ./main trên Linux/MacOS. +

+

Return:

+

+ Chương trình trả về giá trị: +

    +
  • 0 nếu AC (100% điểm)
    • +
  • 1 nếu WA (0 điểm)
    • +
  • 2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC.
    • +
+ Những thông tin được viết ra stdout (bằng cout) sẽ được in ra màn hình cho người nộp bài(feedback) +

-

Ví dụ:

-

Chương trình sau dùng để chấm bài toán: Cho n là một số nguyên dương. In ra hai số tự nhiên a, b sao cho a + b = n.

-

Nếu in ra a + b = n và a, b >= 0 thì được 100% số điểm, nếu a + b = n nhưng một trong 2 số a, b âm thì được 50% số điểm.

-{{ -""" -#include -using namespace std; +

Ví dụ:

+

Chương trình sau dùng để chấm bài toán: Cho n là một số nguyên dương. In ra hai số tự nhiên a, b sao cho a + b = n.

+

Nếu in ra a + b = n và a, b >= 0 thì được 100% số điểm, nếu a + b = n nhưng một trong 2 số a, b âm thì được 50% số điểm.

+ {{ + """ + #include + using namespace std; -int main(int argc, char** argv) { - ifstream inp(argv[1]); - ifstream out(argv[2]); - ifstream ans(argv[3]); + int main(int argc, char** argv) { + ifstream inp(argv[1]); + ifstream out(argv[2]); + ifstream ans(argv[3]); - int n, a, b, c, d; - - inp >> n; - out >> a >> b; - ans >> c >> d; + int n, a, b, c, d; - if (a + b == c + d) { - cout << a << \" + \" << b << \" = \" << c << \" + \" << d << endl; - - if (a >= 0 && b >= 0) { - return 0; // AC - } - else { - cerr << 0.5; - return 2; // PARTIAL - } - } - else { - cout << \"a + b = \" << a + b << \" != \" << n << endl; - return 1; // WA - } -} -""" | highlight('cpp')}} + inp >> n; + out >> a >> b; + ans >> c >> d; + + if (a + b == c + d) { + cout << a << \" + \" << b << \" = \" << c << \" + \" << d << endl; + + if (a >= 0 && b >= 0) { + return 0; // AC + } + else { + cerr << 0.5; + return 2; // PARTIAL + } + } + else { + cout << \"a + b = \" << a + b << \" != \" << n << endl; + return 1; // WA + } + } + """ | highlight('cpp')}}
-

3. Interactive (CPP)

-
-

+

3. Interactive (CPP)

+
+

Để sử dụng chức năng này, cần viết một chương trình C++ pass vào 2 arguments input_file answer_file tương ứng file input và đáp án (nếu cần thiết). -

-

- Để test chương trình trên máy tính với tư cách thí sinh, có thể dùng lệnh như sau (Windows): - 

+      

+      

+        Để test chương trình trên máy tính với tư cách thí sinh, có thể dùng lệnh như sau (Windows):
+        
 main.exe [input_file] [answer_file]
 
-            hoặc thay bằng ./main trên Linux/MacOS.
-        

-        
Return: 

-        

-            Chương trình trả về giá trị:
-            
    
-                
  •  0 nếu AC (100% điểm)
    • 
-                
  •  1 nếu WA (0 điểm)
    • 
-                
  •  2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC. 
    • 
-            

-            Thông tin được in ra trong stderr (bằng cerr) sẽ là feedback hiển thị cho người dùng.
-        

+        hoặc thay bằng ./main trên Linux/MacOS.
+      

+      
Return: 

+      

+        Chương trình trả về giá trị:
+        
    
+          
  •  0 nếu AC (100% điểm)
    • 
+          
  •  1 nếu WA (0 điểm)
    • 
+          
  •  2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC. 
    • 
+        

+        Thông tin được in ra trong stderr (bằng cerr) sẽ là feedback hiển thị cho người dùng.
+      

 
-        
Ví dụ: 

-        
Chương trình sau dùng để chấm bài toán guessgame: Người chơi phải tìm 1 số bí mật n (n chứa trong file input). Mỗi lần họ được hỏi một số x, và chương trình sẽ trả về "SMALLER", "BIGGER" hoặc "HOLA" dựa trên giá trị của n và x. Cần tìm ra n sau không quá 31 câu hỏi. 

-{{
-"""
-#include 
-using namespace std;
+      
Ví dụ: 

+      
Chương trình sau dùng để chấm bài toán guessgame: Người chơi phải tìm 1 số bí mật n (n chứa trong file input). Mỗi lần họ được hỏi một số x, và chương trình sẽ trả về "SMALLER", "BIGGER" hoặc "HOLA" dựa trên giá trị của n và x. Cần tìm ra n sau không quá 31 câu hỏi. 

+      {{
+      """
+      #include 
+        using namespace std;
 
-void quit(string reason) {
-    cerr << reason << endl;
-    exit(1);
-}
+        void quit(string reason) {
+        cerr << reason << endl;
+        exit(1);
+        }
 
-void read(long long& guess) {
-    if (!(cin >> guess)) exit(1); // Nếu không có dòng này, chương trình sẽ chờ vô hạn
-    if (guess < 1 || guess > 2e9) exit(1);
-}
+        void read(long long& guess) {
+        if (!(cin >> guess)) exit(1); // Nếu không có dòng này, chương trình sẽ chờ vô hạn
+        if (guess < 1 || guess > 2e9) exit(1);
+        }
 
-int main(int argc, char *argv[]) {
-    ifstream inp(argv[1]);
-    int N, guesses = 0;
-    long long guess;
-    inp >> N;
+        int main(int argc, char *argv[]) {
+        ifstream inp(argv[1]);
+        int N, guesses = 0;
+        long long guess;
+        inp >> N;
 
-    while (guess != N && guesses <= 31) {
+        while (guess != N && guesses <= 31) {
         read(guess);
         if (guess == N) {
-            cout << \"HOLA\" << endl;
+        cout << \"HOLA\" << endl;
         } else if (guess > N) {
-            cout << \"SMALLER\" << endl;
+        cout << \"SMALLER\" << endl;
         } else {
-            cout << \"BIGGER\" << endl;
+        cout << \"BIGGER\" << endl;
         }
         guesses++;
-    }
-    cerr << \"Number of used guesses: \" << guesses << endl;
-    if (guesses <= 31)
+        }
+        cerr << \"Number of used guesses: \" << guesses << endl;
+        if (guesses <= 31)
         return 0; // AC
-    else {
+        else {
         cerr << \"Used too many guesses\" << endl;
         return 1; // WA
-    }
-}
-""" | highlight('cpp')}}
-
+ } + } + """ | highlight('cpp')}} +
{% endblock %} \ No newline at end of file diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html index 06d6e29..24d07dc 100644 --- a/templates/actionbar/list.html +++ b/templates/actionbar/list.html @@ -1,51 +1,51 @@ {% set logged_in = request.user.is_authenticated %} {% set profile = request.profile if logged_in else None %} {% if logged_in %} -{% if include_hr %}
{% endif %} -
+ {% if include_hr %}
{% endif %} +
- - - - + + + + {% if not hide_actionbar_comment %} - + - - {{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif %} + + {{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif %} - + {% endif %} - - - {{_("Bookmark")}} - + + + {{_("Bookmark")}} + - - - {{_("Share")}} - + + + {{_("Share")}} + {% if actionbar_report_url %} - - - - {{_("Report")}} - - + + + + {{_("Report")}} + + {% endif %} -
+
{% endif %} \ No newline at end of file diff --git a/templates/actionbar/media-css.html b/templates/actionbar/media-css.html index 7e56f59..0ad2a51 100644 --- a/templates/actionbar/media-css.html +++ b/templates/actionbar/media-css.html @@ -1,7 +1,7 @@ diff --git a/templates/actionbar/media-js.html b/templates/actionbar/media-js.html index 1e3b083..78397e4 100644 --- a/templates/actionbar/media-js.html +++ b/templates/actionbar/media-js.html @@ -1,124 +1,124 @@ {% compress js %} - + } + + function ajax_bookmark(url, id, on_success) { + return $.ajax({ + url: url, + type: 'POST', + data: { + id: id + }, + success: function (data, textStatus, jqXHR) { + if (typeof on_success !== 'undefined') + on_success(); + }, + error: function (data, textStatus, jqXHR) { + alert('Could not bookmark: ' + data.responseText); + } + }); + } + + window.bookmark = function(id) { + var $bookmark = $('#bookmark-button-' + id); + if ($bookmark.hasClass('bookmarked')) { + ajax_bookmark('{{ url('undobookmark') }}', id, function () { + $bookmark.removeClass('bookmarked'); + }); + } else { + ajax_bookmark('{{ url('dobookmark') }}', id, function () { + if ($bookmark.hasClass('bookmarked')) + $bookmark.removeClass('bookmarked'); + $bookmark.addClass('bookmarked'); + }); + } + } + + + var get_$votes = function (id) { + var $post = $('#page-vote-' + id); + return { + upvote: $('#like-button-' + id), + downvote: $('#dislike-button-' + id), + }; + }; + + window.pagevote_upvote = function (id) { + var $votes = get_$votes(id); + if ($votes.upvote.hasClass('voted')) { + ajax_vote('{{ url('pagevote_downvote') }}', id, -1, function () { + $votes.upvote.removeClass('voted'); + }); + } + else { + var delta = 1; + if ($votes.downvote.hasClass('voted')) { + delta = 2; + } + for (let i = 0; i < delta; i++) { + ajax_vote('{{ url('pagevote_upvote') }}', id, 1, function () { + if ($votes.downvote.hasClass('voted')) + $votes.downvote.removeClass('voted'); + $votes.upvote.addClass('voted'); + }); + } + } + }; + + window.pagevote_downvote = function (id) { + var $votes = get_$votes(id); + if ($votes.downvote.hasClass('voted')) { + ajax_vote('{{ url('pagevote_upvote') }}', id, 1, function () { + $votes.downvote.removeClass('voted'); + }); + } + else { + var delta = -1; + if ($votes.upvote.hasClass('voted')) { + delta = -2; + } + for (let i = 0; i > delta; i--) { + ajax_vote('{{ url('pagevote_downvote') }}', id, -1, function () { + if ($votes.upvote.hasClass('voted')) + $votes.upvote.removeClass('voted'); + $votes.downvote.addClass('voted'); + }); + } + } + }; + $(".actionbar-share").click( function() { + link = $(this).attr("share-url") || window.location.href; + navigator.clipboard + .writeText(link) + .then(() => { + showTooltip(this, "Copied link", 'n'); + }); + }); + + $('.actionbar-comment').on('click', function() { + if ($('#comment-announcement').length) { + $('#comment-announcement').click(); + } + $('#write-comment').click(); + }) + }); + {% endcompress %} \ No newline at end of file diff --git a/templates/admin/auth/user/change_form.html b/templates/admin/auth/user/change_form.html index 207ab84..d5e581e 100644 --- a/templates/admin/auth/user/change_form.html +++ b/templates/admin/auth/user/change_form.html @@ -2,19 +2,19 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original %} - - {% endif %} + {% if original %} + + {% endif %} {% endblock %} diff --git a/templates/admin/judge/contest/change_form.html b/templates/admin/judge/contest/change_form.html index 7f540f6..5c94aa4 100644 --- a/templates/admin/judge/contest/change_form.html +++ b/templates/admin/judge/contest/change_form.html @@ -2,22 +2,22 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original and original.is_rated and original.ended and perms.judge.contest_rating %} - - {% endif %} + {% if original and original.is_rated and original.ended and perms.judge.contest_rating %} + + {% endif %} {% endblock %} diff --git a/templates/admin/judge/contest/change_list.html b/templates/admin/judge/contest/change_list.html index ae409fc..ec5c05d 100644 --- a/templates/admin/judge/contest/change_list.html +++ b/templates/admin/judge/contest/change_list.html @@ -2,12 +2,12 @@ {% load i18n %} {% block object-tools-items %} - {{ block.super }} - {% if not is_popup and perms.judge.contest_rating %} -
  • - - {% trans "Rate all ratable contests" %} - -
    • - {% endif %} + {{ block.super }} + {% if not is_popup and perms.judge.contest_rating %} +
  • + + {% trans "Rate all ratable contests" %} + +
    • + {% endif %} {% endblock %} diff --git a/templates/admin/judge/judge/change_form.html b/templates/admin/judge/judge/change_form.html index f477768..754c31d 100644 --- a/templates/admin/judge/judge/change_form.html +++ b/templates/admin/judge/judge/change_form.html @@ -2,25 +2,25 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original %} - - - {% endif %} + {% if original %} + + + {% endif %} {% endblock %} diff --git a/templates/admin/judge/problem/change_form.html b/templates/admin/judge/problem/change_form.html index 8731e7f..c5792c1 100644 --- a/templates/admin/judge/problem/change_form.html +++ b/templates/admin/judge/problem/change_form.html @@ -2,24 +2,24 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original %} - - {% endif %} + {% if original %} + + {% endif %} {% endblock %} diff --git a/templates/admin/judge/profile/change_form.html b/templates/admin/judge/profile/change_form.html index 9372383..0ac5f56 100644 --- a/templates/admin/judge/profile/change_form.html +++ b/templates/admin/judge/profile/change_form.html @@ -2,19 +2,19 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original %} - - {% endif %} + {% if original %} + + {% endif %} {% endblock %} diff --git a/templates/admin/judge/submission/change_form.html b/templates/admin/judge/submission/change_form.html index 6f3c5b7..dcb49c8 100644 --- a/templates/admin/judge/submission/change_form.html +++ b/templates/admin/judge/submission/change_form.html @@ -2,19 +2,19 @@ {% load i18n %} {% block extrahead %}{{ block.super }} - + {% endblock extrahead %} {% block after_field_sets %}{{ block.super }} - {% if original %} - - {% endif %} + {% if original %} + + {% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 34b6cc9..f3e23bc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,13 +1,13 @@ - + {% block title %}{{ title }} - {{ SITE_LONG_NAME }}{% endblock %} {% if misc_config.meta_keywords %} - + {% endif %} {% if meta_description %} - + {% endif %} @@ -30,14 +30,14 @@ {# Chrome 39 for Android colour #} {% if og_image %} - + {% endif %} {% block og_title %}{% endblock %} + content="{{ DMOJ_SCHEME }}://{{ DMOJ_CANONICAL|default(site.domain) }}{{ request.get_full_path() }}"> {% if meta_description %} - + {% endif %} {% block meta %}{% endblock %} {% if not INLINE_FONTAWESOME %} - + {% endif %} {% compress css %} - - {% if PYGMENT_THEME %} - - {% endif %}{% if INLINE_FONTAWESOME %} + + {% if PYGMENT_THEME %} + + {% endif %}{% if INLINE_FONTAWESOME %} {% endif %} - - - - + + + + {% endcompress %} + href="{{ DMOJ_SCHEME }}://{{ DMOJ_CANONICAL|default(site.domain) }}{{ request.get_full_path() }}"> {% if request.user.is_impersonate %} - + {% endif %} {% block media %}{% endblock %} {% if use_darkmode %} - {% compress css %} - - - {% endcompress %} + {% compress css %} + + + {% endcompress %} {% endif %} {% if not INLINE_JQUERY %} - + {% endif %} {% compress js %} - - {% if INLINE_JQUERY %} - - {% endif %} - - - - - - {% include "extra_js.html" %} - - - + + {% if INLINE_JQUERY %} + + {% endif %} + + + + + + {% include "extra_js.html" %} + + + {% endcompress %} {% block js_media %}{% endblock %} {% if request.in_contest %} - + + if (localStorage.getItem("contest_timer_position")) { + data = localStorage.getItem("contest_timer_position").split(":"); + $("#contest-info").css({ + left: data[0], + top: data[1] + }); + } + + $("#contest-info").show(); + + $("#contest-info-toggle").on('click', function() { + $.post("{{url('contest_mode_ajax')}}", function() { + window.location.reload(); + }) + }); + + $(document).mousemove(function (e) { + x_pos = e.screenX; + y_pos = e.screenY; + + if (selected !== null) { + left_px = (x_pos - x_elem); + top_px = (y_pos - y_elem); + left_px = Math.max(Math.min(left_px, window.innerWidth), 0) / window.innerWidth * 100 + '%'; + top_px = Math.max(Math.min(top_px, window.innerHeight), 0) / window.innerHeight * 100 + '%'; + localStorage.setItem("contest_timer_position", left_px + ":" + top_px); + + selected.css({ + left: left_px, + top: top_px + }); + } + }); + + $(document).mouseup(function () { + selected = null; + }) + }); + {% endif %} {% if request.user.is_authenticated %} - + {% else %} - + {% endif %} {% if misc_config.analytics %} - {{ misc_config.analytics|safe }} + {{ 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 %} - - - - + + + + - - - + {% if request.in_contest %} + -{% endif %} -
    -
    + {% endif %} +
    + -
    -
    + +
    +
    {% block title_row %} -

    - {% block content_title %} - {% if content_title %}{{ content_title }}{% else %}{{ title }}{% endif %} - {% endblock %} -

    +

    + {% block content_title %} + {% if content_title %}{{ content_title }}{% else %}{{ title }}{% endif %} + {% endblock %} +

    {% endblock %} {% block header %}{% endblock %} {% block title_ruler %} -
    +
    {% endblock %}
    {% block body %}{% endblock %}
    -
    +
    - {% if i18n_config.announcement %} + {% if i18n_config.announcement %}
    {{ i18n_config.announcement|safe }}
    - {% endif %} + {% endif %} - {% block bodyend %}{% endblock %} - {% block footer %} -
    - + {% block bodyend %}{% endblock %} + {% block footer %} +
    +
    proudly powered by DMOJ | developed by LQDJudge team | {% if i18n_config.footer %} - {{ i18n_config.footer|safe }} | + {{ i18n_config.footer|safe }} | {% endif %}
    - {% csrf_token %} - - + -
    -     -
    - {% endblock %} -
    + + + + + {% endblock %} +
    - + diff --git a/templates/blog/blog.html b/templates/blog/blog.html index 4b1abcd..fa97dac 100644 --- a/templates/blog/blog.html +++ b/templates/blog/blog.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% block js_media %} - {% include "comments/media-js.html" %} - {% include "actionbar/media-js.html" %} + {% include "comments/media-js.html" %} + {% include "actionbar/media-js.html" %} {% endblock %} {% block media %} - {% include "comments/media-css.html" %} - {% include "actionbar/media-css.html" %} + {% include "comments/media-css.html" %} + {% include "actionbar/media-css.html" %} {% endblock %} {% block title_row %} @@ -17,41 +17,41 @@ {% endblock %} {% block body %} -
    -
    {{ title }}
    -
    - {% with authors=post.authors.all() %} - {% if authors %} - {{ link_users(authors) }} - {% endif %} - {% endwith %} - - {% trans time=post.publish_on|date(_("N j, Y, g:i a")) %} posted on {{ time }}{% endtrans %} - - {% if post.is_editable_by(request.user) %} - [{{ _('Edit') }}] - {% endif %} - {% if valid_user_to_show_edit %} - {% for org in valid_org_to_show_edit %} - [{{ _('Edit in') }} {{org.slug}}] - {% endfor %} - {% endif %} -
    -
    - {% cache 86400 'post_content' post.id MATH_ENGINE %} - {{ post.content|markdown|reference|str|safe}} - {% endcache %} -
    - {% include "actionbar/list.html" %} +
    +
    {{ title }}
    +
    + {% with authors=post.authors.all() %} + {% if authors %} + {{ link_users(authors) }} + {% endif %} + {% endwith %} + + {% trans time=post.publish_on|date(_("N j, Y, g:i a")) %} posted on {{ time }}{% endtrans %} + + {% if post.is_editable_by(request.user) %} + [{{ _('Edit') }}] + {% endif %} + {% if valid_user_to_show_edit %} + {% for org in valid_org_to_show_edit %} + [{{ _('Edit in') }} {{org.slug}}] + {% endfor %} + {% endif %}
    -
    - {% include "comments/list.html" %} +
    + {% cache 86400 'post_content' post.id MATH_ENGINE %} + {{ post.content|markdown|reference|str|safe}} + {% endcache %} +
    + {% include "actionbar/list.html" %} +
    +
    + {% include "comments/list.html" %} {% endblock %} {% block bodyend %} - {{ super() }} - {% if REQUIRE_JAX %} - {% include "mathjax-load.html" %} - {% endif %} - {% include "comments/math.html" %} + {{ super() }} + {% if REQUIRE_JAX %} + {% include "mathjax-load.html" %} + {% endif %} + {% include "comments/math.html" %} {% endblock %} \ No newline at end of file diff --git a/templates/blog/content.html b/templates/blog/content.html index 506271e..b9a23fa 100644 --- a/templates/blog/content.html +++ b/templates/blog/content.html @@ -1,52 +1,52 @@
    -
    - - {% with authors=post.authors.all() %} - {%- if authors -%} - - {{ link_users(authors) }} - {%- endif -%} - {% endwith %} - • - {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}} - {%- if post.sticky %} • - {% endif -%} - {% if post.is_organization_private and show_organization_private_icon %} - • - - {% for org in post.organizations.all() %} - - - {{ org.name }} - - - {% endfor %} - - {% endif %} +
    + + {% with authors=post.authors.all() %} + {%- if authors -%} + + {{ link_users(authors) }} + {%- endif -%} + {% endwith %} + • + {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}} + {%- if post.sticky %} • + {% endif -%} + {% if post.is_organization_private and show_organization_private_icon %} + • + + {% for org in post.organizations.all() %} + + + {{ org.name }} + + + {% endfor %} - - - - - {{- post_comment_counts[post.id] or 0 -}} - - + {% endif %} + + + + + + {{- post_comment_counts[post.id] or 0 -}} + + +
    +

    + {{ post.title }} +

    +
    +
    + {% cache 86400 'post_summary' post.id %} + {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }} + {% endcache %}
    -

    - {{ post.title }} -

    -
    -
    - {% cache 86400 'post_summary' post.id %} - {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }} - {% endcache %} -
    - {% set pagevote = post.pagevote %} - {% set bookmark = post.bookmark %} - {% set hide_actionbar_comment = True %} - {% set include_hr = True %} - {% set share_url = request.build_absolute_uri(post.get_absolute_url()) %} - {% include "actionbar/list.html" %} -
    + {% set pagevote = post.pagevote %} + {% set bookmark = post.bookmark %} + {% set hide_actionbar_comment = True %} + {% set include_hr = True %} + {% set share_url = request.build_absolute_uri(post.get_absolute_url()) %} + {% include "actionbar/list.html" %} +
    \ No newline at end of file diff --git a/templates/blog/dashboard.html b/templates/blog/dashboard.html index 7ec50e4..b34d406 100644 --- a/templates/blog/dashboard.html +++ b/templates/blog/dashboard.html @@ -1,34 +1,34 @@
    -

    Dashboard -

    -
    -
    - gravatar -
    -
    -

    Recently attempted problems

    - -
    -
    -

    Recommended problems

    Coming soon. -
    +

    Dashboard +

    +
    +
    + gravatar
    +
    +

    Recently attempted problems

    + +
    +
    +

    Recommended problems

    Coming soon. +
    +
    diff --git a/templates/blog/list.html b/templates/blog/list.html index 3873292..8d18b56 100644 --- a/templates/blog/list.html +++ b/templates/blog/list.html @@ -1,115 +1,115 @@ {% extends "three-column-content.html" %} {% block three_col_media %} - {% include "blog/media-css.html" %} - {% include "actionbar/media-css.html" %} - + .no-clarifications-message { + font-style: italic; + text-align: center; + } + {% endblock %} {% block three_col_js %} - {% include "actionbar/media-js.html" %} - + $('.right-sidebar').hide(); + $('#event-tab').click(function (e) { + e.preventDefault(); + $('.left-sidebar-item').removeClass('active'); + $('#event-tab').addClass('active'); + $('.middle-content').hide(); + $('.right-sidebar').show(); + }); + }); + {% endblock %} {% block left_sidebar %} -
    - {{ make_tab_item('blog', 'fa fa-rss', url('home'), _('News')) }} - {{ make_tab_item('comment', 'fa fa-comments', url('comment_feed'), _('Comments')) }} - {{ make_tab_item('ticket', 'fa fa-question-circle', url('ticket_feed'), _('Tickets')) }} - {{ make_tab_item('event', 'fa fa-calendar', '#', _('Events')) }} -
    +
    + {{ make_tab_item('blog', 'fa fa-rss', url('home'), _('News')) }} + {{ make_tab_item('comment', 'fa fa-comments', url('comment_feed'), _('Comments')) }} + {{ make_tab_item('ticket', 'fa fa-question-circle', url('ticket_feed'), _('Tickets')) }} + {{ make_tab_item('event', 'fa fa-calendar', '#', _('Events')) }} +
    {% endblock %} {% block middle_content %} - {% set show_organization_private_icon=True %} - {% if page_type == 'blog' %} - {% for post in posts %} - {% include "blog/content.html" %} - {% endfor %} - {% elif page_type == 'ticket' %} - {% if tickets %} - {% for ticket in tickets %} - {% include "ticket/feed.html" %} - {% endfor %} - {% else %} -

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

    - {% endif %} - {% elif page_type == 'comment' %} - {% for comment in comments %} - {% include "comments/feed.html" %} - {% endfor %} - {% endif %} - {% if page_obj.num_pages > 1 %} -
    {% include "list-pages.html" %}
    + {% set show_organization_private_icon=True %} + {% if page_type == 'blog' %} + {% for post in posts %} + {% include "blog/content.html" %} + {% endfor %} + {% elif page_type == 'ticket' %} + {% if tickets %} + {% for ticket in tickets %} + {% include "ticket/feed.html" %} + {% endfor %} + {% else %} +

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

    {% endif %} + {% elif page_type == 'comment' %} + {% for comment in comments %} + {% include "comments/feed.html" %} + {% endfor %} + {% endif %} + {% if page_obj.num_pages > 1 %} +
    {% include "list-pages.html" %}
    + {% endif %} {% endblock %} {% block right_sidebar %} -
    - {% if request.in_contest_mode and request.participation.contest.use_clarifications %} -
    -

    {{ _('Clarifications') }} - - {% if can_edit_contest %} - - - {% endif %} -

    -
    - {% if has_clarifications %} - - {% else %} -

    - {{ _('No clarifications have been made at this time.') }} -

    - {% endif %} -
    -
    - {% endif %} - {% include 'contests-countdown.html' %} - {% include 'recent-organization.html' %} - {% include 'top-users.html' %} -
    +
    + {% if request.in_contest_mode and request.participation.contest.use_clarifications %} +
    +

    {{ _('Clarifications') }} + + {% if can_edit_contest %} + + + {% endif %} +

    +
    + {% if has_clarifications %} + + {% else %} +

    + {{ _('No clarifications have been made at this time.') }} +

    + {% endif %} +
    +
    + {% endif %} + {% include 'contests-countdown.html' %} + {% include 'recent-organization.html' %} + {% include 'top-users.html' %} +
    {% endblock %} \ No newline at end of file diff --git a/templates/blog/media-css.html b/templates/blog/media-css.html index a4a3d32..d5e4f6c 100644 --- a/templates/blog/media-css.html +++ b/templates/blog/media-css.html @@ -1,30 +1,30 @@ \ No newline at end of file diff --git a/templates/chat/chat.html b/templates/chat/chat.html index 69b9fb0..553ad5e 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -4,24 +4,24 @@ {% block title %} {{_('Chat Box')}} {% endblock %} {% block js_media %} - - - - - + + + + - + + {% endblock js_media %} {% block media %} - {% include "chat/chat_css.html" %} + {% include "chat/chat_css.html" %} {% endblock media %} {% block body %} -
    - - -
    - -
    -
    - {% include 'chat/user_online_status.html' %} -
    -
    - - - -
    -
    - - -
    - -
    -
    +
    + + +
    + +
    +
    + {% include 'chat/user_online_status.html' %} +
    +
    + + + +
    +
    + + +
    + +
    +
    +
    {% endblock body %} diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index 49e0605..3b0452d 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -1,134 +1,134 @@ diff --git a/templates/chat/message.html b/templates/chat/message.html index bd967b6..4b3579f 100644 --- a/templates/chat/message.html +++ b/templates/chat/message.html @@ -1,30 +1,30 @@
  • - - - -
    -
    - - - {{ message.author }} - - - - {{ relative_time(message.time, abs=_('{time}'), rel=_('{time}'), format=_('g:i a d/m/Y')) }} - -
    - -
    - {% if request.user.is_staff %} - - {{_('Delete')}} - - {% endif %} -
    - {{message.body|markdown(lazy_load=True)|reference|str|safe }} -
    -
    -     + + + +
    +
    + + + {{ message.author }} + + + + {{ relative_time(message.time, abs=_('{time}'), rel=_('{time}'), format=_('g:i a d/m/Y')) }} +
    -
    + +
    + {% if request.user.is_staff %} + + {{_('Delete')}} + + {% endif %} +
    + {{message.body|markdown(lazy_load=True)|reference|str|safe }} +
    +
    +     +
    +
    • \ No newline at end of file diff --git a/templates/chat/message_list.html b/templates/chat/message_list.html index cf6c823..df7d561 100644 --- a/templates/chat/message_list.html +++ b/templates/chat/message_list.html @@ -1,12 +1,12 @@ {% if object_list %} - -{% for message in object_list | reverse%} + + {% for message in object_list | reverse%} {% include "chat/message.html" %} -{% endfor %} + {% endfor %} {% else %} -
    {{_('You are connect now. Say something to start the conversation.')}}
    +
    {{_('You are connect now. Say something to start the conversation.')}}
    {% endif %} {% if REQUIRE_JAX %} - {% include "mathjax-load.html" %} + {% include "mathjax-load.html" %} {% endif %} {% include "comments/math.html" %} \ No newline at end of file diff --git a/templates/chat/online_status.html b/templates/chat/online_status.html index e090163..edd257b 100644 --- a/templates/chat/online_status.html +++ b/templates/chat/online_status.html @@ -1,40 +1,40 @@
  • -
    - -
    - - {{_('Lobby')}} - - - {{unread_count_lobby if unread_count_lobby}} - +
    + +
    + + {{_('Lobby')}} + + + {{unread_count_lobby if unread_count_lobby}} +
    • {% for section in status_sections %} - {% if section.user_list %} -
    -

    - {{_(section.title)}} -

    -
    -
    -
      - {% for user in section.user_list %} -
    • -
      - - - - -
      - - {{ user.user.username }} - - - {{user.unread_count if user.unread_count}} - -
      • - {% endfor %} -
    - {% endif %} + {% if section.user_list %} +
    +

    + {{_(section.title)}} +

    +
    +
    +
      + {% for user in section.user_list %} +
    • +
      + + + + +
      + + {{ user.user.username }} + + + {{user.unread_count if user.unread_count}} + +
      • + {% endfor %} +
    + {% endif %} {% endfor %} diff --git a/templates/chat/user_online_status.html b/templates/chat/user_online_status.html index 6bf534c..6f7d8cd 100644 --- a/templates/chat/user_online_status.html +++ b/templates/chat/user_online_status.html @@ -1,41 +1,41 @@ {% if other_user %} -
    +
    - + -
    +
    {% endif %} - {% if other_user %} + {% if other_user %} {{other_user.user.username}} - {% else%} + {% else%} {{ _('Lobby') }} - {% endif %} + {% endif %} {% if other_user and not other_online %} - {{ relative_time(other_user.last_access, abs=_('Last online on {time}'), rel=_('Online {time}'), format=_('g:i a d/m/Y')) }} + {{ relative_time(other_user.last_access, abs=_('Last online on {time}'), rel=_('Online {time}'), format=_('g:i a d/m/Y')) }} {% endif %} {% if other_user %} - -
    -
  • - - {% if is_ignored %} - {{_('Unignore')}} - {% else %} - {{_('Ignore')}} - {% endif %} - -
    • +
  • + + {% if is_ignored %} + {{_('Unignore')}} + {% else %} + {{_('Ignore')}} + {% endif %} + +
    • -     + {% else %} -{{online_count}} {{_('users are online')}} + {{online_count}} {{_('users are online')}} {% endif %} \ No newline at end of file diff --git a/templates/comments/edit-ajax.html b/templates/comments/edit-ajax.html index 77357e3..d8d0f12 100644 --- a/templates/comments/edit-ajax.html +++ b/templates/comments/edit-ajax.html @@ -1,14 +1,14 @@
    -
    - - - {% csrf_token %} - {{ form.non_field_errors() }} - {{ form.body.errors }} -
    -
    {{ form.body }}
    -
    -
    - -
    +
    + + + {% csrf_token %} + {{ form.non_field_errors() }} + {{ form.body.errors }} +
    +
    {{ form.body }}
    +
    +
    + +
    diff --git a/templates/comments/edit.html b/templates/comments/edit.html index 76e6577..c733f2c 100644 --- a/templates/comments/edit.html +++ b/templates/comments/edit.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% block media %} - {% compress css %} - {{ form.media.css }} - {% endcompress %} + {% compress css %} + {{ form.media.css }} + {% endcompress %} {% endblock %} {% block js_media %} - {{ form.media.js }} + {{ form.media.js }} {% endblock %} {% block body %} -
    {% include "comments/edit-ajax.html" %}
    +
    {% include "comments/edit-ajax.html" %}
    {% endblock %} \ No newline at end of file diff --git a/templates/comments/feed.html b/templates/comments/feed.html index dcb813a..c5fb439 100644 --- a/templates/comments/feed.html +++ b/templates/comments/feed.html @@ -1,18 +1,18 @@ -
    -

    - - {{ page_titles[comment.page] }} - -

    - {% with author=comment.author %} - {% if author %} -
    - - {{ link_user(author) }} -
    - {% endif %} - {% endwith %} -
    - {{ comment.body|markdown(lazy_load=True)|reference|str|safe }} -
    +
    +

    + + {{ page_titles[comment.page] }} + +

    + {% with author=comment.author %} + {% if author %} +
    + + {{ link_user(author) }} +
    + {% endif %} + {% endwith %} +
    + {{ comment.body|markdown(lazy_load=True)|reference|str|safe }} +
    \ No newline at end of file diff --git a/templates/comments/list.html b/templates/comments/list.html index 7cafe3e..7f7a70b 100644 --- a/templates/comments/list.html +++ b/templates/comments/list.html @@ -1,165 +1,165 @@ {% set can_comment = request.user.is_authenticated and comment_form and not comment_lock %}
    -

    - {{ _('Comments') }} - {% if can_comment %} - {{ _('Write comment') }} - {% endif %} -

    +

    + {{ _('Comments') }} {% if can_comment %} -

    + {% if can_comment %} + + {% endif %} + {% if has_comments %} +
      + {% 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 %} + + {% else %} + + {% endif %} +
      +
      {{ node.score }}
      + {% if logged_in %} + + {% else %} + + {% endif %} +
      + {% with author=node.author, user=node.author.user %} + + + + {% endwith %} +
      +
      +
      + {{ link_user(node.author) }}  + {{ relative_time(node.time, abs=_('commented on {time}'), rel=_('commented {time}')) }} + + + {% if node.revisions > 1 %} + + ← + + {% if node.revisions > 2 %} + {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} + {% else %} + {{ _('edited') }} + {% endif %} + + + + {% else %} + + {% endif %} + + + + {% if logged_in and not comment_lock %} + {% set can_edit = node.author.id == profile.id and not profile.mute %} + {% if can_edit %} + + + + {% else %} + + + + {% endif %} + {% if perms.judge.change_comment %} + {% if can_edit %} + + {% else %} + + {% endif %} + + + {% endif %} + {% endif %} + +
      +
      + - {% else %} -
      - {% csrf_token %} - {% if comment_form.errors %} -
      - {{ comment_form.non_field_errors() }} - {{ comment_form.parent.errors }} - {% if comment_form.body.errors %}{{ _('Invalid comment body.') }}{% endif %} -
      - {% endif %} - {{ comment_form.parent }} -
      -
      {{ comment_form.body }}
      -
      -
      - -
      - {% endif %} -
      - {% endif %} - {% if has_comments %} -
        - {% 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 %} - - {% else %} - - {% endif %} -
        -
        {{ node.score }}
        - {% if logged_in %} - - {% else %} - - {% endif %} -
        - {% with author=node.author, user=node.author.user %} - - - - {% endwith %} -
        -
        -
        - {{ link_user(node.author) }}  - {{ relative_time(node.time, abs=_('commented on {time}'), rel=_('commented {time}')) }} - - - {% if node.revisions > 1 %} - - ← - - {% if node.revisions > 2 %} - {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} - {% else %} - {{ _('edited') }} - {% endif %} - - - - {% else %} - - {% endif %} - - - - {% if logged_in and not comment_lock %} - {% set can_edit = node.author.id == profile.id and not profile.mute %} - {% if can_edit %} - - - - {% else %} - - - - {% endif %} - {% if perms.judge.change_comment %} - {% if can_edit %} - - {% else %} - - {% endif %} - - - {% endif %} - {% endif %} - -
        -
        - - {% if node.score <= vote_hide_threshold %} -
        -

        - {% trans id=node.id %} - This comment is hidden due to too much negative feedback. - Click here to view it. - {% endtrans %} -

        -
        - {% endif %} -
        -
        -
        -
        • - - {% with children=node.get_children() %} - {% if children %} -
          {{ loop(children) }}
        - {% endif %} - {% endwith %} - {% endfor %} -
      - {% elif not comment_lock %} -

      {{ _('There are no comments at the moment.') }}

      - {% endif %} + {% if node.score <= vote_hide_threshold %} +
      +

      + {% trans id=node.id %} + This comment is hidden due to too much negative feedback. + Click here to view it. + {% endtrans %} +

      +
      + {% endif %} +
      +
      +
    + + + {% with children=node.get_children() %} + {% if children %} +
      {{ loop(children) }}
    + {% endif %} + {% endwith %} + {% endfor %} + + {% elif not comment_lock %} +

    {{ _('There are no comments at the moment.') }}

    + {% endif %} - {% if comment_lock %} -
    - {{ _('Comments are disabled on this page.') }} -
    - {% endif %} + {% if comment_lock %} +
    + {{ _('Comments are disabled on this page.') }} +
    + {% endif %}
    diff --git a/templates/comments/math.html b/templates/comments/math.html index 8bf58d1..16b228a 100644 --- a/templates/comments/math.html +++ b/templates/comments/math.html @@ -1,3 +1,3 @@ {% compress js, inline %} - + {% endcompress %} diff --git a/templates/comments/media-css.html b/templates/comments/media-css.html index f3732d7..1889867 100644 --- a/templates/comments/media-css.html +++ b/templates/comments/media-css.html @@ -1,3 +1,3 @@ {% compress css %} - {{ comment_form.media.css }} + {{ comment_form.media.css }} {% endcompress %} diff --git a/templates/comments/media-js.html b/templates/comments/media-js.html index e1c1ec1..b1131d5 100644 --- a/templates/comments/media-js.html +++ b/templates/comments/media-js.html @@ -1,231 +1,231 @@ {% compress js %} - {{ comment_form.media.js }} - {% if not REQUIRE_JAX %} - - {% endif %} + {{ comment_form.media.js }} + {% if not REQUIRE_JAX %} + }); + + {% endif %} + {% endcompress %} diff --git a/templates/comments/preview.html b/templates/comments/preview.html index 82e7cb1..1c5028c 100644 --- a/templates/comments/preview.html +++ b/templates/comments/preview.html @@ -1,4 +1,4 @@ {{ preview_data|markdown|reference|str|safe }} {% if REQUIRE_JAX %} -
    +
    {% endif %} \ No newline at end of file diff --git a/templates/comments/revision-ajax.html b/templates/comments/revision-ajax.html index 720cd72..dc81cfc 100644 --- a/templates/comments/revision-ajax.html +++ b/templates/comments/revision-ajax.html @@ -1,3 +1,3 @@ {% with node=revision.field_dict %} -
    {{ node.body|markdown|reference|str|safe }}
    +
    {{ node.body|markdown|reference|str|safe }}
    {% endwith %} diff --git a/templates/comments/votes.html b/templates/comments/votes.html index 395b18e..901770d 100644 --- a/templates/comments/votes.html +++ b/templates/comments/votes.html @@ -1,17 +1,17 @@

    Votes

    - + - - + + - - + + {% for vote in votes %} - - - - + + + + {% endfor %} - +
    VoterScoreVoterScore
    {{ link_user(vote.voter) }}{{ vote.score }}
    {{ link_user(vote.voter) }}{{ vote.score }}
    \ No newline at end of file diff --git a/templates/common-content.html b/templates/common-content.html index 52f195b..ff57965 100644 --- a/templates/common-content.html +++ b/templates/common-content.html @@ -1,80 +1,80 @@ {% extends "base.html" %} {% block media %} - {% block content_media %}{% endblock %} + {% block content_media %}{% endblock %} {% endblock %} {% block js_media %} - {% compress js %} - - + - {% endcompress %} - {% block content_js_media %}{% endblock %} + info_float.width(container.width()); + } + } + + var copyButton; + $('pre code').each(function () { + $(this).parent().before($('
    ', {'class': 'copy-clipboard'}) + .append(copyButton = $('', { + 'class': 'btn-clipboard', + 'data-clipboard-text': $(this).text(), + 'title': 'Click to copy' + }).text('Copy'))); + + $(copyButton.get(0)).mouseleave(function () { + $(this).attr('class', 'btn-clipboard'); + $(this).removeAttr('aria-label'); + }); + + var curClipboard = new Clipboard(copyButton.get(0)); + + curClipboard.on('success', function (e) { + e.clearSelection(); + showTooltip(e.trigger, 'Copied!'); + }); + + curClipboard.on('error', function (e) { + showTooltip(e.trigger, fallbackMessage(e.action)); + }); + + }); + }); + + {% endcompress %} + {% block content_js_media %}{% endblock %} {% endblock %} {% block body %} -
    -
    -
    {% block info_float %}{% endblock %}
    -
    -
    -
    - {% block description %}{% endblock %} - {% block description_end %} -
    - {% endblock %} -
    - {% block post_description_end %}{% endblock %} - {% block comments %}{% endblock %} -
    +
    +
    +
    {% block info_float %}{% endblock %}
    +
    +
    + {% block description %}{% endblock %} + {% block description_end %} +
    + {% endblock %} +
    + {% block post_description_end %}{% endblock %} + {% block comments %}{% endblock %} +
    +
    {% endblock %} {% block bodyend %} - {% if REQUIRE_JAX %} - {% include "mathjax-load.html" %} - {% endif %} + {% if REQUIRE_JAX %} + {% include "mathjax-load.html" %} + {% endif %} {% endblock %} diff --git a/templates/contest/access_code.html b/templates/contest/access_code.html index 7013c62..9ae18d8 100644 --- a/templates/contest/access_code.html +++ b/templates/contest/access_code.html @@ -1,35 +1,35 @@ {% extends "base.html" %} {% block media %} - + .button-line { + text-align: right; + } + {% endblock %} {% block body %} -
    - {% csrf_token %} - {% if form.errors or wrong_code %} -
    -

    {{ _('Invalid access code.') }}

    -
    - {% endif %} -

    {{ _('Please enter your access code:') }}

    -

    {{ form.access_code }}

    -

    - -

    -
    +
    + {% csrf_token %} + {% if form.errors or wrong_code %} +
    +

    {{ _('Invalid access code.') }}

    +
    + {% endif %} +

    {{ _('Please enter your access code:') }}

    +

    {{ form.access_code }}

    +

    + +

    +
    {% endblock %} diff --git a/templates/contest/calendar.html b/templates/contest/calendar.html index e35a4ea..62997d2 100644 --- a/templates/contest/calendar.html +++ b/templates/contest/calendar.html @@ -2,55 +2,55 @@ {% set page_type = 'calendar' %} {% block left_sidebar %} - {% include "contest/contest-list-tabs.html" %} + {% include "contest/contest-list-tabs.html" %} {% endblock %} {% block middle_content %} -
    - {% if prev_month %} - « {{ _('Prev') }} - {% endif %} - {% if not (curr_month.year == now.year and curr_month.month == now.month) %} - {{ _('Today') }} - {% endif %} - {% if next_month %} - {{ _('Next') }} » - {% endif %} -
    - - - - - - - - - - - {% for week in calendar %} - {% for day in week %} - - {% endfor %} - {% endfor %} -
    {{ _('Sunday') }}{{ _('Monday') }}{{ _('Tuesday') }}{{ _('Wednesday') }}{{ _('Thursday') }}{{ _('Friday') }}{{ _('Saturday') }}
    - {{ day.date.day }} - -
    +
    + {% if prev_month %} + « {{ _('Prev') }} + {% endif %} + {% if not (curr_month.year == now.year and curr_month.month == now.month) %} + {{ _('Today') }} + {% endif %} + {% if next_month %} + {{ _('Next') }} » + {% endif %} +
    + + + + + + + + + + + {% for week in calendar %} + {% for day in week %} + + {% endfor %} + {% endfor %} +
    {{ _('Sunday') }}{{ _('Monday') }}{{ _('Tuesday') }}{{ _('Wednesday') }}{{ _('Thursday') }}{{ _('Friday') }}{{ _('Saturday') }}
    + {{ day.date.day }} + +
    {% endblock %} diff --git a/templates/contest/clarification.html b/templates/contest/clarification.html index 156ea17..86f5991 100644 --- a/templates/contest/clarification.html +++ b/templates/contest/clarification.html @@ -1,54 +1,54 @@ {% extends "base.html" %} {% block media %} - {{ form.media.css }} - + form#clarification-form .submit { + margin: 10px 0 0 auto; + } + {% endblock %} {% block js_media %} -{{ form.media.js }} - + {% endblock %} {% block body %} -
    - {% csrf_token %} - {% if form.body.errors %} -
    - {{ form.body.errors }} -
    - {% endif %} -

    - {{_('Problem')}}: - -

    -
    {{ form.body }}
    - -
    +
    + {% csrf_token %} + {% if form.body.errors %} +
    + {{ form.body.errors }} +
    + {% endif %} +

    + {{_('Problem')}}: + +

    +
    {{ form.body }}
    + +
    {% endblock %} diff --git a/templates/contest/clone.html b/templates/contest/clone.html index 15739d2..f1b4a0f 100644 --- a/templates/contest/clone.html +++ b/templates/contest/clone.html @@ -1,42 +1,42 @@ {% extends "base.html" %} {% block media %} - + ul.errorlist { + list-style-type: none; + padding-left: 0; + text-align: center; + } + {% endblock %} {% block body %} -
    - {% csrf_token %} - {% if form.errors %} -
    - {{ form.key.errors }} -
    - {% endif %} + + {% csrf_token %} + {% if form.errors %} +
    + {{ form.key.errors }} +
    + {% endif %} -
    -
    {{ form.key }}
    -
    - -
    +
    +
    {{ form.key }}
    +
    + + {% endblock %} diff --git a/templates/contest/contest-datetime.html b/templates/contest/contest-datetime.html index 470661b..b4b6278 100644 --- a/templates/contest/contest-datetime.html +++ b/templates/contest/contest-datetime.html @@ -1,53 +1,53 @@ - - {% endblock %} diff --git a/templates/contest/media-js.html b/templates/contest/media-js.html index d11b9ef..9016b7d 100644 --- a/templates/contest/media-js.html +++ b/templates/contest/media-js.html @@ -1,212 +1,212 @@ \ No newline at end of file diff --git a/templates/contest/moss.html b/templates/contest/moss.html index 8ca86e2..8bfcf06 100644 --- a/templates/contest/moss.html +++ b/templates/contest/moss.html @@ -1,85 +1,85 @@ {% extends "two-column-content.html" %} {% set page_type = 'moss' %} - + {% block left_sidebar %} - {% include "contest/contest-tabs.html" %} + {% include "contest/contest-tabs.html" %} {% endblock %} {% block two_col_media %} - + {% endblock %} {% block two_col_js %} - + {% endblock %} {% block middle_content %} - {% if has_results %} - - - - - {% for lang in languages %} - - {% endfor %} - - - - {% for problem, results in moss_results %} - - - {% for result in results %} - - {% endfor %} - - {% endfor %} - -
    {{ _('Problem') }}{{ lang }}
    - {{ problem.name }} - - {% if result.submission_count %} - {{ result.submission_count }} {{_('submissions')}} - {% else %} - {{ _('No submissions') }} - {% endif %} -
    - {% endif %} -
    -
    -
    - {% csrf_token %} - -
    -
    - {% if has_results %} -
    -
    - {% csrf_token %} - -
    -
    - {% endif %} + {% if has_results %} + + + + + {% for lang in languages %} + + {% endfor %} + + + + {% for problem, results in moss_results %} + + + {% for result in results %} + + {% endfor %} + + {% endfor %} + +
    {{ _('Problem') }}{{ lang }}
    + {{ problem.name }} + + {% if result.submission_count %} + {{ result.submission_count }} {{_('submissions')}} + {% else %} + {{ _('No submissions') }} + {% endif %} +
    + {% endif %} +
    +
    +
    + {% csrf_token %} + +
    + {% if has_results %} +
    +
    + {% csrf_token %} + +
    +
    + {% endif %} +
    {% endblock %} diff --git a/templates/contest/preview.html b/templates/contest/preview.html index 82e7cb1..1c5028c 100644 --- a/templates/contest/preview.html +++ b/templates/contest/preview.html @@ -1,4 +1,4 @@ {{ preview_data|markdown|reference|str|safe }} {% if REQUIRE_JAX %} -
    +
    {% endif %} \ No newline at end of file diff --git a/templates/contest/private.html b/templates/contest/private.html index fbb9c13..047c06d 100644 --- a/templates/contest/private.html +++ b/templates/contest/private.html @@ -1,20 +1,20 @@ {% extends "base.html" %} {% block body %} - {% if error.is_private %} -

    {{ _('This contest is private to specific users.') }}

    - {% endif %} + {% if error.is_private %} +

    {{ _('This contest is private to specific users.') }}

    + {% endif %} - {% if error.is_organization_private %} - {% if error.is_private %} -

    {{ _('Additionally, only the following organizations may access this contest:') }}

    - {% else %} -

    {{ _('Only the following organizations may access this contest:') }}

    - {% endif %} - + {% if error.is_organization_private %} + {% if error.is_private %} +

    {{ _('Additionally, only the following organizations may access this contest:') }}

    + {% else %} +

    {{ _('Only the following organizations may access this contest:') }}

    {% endif %} + + {% endif %} {% endblock %} diff --git a/templates/contest/ranking-css.html b/templates/contest/ranking-css.html index 316fa7d..179a4f8 100644 --- a/templates/contest/ranking-css.html +++ b/templates/contest/ranking-css.html @@ -1,102 +1,102 @@ - - -{% if has_rating %} - -{% endif %} + + +{% if has_rating %} + +{% endif %} diff --git a/templates/contest/ranking-table.html b/templates/contest/ranking-table.html index 11c561c..2c75147 100644 --- a/templates/contest/ranking-table.html +++ b/templates/contest/ranking-table.html @@ -3,77 +3,77 @@ {% set friends = request.profile.get_friends() if request.user.is_authenticated else {} %} {% block after_rank_head %} - {% if has_rating %} - {{ _('Rating') }} - {% endif %} + {% if has_rating %} + {{ _('Rating') }} + {% endif %} {% endblock %} {% block after_rank %} - {% if has_rating %} - {% if user.participation_rating %}{{ rating_number(user.participation_rating) }}{% endif %} - {% endif %} + {% if has_rating %} + {% if user.participation_rating %}{{ rating_number(user.participation_rating) }}{% endif %} + {% endif %} {% endblock %} {% block user_footer %} - {% if user.user.first_name %} - - {% endif %} - {% if user.user.last_name %} - - {% endif %} + {% if user.user.first_name %} + + {% endif %} + {% if user.user.last_name %} + + {% endif %} {% endblock %} {% block user_data %} - {% if user.participation.virtual %} - [{{user.participation.virtual}}] - {% endif %} - {% if can_edit %} - -
    - {% csrf_token %} - - {% if user.participation.is_disqualified %} - - {% else %} - - {% endif %} -
    - {% if perms.judge.change_contestparticipation %} - - {% endif %} -     - {% endif %} + {% if user.participation.virtual %} + [{{user.participation.virtual}}] + {% endif %} + {% if can_edit %} + +
    + {% csrf_token %} + + {% if user.participation.is_disqualified %} + + {% else %} + + {% endif %} +
    + {% if perms.judge.change_contestparticipation %} + + {% endif %} +     + {% endif %} {% endblock %} {% block before_point_head %} - {{ _('Fullname') }} - {{ _('School') }} - {% for problem in problems %} - - {{- contest.get_label_for_problem(loop.index0) }} -
    {{ problem.points }}
    - -     - {% endfor %} + {{ _('Fullname') }} + {{ _('School') }} + {% for problem in problems %} + + {{- contest.get_label_for_problem(loop.index0) }} +
    {{ problem.points }}
    + +     + {% endfor %} {% endblock %} {% block row_extra %} - class="{{ 'disqualified' if user.participation.is_disqualified }} {{'highlight' if user.username == request.user.username}}" + class="{{ 'disqualified' if user.participation.is_disqualified }} {{'highlight' if user.username == request.user.username}}" {% endblock %} {% block before_point %} - {% for cell in user.problem_cells %} - {{ cell }} - {% endfor %} + {% for cell in user.problem_cells %} + {{ cell }} + {% endfor %} {% endblock %} {% block point %} - {{ user.result_cell }} + {{ user.result_cell }} {% endblock %} diff --git a/templates/contest/ranking.html b/templates/contest/ranking.html index 3bd8176..1f4fe6c 100644 --- a/templates/contest/ranking.html +++ b/templates/contest/ranking.html @@ -1,160 +1,160 @@ {% extends "user/base-users-two-col.html" %} {% block left_sidebar %} - {% include "contest/contest-tabs.html" %} + {% include "contest/contest-tabs.html" %} {% endblock %} {% block users_media %} - {% include "contest/ranking-css.html" %} + {% include "contest/ranking-css.html" %} {% endblock %} {% block users_js_media %} - {% if can_edit %} - + {% endif %} + {% if perms.judge.change_contestparticipation %} + + {% endif %} + {% if not contest.ended %} + - {% endif %} - {% if perms.judge.change_contestparticipation %} - - {% endif %} - {% if not contest.ended %} - - {% endif %} - {% if page_type == 'ranking' or page_type == 'final_ranking' %} - + {% endif %} + {% if page_type == 'ranking' or page_type == 'final_ranking' %} + - {% endif %} - {% include "contest/media-js.html" %} + }); + csv.push(header.join(',')); + }); + + $('table#users-table tbody tr').each(function () { + var row_data = []; + + $(this).find('td').each(function () { + var $col = $(this); + if ($col.hasClass('rating-column')) { + return; + } else if ($col.hasClass('user-name')) { + row_data.push(clean_text($col.ignore('.fullname').ignore('.school').text())); + row_data.push(clean_text($col.ignore('.user').ignore('.school').text())); + row_data.push(clean_text($col.ignore('.user').ignore('.fullname').text())); + } else { + row_data.push(clean_text($col.ignore('.solving-time').text())); + } + }); + csv.push(row_data.join(',')); + }); + + csv = csv.join('\n'); + var filename = '{{ contest.key }}_' + moment().format('MMMM Do YYYY, h:mm:ss a'); + '.csv'; + var link = document.createElement('a'); + link.style.display = 'none'; + link.setAttribute('target', '_blank'); + link.setAttribute('href', 'data:text/csv;charset=utf-8,\uFEFF' + encodeURIComponent(csv)); + link.setAttribute('download', filename); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + + {% endif %} + {% include "contest/media-js.html" %} {% endblock %} {% block before_table %} - {% include "contest/contest-datetime.html" %} -
    - {% if page_type == 'participation' %} - {% if contest.can_see_full_scoreboard(request.user) %} - - {% endif %} - {% endif %} - - - - + {% include "contest/contest-datetime.html" %} +
    + {% if page_type == 'participation' %} + {% if contest.can_see_full_scoreboard(request.user) %} + + {% endif %} + {% endif %} + + - - {% if request.user.is_authenticated %} - - - {% endif %} - - - - - - - - {{ _('Download as CSV') }} - -
    + + + + {% if request.user.is_authenticated %} + + + {% endif %} + + + + + + + + {{ _('Download as CSV') }} + +
    {% endblock %} {% block users_table %} - {% include "contest/ranking-table.html" %} + {% include "contest/ranking-table.html" %} {% endblock %} \ No newline at end of file diff --git a/templates/contest/stats.html b/templates/contest/stats.html index fb249d4..e0b4d84 100644 --- a/templates/contest/stats.html +++ b/templates/contest/stats.html @@ -2,82 +2,82 @@ {% set page_type = 'stats' %} {% block left_sidebar %} - {% include "contest/contest-tabs.html" %} + {% include "contest/contest-tabs.html" %} {% endblock %} {% block two_col_js %} + + {% compress js %} + {% include "stats/media-js.html" %} - {% compress js %} - {% include "stats/media-js.html" %} - - {% endcompress %} - {% include "contest/media-js.html" %} + $('#problem-point-select').change(function() { + pts_hist.destroy(); + problem = $(this).val(); + pts_hist = draw_histogram(window.stats.problem_point[problem], + $('#problem-point')); + }) + + $('#problem-point-select').select2({ + width: '10em', + }); + }); + + + {% endcompress %} + {% include "contest/media-js.html" %} {% endblock %} {% block two_col_media %} - + {% endblock %} {% block middle_content %} -

    {{ _('Problem Status Distribution') }}

    -
    - -
    +

    {{ _('Problem Status Distribution') }}

    +
    + +
    -

    {{ _('Problem AC Rate') }}

    -
    - -
    - -

    - {{ _('Problem Point Distribution') }}: - -

    +

    {{ _('Problem AC Rate') }}

    +
    + +
    -
    - -
    +

    + {{ _('Problem Point Distribution') }}: + +

    -

    {{ _('Submissions by Language') }}

    -
    - -
      -
      +
      + +
      -

      {{ _('Language AC Rate') }}

      -
      - -
      +

      {{ _('Submissions by Language') }}

      +
      + +
        +
        + +

        {{ _('Language AC Rate') }}

        +
        + +
        {% endblock %} diff --git a/templates/contest/tag-ajax.html b/templates/contest/tag-ajax.html index 2aa38be..b027b89 100644 --- a/templates/contest/tag-ajax.html +++ b/templates/contest/tag-ajax.html @@ -1,7 +1,7 @@ {% if not title %} - {% include "contest/tag-title.html" %} -

        -
        + {% include "contest/tag-title.html" %} +

        +
        {% endif %} {{ tag.description|markdown }} diff --git a/templates/contest/tag-title.html b/templates/contest/tag-title.html index d3309fa..a489680 100644 --- a/templates/contest/tag-title.html +++ b/templates/contest/tag-title.html @@ -1,11 +1,11 @@

        - - {{- tag.name -}} - + + {{- tag.name -}} +

        {% if perms.judge.change_contesttag %} -
        - [{{ _('Edit') }}] -
        +
        + [{{ _('Edit') }}] +
        {% endif %} diff --git a/templates/contest/tag.html b/templates/contest/tag.html index 955c092..bbac389 100644 --- a/templates/contest/tag.html +++ b/templates/contest/tag.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block content_title %} - {% include "contest/tag-title.html" %} + {% include "contest/tag-title.html" %} {% endblock %} {% block body %} - {% include "contest/tag-ajax.html" %} + {% include "contest/tag-ajax.html" %} {% endblock %} \ No newline at end of file diff --git a/templates/contests-countdown.html b/templates/contests-countdown.html index 9cd2310..a7e4840 100644 --- a/templates/contests-countdown.html +++ b/templates/contests-countdown.html @@ -1,35 +1,35 @@ -{% if current_contests %} -
        -

        {{ _('Ongoing contests') }}

        -
        - {% for contest in current_contests %} -
        -
        - {{ contest.name }} -
        -
        - {{ _('Ends in') }} {{ _('%(countdown)s.', countdown=contest.end_time|as_countdown) }} -
        -
        - {% endfor %} -
        -
        -{% endif %} - -{% if future_contests %} -
        -

        {{ _('Upcoming contests') }}

        -
        - {% for contest in future_contests %} -
        -
        - {{ contest.name }} -
        -
        - {{ _('Starting in %(countdown)s.', countdown=contest.start_time|as_countdown) }} -
        -
        - {% endfor %} -
        -
        -{% endif %} +{% if current_contests %} +
        +

        {{ _('Ongoing contests') }}

        +
        + {% for contest in current_contests %} +
        +
        + {{ contest.name }} +
        +
        + {{ _('Ends in') }} {{ _('%(countdown)s.', countdown=contest.end_time|as_countdown) }} +
        +
        + {% endfor %} +
        +
        +{% endif %} + +{% if future_contests %} +
        +

        {{ _('Upcoming contests') }}

        +
        + {% for contest in future_contests %} +
        +
        + {{ contest.name }} +
        +
        + {{ _('Starting in %(countdown)s.', countdown=contest.start_time|as_countdown) }} +
        +
        + {% endfor %} +
        +
        +{% endif %} diff --git a/templates/error.html b/templates/error.html index 55dfae7..2f22c06 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,32 +1,32 @@ - + {{ code }} - {{ id }} - - -

        SIGSEGV: {{ id }}

        -
        -
        {{ description }}
+  
+  
+    
        SIGSEGV: {{ id }}
        
+    
        
+    
        {{ description }}
 site: fatal signal: Segmentation fault
 site died (signal {{ code }}, exit -11)

        Go back
        
-{% if request.user.is_superuser and traceback %}
-    
        {{ traceback }}
        
-{% endif %}
-
+    {% if request.user.is_superuser and traceback %}
+      
        {{ traceback }}
        
+    {% endif %}
+  
 
diff --git a/templates/fine_uploader/script.html b/templates/fine_uploader/script.html
index 17957c7..436ec9e 100644
--- a/templates/fine_uploader/script.html
+++ b/templates/fine_uploader/script.html
@@ -1,32 +1,32 @@
 
\ No newline at end of file
diff --git a/templates/flatpages/admin_link.html b/templates/flatpages/admin_link.html
index 521300e..91b8798 100644
--- a/templates/flatpages/admin_link.html
+++ b/templates/flatpages/admin_link.html
@@ -1,5 +1,5 @@
 {% if perms.flatpages.change_flatpage %}
-    
        
-        [{{ _('Edit') }}]
-    
        
+  
        
+    [{{ _('Edit') }}]
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html
index 15c4113..4c84019 100644
--- a/templates/flatpages/default.html
+++ b/templates/flatpages/default.html
@@ -1,15 +1,15 @@
 {% extends "base.html" %}
 {% block title %}{{ flatpage.title }} - {{ SITE_LONG_NAME }}{% endblock %}
 {% block og_title %}
-    
+  
 {% endblock %}
 
 {% block content_title %}{{ flatpage.title }}{% endblock %}
 
 {% block header %}
-    {% include "flatpages/admin_link.html" %}
+  {% include "flatpages/admin_link.html" %}
 {% endblock %}
 
 {% block body %}
-    {{ render_django(flatpage.content) }}
+  {{ render_django(flatpage.content) }}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/flatpages/markdown.html b/templates/flatpages/markdown.html
index 62b3015..370721c 100644
--- a/templates/flatpages/markdown.html
+++ b/templates/flatpages/markdown.html
@@ -2,7 +2,7 @@
 {% block title %}{{ flatpage.title }} - {{ SITE_LONG_NAME }}{% endblock %}
 
 {% block og_title %}
-    
+  
 {% endblock %}
 
 {% block content_title %}{{ flatpage.title }}{% endblock %}
@@ -10,5 +10,5 @@
 {% block header %}{% include "flatpages/admin_link.html" %}{% endblock %}
 
 {% block body %}
-    
        {{ flatpage.content|markdown|reference|str|safe }}
        
+  
        {{ flatpage.content|markdown|reference|str|safe }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/flatpages/markdown_math.html b/templates/flatpages/markdown_math.html
index a959e50..f9aa42c 100644
--- a/templates/flatpages/markdown_math.html
+++ b/templates/flatpages/markdown_math.html
@@ -1,9 +1,9 @@
 {% extends "flatpages/markdown.html" %}
 
 {% block body %}
-    
        {{ flatpage.content|markdown|reference }}
        
+  
        {{ flatpage.content|markdown|reference }}
        
 {% endblock %}
 
 {% block bodyend %}
-    {% if REQUIRE_JAX %}{% include "mathjax-load.html" %}{% endif %}
+  {% if REQUIRE_JAX %}{% include "mathjax-load.html" %}{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/generic-message.html b/templates/generic-message.html
index 2c125ab..4e0a258 100644
--- a/templates/generic-message.html
+++ b/templates/generic-message.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 
 {% block body %}
-    
        {{ message }}
        
+  
        {{ message }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/home.html b/templates/home.html
index 059328c..833d0d3 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,23 +1,23 @@
 {% extends "blog/list.html" %}
 {% block before_posts %}
-    {% if i18n_config.home_page_top %}
-        {{ render_django(i18n_config.home_page_top, request=request, user_count=user_count, problem_count=problem_count, submission_count=submission_count, language_count=language_count, perms=perms) }}
-    {% endif %}
+  {% if i18n_config.home_page_top %}
+    {{ render_django(i18n_config.home_page_top, request=request, user_count=user_count, problem_count=problem_count, submission_count=submission_count, language_count=language_count, perms=perms) }}
+  {% endif %}
 {% endblock %}
 {% block meta %}
-    {% if i18n_config.meta_description %}
-        
-    {% endif %}
-    
+  {% if i18n_config.meta_description %}
+    
+  {% endif %}
+  
 {% endblock %}
diff --git a/templates/internal/base.html b/templates/internal/base.html
index d3fba7c..1df34d8 100644
--- a/templates/internal/base.html
+++ b/templates/internal/base.html
@@ -1,92 +1,92 @@
-{% extends "three-column-content.html" %}
-{% block three_col_media %}
-    
-{% endblock %}
-
-{% block three_col_js %}
-    
-{% endblock %}
-
-{% block left_sidebar %}
-    
        
-        {{ make_tab_item('problem', 'fa fa-list', url('internal_problem'), _('Problem')) }}
-    
        
-{% endblock %}
-
-{% block middle_content %}
-    
-        
-            
-                
-                
-                
-            
-        
-        
-            {% for problem in problems %}
-                
-                    
-                    
-                    
-                
-            {% endfor %}
-        
-    
        {{_('Problem')}}{{_('Code')}}{{_('Vote count')}}
        {{problem.name}}{{problem.code}}{{problem.vote_count}}
        
-    {% if page_obj.num_pages > 1 %}
-        
        {% include "list-pages.html" %}
        
-    {% endif %}
-{% endblock %}
-
-{% block right_sidebar %}
-    
        
-    
-    {% for problem in problems %}
-        
-    {% endfor %}
+{% extends "three-column-content.html" %}
+{% block three_col_media %}
+  
+{% endblock %}
+
+{% block three_col_js %}
+  
+{% endblock %}
+
+{% block left_sidebar %}
+  
        
+    {{ make_tab_item('problem', 'fa fa-list', url('internal_problem'), _('Problem')) }}
+  
        
+{% endblock %}
+
+{% block middle_content %}
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      {% for problem in problems %}
+        
+          
+          
+          
+        
+      {% endfor %}
+    
+  
        {{_('Problem')}}{{_('Code')}}{{_('Vote count')}}
        {{problem.name}}{{problem.code}}{{problem.vote_count}}
        
+  {% if page_obj.num_pages > 1 %}
+    
        {% include "list-pages.html" %}
        
+  {% endif %}
+{% endblock %}
+
+{% block right_sidebar %}
+  
        
+    
+    {% for problem in problems %}
+      
+    {% endfor %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/license.html b/templates/license.html
index b7830a8..144a801 100644
--- a/templates/license.html
+++ b/templates/license.html
@@ -1,13 +1,13 @@
 {% extends "common-content.html" %}
 {% block description %}
-    {% cache 3600 'license_html' license.id %}
-        {{ license.text|markdown }}
-    {% endcache %}
+  {% cache 3600 'license_html' license.id %}
+    {{ license.text|markdown }}
+  {% endcache %}
 {% endblock %}
 
 {% block info_float %}
-    {% if perms.judge.change_license %}
-        
-    {% endif %}
-    
        {{ _('Source:') }} {{ license.link }}
        
+  {% if perms.judge.change_license %}
+    
+  {% endif %}
+  
        {{ _('Source:') }} {{ license.link }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/list-pages.html b/templates/list-pages.html
index 463797c..9f0f428 100644
--- a/templates/list-pages.html
+++ b/templates/list-pages.html
@@ -1,31 +1,31 @@
 
          
-    {% if page_obj.has_previous() %}
-        {% if page_obj.previous_page_number() == 1 and first_page_href != None %}
-            
        • «
          • 
-        {% else %}
-            
        • «
          • 
-        {% endif %}
+  {% if page_obj.has_previous() %}
+    {% if page_obj.previous_page_number() == 1 and first_page_href != None %}
+      
        • «
          • 
     {% else %}
-        
        • «
          • 
+      
        • «
          • 
     {% endif %}
+  {% else %}
+    
        • «
          • 
+  {% endif %}
 
-    {% for page in page_obj.page_range %}
-        {% if not page %}
-            
        • ...
          • 
-        {% else %}
-            {{ page }}
-        {% endif %}
-    {% endfor %}
-
-    {% if page_obj.has_next() %}
-        
        • »
          • 
+  {% for page in page_obj.page_range %}
+    {% if not page %}
+      
        • ...
          • 
     {% else %}
-        
        • »
          • 
+      {{ page }}
     {% endif %}
+  {% endfor %}
+
+  {% if page_obj.has_next() %}
+    
        • »
          • 
+  {% else %}
+    
        • »
          • 
+  {% endif %}
 
        
diff --git a/templates/messages.html b/templates/messages.html
index 1c4a5d0..3e33214 100644
--- a/templates/messages.html
+++ b/templates/messages.html
@@ -1,7 +1,7 @@
 {% if messages %}
-    
          
-        {% for message in messages %}
-            
        • {{ message }}
          • 
-        {% endfor %}
-    
        
+  
          
+    {% for message in messages %}
+      
        • {{ message }}
          • 
+    {% endfor %}
+  
        
 {% endif %}
diff --git a/templates/notification/list.html b/templates/notification/list.html
index 3900bb3..175c696 100644
--- a/templates/notification/list.html
+++ b/templates/notification/list.html
@@ -2,49 +2,49 @@
 
 {% block body %}
 
-{% if not has_notifications %}
+  {% if not has_notifications %}
 
-
        {{ _('You have no notifications') }}
        
+    
        {{ _('You have no notifications') }}
        
 
-{% else %}
+  {% else %}
     
-    
+      
-    
-    {% for notification in notifications %}
-        
-        
+      {% for notification in notifications %}
+        
+          
-        
+          
-        
+          
-        
+          
-    
-    {% endfor %}
+          
+        
+      {% endfor %}
     
        
         {{ _('User') }}
         {{ _('Activity') }}
         {{ _('Link') }}
         {{ _('Time') }}
        
+      
        
             {% if notification.comment %}
-                {{ link_user(notification.comment.author) }}
+              {{ link_user(notification.comment.author) }}
             {% else %}
-                {{ link_user(notification.author) }}
+              {{ link_user(notification.author) }}
             {% endif %}
-            
-        
+
+          
             {{ notification.category }}
-        
+          
             {% if notification.comment %}
-                {{ page_titles[notification.comment.page] }}
+              {{ page_titles[notification.comment.page] }}
             {% else %}
-                {% autoescape off %}
-                    {{notification.html_link}}
-                {% endautoescape %}
+              {% autoescape off %}
+                {{notification.html_link}}
+              {% endautoescape %}
             {% endif %}
-        
+          
             {{ relative_time(notification.time) }}
-        
        
-{% endif %}
+  {% endif %}
 
 {% endblock %}
 
-
\ No newline at end of file
diff --git a/templates/organization/add-member.html b/templates/organization/add-member.html
index 3a562e4..5148e95 100644
--- a/templates/organization/add-member.html
+++ b/templates/organization/add-member.html
@@ -1,9 +1,9 @@
-{% extends "organization/home-base.html" %}
-
-{% block org_js %}
-    {{ form.media.js }}
-{% endblock %}
-
-{% block middle_content %}
-    {% include "organization/form.html" %}
-{% endblock %}
+{% extends "organization/home-base.html" %}
+
+{% block org_js %}
+  {{ form.media.js }}
+{% endblock %}
+
+{% block middle_content %}
+  {% include "organization/form.html" %}
+{% endblock %}
diff --git a/templates/organization/add.html b/templates/organization/add.html
index 151fa2b..d48f453 100644
--- a/templates/organization/add.html
+++ b/templates/organization/add.html
@@ -1,18 +1,18 @@
-{% extends "two-column-content.html" %}
-
-{% block two_col_js %}
-    {{ form.media.js }}
-{% endblock %}
-
-{% block two_col_media %}
-    {{ form.media.css }}
-{% endblock %}
-
-{% block left_sidebar %}
-    {% include "user/user-left-sidebar.html" %}
-{% endblock %}
-
-{% block middle_content %}
-    
        {{title}}
        
-    {% include "organization/form.html" %}
-{% endblock %}
+{% extends "two-column-content.html" %}
+
+{% block two_col_js %}
+  {{ form.media.js }}
+{% endblock %}
+
+{% block two_col_media %}
+  {{ form.media.css }}
+{% endblock %}
+
+{% block left_sidebar %}
+  {% include "user/user-left-sidebar.html" %}
+{% endblock %}
+
+{% block middle_content %}
+  
        {{title}}
        
+  {% include "organization/form.html" %}
+{% endblock %}
diff --git a/templates/organization/blog/add.html b/templates/organization/blog/add.html
index 9db392b..77af26c 100644
--- a/templates/organization/blog/add.html
+++ b/templates/organization/blog/add.html
@@ -1,14 +1,14 @@
-{% extends "organization/home-base.html" %}
-
-{% block three_col_js %}
-    {{ form.media.js }}
-    {% include "organization/home-js.html" %}
-{% endblock %}
-
-{% block three_col_media %}
-    {{ form.media.css }}
-{% endblock %}
-
-{% block middle_content %}
-    {% include "organization/form.html" %}
+{% extends "organization/home-base.html" %}
+
+{% block three_col_js %}
+  {{ form.media.js }}
+  {% include "organization/home-js.html" %}
+{% endblock %}
+
+{% block three_col_media %}
+  {{ form.media.css }}
+{% endblock %}
+
+{% block middle_content %}
+  {% include "organization/form.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/blog/edit.html b/templates/organization/blog/edit.html
index e2cca8e..6de760f 100644
--- a/templates/organization/blog/edit.html
+++ b/templates/organization/blog/edit.html
@@ -1,39 +1,39 @@
 {% extends "organization/home-base.html" %}
 
 {% block three_col_js %}
-    {{ form.media.js }}
-    {% include "organization/home-js.html" %}
+  {{ form.media.js }}
+  {% include "organization/home-js.html" %}
 {% endblock %}
 
 {% block three_col_media %}
-    {{ form.media.css }}
+  {{ form.media.css }}
 {% endblock %}
 
 {% block middle_content %}
-
        
+  
     {% csrf_token %}
     {% if form.errors %}
-        
        
-            x
-                {{ form.non_field_errors() }}
-                {{ form.errors }}
-        
        
+      
        
+        x
+        {{ form.non_field_errors() }}
+        {{ form.errors }}
+      
        
     {% endif %}
     {% for field in form %}
-        {% if not field.is_hidden %}
-            
        
-                {{ field.errors }}
-                
-                
        
-                    {{ field }}
-                
        
-                {% if field.help_text %}
-                    {{ field.help_text|safe }}
-                {% endif %}
-            
        
-        {% endif %}
+      {% if not field.is_hidden %}
+        
        
+          {{ field.errors }}
+          
+          
        
+            {{ field }}
+          
        
+          {% if field.help_text %}
+            {{ field.help_text|safe }}
+          {% endif %}
+        
        
+      {% endif %}
     {% endfor %}
     
     
-
        
+  
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/blog/pending.html b/templates/organization/blog/pending.html
index 4df3608..98fcac5 100644
--- a/templates/organization/blog/pending.html
+++ b/templates/organization/blog/pending.html
@@ -1,28 +1,28 @@
-{% extends "organization/home-base.html" %}
-
-{% block middle_content %}
-    
-        
-            
-                
-                
-                
-            
-        
-        
-            {% for blog in blogs %}
-                
-                    
-                    
-                    
-                
-            {% endfor %}
-        
-    
        
-                    {{_('Blog')}}
-                
-                    {{_('Author')}}
-                
-                    {{_('Post time')}}
-                
        {{blog.title}}{{link_users(blog.authors.all())}}{{- blog.publish_on|date(_("N j, Y, g:i a")) -}}
        
+{% extends "organization/home-base.html" %}
+
+{% block middle_content %}
+  
+    
+      
+        
+        
+        
+      
+    
+    
+      {% for blog in blogs %}
+        
+          
+          
+          
+        
+      {% endfor %}
+    
+  
        
+          {{_('Blog')}}
+        
+          {{_('Author')}}
+        
+          {{_('Post time')}}
+        
        {{blog.title}}{{link_users(blog.authors.all())}}{{- blog.publish_on|date(_("N j, Y, g:i a")) -}}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/contest/add.html b/templates/organization/contest/add.html
index 42da502..7b625a8 100644
--- a/templates/organization/contest/add.html
+++ b/templates/organization/contest/add.html
@@ -1,38 +1,38 @@
-{% extends "organization/home-base.html" %}
-
-{% block three_col_js %}
-    {{ form.media.js }}
-{% endblock %}
-
-{% block three_col_media %}
-    {{ form.media.css }}
-{% endblock %}
-
-{% block middle_content %}
-    
        
-        {% csrf_token %}
-        {% if form.errors %}
-            
        
-                x
-                    {{ form.non_field_errors() }}
-                    {{ form.errors }}
-            
        
-        {% endif %}
-        {% for field in form %}
-            {% if not field.is_hidden %}
-                
        
-                    {{ field.errors }}
-                    
-                    
        
-                        {{ field }}
-                    
        
-                    {% if field.help_text %}
-                        {{ field.help_text|safe }}
-                    {% endif %}
-                
        
-            {% endif %}
-        {% endfor %}
-
-        
-    
        
+{% extends "organization/home-base.html" %}
+
+{% block three_col_js %}
+  {{ form.media.js }}
+{% endblock %}
+
+{% block three_col_media %}
+  {{ form.media.css }}
+{% endblock %}
+
+{% block middle_content %}
+  
        
+    {% csrf_token %}
+    {% if form.errors %}
+      
        
+        x
+        {{ form.non_field_errors() }}
+        {{ form.errors }}
+      
        
+    {% endif %}
+    {% for field in form %}
+      {% if not field.is_hidden %}
+        
        
+          {{ field.errors }}
+          
+          
        
+            {{ field }}
+          
        
+          {% if field.help_text %}
+            {{ field.help_text|safe }}
+          {% endif %}
+        
        
+      {% endif %}
+    {% endfor %}
+
+    
+  
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/contest/edit.html b/templates/organization/contest/edit.html
index 5d7e19b..71e49a9 100644
--- a/templates/organization/contest/edit.html
+++ b/templates/organization/contest/edit.html
@@ -1,88 +1,88 @@
-{% extends "organization/home-base.html" %}
-
-{% block three_col_js %}
-    {{ form.media.js }}
-{% endblock %}
-
-{% block three_col_media %}
-    {{ form.media.css }}
-    
-{% endblock %}
-
-{% block middle_content %}
-    
        
-        {% csrf_token %}
-        {% if form.errors %}
-            
        
-                x
-                    {{ form.non_field_errors() }}
-                    {{ form.errors }}
-            
        
-        {% endif %}
-        {% for field in form %}
-            {% if not field.is_hidden %}
-                
        
-                    {{ field.errors }}
-                    
-                    
        
-                        {{ field }}
-                    
        
-                    {% if field.help_text %}
-                        {{ field.help_text|safe }}
-                    {% endif %}
-                
        
-            {% endif %}
-        {% endfor %}
-
-        

        
-        {{ problems_form.management_form }}
-        {{_('If you run out of rows, click Save')}}
-        
-            
-                
-                    {% for field in problems_form[0] %}
-                    {% if not field.is_hidden %}
-                        
-                    {% endif %}
-                    {% endfor %}
-                
-            
-            
-            {% for form in problems_form %}
-                
-                    {% for field in form %}
-                        
-                        {% endfor %}
-                
-            {% endfor %}
-            
-        
        
-                            {{field.label}}
-                        
        {{field}}
        {{field.errors}}
        
-        
-    
        
+{% extends "organization/home-base.html" %}
+
+{% block three_col_js %}
+  {{ form.media.js }}
+{% endblock %}
+
+{% block three_col_media %}
+  {{ form.media.css }}
+  
+{% endblock %}
+
+{% block middle_content %}
+  
        
+    {% csrf_token %}
+    {% if form.errors %}
+      
        
+        x
+        {{ form.non_field_errors() }}
+        {{ form.errors }}
+      
        
+    {% endif %}
+    {% for field in form %}
+      {% if not field.is_hidden %}
+        
        
+          {{ field.errors }}
+          
+          
        
+            {{ field }}
+          
        
+          {% if field.help_text %}
+            {{ field.help_text|safe }}
+          {% endif %}
+        
        
+      {% endif %}
+    {% endfor %}
+
+    

        
+    {{ problems_form.management_form }}
+    {{_('If you run out of rows, click Save')}}
+    
+      
+        
+          {% for field in problems_form[0] %}
+            {% if not field.is_hidden %}
+              
+            {% endif %}
+          {% endfor %}
+        
+      
+      
+        {% for form in problems_form %}
+          
+            {% for field in form %}
+              
+            {% endfor %}
+          
+        {% endfor %}
+      
+    
        
+                {{field.label}}
+              
        {{field}}
        {{field.errors}}
        
+    
+  
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/contests.html b/templates/organization/contests.html
index 14aed86..5df7868 100644
--- a/templates/organization/contests.html
+++ b/templates/organization/contests.html
@@ -1,4 +1,4 @@
-{% extends "contest/list.html" %}
-{% block left_sidebar %}
-    {% include "organization/org-left-sidebar.html" %}
+{% extends "contest/list.html" %}
+{% block left_sidebar %}
+  {% include "organization/org-left-sidebar.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/edit.html b/templates/organization/edit.html
index fd8ce22..5efefef 100644
--- a/templates/organization/edit.html
+++ b/templates/organization/edit.html
@@ -1,36 +1,36 @@
 {% extends "organization/home-base.html" %}
 
 {% block org_js %}
-    {{ form.media.js }}
-    
+    function interpolate(fmt, obj, named) {
+      if (named) {
+        return fmt.replace(/%\(\w+\)s/g, function (match) {
+          return String(obj[match.slice(2, -2)])
+        });
+      } else {
+        return fmt.replace(/%s/g, function (match) {
+          return String(obj.shift())
+        });
+      }
+    }
+  
 {% endblock %}
 
 {% block three_col_media %}
-    {{ form.media.css }}
+  {{ form.media.css }}
 {% endblock %}
 
 {% block middle_content %}
-    {% include "organization/form.html" %}
+  {% include "organization/form.html" %}
 {% endblock %}
diff --git a/templates/organization/form.html b/templates/organization/form.html
index a062b8c..5201ace 100644
--- a/templates/organization/form.html
+++ b/templates/organization/form.html
@@ -1,25 +1,25 @@
 
        
-    {% csrf_token %}
-    {% if form.errors %}
-        
        
-            x
-                {{ form.non_field_errors() }}
-                {{ form.errors }}
+  {% csrf_token %}
+  {% if form.errors %}
+    
        
+      x
+      {{ form.non_field_errors() }}
+      {{ form.errors }}
+    
        
+  {% endif %}
+  {% for field in form %}
+    {% if not field.is_hidden %}
+      
        
+        {{ field.errors }}
+        
+        
        
+          {{ field }}
         
        
-    {% endif %}
-    {% for field in form %}
-        {% if not field.is_hidden %}
-            
        
-                {{ field.errors }}
-                
-                
        
-                    {{ field }}
-                
        
-                {% if field.help_text %}
-                    {{ field.help_text|safe }}
-                {% endif %}
-            
        
+        {% if field.help_text %}
+          {{ field.help_text|safe }}
         {% endif %}
-    {% endfor %}
-    
+      
        
+    {% endif %}
+  {% endfor %}
+  
 
\ No newline at end of file
diff --git a/templates/organization/home-base.html b/templates/organization/home-base.html
index a0ac617..5c87ef8 100644
--- a/templates/organization/home-base.html
+++ b/templates/organization/home-base.html
@@ -1,21 +1,21 @@
-{% extends "three-column-content.html" %}
-
-{% block three_col_js %}
-    {% include "organization/home-js.html" %}
-    {% block org_js %}{% endblock %} 
-{% endblock %}
-
-{% block left_sidebar %}
-    {% include "organization/org-left-sidebar.html" %}
-{% endblock %}
-
-{% block right_sidebar %}
-    {% include "organization/org-right-sidebar.html" %}
-{% endblock %}
-
-{% block middle_title %}
-    {% if title or content_title %}
-        
        {{ content_title if content_title else title }}
        
-        
        
-    {% endif %}
-{% endblock %}
+{% extends "three-column-content.html" %}
+
+{% block three_col_js %}
+  {% include "organization/home-js.html" %}
+  {% block org_js %}{% endblock %}
+{% endblock %}
+
+{% block left_sidebar %}
+  {% include "organization/org-left-sidebar.html" %}
+{% endblock %}
+
+{% block right_sidebar %}
+  {% include "organization/org-right-sidebar.html" %}
+{% endblock %}
+
+{% block middle_title %}
+  {% if title or content_title %}
+    
        {{ content_title if content_title else title }}
        
+    
        
+  {% endif %}
+{% endblock %}
diff --git a/templates/organization/home-js.html b/templates/organization/home-js.html
index 0ae4296..d9fa078 100644
--- a/templates/organization/home-js.html
+++ b/templates/organization/home-js.html
@@ -1,23 +1,23 @@
-
\ No newline at end of file
diff --git a/templates/organization/home.html b/templates/organization/home.html
index 5d481b9..5d4f0b7 100644
--- a/templates/organization/home.html
+++ b/templates/organization/home.html
@@ -3,62 +3,62 @@
 {% block title_ruler %}{% endblock %}
 
 {% block org_js %}
-    {% include "actionbar/media-js.html" %}
+  {% include "actionbar/media-js.html" %}
 {% endblock %}
 
 {% block three_col_media %}
-    {% include "actionbar/media-css.html" %}
+  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block middle_title %}
-    
        
-        
        
-            
        
-                {{title}}
-            
        
-            {% if is_member %}
-            
-            {% endif %}
-            
-        
-            {% if request.user.is_authenticated %}
-                {% if is_member %}
-                {% elif organization.is_open or can_edit %}
-                    
        
-                        {% csrf_token %}
-                        
-                    
        
-                {% else %}
-                    {{ _('Request membership') }}
-                {% endif %}
-            {% endif %}
+  
        
+    
        
+      
        
+        {{title}}
+      
        
+      {% if is_member %}
+        
+      {% endif %}
+      
+
+      {% if request.user.is_authenticated %}
+        {% if is_member %}
+        {% elif organization.is_open or can_edit %}
+          
        
+            {% csrf_token %}
+            
+          
        
+        {% else %}
+          {{ _('Request membership') }}
+        {% endif %}
+      {% endif %}
     
        
+  
        
 {% endblock %}
 
 {% block middle_content %}
-    {% block before_posts %}{% endblock %}
-    {% if is_member or can_edit %}
-        {% for post in posts %}
-            {% include "blog/content.html" %}
-        {% endfor %}
-        {% if posts.paginator.num_pages > 1 %}
-            
        {% include "list-pages.html" %}
        
-        {% endif %}
-    {% else %}
-        
        
-            
        {{ _('About') }}
        
-            
        
-                
        
-                    {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
-                        {{ organization.about|markdown|reference|str|safe }}
-                    {% endcache %}
-                
        
-            
        
-        
        
+  {% block before_posts %}{% endblock %}
+  {% if is_member or can_edit %}
+    {% for post in posts %}
+      {% include "blog/content.html" %}
+    {% endfor %}
+    {% if posts.paginator.num_pages > 1 %}
+      
        {% include "list-pages.html" %}
        
     {% endif %}
-    {% block after_posts %}{% endblock %}
+  {% else %}
+    
        
+      
        {{ _('About') }}
        
+      
        
+        
        
+          {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
+            {{ organization.about|markdown|reference|str|safe }}
+          {% endcache %}
+        
        
+      
        
+    
        
+  {% endif %}
+  {% block after_posts %}{% endblock %}
 {% endblock %}
diff --git a/templates/organization/list.html b/templates/organization/list.html
index ebcb202..65debd0 100644
--- a/templates/organization/list.html
+++ b/templates/organization/list.html
@@ -1,49 +1,49 @@
 {% extends "two-column-content.html" %}
 
 {% block two_col_media %}
-    
+  
 {% endblock %}
 
 {% block title_ruler %}{% endblock %}
 
 {% block left_sidebar %}
-    {% include "user/user-left-sidebar.html" %}
+  {% include "user/user-left-sidebar.html" %}
 {% endblock %}
 
 {% macro org_list(title, queryset) %}
-    {% if queryset %}
-        
         {{title}} ({{queryset.count()}})
        
-        
        
-            {% for org in queryset %}
-                
-                    
-                    {{ org.name }}
-                    {{ org.member_count }} {{_('members')}}
-                
-            {% endfor %}
-        
        
-    {% endif %}
+  {% if queryset %}
+    
         {{title}} ({{queryset.count()}})
        
+    
        
+      {% for org in queryset %}
+        
+          
+          {{ org.name }}
+          {{ org.member_count }} {{_('members')}}
+        
+      {% endfor %}
+    
        
+  {% endif %}
 {% endmacro %}
 
 {% block middle_content %}
-    {{_("Create group")}}
-    {{ org_list(_('My groups'), my_organizations) }}
-    {{ org_list(_('Open groups'), open_organizations) }}
-    {{ org_list(_('Private groups'), private_organizations) }}
+  {{_("Create group")}}
+  {{ org_list(_('My groups'), my_organizations) }}
+  {{ org_list(_('Open groups'), open_organizations) }}
+  {{ org_list(_('Private groups'), private_organizations) }}
 {% endblock %}
diff --git a/templates/organization/new.html b/templates/organization/new.html
index 916c173..cb58256 100644
--- a/templates/organization/new.html
+++ b/templates/organization/new.html
@@ -4,9 +4,9 @@
 {% block media %}{{ form.media.css }}{% endblock %}
 
 {% block body %}
-    
        
-        {% csrf_token %}
-        {{ form.as_table() }}
        
-        
-    
        
+  
        
+    {% csrf_token %}
+    {{ form.as_table() }}
        
+    
+  
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/org-left-sidebar.html b/templates/organization/org-left-sidebar.html
index 9e7ab6d..abdb11e 100644
--- a/templates/organization/org-left-sidebar.html
+++ b/templates/organization/org-left-sidebar.html
@@ -1,14 +1,14 @@
-
        
-    {{ make_tab_item('home', 'fa fa-home', organization.get_absolute_url(), _('Home')) }}
-    {% if is_member or can_edit %}
-        {{ make_tab_item('problems', 'fa fa-list', organization.get_problems_url(), _('Problems')) }}
-        {{ make_tab_item('contests', 'fa fa-trophy', organization.get_contests_url(), _('Contests')) }}
-        {{ make_tab_item('submissions', 'fa fa-book', organization.get_submissions_url(), _('Submissions')) }}
-    {% endif %}
-    {% if is_member or can_edit or organization.is_open %}
-        {{ make_tab_item('users', 'fa fa-user', organization.get_users_url(), _('Members')) }}
-    {% endif %}
-    {% if perms.judge.change_organization %}
-        {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_organization_change', organization.id), _('Admin')) }}
-    {% endif %}
+
        
+  {{ make_tab_item('home', 'fa fa-home', organization.get_absolute_url(), _('Home')) }}
+  {% if is_member or can_edit %}
+    {{ make_tab_item('problems', 'fa fa-list', organization.get_problems_url(), _('Problems')) }}
+    {{ make_tab_item('contests', 'fa fa-trophy', organization.get_contests_url(), _('Contests')) }}
+    {{ make_tab_item('submissions', 'fa fa-book', organization.get_submissions_url(), _('Submissions')) }}
+  {% endif %}
+  {% if is_member or can_edit or organization.is_open %}
+    {{ make_tab_item('users', 'fa fa-user', organization.get_users_url(), _('Members')) }}
+  {% endif %}
+  {% if perms.judge.change_organization %}
+    {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_organization_change', organization.id), _('Admin')) }}
+  {% endif %}
 
        
\ No newline at end of file
diff --git a/templates/organization/org-right-sidebar.html b/templates/organization/org-right-sidebar.html
index bf74949..0a60aca 100644
--- a/templates/organization/org-right-sidebar.html
+++ b/templates/organization/org-right-sidebar.html
@@ -1,83 +1,83 @@
-
        
-    {% if (is_member or can_edit) %}
-        {% include 'contests-countdown.html' %}
-    {% endif %}
-    {% if can_edit or is_member %}
-        
-        
        
-            
        {{ _('About') }}
        
-            
        
-                
        
-                    {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
-                        {{ organization.about|markdown|reference|str|safe }}
-                    {% endcache %}
-                
        
-            
        
-        
        
-    {% endif %}
-    {% if is_member or can_edit or organization.is_open %}
-        {% include 'top-users.html' %}
-    {% endif %}
+
        
+  {% if (is_member or can_edit) %}
+    {% include 'contests-countdown.html' %}
+  {% endif %}
+  {% if can_edit or is_member %}
+    
+    
        
+      
        {{ _('About') }}
        
+      
        
+        
        
+          {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
+            {{ organization.about|markdown|reference|str|safe }}
+          {% endcache %}
+        
        
+      
        
+    
        
+  {% endif %}
+  {% if is_member or can_edit or organization.is_open %}
+    {% include 'top-users.html' %}
+  {% endif %}
 
        
\ No newline at end of file
diff --git a/templates/organization/preview.html b/templates/organization/preview.html
index 82e7cb1..1c5028c 100644
--- a/templates/organization/preview.html
+++ b/templates/organization/preview.html
@@ -1,4 +1,4 @@
 {{ preview_data|markdown|reference|str|safe }}
 {% if REQUIRE_JAX %}
-    
        
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/organization/problems.html b/templates/organization/problems.html
index 3f0ab87..6b7580b 100644
--- a/templates/organization/problems.html
+++ b/templates/organization/problems.html
@@ -1,4 +1,4 @@
-{% extends "problem/list.html" %}
-{% block left_sidebar %}
-    {% include "organization/org-left-sidebar.html" %}
+{% extends "problem/list.html" %}
+{% block left_sidebar %}
+  {% include "organization/org-left-sidebar.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/requests/detail.html b/templates/organization/requests/detail.html
index 8e18e20..b308324 100644
--- a/templates/organization/requests/detail.html
+++ b/templates/organization/requests/detail.html
@@ -1,26 +1,26 @@
 {% extends "organization/home-base.html" %}
 
 {% block middle_content %}
-    
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
-        
-    
        {{ _('User:') }}{{ link_user(object.user) }}
        {{ _('Organization:') }}
-                {% with org=object.organization %}
-                    {{ org.name }}
-                {% endwith %}
-            
        {{ _('Time:') }}{{ object.time|date(_("N j, Y, g:i a")) }}
        {{ _('Reason:') }}{{ object.reason }}
        
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
        {{ _('User:') }}{{ link_user(object.user) }}
        {{ _('Organization:') }}
+        {% with org=object.organization %}
+          {{ org.name }}
+        {% endwith %}
+      
        {{ _('Time:') }}{{ object.time|date(_("N j, Y, g:i a")) }}
        {{ _('Reason:') }}{{ object.reason }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/requests/log.html b/templates/organization/requests/log.html
index a70f2ab..b0eef34 100644
--- a/templates/organization/requests/log.html
+++ b/templates/organization/requests/log.html
@@ -1,30 +1,30 @@
 {% extends "organization/home-base.html" %}
 
 {% block middle_content %}
-    {% include "organization/requests/tabs.html" %}
+  {% include "organization/requests/tabs.html" %}
 
-    {% if requests %}
-        
-            
-                
-                
-                
-                
-            
-            {% for r in requests %}
-                
-                    
-                    
-                    
-                    
-                
-            {% endfor %}
-        
        {{ _('User') }}{{ _('Time') }}{{ _('State') }}{{ _('Reason') }}
        {{ link_user(r.user) }}
-                        
-                            {{- r.time|date(_("N j, Y, g:i a")) -}}
-                        
-                    {{ r.state }}{{ r.reason|truncatechars(50) }}
        
-    {% else %}
-        
        {{ _('There are no requests to approve.') }}
        
-    {% endif %}
+  {% if requests %}
+    
+      
+        
+        
+        
+        
+      
+      {% for r in requests %}
+        
+          
+          
+          
+          
+        
+      {% endfor %}
+    
        {{ _('User') }}{{ _('Time') }}{{ _('State') }}{{ _('Reason') }}
        {{ link_user(r.user) }}
+            
+              {{- r.time|date(_("N j, Y, g:i a")) -}}
+            
+          {{ r.state }}{{ r.reason|truncatechars(50) }}
        
+  {% else %}
+    
        {{ _('There are no requests to approve.') }}
        
+  {% endif %}
 {% endblock %}
diff --git a/templates/organization/requests/pending.html b/templates/organization/requests/pending.html
index 525fb7e..c07707c 100644
--- a/templates/organization/requests/pending.html
+++ b/templates/organization/requests/pending.html
@@ -1,46 +1,46 @@
 {% extends "organization/home-base.html" %}
 {% block org_js %}
-    
-{% endblock %} 
+  
+{% endblock %}
 {% block middle_content %}
-    {% include "messages.html" %}
-    {% include "organization/requests/tabs.html" %}
+  {% include "messages.html" %}
+  {% include "organization/requests/tabs.html" %}
 
-    {% if formset.forms %}
-        
        
-            {% csrf_token %}
-            {{ formset.management_form }}
-            
-                
-                    
-                    
-                    
-                    
-                    {% if formset.can_delete %}
-                        
-                    {% endif %}
-                
-                {% for form in formset %}
-                    
-                        
-                        
-                        
-                        
-                        {% if formset.can_delete %}
-                            
-                        {% endif %}
-                    
-                {% endfor %}
-            
        {{ _('User') }}{{ _('Time') }}{{ _('State') }}{{ _('Reason') }}{{ _('Delete?') }}
        {{ form.id }}{{ link_user(form.instance.user) }}
-                            {{ form.instance.time|date(_("N j, Y, g:i a")) }}
-                        {{ form.state }}{{ form.instance.reason|truncatechars(50) }}{{ form.DELETE }}
        
-            
-        
        
-    {% else %}
-        
        {{ _('There are no requests to approve.') }}
        
-    {% endif %}
+  {% if formset.forms %}
+    
        
+      {% csrf_token %}
+      {{ formset.management_form }}
+      
+        
+          
+          
+          
+          
+          {% if formset.can_delete %}
+            
+          {% endif %}
+        
+        {% for form in formset %}
+          
+            
+            
+            
+            
+            {% if formset.can_delete %}
+              
+            {% endif %}
+          
+        {% endfor %}
+      
        {{ _('User') }}{{ _('Time') }}{{ _('State') }}{{ _('Reason') }}{{ _('Delete?') }}
        {{ form.id }}{{ link_user(form.instance.user) }}
+              {{ form.instance.time|date(_("N j, Y, g:i a")) }}
+            {{ form.state }}{{ form.instance.reason|truncatechars(50) }}{{ form.DELETE }}
        
+      
+    
        
+  {% else %}
+    
        {{ _('There are no requests to approve.') }}
        
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/requests/request.html b/templates/organization/requests/request.html
index b3666e8..dd84485 100644
--- a/templates/organization/requests/request.html
+++ b/templates/organization/requests/request.html
@@ -1,22 +1,22 @@
 {% extends "organization/home-base.html" %}
 
 {% block org_js %}
-    
+  
 {% endblock %}
 
 {% block middle_content %}
-    
        
-        {% csrf_token %}
-        
        
-        
        {{ form.reason }}
        
-        
-    
        
+  
        
+    {% csrf_token %}
+    
        
+    
        {{ form.reason }}
        
+    
+  
        
 {% endblock %}
diff --git a/templates/organization/requests/tabs.html b/templates/organization/requests/tabs.html
index 569f75a..a4bcfdc 100644
--- a/templates/organization/requests/tabs.html
+++ b/templates/organization/requests/tabs.html
@@ -1,16 +1,16 @@
 
        
-    
+  
 
        
\ No newline at end of file
diff --git a/templates/organization/submissions.html b/templates/organization/submissions.html
index 5090f7d..9ab69a7 100644
--- a/templates/organization/submissions.html
+++ b/templates/organization/submissions.html
@@ -1,4 +1,4 @@
-{% extends "submission/list.html" %}
-{% block left_sidebar %}
-    {% include "organization/org-left-sidebar.html" %}
+{% extends "submission/list.html" %}
+{% block left_sidebar %}
+  {% include "organization/org-left-sidebar.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/organization/users-table.html b/templates/organization/users-table.html
index 7046194..3723327 100644
--- a/templates/organization/users-table.html
+++ b/templates/organization/users-table.html
@@ -1,19 +1,19 @@
 {% extends "user/users-table.html" %}
 
 {% block before_point_head %}
-    {% if can_edit %}
-        
-    {% endif %}
+  {% if can_edit %}
+    
+  {% endif %}
 {% endblock %}
 
 {% block before_point %}
-    {% if can_edit %}
-        
-            
        
-                {% csrf_token %}
-                
-                {{ _('Kick') }}
-            
        
-        
-    {% endif %}
+  {% if can_edit %}
+    
+      
        
+        {% csrf_token %}
+        
+        {{ _('Kick') }}
+      
        
+    
+  {% endif %}
 {% endblock %}
diff --git a/templates/organization/users.html b/templates/organization/users.html
index 241227c..dcd0c33 100644
--- a/templates/organization/users.html
+++ b/templates/organization/users.html
@@ -1,46 +1,46 @@
 {% extends "user/base-users-two-col.html" %}
 {% block users_media %}
-    
+  
 
-    {% if can_edit %}
-        
-    {% endif %}
+  {% if can_edit %}
+    
+  {% endif %}
 {% endblock %}
 
 {% block users_js_media %}
-    
+  
 {% endblock %}
 
 {% block left_sidebar %}
-    {% include "organization/org-left-sidebar.html" %}
+  {% include "organization/org-left-sidebar.html" %}
 {% endblock %}
 
 {% block users_table %}{% include "organization/users-table.html" %}{% endblock %}
diff --git a/templates/pagedown.html b/templates/pagedown.html
index 03b1cc3..ab5867a 100644
--- a/templates/pagedown.html
+++ b/templates/pagedown.html
@@ -1,35 +1,35 @@
 
        
-    
        
-        
        
-        
+  
        
+    
        
+    
+  
        
+  {% if show_preview %}
+    
        
+      
         Update Preview
        
+      
        
     
        
-    {% if show_preview %}
-        
        
-            
         Update Preview
        
-            
        
+  {% endif %}
+  {% if image_upload_enabled %}
+    
        
+      
        Insert Image
        
+      
        
+        
        
+          
+          
         
        
-    {% endif %}
-    {% if image_upload_enabled %}
-        
        
-            
        Insert Image
        
-            
        
-                
        
-                    
-                    
-                
        
-            
        
-            
        
-                
        
-                    
-                    
-                
        
-            
        
-            
        
-                
        
-                
-                
        Cancel
        
-            
        
+      
        
+      
        
+        
        
+          
+          
         
        
-    {% endif %}
+      
        
+      
        
+        
        
+        
+        
        Cancel
        
+      
        
+    
        
+  {% endif %}
 
        
\ No newline at end of file
diff --git a/templates/pagedown/widgets/default.html b/templates/pagedown/widgets/default.html
index 607e4f1..2249589 100644
--- a/templates/pagedown/widgets/default.html
+++ b/templates/pagedown/widgets/default.html
@@ -1,9 +1,9 @@
 
        
-    
        
-        
        
-        {{ body }}
-    
        
-    {% if show_preview %}
-        
        
-    {% endif %}
+  
        
+    
        
+    {{ body }}
+  
        
+  {% if show_preview %}
+    
        
+  {% endif %}
 
        
\ No newline at end of file
diff --git a/templates/problem/clone.html b/templates/problem/clone.html
index dfd5fe7..26cf0a9 100644
--- a/templates/problem/clone.html
+++ b/templates/problem/clone.html
@@ -1,42 +1,42 @@
 {% extends "base.html" %}
 
 {% block media %}
-    
+    ul.errorlist {
+      list-style-type: none;
+      padding-left: 0;
+      text-align: center;
+    }
+  
 {% endblock %}
 
 {% block body %}
-    
        
-        {% csrf_token %}
-        {% if form.errors %}
-            
        
-                {{ form.code.errors }}
-            
        
-        {% endif %}
+  
+    {% csrf_token %}
+    {% if form.errors %}
+      
        
+        {{ form.code.errors }}
+      
        
+    {% endif %}
 
-        
        
-        
        {{ form.code }}
        
-        
        
-        
-    
        
+    
        
+    
        {{ form.code }}
        
+    
        
+    
+  
 {% endblock %}
diff --git a/templates/problem/data.html b/templates/problem/data.html
index ae4b713..696cab8 100644
--- a/templates/problem/data.html
+++ b/templates/problem/data.html
@@ -1,563 +1,563 @@
 {% extends "base.html" %}
 
 {% block js_media %}
-    
-    
-    
-    
-    
+  
+  
+  
+  
-    {% include 'fine_uploader/script.html' %}
+      }
+
+      (function toggle_custom() {
+        let $checker = $('#id_problem-data-checker')
+
+        let $custom_checker = $('#id_problem-data-custom_checker')
+        let $validator = $('#id_problem-data-custom_validator')
+        let $interactive = $('#id_problem-data-interactive_judge')
+
+        $tr_checker = $custom_checker.parent().parent();
+        $tr_validator = $validator.parent().parent()
+        $tr_interactive = $interactive.parent().parent()
+
+        $td = $checker.parent();
+        var $sample = $("",{
+          text: "{{_('Instruction')}}",
+          style: "margin-left:3em;",
+          target: "_blank",
+          href: "{{url('custom_checker_sample')}}"
+        }).appendTo($td);
+
+        $checker.change(function () {
+          $tr_checker.toggle($checker.val() == 'custom').change();
+          $tr_validator.toggle($checker.val() == 'customval' || $checker.val() == 'testlib').change();
+          $tr_interactive.toggle($checker.val() == 'interact').change();
+
+          $sample.toggle(['custom', 'customval', 'interact'].includes($checker.val())).change();
+        }).change();
+      })();
+
+      checker_precision($('#id_problem-data-checker'));
+
+      $table.on('add-row', function (e, $tr) {
+        var $order = $tr.find('input').filter('[id$=order]').attr('type', 'hidden').val(++order);
+        $order.after($('', {'class': 'order'}).text($order.val()))
+          .after($('', {'class': 'fa fa-fw fa-lg fa-ellipsis-v'}));
+
+        var $opts = $tr.find('input').slice(2, 6);
+        var $files = $tr.find('select').slice(1, 3);
+        var $delete = $files.end().last();
+        $tr.find('select[id$=type]').change(function () {
+          var $this = $(this), val = $this.val(), disabled;
+          switch (val) {
+            case 'S':
+            case 'E':
+              disabled = val == 'S';
+              $opts.toggle(val == 'S');
+              $files.siblings('.select2').hide();
+              $delete.toggle(val == 'S');
+              break;
+            default:
+              $opts.toggle(val == 'C');
+              $files.siblings('.select2').toggle(val == 'C');
+              $delete.toggle(val == 'C');
+              var $prevs = $tr.prevAll('tr[data-type=S], tr[data-type=E]');
+              disabled = $prevs.length && $prevs.get(0).getAttribute('data-type') == 'S';
+              $tr.find('input[id$=pretest]').toggle(val == 'C' && !disabled);
+          }
+          $tr.attr('data-type', val).nextUntil('tr[data-type=S], tr[data-type=E], tr[data-type=""]')
+            .find('input[id$=pretest]').toggle(!disabled);
+        }).change();
+
+        var tooltip_classes = 'tooltipped tooltipped-s';
+        $tr.find('a.edit-generator-args').mouseover(function () {
+          switch ($tr.attr('data-type')) {
+            case 'C':
+            case 'S':
+              var $this = $(this).addClass(tooltip_classes);
+              $this.attr('aria-label', $this.prev().val() || '(none)');
+          }
+        }).mouseout(function () {
+          $(this).removeClass(tooltip_classes).removeAttr('aria-label');
+        }).featherlight($('.generator-args-editor'), {
+          beforeOpen: function () {
+            switch ($tr.attr('data-type')) {
+              case 'C':
+              case 'S':
+                return true;
+              default:
+                return false;
+            }
+          },
+          afterOpen: function () {
+            var $input = this.$currentTarget.prev();
+            this.$instance.find('.generator-args-editor')
+              .find('textarea').val($input.val()).end()
+              .find('.button').click(function () {
+              $input.val($(this).prev().val());
+              $.featherlight.current().close();
+            }).end()
+              .show();
+          }
+        });
+
+        checker_precision($tr.find('select[id$=checker]'));
+      }).find('tbody:first').find('tr').each(function () {
+        $table.trigger('add-row', [$(this)]);
+      });
+
+      $('form').submit(function () {
+        $table.find('tbody:first').find('tr').each(function () {
+          var filled = false;
+          $(this).find('input, select').each(function () {
+            var $this = $(this);
+            if (!$this.attr('name'))
+            return;
+            if ($this.attr('type') === 'checkbox')
+            filled |= $this.is(':checked');
+            else if (!$this.attr('name').endsWith('order'))
+            filled |= !!$this.val();
+          });
+          if (!filled)
+          $(this).find('input[id$=order]').val('');
+        });
+      });
+
+      var $total = $('#id_cases-TOTAL_FORMS');
+
+      $('a#add-case-row').click(function () {
+        var $tr;
+        $table.find('tbody:first').append($tr = $($table.find('.extra-row-body').html()
+            .replace(/__prefix__/g, $total.val())));
+        $tr.find('.type-column select option[value="C"]').attr('selected', true);
+        $total.val(parseInt($total.val()) + 1);
+        $table.trigger('add-row', [$tr]);
+        window.scrollBy(0, $tr.height());
+        return false;
+      });
+
+      function isInpFile(x) {
+        let tail = ['.in', '.inp', '.IN', '.INP']
+        for (let i of tail) {
+          if (x.endsWith(i)) {
+            return true;
+          }
+        }
+        return false;
+      }
+      function isOutFile(x) {
+        let tail = ['.out', '.OUT', '.ans', '.ANS']
+        for (let i of tail) {
+          if (x.endsWith(i)) {
+            return true;
+          }
+        }
+        return false;
+      }
+
+      $('a#fill-testcases').click(function (e) {
+        e.preventDefault();
+        var inFiles = [], outFiles = [];
+        for (let file of window.valid_files) {
+          if (isInpFile(file)) {
+            inFiles.push(file);
+          }
+          if (isOutFile(file)) {
+            outFiles.push(file);
+          }
+        }
+        if (inFiles.length == 0) {
+          alert("No input/output files. Make sure your files' suffices are .in(p)/.out");
+          return false;
+        }
+        if (inFiles.length != outFiles.length) {
+          alert("The input files do not match the output files!");
+          return false;
+        }
+
+        inFiles.sort();
+        outFiles.sort();
+
+        // big number of input
+        if (inFiles.length > 100) {
+          window.big_input = true;
+        }
+
+        var batch_starts = $('#batch_starts').val();
+        batch_starts = batch_starts.split(',');
+        batch_starts = batch_starts.filter(e => {
+          return e.length && e == +e;
+        });
+        batch_starts = new Set(batch_starts.map(x => Math.min(Math.max(1, parseInt(x)), inFiles.length - 1)));
+        batch_starts.add(inFiles.length + 1);
+
+        var numRows = inFiles.length + 2 * batch_starts.size - 2;
+        while ($total.val() < numRows) {
+          $('a#add-case-row').click();
+        }
+
+        // fill cases
+        var row = 0;
+        for (var i = 0; i < inFiles.length; i++) {
+          if (batch_starts.has(i + 1)) {
+            $("#id_cases-"+row+"-type").val('S').change();
+            row += 1;
+          }
+          var $input = $("#id_cases-"+row+"-input_file");
+          $input.select2('destroy').empty().select2({ data: [inFiles[i]] });
+          $input.val(inFiles[i]).change();
+          var $output = $("#id_cases-"+row+"-output_file");
+          $output.select2('destroy').empty().select2({ data: [outFiles[i]] });
+          $output.val(outFiles[i]).change();
+
+          if ($("#problem-type").val() == "ICPC") {
+            $("#id_cases-"+row+"-points").val('0').change();
+          }
+          else {
+            $("#id_cases-"+row+"-points").val('1').change();
+          }
+          row += 1;
+
+          if (batch_starts.has(i + 2)) {
+            $("#id_cases-"+(row-1)+"-points").val('1').change();
+            $("#id_cases-"+row+"-type").val('E').change();
+            row += 1;
+          }
+        }
+        update_select2();
+        return false;
+      });
+
+      var oldIndex;
+      $('#case-table tbody').sortable({
+        itemSelector: 'tr',
+        handle: 'i.fa-ellipsis-v',
+        start: function (event, ui) {
+          $item = ui.item;
+          oldIndex = $item.index();
+        },
+        stop: function (event, ui) {
+          $item = ui.item;
+          var newIndex = $item.index();
+          if (newIndex > oldIndex) {
+            var order = parseInt($item.parent().children().slice(oldIndex, newIndex).each(function () {
+              var $order = $(this).find('input[id$=order]');
+              $order.val(parseInt($order.val()) - 1).siblings('span.order').text($order.val());
+            }).last().after($item).find('input[id$=order]').val());
+            $item.find('input[id$=order]').val(order + 1).siblings('span.order').text(order + 1);
+          } else if (newIndex < oldIndex) {
+            var order = parseInt($item.parent().children().slice(newIndex + 1, oldIndex + 1).each(function () {
+              var $order = $(this).find('input[id$=order]');
+              $order.val(parseInt($order.val()) + 1).siblings('span.order').text($order.val());
+            }).first().before($item).find('input[id$=order]').val());
+            $item.find('input[id$=order]').val(order - 1).siblings('span.order').text(order - 1);
+          }
+          if (newIndex != oldIndex)
+          handle_table_reorder();
+        }
+      });
+
+      $('input#delete-all').change(function() {
+        if (this.checked) {
+          $("input[name$='DELETE']").attr('checked', true);
+        }
+        else {
+          $("input[name$='DELETE']").attr('checked', false);
+        }
+      });
+
+      // Change to OI if the first row point > 0
+      if($("#id_cases-0-points").val() != '0') $('#problem-type').val('OI');
+      $("#problem-type").select2();
+
+      // Change batch_starts based on current tests
+      function update_batch_starts() {
+        var numBatches = 0;
+        var batchStarts = [];
+        $("#case-table tbody:first tr").each(function(idx) {
+          $select = $('#id_cases-' + idx + '-type');
+          if ($select.val() == 'S') {
+            batchStarts.push(idx + 1 - 2 * numBatches);
+            numBatches++;
+          }
+        });
+        if (batchStarts) {
+          $("#batch_starts").val(batchStarts.join(', '));
+        }
+      }
+      update_batch_starts();
+
+    }).change();
+  
+  {% include 'fine_uploader/script.html' %}
 {% endblock %}
 
 {% block media %}
-    
-    
+    ul.errorlist {
+      border: 3px red solid;
+      border-radius: 5px;
+      padding-top: 1em;
+      padding-bottom: 1em;
+      background: #e99;
+    }
+  
 {% endblock %}
 
 {% block header %}
-    {% if data_form.instance.has_yml %}
-        
        
-            [{{ _('View YAML') }}]
-        
        
-    {% endif %}
+  {% if data_form.instance.has_yml %}
+    
        
+      [{{ _('View YAML') }}]
+    
        
+  {% endif %}
 {% endblock %}
 
 {% block body %}
-    {% if data_form.instance.feedback %}
-        
          
-            
        • {{ data_form.instance.feedback }}
          • 
-        
        
-    {% endif %}
-    
        
-        {% csrf_token %}
-        {{ cases_formset.management_form }}
-        
-            {{ data_form.as_table() }}
-            
+          {% endif %}
+          
+            
+            
+            
+        {{ form.input_file.errors }}{{ form.input_file }}
+      
+      
+  {{ form.output_file.errors }}{{ form.output_file }}
+
+
+
+{% if cases_formset.can_delete %}
+  
+{% endif %}
+
+{% endfor %}
+
+
        
-                
+  {% if data_form.instance.feedback %}
+    
          
+      
        • {{ data_form.instance.feedback }}
          • 
+    
        
+  {% endif %}
+  
+    {% csrf_token %}
+    {{ cases_formset.management_form }}
+    
+      {{ data_form.as_table() }}
+      
+      
+    
        
+        
+      
+        
        
+          {{_('Problem type')}}:
+          
+          
+            
+            {{_('Fill testcases')}}
+          
+        
        
+        
        
+          {{_("Batch start positions")}}:
+          
+        
        
+        
        
+          {{_("Leave empty if not use batch. If you want to divide to three batches [1, 4], [5, 8], [9, 10], enter: 1, 5, 9")}}
+        
        
+      
        
+    
+    
+      
+        
+          
+          
+          
+          
+          
+          
+          {% if cases_formset.can_delete %}
+            
-            
-        
        {{ _('Type') }}{{ _('Input file') }}{{ _('Output file') }}{{ _('Points') }}{{ _('Pretest?') }}{{ _('Delete?') }}
+              
        
+              
                     		
-                
        
-                    {{_('Problem type')}}:
-                    
-                    
-                        
-                        {{_('Fill testcases')}}
-                    
-                
        
-                
        
-                    {{_("Batch start positions")}}:
-                    
-                
        
-                
        
-                    {{_("Leave empty if not use batch. If you want to divide to three batches [1, 4], [5, 8], [9, 10], enter: 1, 5, 9")}}
-                
        
-            
        
-        
-        
-            
+          {% endif %}
+        
+      
+      
+        {% for form in all_case_forms %}
+          {% if form.non_field_errors() %}
             
-                
-                
-                
-                
-                
-                
-                {% if cases_formset.can_delete %}
-                    
-                {% endif %}
+              
-            
-            
-            {% for form in all_case_forms %}
-                {% if form.non_field_errors() %}
-                    
-                        
-                    
-                {% endif %}
-                {% if form.prefix and '__prefix__' in form.prefix %}
-                    
-                    
-                {% endif %}
-                
-                    
-                    
-                    
-                        {{ form.input_file.errors }}{{ form.input_file }}
-                    
-                    
-                        {{ form.output_file.errors }}{{ form.output_file }}
-                    
-                    
-                    
-                    {% if cases_formset.can_delete %}
-                        
-                    {% endif %}
-                
-            {% endfor %}
+          {% endif %}
+          {% if form.prefix and '__prefix__' in form.prefix %}
             
-        
        {{ _('Type') }}{{ _('Input file') }}{{ _('Output file') }}{{ _('Points') }}{{ _('Pretest?') }}{{ _('Delete?') }}
-                        
        
-                         
-                            		{{ form.non_field_errors() }}
             
        {{ form.non_field_errors() }}
        
-        
-         {{ _('Add new case') }}
-    
+            
        
+
+ {{ _('Add new case') }}
+
 {% endblock %}
diff --git a/templates/problem/editorial.html b/templates/problem/editorial.html
index d4b760d..d942b8e 100644
--- a/templates/problem/editorial.html
+++ b/templates/problem/editorial.html
@@ -1,44 +1,44 @@
 {% extends "common-content.html" %}
 
 {% block content_js_media %}
-    {% include "comments/media-js.html" %}
-    {% include "actionbar/media-js.html" %}
+  {% include "comments/media-js.html" %}
+  {% include "actionbar/media-js.html" %}
 {% endblock %}
 
 {% block content_media %}
-    {% include "comments/media-css.html" %}
-    {% include "actionbar/media-css.html" %}
+  {% include "comments/media-css.html" %}
+  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block header %}
-    
        
-        {% if perms.judge.change_problem %}
-            [{{ _('Edit') }}]
-        {% endif %}
-    
        
+  
        
+    {% if perms.judge.change_problem %}
+      [{{ _('Edit') }}]
+    {% endif %}
+  
        
 {% endblock %}
 
 {% block body %}
-    
        
-        {% if not has_solved_problem %}
-            
        {{ _('Remember to use this editorial only when stuck, and not to copy-paste code from it. Please be respectful to the problem author and editorialist. 

         Submitting an official solution before solving the problem yourself is a bannable offence.') }}
        
-        {% endif %}
-        {% with authors=solution.authors.all() %}
-            {% if authors %}
-                
        Authors: {{ link_users(authors) }}
        
-            {% endif %}
-        {% endwith %}
-        {{ solution.content|markdown|reference|str|safe }}
-    
        
-    
        
-    {% include "actionbar/list.html" %}
-    
        
-    {% include "comments/list.html" %}
+  
        
+    {% if not has_solved_problem %}
+      
        {{ _('Remember to use this editorial only when stuck, and not to copy-paste code from it. Please be respectful to the problem author and editorialist. 

         Submitting an official solution before solving the problem yourself is a bannable offence.') }}
        
+    {% endif %}
+    {% with authors=solution.authors.all() %}
+      {% if authors %}
+        
        Authors: {{ link_users(authors) }}
        
+      {% endif %}
+    {% endwith %}
+    {{ solution.content|markdown|reference|str|safe }}
+  
        
+  
        
+  {% include "actionbar/list.html" %}
+  
        
+  {% include "comments/list.html" %}
 {% endblock %}
 
 {% block bodyend %}
-    {% if REQUIRE_JAX %}
-        {% include "mathjax-load.html" %}
-    {% endif %}
-    {% include "comments/math.html" %}
+  {% if REQUIRE_JAX %}
+    {% include "mathjax-load.html" %}
+  {% endif %}
+  {% include "comments/math.html" %}
 {% endblock %}
diff --git a/templates/problem/feed.html b/templates/problem/feed.html
index 848e6c9..ff602d8 100644
--- a/templates/problem/feed.html
+++ b/templates/problem/feed.html
@@ -1,141 +1,141 @@
-{% extends "problem/list-base.html" %}
-{% block left_sidebar %}
-    {% include "problem/left-sidebar.html" %}
-{% endblock %}
-
-{% block middle_content %}
-    
        
-        
-            {{_('FOR YOU')}}
-        
-        
-            {{_('NEW')}}
-        
-        {% if request.user.has_perm('judge.suggest_problem_changes') %}
-            
-                {{_('VOLUNTEER')}}
-            
-        {% endif %}
-    
        
-    {% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
-        
-    {% endif %}
-    {% for problem in problems %}
-        
        
-            
        
-                
-                    {{ problem.i18n_name }}
-                
-                {% if problem.id in completed_problem_ids %}
-                    
-                {% elif problem.id in attempted_problems %}
-                    
-                {% else %}
-                    
-                {% endif %}
-            
        
-            {% with authors=problem.authors.all() %}
-                {% if authors %}
-                    
        
-                        
-                        {{ link_users(authors) }}
-                    
        
-                {% endif %}
-            {% endwith %}
-            {% if show_types %}
-                
        
-                    
-                    {% for type in problem.types_list %}
-                        {{ type }}{% if not loop.last %}, {% endif %}
-                    {% endfor %}, *{{problem.points | int}}
-                
        
-            {% endif %}
-            
        
-                
        
-                    {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
-                        {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
-                    {% endcache %}
-                    {% if problem.pdf_description %}
-                        
-                    {% endif %}
-                
        
-                {% set include_hr = True %}
-                {% set hide_actionbar_comment = True %}
-                {% set pagevote = problem.pagevote %}
-                {% set bookmark = problem.bookmark %}
-                {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
-                {% include "actionbar/list.html" %}
-
-                {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
-                    
        
-                    {{ _('View source') }}
-                    
-                    
        
-                    
        {{_('Volunteer form')}}
        
-                    
        
-                    
-                    
-                    
-                {% endif %}
-            
        
-        
        
-    {% endfor %}
-    {% if page_obj.num_pages > 1 %}
-        
        {% include "list-pages.html" %}
        
-    {% endif %}
+{% extends "problem/list-base.html" %}
+{% block left_sidebar %}
+  {% include "problem/left-sidebar.html" %}
+{% endblock %}
+
+{% block middle_content %}
+  
        
+    
+      {{_('FOR YOU')}}
+    
+    
+      {{_('NEW')}}
+    
+    {% if request.user.has_perm('judge.suggest_problem_changes') %}
+      
+        {{_('VOLUNTEER')}}
+      
+    {% endif %}
+  
        
+  {% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
+    
+  {% endif %}
+  {% for problem in problems %}
+    
        
+      
        
+        
+          {{ problem.i18n_name }}
+        
+        {% if problem.id in completed_problem_ids %}
+          
+        {% elif problem.id in attempted_problems %}
+          
+        {% else %}
+          
+        {% endif %}
+      
        
+      {% with authors=problem.authors.all() %}
+        {% if authors %}
+          
        
+            
+            {{ link_users(authors) }}
+          
        
+        {% endif %}
+      {% endwith %}
+      {% if show_types %}
+        
        
+          
+          {% for type in problem.types_list %}
+            {{ type }}{% if not loop.last %}, {% endif %}
+          {% endfor %}, *{{problem.points | int}}
+        
        
+      {% endif %}
+      
        
+        
        
+          {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
+            {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
+          {% endcache %}
+          {% if problem.pdf_description %}
+            
+          {% endif %}
+        
        
+        {% set include_hr = True %}
+        {% set hide_actionbar_comment = True %}
+        {% set pagevote = problem.pagevote %}
+        {% set bookmark = problem.bookmark %}
+        {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
+        {% include "actionbar/list.html" %}
+
+        {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
+          
        
+          {{ _('View source') }}
+          
+          
        
+          
        {{_('Volunteer form')}}
        
+          
        
+          
+          
+          
+        {% endif %}
+      
        
+    
        
+  {% endfor %}
+  {% if page_obj.num_pages > 1 %}
+    
        {% include "list-pages.html" %}
        
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/left-sidebar.html b/templates/problem/left-sidebar.html
index 97f5f7b..3be6d24 100644
--- a/templates/problem/left-sidebar.html
+++ b/templates/problem/left-sidebar.html
@@ -1,9 +1,9 @@
-{% if not show_contest_mode %}
-    
        
-        {{ make_tab_item('feed', 'fa fa-pagelines', url('problem_feed'), _('Feed')) }}
-        {{ make_tab_item('list', 'fa fa-list', url('problem_list'), _('List')) }}
-        {% if request.user.is_superuser %}
-        {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }}
-        {% endif %}
-    
        
+{% if not show_contest_mode %}
+  
        
+    {{ make_tab_item('feed', 'fa fa-pagelines', url('problem_feed'), _('Feed')) }}
+    {{ make_tab_item('list', 'fa fa-list', url('problem_list'), _('List')) }}
+    {% if request.user.is_superuser %}
+      {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }}
+    {% endif %}
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html
index 0e44083..eacf581 100644
--- a/templates/problem/list-base.html
+++ b/templates/problem/list-base.html
@@ -1,261 +1,261 @@
-{% extends "three-column-content.html" %}
-{% block three_col_media %}
-    
-    
-    {% if not show_contest_mode %}
-        
-    {% else %}
-        
-    {% endif %}
-    {% include "actionbar/media-css.html" %}
-{% endblock %}
-
-{% block three_col_js %}
-    {% include "actionbar/media-js.html" %}
-    
-    {% compress js %}
-        
-        
-    {% endcompress %}
-    {% if show_contest_mode %}
-        {% compress js %}
-            
-            
-        {% endcompress %}
-    {% endif %}
-{% endblock %}
-
-{% block left_sidebar %}
-    {% include "problem/left-sidebar.html" %}
-{% endblock %}
-
-{% block right_sidebar %}
-    {% if not show_contest_mode %}
-        
        
-            {% include "problem/search-form.html" %}
-            {% include "problem/recent-attempt.html" %}
-        
        
-    {% endif %}
+{% extends "three-column-content.html" %}
+{% block three_col_media %}
+  
+  
+  {% if not show_contest_mode %}
+    
+  {% else %}
+    
+  {% endif %}
+  {% include "actionbar/media-css.html" %}
+{% endblock %}
+
+{% block three_col_js %}
+  {% include "actionbar/media-js.html" %}
+  
+  {% compress js %}
+    
+    
+  {% endcompress %}
+  {% if show_contest_mode %}
+    {% compress js %}
+      
+      
+    {% endcompress %}
+  {% endif %}
+{% endblock %}
+
+{% block left_sidebar %}
+  {% include "problem/left-sidebar.html" %}
+{% endblock %}
+
+{% block right_sidebar %}
+  {% if not show_contest_mode %}
+    
        
+      {% include "problem/search-form.html" %}
+      {% include "problem/recent-attempt.html" %}
+    
        
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/list.html b/templates/problem/list.html
index 084a221..ebf0cdb 100644
--- a/templates/problem/list.html
+++ b/templates/problem/list.html
@@ -1,180 +1,180 @@
 {% extends "problem/list-base.html" %}
 {% block left_sidebar %}
-    {% include "problem/left-sidebar.html" %}
+  {% include "problem/left-sidebar.html" %}
 {% endblock %}
 
 {% set has_hidden_subtasks = show_contest_mode and request.participation.contest.format.has_hidden_subtasks %}
 
 {% block middle_content %}
-    
        
-        
-            
-            
-                {% if show_contest_mode %}
-                    {% if request.user.is_authenticated and not has_hidden_subtasks %}
-                        
+  
        
+    
        
+      
+        
+          {% if show_contest_mode %}
+            {% if request.user.is_authenticated and not has_hidden_subtasks %}
+              
+            {% endif %}
+            
+            
+            {% if show_types %}
+              
+            {% endif %}
+            
+            {% if not has_hidden_subtasks %}
+              
+            {% endif %}
+          {% else %}
+            {% if request.user.is_authenticated %}
+              
+            {% endif %}
+            
+            
+            
+            {% if show_types %}
+              
+            {% endif %}
+            
+            
+            
+            {% if show_editorial %}
+              
+            {% endif %}
+          {% endif %}
+        
+      
+      
+        {% for problem in object_list %}
+          
+            {% if request.user.is_authenticated and not has_hidden_subtasks %}
+              {% if problem.id in completed_problem_ids %}
+                
-                    
-                    {% if show_types %}
-                        
-                    {% endif %}
-                    
-                    {% if not has_hidden_subtasks %}
-                    
-                    {% endif %}
-                {% else %}
-                    {% if request.user.is_authenticated %}
-                        
-                    {% endif %}
-                    
-                    
-                    
-                    {% if show_types %}
-                        
-                    {% endif %}
-                    
-                    
-                    
-                    {% if show_editorial %}
-                    
-                    {% endif %}
-                {% endif %}
-            
-            
-            
-            {% for problem in object_list %}
-                
-                    {% if request.user.is_authenticated and not has_hidden_subtasks %}
-                        {% if problem.id in completed_problem_ids %}
-                            
-                        {% elif problem.id in attempted_problems %}
-                            
-                        {% else %}
-                            
-                        {% endif %}
-                    {% endif %}
-                    
-                    
-                    {% if not show_contest_mode %}
-                        
-                    {% endif %}
-                    {% if show_types %}
-                        
-                    {% endif %}
-                    
-                    {% if not show_contest_mode %}
-                        
-                    {% endif %}
-                    {% if not has_hidden_subtasks %}
-                    
+                  
+                
+              {% elif problem.id in attempted_problems %}
+                
+              {% else %}
+                
+              {% endif %}
+            {% endif %}
+            
+            
+            {% if not show_contest_mode %}
+              
+            {% endif %}
+            {% if show_types %}
+              
+            {% endif %}
+            
+            {% if not show_contest_mode %}
+              
+            {% endif %}
+            {% if not has_hidden_subtasks %}
+              
+            {% endif %}
 
-                    {% if show_editorial%}
-                    
-                    {% endif %}
-                
-            {% endfor %}
-            
+            {% if show_editorial%}
+              
+            {% endif %}
+          
+        {% endfor %}
+      
+    
        {{ _('Problem') }}{{ _('Problem code') }}{{ _('Types') }}{{ _('Points') }}{{ _('Users') }}
+                {{ sort_order.solved }}
+                
+              
+              {{ _('Problem') }}{{ sort_order.name }}
+            
+              {{ _('Problem code') }}
+            
+              {{ _('Category') }}{{ sort_order.group }}
+            
+                {{ _('Types') }}{{ sort_order.type }}
+              
+              {{ _('Points') }}{{ sort_order.points }}
+            
+              {{ _('AC %%') }}{{ sort_order.ac_rate }}
+            
+              {{ _('AC #') }}{{ sort_order.user_count }}
+            
+                {{_('Editorial')}}
+              
        
+                  
+                    {% if problem.is_public or show_contest_mode %}
+                      
+                    {% else %}
+                      
                     {% endif %}
-                    {{ _('Problem') }}{{ _('Problem code') }}{{ _('Types') }}{{ _('Points') }}{{ _('Users') }}
-                            {{ sort_order.solved }}
-                            
-                        
-                        {{ _('Problem') }}{{ sort_order.name }}
-                    
-                        {{ _('Problem code') }}
-                    
-                        {{ _('Category') }}{{ sort_order.group }}
-                    
-                            {{ _('Types') }}{{ sort_order.type }}
-                        
-                        {{ _('Points') }}{{ sort_order.points }}
-                    
-                        {{ _('AC %%') }}{{ sort_order.ac_rate }}
-                    
-                        {{ _('AC #') }}{{ sort_order.user_count }}
-                    
-                        {{_('Editorial')}}
-                    
        
-                                
-                                    {% if problem.is_public or show_contest_mode %}
-                                        
-                                    {% else %}
-                                        
-                                    {% endif %}
-                                
-                            
-                                
-                                    {% if problem.is_public or show_contest_mode %}
-                                        
-                                    {% else %}
-                                        
-                                    {% endif %}
-                                
-                            
-                                {% if problem.is_public or show_contest_mode %}
-                                    
-                                {% else %}
-                                    
-                                {% endif %}
-                            
-                        {{ problem.i18n_name }}
-                    
-                        {{ problem.code }}
-                    {{ problem.group.full_name }}
-                            {% for type in problem.types_list %}
-                                {{ type }}{% if not loop.last %}, {% endif %}
-                            {% endfor %}
-                        {{ problem.points|floatformat }}{% if problem.partial %}p{% endif %}{{ problem.ac_rate|floatformat(0) }}%
-                        
-                            {% if not show_contest_mode or not hide_contest_scoreboard %}
-                                {{ problem.user_count }}
-                            {% else %}
-                                ???
-                            {% endif %}
-                        
-                    
+                  
+                    {% if problem.is_public or show_contest_mode %}
+                      
+                    {% else %}
+                      
                     {% endif %}
+                  
+                
+                  {% if problem.is_public or show_contest_mode %}
+                    
+                  {% else %}
+                    
+                  {% endif %}
+                
+              {{ problem.i18n_name }}
+            
+              {{ problem.code }}
+            {{ problem.group.full_name }}
+                {% for type in problem.types_list %}
+                  {{ type }}{% if not loop.last %}, {% endif %}
+                {% endfor %}
+              {{ problem.points|floatformat }}{% if problem.partial %}p{% endif %}{{ problem.ac_rate|floatformat(0) }}%
+                
+                  {% if not show_contest_mode or not hide_contest_scoreboard %}
+                    {{ problem.user_count }}
+                  {% else %}
+                    ???
+                  {% endif %}
+                
+              
-                        {% if problem.has_public_editorial %}
-                            {{ _('Editorial') }}
-                        {% endif %}
-                    
        
+                {% if problem.has_public_editorial %}
+                  {{ _('Editorial') }}
+                {% endif %}
+              
        
+    {% if show_contest_mode and request.participation.contest.use_clarifications %}
+      

        
+      {% if can_edit_contest %}
+        
+      {% endif %}
+      {% if has_clarifications %}
+        
        
+           {{_('Clarifications')}}
        
+        
+          
+            
+            
+            
+          
+          {% for clarification in clarifications %}
+            
+              
+              
+              
+            
+          {% endfor %}
         
        {{_('Problem')}}{{_('Time')}}{{_('Description')}}
        
+                
+                  {{ clarification.problem.problem.name }}
+                
+              {{ relative_time(clarification.date) }}
        {{clarification.description}}
        
-        {% if show_contest_mode and request.participation.contest.use_clarifications %}
-            

        
-            {% if can_edit_contest %}
-            
-            {% endif %}
-            {% if has_clarifications %}
-                
        
-                     {{_('Clarifications')}}
        
-                
-                    
-                        
-                        
-                        
-                    
-                    {% for clarification in clarifications %}
-                        
-                            
-                            
-                            
-                        
-                    {% endfor %}
-                
        {{_('Problem')}}{{_('Time')}}{{_('Description')}}
        
-                                
-                                    {{ clarification.problem.problem.name }}
-                                
-                            {{ relative_time(clarification.date) }}
        {{clarification.description}}
        
-            {% else %}
-                
        
-                    {{ _('No clarifications have been made at this time.') }}
-                
        
-            {% endif %}
-        {% endif %}
-    
        
-    {% if page_obj.num_pages > 1 %}
-        
        {% include "list-pages.html" %}
        
+      {% else %}
+        
        
+          {{ _('No clarifications have been made at this time.') }}
+        
        
+      {% endif %}
     {% endif %}
+  
        
+  {% if page_obj.num_pages > 1 %}
+    
        {% include "list-pages.html" %}
        
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/manage_submission.html b/templates/problem/manage_submission.html
index d19aaa8..7aa67d9 100644
--- a/templates/problem/manage_submission.html
+++ b/templates/problem/manage_submission.html
@@ -1,183 +1,183 @@
 {% extends "base.html" %}
 
 {% block media %}
-    
+    .control-group select {
+      display: block;
+      width: 100%;
+    }
+  
 {% endblock %}
 
 {% block js_media %}
-    
+      };
+
+      $('#rejudge-selected').on('click', {action: 'rejudge'}, actionClick);
+      $('#download-selected').on('click', {action: 'download'}, actionClick);
+
+
+      $use_id.change(function () {
+        $('#by-range-filter').find('input').prop('disabled', !this.checked);
+      });
+
+    });
+  
 {% endblock %}
 
 {% block body %}
-    {% include "messages.html" %}
+  {% include "messages.html" %}
 
-    
        
-        {% if request.user.has_perm('judge.rejudge_submission_lot') %}
-            
        
-                
        {{ _('Filter submissions') }}
        
-                
        
-                    {% csrf_token %}
-                    
        
-                        
-                        
-                            
-                                
-                                
-                            
-                            
-                                
-                                
-                            
-                        
        
-                        
        {{ _('This range includes both endpoints.') }}
        
-                    
        
-                    
        
-                        
-                        
-                    
        
-                    
        
-                        
-                        
-                    
        
-                
        
-            
        
-            
        
-                
         {{ _('Action') }} 
        
-                
-                    {{ _('Rejudge selected submissions') }}
-                
-                
        
+  
        
+    {% if request.user.has_perm('judge.rejudge_submission_lot') %}
+      
        
+        
        {{ _('Filter submissions') }}
        
+        
        
+          {% csrf_token %}
+          
        
+            
+            
+              
+                
+                
+              
+              
+                
+                
+              
+            
        
+            
        {{ _('This range includes both endpoints.') }}
        
+          
        
+          
        
+            
+            
+          
        
+          
        
+            
+            
+          
        
+        
        
+      
        
+      
        
+        
         {{ _('Action') }} 
        
+        
+          {{ _('Rejudge selected submissions') }}
+        
+        
        
 
-                
-                    {{ _('Download selected submissions') }}
-                
-                
        
-                
        
-                    {% csrf_token %}
-                    
-                        {{ _('Rescore all submissions') }}
-                    
-                
        
-            
        
-        {% endif %}
-    
        
+        
+          {{ _('Download selected submissions') }}
+        
+        
        
+        
        
+          {% csrf_token %}
+          
+            {{ _('Rescore all submissions') }}
+          
+        
        
+      
        
+    {% endif %}
+  
        
 {% endblock %}
diff --git a/templates/problem/preview.html b/templates/problem/preview.html
index 82e7cb1..1c5028c 100644
--- a/templates/problem/preview.html
+++ b/templates/problem/preview.html
@@ -1,4 +1,4 @@
 {{ preview_data|markdown|reference|str|safe }}
 {% if REQUIRE_JAX %}
-    
        
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/problem/problem-list-tabs.html b/templates/problem/problem-list-tabs.html
index a3e5dfc..1a8b3e2 100644
--- a/templates/problem/problem-list-tabs.html
+++ b/templates/problem/problem-list-tabs.html
@@ -1,8 +1,8 @@
 {% extends "tabs-base.html" %}
 
 {% block tabs %}
-    {% if perms.judge.edit_all_problem or perms.judge.edit_public_problem or perms.judge.edit_own_problem %}
-        {{ make_tab('list', 'fa-list', url('problem_list'), _('List')) }}
-        {{ make_tab('admin', 'fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }}
-    {% endif %}
+  {% if perms.judge.edit_all_problem or perms.judge.edit_public_problem or perms.judge.edit_own_problem %}
+    {{ make_tab('list', 'fa-list', url('problem_list'), _('List')) }}
+    {{ make_tab('admin', 'fa-edit', url('admin:judge_problem_changelist'), _('Admin')) }}
+  {% endif %}
 {% endblock %}
diff --git a/templates/problem/problem.html b/templates/problem/problem.html
index 09e52a5..0dbcb66 100644
--- a/templates/problem/problem.html
+++ b/templates/problem/problem.html
@@ -1,424 +1,424 @@
 {% extends "common-content.html" %}
 {% block content_media %}
-    {% include "comments/media-css.html" %}
-    {% include "actionbar/media-css.html" %}
-    
+    #comment-section {
+      display: none;
+    }
+  
 {% endblock %}
 
 {% block content_js_media %}
-    {% include "comments/media-js.html" %}
-    {% include "actionbar/media-js.html" %}
-    {% if request.in_contest_mode %}
-        
-    {% endif %}
+  {% include "comments/media-js.html" %}
+  {% include "actionbar/media-js.html" %}
+  {% if request.in_contest_mode %}
     
+  {% endif %}
+  
 {% endblock %}
 
 {% block title_row %}
-    
        
-        {% if request.user.is_authenticated %}
-            {% if problem.id in completed_problem_ids %}
-                
-                    {% if problem.is_public or request.in_contest_mode %}
-                        
-                    {% else %}
-                        
-                    {% endif %}
-                
-            {% elif problem.id in attempted_problems %}
-                
-                    {% if problem.is_public or request.in_contest_mode %}
-                        
-                    {% else %}
-                        
-                    {% endif %}
-                
-            {% endif %}
-        {% endif %}
-        
        {{ title }}
        
-        {% if problem.is_organization_private %}
-            
-                {% for org in problem.organizations.all() %}
-                    
-                        
-                             {{ org.name }}
-                        
-                    
-                {% endfor %}
-            
-        {% endif %}
-        
-        
-        {% if has_render %}
-        
-        {% elif problem.pdf_description %}
-        
-        {% else %}
-        
-        {% endif %}
-            
-                
-                
-            
-            {{ _('View as PDF') }}
+  
        
+    {% if request.user.is_authenticated %}
+      {% if problem.id in completed_problem_ids %}
+        
+          {% if problem.is_public or request.in_contest_mode %}
+            
+          {% else %}
+            
+          {% endif %}
         
-    
        
+      {% elif problem.id in attempted_problems %}
+        
+          {% if problem.is_public or request.in_contest_mode %}
+            
+          {% else %}
+            
+          {% endif %}
+        
+      {% endif %}
+    {% endif %}
+    
        {{ title }}
        
+    {% if problem.is_organization_private %}
+      
+        {% for org in problem.organizations.all() %}
+          
+            
+               {{ org.name }}
+            
+          
+        {% endfor %}
+      
+    {% endif %}
+
+    
+    {% if has_render %}
+      
+    {% elif problem.pdf_description %}
+      
+    {% else %}
+      
+    {% endif %}
+    
+      
+      
+    
+    {{ _('View as PDF') }}
+  
+  
        
 {% endblock %}
 
 {% block info_float %}
-    {% if request.user.is_authenticated and request.in_contest_mode and submission_limit %}
-        {% if submissions_left > 0 %}
-            
-                {{ _('Submit solution') }}
-            
-            
        
-                {% trans trimmed counter=submissions_left %}
-                    {{ counter }} submission left
-                    {% pluralize %}
-                    {{ counter }} submissions left
-                {% endtrans %}
-            
        
-        {% else %}
-            {{ _('Submit solution') }}
-            
        {{ _('0 submissions left') }}
        
-        {% endif %}
+  {% if request.user.is_authenticated and request.in_contest_mode and submission_limit %}
+    {% if submissions_left > 0 %}
+      
+        {{ _('Submit solution') }}
+      
+      
        
+        {% trans trimmed counter=submissions_left %}
+          {{ counter }} submission left
+          {% pluralize %}
+          {{ counter }} submissions left
+        {% endtrans %}
+      
        
     {% else %}
-        
-            {{ _('Submit solution') }}
-        
+      {{ _('Submit solution') }}
+      
        {{ _('0 submissions left') }}
        
     {% endif %}
+  {% else %}
+    
+      {{ _('Submit solution') }}
+    
+  {% endif %}
 
-    
        
+  
        
 
-    {% if request.user.is_authenticated and has_submissions %}
-        
+  {% if request.user.is_authenticated and has_submissions %}
+    
+  {% endif %}
+  
+  
+  {% if editorial and editorial.is_public and
+  not (request.user.is_authenticated and request.in_contest_mode) %}
+  
        
+  
+{% endif %}
+{% if can_edit_problem %}
+  
        
+  
+  
+  {% if not problem.is_manually_managed %}
+    
+  {% endif %}
+{% elif request.user.is_authenticated and has_tickets %}
+  
        
+  
+{% endif %}
+
+{% if problem.is_subs_manageable_by(request.user) %}
+  
+{% endif %}
+
+{% if perms.judge.clone_problem %}
+  
+{% endif %}
+
+
        
+
+
        
+  {{ _('Points:') }}
+  
+    {% if contest_problem %}
+      {{ contest_problem.points }}{% if contest_problem.partial %} {{ _('(partial)') }}{% endif %}
+    {% else %}
+      {{ problem.points|floatformat }}{% if problem.partial %} {{ _('(partial)') }}{% endif %}
     {% endif %}
-    
-    
-    {% if editorial and editorial.is_public and 
-            not (request.user.is_authenticated and request.in_contest_mode) %}
-        
        
-        
+          
+
        
+
        
+  {{ _('Time limit:') }}
+  {{ problem.time_limit }}s
+
        
+
        
+  {% for name, limit in problem.language_time_limit %}
+    
        
+      {{ name }}
+      {{ limit }}s
+    
        
+  {% endfor %}
+
        
+
        
+  {{ _('Memory limit:') }}
+  {{ problem.memory_limit|kbsimpleformat }}
+
        
+
        
+  {% for name, limit in problem.language_memory_limit %}
+    
        
+      {{ name }}
+      {{ limit|kbsimpleformat }}
+    
        
+  {% endfor %}
+
        
+
        
+  {{ _('Input:') }}
+  
+    {{ fileio_input or _('stdin') }}
+  
+
        
+
        
+  {{ _('Output:') }}
+  {{ fileio_output or _('stdout') }}
+
        
+
+
        
+
+{% cache 86400 'problem_authors' problem.id LANGUAGE_CODE %}
+  {% with authors=problem.authors.all() %}
+    {% if authors %}
+      
        
+        {% trans trimmed count=authors|length %}
+            Author:
+            {% pluralize count %}
+            Authors:
+          {% endtrans %}
+        
        {{ link_users(authors) }}
        
+      
        
     {% endif %}
-    {% if can_edit_problem %}
-        
        
-        
-        
-        {% if not problem.is_manually_managed %}
-            
+  {% endwith %}
+{% endcache %}
+
+{% if not contest_problem or not contest_problem.contest.hide_problem_tags %}
+  
        
+    {% with types=problem.types_list %}
+      
        
+        {% trans trimmed count=problem.types_list|length %}
+          Problem type
+          {% pluralize count %}
+          Problem types
+        {% endtrans %}
+      
        
+      
+    {% endwith %}
+  
        
+{% endif %}
+{% if show_languages %}
+  
        
+    
        
+      {{ _('Allowed languages') }}
+    
        
+    
        
+      {% with usable=problem.usable_common_names, langs=problem.languages_list() %}
+        {% for lang in langs %}
+          {%- if lang in usable -%}
+            {{ lang }}
+          {%- else -%}
+            {{ lang }}
+          {%- endif -%}
+          {% if not loop.last %}, {% endif -%}
+        {% endfor %}
+      {% endwith %}
+    
        
+  
        
+{% endif %}
+{% if problem.is_editable_by(request.user) %}
+  
        
+    
        
+      {% trans trimmed count=available_judges|length %}
+          Judge
+          {% pluralize count %}
+          Judges
+        {% endtrans %}
+      
+    
        
+    
+{% endif %}
 {% endblock %}
 
 {% block description %}
-    {% if contest_problem and contest_problem.contest.use_clarifications and has_clarifications %}
-        
+  {% if contest_problem and contest_problem.contest.use_clarifications and has_clarifications %}
+    
+  {% endif %}
+
+  {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
+    {{ description|markdown(lazy_load=True)|reference|str|safe }}
+  {% endcache %}
+
+  {% if problem.pdf_description %}
+    
+  {% endif %}
+
+  {% with license=problem.license %}
+    {% if license %}
+      
+        {{ license.display or license.name }}
+      
+      
        
     {% endif %}
-
-    {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
-        {{ description|markdown(lazy_load=True)|reference|str|safe }}
-    {% endcache %}
-
-    {% if problem.pdf_description %}
-        
-    {% endif %}
-
-    {% with license=problem.license %}
-        {% if license %}
-        
-            {{ license.display or license.name }}
-        
-        
        
-        {% endif %}
-    {% endwith %}
+  {% endwith %}
 {% endblock %}
 
 {% block post_description_end %}
-    {% if request.user.is_authenticated and not request.profile.mute %}
-        {%- if contest_problem and contest_problem.contest.use_clarifications and request.profile.current_contest.live -%}
-            
-                
-                {{ _('Request clarification') }}
-            
-            
        
-        {%- else -%}
-            {% set actionbar_report_url = url('new_problem_ticket', problem.code) %}
-            {% include "actionbar/list.html" %}
-            
        
-        {%- endif -%}
-    {% endif %}
-    {% if not (contest_problem and contest_problem.contest.use_clarifications) %}
-        
        
-            
        
-                {% if has_comments %}
-                    {{_('View comments')}} ({{comment_list.count()}})
-                {% else %}
-                    {{_('Be the first to comment')}}
-                {% endif %}
-            
        
-        
        
-    {% endif %}
+  {% if request.user.is_authenticated and not request.profile.mute %}
+    {%- if contest_problem and contest_problem.contest.use_clarifications and request.profile.current_contest.live -%}
+      
+        
+        {{ _('Request clarification') }}
+      
+      
        
+    {%- else -%}
+      {% set actionbar_report_url = url('new_problem_ticket', problem.code) %}
+      {% include "actionbar/list.html" %}
+      
        
+    {%- endif -%}
+  {% endif %}
+  {% if not (contest_problem and contest_problem.contest.use_clarifications) %}
+    
        
+      
        
+        {% if has_comments %}
+          {{_('View comments')}} ({{comment_list.count()}})
+        {% else %}
+          {{_('Be the first to comment')}}
+        {% endif %}
+      
        
+    
        
+  {% endif %}
 {% endblock %}
 
 {% block comments %}
-    {% if contest_problem and contest_problem.contest.use_clarifications %}
-        
        
-            
         {{ _('Clarifications') }}
        
-            {% if has_clarifications %}
-                {% for clarification in clarifications %}
-                    
        
-                        
        {{ relative_time(clarification.date) }}
        
-                        
-                            {{ clarification.description|markdown|reference }}
-                        
-                    
        
-                {% endfor %}
-            {% else %}
-                
        {{ _('No clarifications have been made at this time.') }}
        
-            {% endif %}
-        
        
-    {% else %}
-        
        
-            {% include "comments/list.html" %}
-        
        
-    {% endif %}
-    
+  {% if contest_problem and contest_problem.contest.use_clarifications %}
+    
        
+      
         {{ _('Clarifications') }}
        
+      {% if has_clarifications %}
+        {% for clarification in clarifications %}
+          
        
+            
        {{ relative_time(clarification.date) }}
        
+            
+              {{ clarification.description|markdown|reference }}
+            
+          
        
+        {% endfor %}
+      {% else %}
+        
        {{ _('No clarifications have been made at this time.') }}
        
+      {% endif %}
+    
        
+  {% else %}
+    
        
+      {% include "comments/list.html" %}
+    
        
+  {% endif %}
+  
 {% endblock %}
 
 {% block bodyend %}
-    {{ super() }}
-    {% include "comments/math.html" %}
+  {{ super() }}
+  {% include "comments/math.html" %}
 {% endblock %}
diff --git a/templates/problem/raw.html b/templates/problem/raw.html
index a620d22..e227009 100644
--- a/templates/problem/raw.html
+++ b/templates/problem/raw.html
@@ -1,107 +1,107 @@
 
 
-
+  
     
     
     
     
     
     
-    
+
     
     
-
+  
 
-
-
        {{ problem_name }}
        
-
        
-
        
-    
        
+  
+    
        {{ problem_name }}
        
+    
        
+    
        
+      
        
         {{ _('Input:') }} {{ fileio_input or _('stdin') }}
-    
        
-    
        
+      
        
+      
        
         {{ _('Output:') }} {{ fileio_output or _('stdout') }}
-    
        
-    
        
+      
        
+      
        
         {{ _('Time Limit:') }} {{ problem.time_limit }}s
         {% for name, limit in problem.language_time_limit %}
-            
        
-                {{ name }}
-                {{ limit }}s
-            
        
+          
        
+            {{ name }}
+            {{ limit }}s
+          
        
         {% endfor %}
-    
        
-    
        
+      
        
+      
        
         {{ _('Memory Limit:') }} {{ problem.memory_limit|kbsimpleformat}}
         {% for name, limit in problem.language_memory_limit %}
-            
        
-                {{ name }}
-                {{ limit|kbsimpleformat }}
-            
        
+          
        
+            {{ name }}
+            {{ limit|kbsimpleformat }}
+          
        
         {% endfor %}
+      
        
+    
        
+    
        
+    
        
+      {{ description|markdown|reference|absolutify(url)|str|safe }}
     
        
-
        
-
        
-
        
-    {{ description|markdown|reference|absolutify(url)|str|safe }}
-
        
 
-
-
-
-
+    
+    
+    
-
+      });
+    
+  
 
diff --git a/templates/problem/recent-attempt.html b/templates/problem/recent-attempt.html
index d94d17c..86aa7d3 100644
--- a/templates/problem/recent-attempt.html
+++ b/templates/problem/recent-attempt.html
@@ -1,22 +1,22 @@
-{% if last_attempted_problems%}
-    
        
-        
        {{ _('Last unsolved') }} 
-        
        
-        
        
-            
-                
-                    {% for problem in last_attempted_problems %}
-                        
-                            
-                            
-                        
-                    {% endfor %}
-                
-            
        
-                                {{ problem.name }}
-                            
-                                {{ problem.last_submission }}
-                            
        
-        
        
-    
        
+{% if last_attempted_problems%}
+  
        
+    
        {{ _('Last unsolved') }} 
+    
        
+    
        
+      
+        
+          {% for problem in last_attempted_problems %}
+            
+              
+              
+            
+          {% endfor %}
+        
+      
        
+                {{ problem.name }}
+              
+                {{ problem.last_submission }}
+              
        
+    
        
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/problem/search-form.html b/templates/problem/search-form.html
index d0116fe..073d3c7 100644
--- a/templates/problem/search-form.html
+++ b/templates/problem/search-form.html
@@ -1,106 +1,106 @@
 
        
-    
        {{ _('Problem search') }} 
-    
        
-    
        
-        
        
-            
        
-                
-            
        
-            {% if feed_type != 'volunteer' and request.user.is_authenticated %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if feed_type == 'volunteer' and request.user.is_authenticated %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if feed_type != 'volunteer' %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if has_show_editorial_option %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if has_have_editorial_option %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if organizations %}
-                
        
-                    
-                     
-                
        
-            {% endif %}
-            
        
-                
-                 
-            
        
-            
        
-                
-                
-            
        
-            {% if show_types %}
-                
        
-                    
-                    
-                
        
-            {% endif %}
-            {% if point_values %}
-                
        {{ _('Point range') }}
        
-                
        
-            {% endif %}
-            
-            
-            
        
-                {{ _('Go') }}
-                {{ _('Random') }}
-            
        
-        
        
-    
        
+  
        {{ _('Problem search') }} 
+  
        
+  
        
+    
        
+      
        
+        
+      
        
+      {% if feed_type != 'volunteer' and request.user.is_authenticated %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if feed_type == 'volunteer' and request.user.is_authenticated %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if feed_type != 'volunteer' %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if has_show_editorial_option %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if has_have_editorial_option %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if organizations %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      
        
+        
+        
+      
        
+      
        
+        
+        
+      
        
+      {% if show_types %}
+        
        
+          
+          
+        
        
+      {% endif %}
+      {% if point_values %}
+        
        {{ _('Point range') }}
        
+        
        
+      {% endif %}
+      
+      
+      
        
+        {{ _('Go') }}
+        {{ _('Random') }}
+      
        
+    
        
+  
        
 
        
\ No newline at end of file
diff --git a/templates/problem/submission-diff.html b/templates/problem/submission-diff.html
index 55dbd35..f541762 100644
--- a/templates/problem/submission-diff.html
+++ b/templates/problem/submission-diff.html
@@ -1,100 +1,100 @@
 {% extends "common-content.html" %}
 
 {% block js_media %}
-    
-    
-    
+  
+  
+  
 {% endblock %}
 
 {% block media %}
-    
+    .sub-case-status {
+      text-decoration: underline;
+    }
+  
 {% endblock %}
 
 {% block body %}
-    
-        
-        
-            
-            
-            
-            
-            
-            {% for case in range(num_cases) %}
-                
-            {% endfor %}
-        
-        
-        
-        {% for sub in submissions %}
-            
-                
-                
-                
-                
-                
-                {% for case in sub.test_cases.all() %}
-                    
-                {% endfor %}
-            
+  
        IDUsernameResultLanguageDate{{ loop.index }}
        {{ sub.id }}{{ link_user(sub.user) }}{{ sub.result }}{{ sub.language.name }}{{ relative_time(sub.date) }}
-                        {% if case.status == 'SC' %}
-                            ---
-                        {% else %}
-                            
-                                {% if case.status == 'AC' %}
-                                    {{ case.time|floatformat(2) }}
-                                {% else %}
-                                    {{ case.status }}
-                                {% endif %}
-                            
-                        {% endif %}
-                    
        
+    
+      
+        
+        
+        
+        
+        
+        {% for case in range(num_cases) %}
+          
         {% endfor %}
-        
-    
        IDUsernameResultLanguageDate{{ loop.index }}
        
-    
+      
+    
+    
+      {% for sub in submissions %}
+        
+          {{ sub.id }}
+          {{ link_user(sub.user) }}
+          {{ sub.result }}
+          {{ sub.language.name }}
+          {{ relative_time(sub.date) }}
+          {% for case in sub.test_cases.all() %}
+            
+              {% if case.status == 'SC' %}
+                ---
+              {% else %}
+                
+                  {% if case.status == 'AC' %}
+                    {{ case.time|floatformat(2) }}
+                  {% else %}
+                    {{ case.status }}
+                  {% endif %}
+                
+              {% endif %}
+            
+          {% endfor %}
+        
+      {% endfor %}
+    
+  
+  
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/submit.html b/templates/problem/submit.html
index 4d7821e..282ee5c 100644
--- a/templates/problem/submit.html
+++ b/templates/problem/submit.html
@@ -1,236 +1,236 @@
 {% extends "base.html" %}
 
 {% block js_media %}
-    
-    
-    {{ form.media.js }}
-    {% compress js %}
-        
+  
+  {{ form.media.js }}
+  {% compress js %}
+    
-    {% endcompress %}
+            RefPresenter.__super__.bind.call(this, container, $container);
+          };
+          return RefPresenter;
+        });
+
+        var customAdapter = $.fn.select2.amd.require('select2/data/customAdapter');
+
+        $("#id_language").select2({
+          templateResult: format,
+          templateSelection: formatSelection,
+          resultsAdapter: customAdapter
+        });
+
+        $('#id_language').on('select2:open', function (evt) {
+          var dropdown = $('.select2-dropdown');
+          if (!$('#result-version-info').length)
+          dropdown.append($(""));
+          dropdown.attr('id', 'language-select2');
+        });
+
+        $('#id_judge').on('select2:open', function (evt) {
+          var dropdown = $('.select2-dropdown');
+          $('#result-version-info').remove();
+          dropdown.attr('id', 'judge-select2');
+        });
+
+        $('#id_language').change(function () {
+          var lang = $("#id_language").find("option:selected").attr('data-ace');
+          window.ace_source.getSession().setMode("ace/mode/" + lang);
+          update_language_template();
+        });
+
+        $('#ace_source').on('ace_load', function (e, editor) {
+          update_language_template();
+          editor.commands.addCommand({
+            name: 'save',
+            bindKey: {win: 'Ctrl-S', mac: 'Command-S'},
+            exec: function () {
+              localStorage.setItem('submit:' + $('#id_language').val(), editor.getSession().getValue());
+            }
+          });
+          editor.getSession().setUseWrapMode(true);
+          editor.setFontSize(14);
+          editor.setShowPrintMargin(false);
+          // editor.setPrintMarginColumn(100);
+          editor.focus();
+        });
+
+        // $(window).resize(function () {
+        //     $('#ace_source').height(Math.max($(window).height() - 353, 100));
+        // }).resize();
+
+        $('#problem_submit').submit(function (event) {
+          if ($('#id_source').val().length > 65536) {
+            alert("{{ _('Your source code must contain at most 65536 characters.') }}");
+            event.preventDefault();
+            $('#problem_submit').find(':submit').attr('disabled', false);
+          }
+        });
+
+        function get_source_default(file) {
+          const reader = new FileReader();
+          reader.readAsText(file);
+          reader.onload = function (evt) {
+            var src = evt.target.result;
+            update_submit_area(src);
+          }
+          reader.onerror = function (evt) {
+            alert("Fail to upload file");
+          }
+        }
+
+        function get_source_scratch(file) {
+          JSZip.loadAsync(file).then(function($content) {
+            return $content.files["project.json"].async('text');
+          }).then(function (src) {
+            update_submit_area(src);
+          });
+        }
+
+        $('#file-upload').on('click change', function(e) {
+          var file = $(this)[0].files[0];
+          if (file) {
+            if (file.name.endsWith('sb3')) {
+              get_source_scratch(file);
+            }
+            else {
+              get_source_default(file);
+            }
+          }
+        })
+      });
+    
+  {% endcompress %}
 {% endblock %}
 
 {% block media %}
-    {{ form.media.css }}
+  {{ form.media.css }}
 {% endblock %}
 
 {% block body %}
-    
        
-    {% if not no_judges %}
-        {% if default_lang not in form.fields.language.queryset %}
-            
        
-                x
-                {% trans trimmed default_language=default_lang.name %}
-                    Warning! Your default language, {{ default_language }},
-                    is unavailable for this problem and has been deselected.
-                {% endtrans %}
-            
        
-        {% endif %}
-
-        {% if request.in_contest and submission_limit %}
-            {% if submissions_left > 0 %}
-                
        
-                    x
-                    {% trans left=submissions_left %}
-                        You have {{ left }} submission left
-                        {% pluralize %}
-                        You have {{ left }} submissions left
-                    {% endtrans %}
-                
        
-            {% else %}
-                
        
-                    x
-                    {{ _('You have 0 submissions left') }}
-                
        
-            {% endif %}
-        {% endif %}
+  
        
+  {% if not no_judges %}
+    {% if default_lang not in form.fields.language.queryset %}
+      
        
+        x
+        {% trans trimmed default_language=default_lang.name %}
+          Warning! Your default language, {{ default_language }},
+          is unavailable for this problem and has been deselected.
+        {% endtrans %}
+      
        
     {% endif %}
 
-    
        
-        {% csrf_token %}
-        {{ form.non_field_errors() }}
-        
        
-            
        
-                {{ form.source.errors }}
-                {{ form.source }}
-            
        
-            {% if not no_judges %}
-                
        
-                    {{ form.language.errors }}
-                    
        
-                        
-                    
        
-                
        
-            {% endif %}
+    {% if request.in_contest and submission_limit %}
+      {% if submissions_left > 0 %}
+        
        
+          x
+          {% trans left=submissions_left %}
+            You have {{ left }} submission left
+            {% pluralize %}
+            You have {{ left }} submissions left
+          {% endtrans %}
         
        
+      {% else %}
+        
        
+          x
+          {{ _('You have 0 submissions left') }}
+        
        
+      {% endif %}
+    {% endif %}
+  {% endif %}
 
-        
        
+  
+    {% csrf_token %}
+    {{ form.non_field_errors() }}
+    
        
+      
        
+        {{ form.source.errors }}
+        {{ form.source }}
+      
        
+      {% if not no_judges %}
+        
        
+          {{ form.language.errors }}
+          
        
+            
+          
        
+        
        
+      {% endif %}
+    
        
 
-        {% if no_judges %}
-            {{ _('No judge is available for this problem.') }}
-        {% else %}
-            
-            
        
-                {{ form.judge }}
-                
-            
        
-        {% endif %}
-    
+    
        
+
+    {% if no_judges %}
+      {{ _('No judge is available for this problem.') }}
+    {% else %}
+      
+      
        
+        {{ form.judge }}
+        
+      
        
+    {% endif %}
+  
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/yaml.html b/templates/problem/yaml.html
index 8dee21c..1a7b821 100644
--- a/templates/problem/yaml.html
+++ b/templates/problem/yaml.html
@@ -1,20 +1,20 @@
 {% extends "base.html" %}
 
 {% block body %}
-    
        
-        
-            
-                
-                
-            
-        
        
-                    
        
-                        {% for line in raw_source.split('\n') %}
-                            
-                                
        {{ loop.index }}
        
-                                    
-                        {% endfor %}
-                    
        
-                        		{{ highlighted_source }}
        
-    
        
+  
        
+    
+      
+        
+        
+      
+    
        
+          
        
+            {% for line in raw_source.split('\n') %}
+              
+                
        {{ loop.index }}
        
+                      
+            {% endfor %}
+          
        
+                		{{ highlighted_source }}
        
+  
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/recent-organization.html b/templates/recent-organization.html
index 2af87b7..41e9e57 100644
--- a/templates/recent-organization.html
+++ b/templates/recent-organization.html
@@ -1,28 +1,28 @@
 {% block two_col_media %}
-    
+  
 {% endblock %}
 
 {% if recent_organizations %}
-    
        
-        
        {{ _('Recent groups') }} 
        
-        
        
-            {% for organization in recent_organizations %}
-                
-                    
-                    {{ organization.organization }}
-                
-            {% endfor %}
-        
          
+  
        
+    
        {{ _('Recent groups') }} 
        
+    
        
+      {% for organization in recent_organizations %}
+        
+          
+          {{ organization.organization }}
+        
+      {% endfor %}
     
        
+  
        
 {% endif %}
\ No newline at end of file
diff --git a/templates/registration/activate.html b/templates/registration/activate.html
index 8cee082..6d0db5c 100644
--- a/templates/registration/activate.html
+++ b/templates/registration/activate.html
@@ -1,4 +1,4 @@
 {% extends "base.html" %}
 {% block body %}
-    
        {{ _('%(key)s is an invalid activation key.', key=activation_key) }}
        
+  
        {{ _('%(key)s is an invalid activation key.', key=activation_key) }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
index 6140ad7..6ee4c0d 100644
--- a/templates/registration/activation_complete.html
+++ b/templates/registration/activation_complete.html
@@ -1,4 +1,4 @@
 {% extends "base.html" %}
 {% block body %}
-    
        {{ _('Your account has been successfully activated.') }}
        
+  
        {{ _('Your account has been successfully activated.') }}
        
 {% endblock %}
\ No newline at end of file
diff --git a/templates/registration/activation_email.html b/templates/registration/activation_email.html
index a90b9fc..f5e4eaa 100644
--- a/templates/registration/activation_email.html
+++ b/templates/registration/activation_email.html
@@ -4,7 +4,7 @@ The last step is activating your account. Please activate your {{ SITE_NAME }} a
 

        
 Please click on the following link to activate your account:
 
        
-      http://{{ site.domain }}/accounts/activate/{{ activation_key }}
+  http://{{ site.domain }}/accounts/activate/{{ activation_key }}
 
        
 
 Alternatively, you can reply to this message to activate your account.
@@ -15,9 +15,9 @@ Your reply must keep the following text intact for this to work:
        {% if SITE_ADMIN_EMAIL %} -See you soon! -
        -If you have problems activating your account, feel free to send us an email at {{ SITE_ADMIN_EMAIL }}. + See you soon! +
        + If you have problems activating your account, feel free to send us an email at {{ SITE_ADMIN_EMAIL }}. {% else %} -See you soon! + See you soon! {% endif %} diff --git a/templates/registration/login.html b/templates/registration/login.html index b522d2d..5b52269 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,51 +1,51 @@ {% extends "base.html" %} {% block body %} -
        -
        - {% csrf_token %} - {% if form.errors %} -
        -

        {{ _('Invalid username or password.') }}

        -
        - {% endif %} - - - - - - - - - -
        - {{ form.username }} -
        - {{ form.password }} -
        -
        - - -
        -
        {{ _('Forgot your password?') }} +
        +
        + {% csrf_token %} + {% if form.errors %} +
        +

        {{ _('Invalid username or password.') }}

        +
        + {% endif %} + + + + + + + + + +
        + {{ form.username }} +
        + {{ form.password }} +
        +
        + + +
        +
        {{ _('Forgot your password?') }} - {% if form.has_google_auth or form.has_facebook_auth or form.has_github_auth %} -

        {{ _('Or log in with...') }}

        - {% if form.has_google_auth %} - - {% endif %} - {% if form.has_facebook_auth %} - - {% endif %} - {% if form.has_github_auth %} - - {% endif %} - {% endif %} -
        + {% if form.has_google_auth or form.has_facebook_auth or form.has_github_auth %} +

        {{ _('Or log in with...') }}

        + {% if form.has_google_auth %} + + {% endif %} + {% if form.has_facebook_auth %} + + {% endif %} + {% if form.has_github_auth %} + + {% endif %} + {% endif %} +
        {% endblock %} diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 176a230..76c6ec2 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,4 +1,4 @@ {% extends "base.html" %} {% block body %} -

        {{ _('See you later!') }}

        +

        {{ _('See you later!') }}

        {% endblock %} \ No newline at end of file diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html index 78a146c..3cd3e58 100644 --- a/templates/registration/password_change_done.html +++ b/templates/registration/password_change_done.html @@ -1,4 +1,4 @@ {% extends "base.html" %} {% block body %} -

        {{ _('Your password was sucessfully changed.') }}

        +

        {{ _('Your password was sucessfully changed.') }}

        {% endblock %} \ No newline at end of file diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index a8f56ae..7d0642a 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% block body %} -
        - {% csrf_token %} - {{ form.as_table() }}
        -
        - -
        +
        + {% csrf_token %} + {{ form.as_table() }}
        +
        + +
        {% endblock %} diff --git a/templates/registration/password_reset.html b/templates/registration/password_reset.html index 4f5d738..0685935 100644 --- a/templates/registration/password_reset.html +++ b/templates/registration/password_reset.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block body %} -
        {% csrf_token %} - {{ form.as_table() }}
        -
        - -
        +
        {% csrf_token %} + {{ form.as_table() }}
        +
        + +
        {% endblock %} \ No newline at end of file diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html index 5727282..a456473 100644 --- a/templates/registration/password_reset_complete.html +++ b/templates/registration/password_reset_complete.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block body %} -

        {{ _('Your password has been set. You may go ahead and log in now') }}

        - {{ _('Log in') }} +

        {{ _('Your password has been set. You may go ahead and log in now') }}

        + {{ _('Log in') }} {% endblock %} \ No newline at end of file diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index 6f65215..d2d0d78 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block body %} - {% if validlink %} -
        - {% csrf_token %} - {{ form.as_table() }}
        -
        - -
        - {% else %} -

        Invalid password reset link.

        - {% endif %} + {% if validlink %} +
        + {% csrf_token %} + {{ form.as_table() }}
        +
        + +
        + {% else %} +

        Invalid password reset link.

        + {% endif %} {% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html index 8e415d1..5255864 100644 --- a/templates/registration/password_reset_done.html +++ b/templates/registration/password_reset_done.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block body %} -

        {{ _("We've emailed you instructions for setting your password. You should be receiving them shortly.") }}

        -

        {{ _("If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder.") }}

        +

        {{ _("We've emailed you instructions for setting your password. You should be receiving them shortly.") }}

        +

        {{ _("If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder.") }}

        {% endblock %} \ No newline at end of file diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html index a37c29f..30ae59d 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.html @@ -1,19 +1,19 @@ -
        -

        LQDOJ -

        -
        +
        +

        LQDOJ +

        +
        -Forgot your password on the {{ site_name }}? Don't worry!

        -To reset the password for your account "{{ user.get_username() }}", click the below button. -

        -Reset password -

        -{% if SITE_ADMIN_EMAIL %} -See you soon! If you have problems resetting your email, feel free to shoot us an email at {{ SITE_ADMIN_EMAIL }} -{% else %} -See you soon! -{% endif %} + Forgot your password on the {{ site_name }}? Don't worry!

        + To reset the password for your account "{{ user.get_username() }}", click the below button. +

        + Reset password +

        + {% if SITE_ADMIN_EMAIL %} + See you soon! If you have problems resetting your email, feel free to shoot us an email at {{ SITE_ADMIN_EMAIL }} + {% else %} + See you soon! + {% endif %}
        diff --git a/templates/registration/profile_creation.html b/templates/registration/profile_creation.html index 7641b65..9be32c0 100644 --- a/templates/registration/profile_creation.html +++ b/templates/registration/profile_creation.html @@ -1,58 +1,58 @@ {% extends "base.html" %} {% block media %} - - {{ form.media.css }} - + {% if TIMEZONE_BG %} + .map-wrap { + background: {{TIMEZONE_BG}} + } + {% endif %} + {% endblock %} {% block js_media %}{{ form.media.js }}{% endblock %} {% block body %} -
        - {% csrf_token %} - {{ form.as_table() }}
        - -
        +
        + {% csrf_token %} + {{ form.as_table() }}
        + +
        -
        -
        -
        -
        -
        +
        +
        +
        +
        +
        {% endblock %} {% block bodyend %} - - + + {% endblock %} \ No newline at end of file diff --git a/templates/registration/registration_closed.html b/templates/registration/registration_closed.html index 7c732b0..fcd1777 100644 --- a/templates/registration/registration_closed.html +++ b/templates/registration/registration_closed.html @@ -1,4 +1,4 @@ {% extends "base.html" %} {% block body %} -

        {{ _('Registration is currently closed. Please contact an administrator.') }}

        +

        {{ _('Registration is currently closed. Please contact an administrator.') }}

        {% endblock %} diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 25903d7..6d2b39a 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,4 +1,4 @@ {% extends "base.html" %} {% block body %} -

        {{ _('You have successfully been registered. An email has been sent to the email address you provided to confirm your registration.') }}

        +

        {{ _('You have successfully been registered. An email has been sent to the email address you provided to confirm your registration.') }}

        {% endblock %} \ No newline at end of file diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 93854df..58840b1 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -1,111 +1,111 @@ {% extends "base.html" %} {% block media %} - {% include "timezone/media-css.html" %} - {{ form.media.css }} - + {% include "timezone/media-css.html" %} + {{ form.media.css }} + {% endblock %} {% block js_media %} - {% include "timezone/media-js.html" %} - {{ form.media.js }} - - {% if form.captcha %} - {{ recaptcha_init(LANGUAGE_CODE) }} - {% endif %} + {% include "timezone/media-js.html" %} + {{ form.media.js }} + + {% if form.captcha %} + {{ recaptcha_init(LANGUAGE_CODE) }} + {% endif %} {% endblock %} {% block body %} -
        -
        - {% csrf_token %} +
        + + {% csrf_token %} -
        {{ _('Username') }}
        - {{ form.username }} - {% if form.username.errors %} -
        {{ form.username.errors }}
        - {% endif %} +
        {{ _('Username') }}
        + {{ form.username }} + {% if form.username.errors %} +
        {{ form.username.errors }}
        + {% endif %} -
        {{ _('Email') }}
        - {{ form.email }} - {% if form.email.errors %} -
        {{ form.email.errors }}
        - {% endif %} +
        {{ _('Email') }}
        + {{ form.email }} + {% if form.email.errors %} +
        {{ form.email.errors }}
        + {% endif %} -
        {{ _('Password') -}} - (?) -
        - - {{ form.password1 }} - {% if form.password1.errors %} -
        {{ form.password1.errors }}
        - {% endif %} -
        {{ _('Password') }}2{# -#} - {{ _('(again, for confirmation)') }} -
        - {{ form.password2 }} - {% if form.password2.errors %} -
        {{ form.password2.errors }}
        - {% endif %} +
        {{ _('Password') -}} + (?) +
        + + {{ form.password1 }} + {% if form.password1.errors %} +
        {{ form.password1.errors }}
        + {% endif %} +
        {{ _('Password') }}2{# -#} + {{ _('(again, for confirmation)') }} +
        + {{ form.password2 }} + {% if form.password2.errors %} +
        {{ form.password2.errors }}
        + {% endif %} -
        {{ _('Timezone') }}{{ _('(select your closest major city)') }}
        -
        -
        {{ form.timezone }} -
        - {{ _('or') }} - {{ _('pick from map') }} -
        -
        -
        - -
        {{ _('Default language') }}
        - {{ form.language }} - -
        {{ _('Affiliated organizations') }}
        - {{ form.organizations }} - {% if form.organizations.errors %} -
        {{ form.organizations.errors }}
        - {% endif %} - - {% if form.captcha %} -
        {{ form.captcha }}
        - {% if form.captcha.errors %} -
        {{ form.captcha.errors }}
        - {% endif %} - {% endif %} - -
        - {% if tos_url %} - - {{ _('By registering, you agree to our') }} - {{ _('Terms & Conditions') }}. - - {% endif %} - - -
        - -
        -
        -
        -
        +
        {{ _('Timezone') }}{{ _('(select your closest major city)') }}
        +
        +
        {{ form.timezone }} +
        + {{ _('or') }} + {{ _('pick from map') }} +
        +
        + +
        {{ _('Default language') }}
        + {{ form.language }} + +
        {{ _('Affiliated organizations') }}
        + {{ form.organizations }} + {% if form.organizations.errors %} +
        {{ form.organizations.errors }}
        + {% endif %} + + {% if form.captcha %} +
        {{ form.captcha }}
        + {% if form.captcha.errors %} +
        {{ form.captcha.errors }}
        + {% endif %} + {% endif %} + +
        + {% if tos_url %} + + {{ _('By registering, you agree to our') }} + {{ _('Terms & Conditions') }}. + + {% endif %} + + +
        + +
        +
        +
        +
        +
        {% endblock %} diff --git a/templates/registration/totp_auth.html b/templates/registration/totp_auth.html index 2c6ac4e..7fc596b 100644 --- a/templates/registration/totp_auth.html +++ b/templates/registration/totp_auth.html @@ -1,43 +1,43 @@ {% extends "base.html" %} {% block media %} - + .totp-panel-message { + width: 300px; + } + {% endblock %} {% block body %} -
        -
        - {% csrf_token %} - {% if form.errors %} -
        -

        {{ _('Invalid Two Factor Authentication token.') }}

        -
        - {% endif %} +
        + + {% csrf_token %} + {% if form.errors %} +
        +

        {{ _('Invalid Two Factor Authentication token.') }}

        +
        + {% endif %} -
        -
        {{ form.totp_token }}
        -
        - - -

        {{ _('If you lost your authentication device, please contact us at %(email)s.', email=SITE_ADMIN_EMAIL)|urlize }}

        -
        +
        +
        {{ form.totp_token }}
        +
        + + +

        {{ _('If you lost your authentication device, please contact us at %(email)s.', email=SITE_ADMIN_EMAIL)|urlize }}

        +
        {% endblock %} diff --git a/templates/registration/totp_disable.html b/templates/registration/totp_disable.html index 9919bb6..4aab628 100644 --- a/templates/registration/totp_disable.html +++ b/templates/registration/totp_disable.html @@ -1,51 +1,51 @@ {% extends "base.html" %} {% block media %} - + #totp-disable-form { + border: unset; + background: unset; + max-width: 700px; + } + {% endblock %} {% block body %} -
        -
        - {% csrf_token %} -
        {{ _('To protect your account, you must first authenticate before you can disable Two Factor Authentication.') }}
        - {% if form.totp_token.errors %} -
        - {{ form.totp_token.errors }} -
        - {% endif %} -
        - - {{ form.totp_token }} -
        - -
        -
        +
        +
        + {% csrf_token %} +
        {{ _('To protect your account, you must first authenticate before you can disable Two Factor Authentication.') }}
        + {% if form.totp_token.errors %} +
        + {{ form.totp_token.errors }} +
        + {% endif %} +
        + + {{ form.totp_token }} +
        + +
        +
        {% endblock %} diff --git a/templates/registration/totp_enable.html b/templates/registration/totp_enable.html index c291353..4ade865 100644 --- a/templates/registration/totp_enable.html +++ b/templates/registration/totp_enable.html @@ -1,89 +1,89 @@ {% extends "base.html" %} {% block media %} - + .totp-qr-code img, .totp-qr-code canvas { + width: 400px; + max-width: 100%; + margin: 0 auto; + display: block; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: -webkit-optimize-contrast; + image-rendering: -webkit-crisp-edges; + image-rendering: -o-crisp-edges; + image-rendering: pixelated; + image-rendering: -moz-crisp-edges; + image-rendering: crisp-edges; + } + {% endblock %} {% block js_media %} - + } + }); + {% endblock %} {% block body %} -
        -
        - {% csrf_token %} +
        + + {% csrf_token %} -
        {{ _('Scan this code with your authenticator app:') }}
        -
        {{ _('QR code') }}
        -
        {{ _('Or enter this code manually:') }} - {{ totp_key }} -
        -
        - {% if form.totp_token.errors %} -
        - {{ form.totp_token.errors }} -
        - {% endif %} -
        - - {{ form.totp_token }} -
        - - -
        +
        {{ _('Scan this code with your authenticator app:') }}
        +
        {{ _('QR code') }}
        +
        {{ _('Or enter this code manually:') }} + {{ totp_key }} +
        +
        + {% if form.totp_token.errors %} +
        + {{ form.totp_token.errors }} +
        + {% endif %} +
        + + {{ form.totp_token }} +
        + + +
        {% endblock %} diff --git a/templates/registration/username_select.html b/templates/registration/username_select.html index c3df4d4..8eb66e4 100644 --- a/templates/registration/username_select.html +++ b/templates/registration/username_select.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block body %} -
        - {% csrf_token %} - {{ form.as_table() }}
        - -
        +
        + {% csrf_token %} + {{ form.as_table() }}
        + +
        {% endblock %} diff --git a/templates/resolver/media-js.html b/templates/resolver/media-js.html index 8262618..07e40e2 100644 --- a/templates/resolver/media-js.html +++ b/templates/resolver/media-js.html @@ -1,427 +1,427 @@ {% compress js %} - -{% endcompress %} \ No newline at end of file + $('.rank-list').on('click', 'li', function () { + if (curop == resolver.operations.length - 1) { + var classstr = $(this).attr('class'); + var index = classstr.indexOf('id-'); + var useridstr = ""; + for (let i = index + 3; i < classstr.length; i++) { + useridstr = useridstr + classstr[i]; + } + var userid = parseInt(useridstr); + var problemid = classstr[classstr.indexOf('p-') + 2]; + var sub = parseInt(classstr[classstr.indexOf('s-') + 2]); + var rankid = resolver.rank_frozen[userid].rank_show; + resolver.operations = []; + curop = -1; + console.log("Clicked!"); + resolver.operation(rankid - 1, problemid, sub); + if (resolver.operations.length == 1) { + for (let x in window.resolver.operations) { + curop++; + updateSelector(); + setTimeout(function () { + getNewData(); + }, 500); + } + } else { + for (let x in window.resolver.operations) { + setTimeout(function () { + curop++; + updateSelector(); + }, speed * x); + setTimeout(function () { + getNewData(); + }, speed * x + speed / 2); + } + } + } + }); + + var primary_color, secondary_color; + var wa, partially, ac, selected, frozen, untouched; + var theme_text_color, theme_background_color; + + function dark_theme() { + primary_color = "black"; + secondary_color = '#3e3e3e'; + frozen = "#34495e"; + untouched = "#1f1f1f"; + wa = "#B71C0C"; + partially = "#A79D03"; + ac = "#086d08"; + selected = "rgb(206, 75, 199)"; + theme_text_color = "white"; + theme_background_color = "black"; + set_theme(); + } + + function light_theme() { + primary_color = "#EFF5F5"; + secondary_color = "#D6E4E5"; + wa = "#EB6440"; + partially = "#fff133"; + ac = "#80ED99"; + // ac = "green"; + frozen = "#497174"; + untouched = "#A7BBC7"; + selected = "rgb(206, 75, 199)"; + theme_text_color = "black"; + theme_background_color = "white"; + set_theme(); + } + + function set_theme() { + let root = document.querySelector(':root'); + root.style.setProperty('--primary_color', primary_color); + root.style.setProperty('--secondary_color', secondary_color); + root.style.setProperty('--wa', wa); + root.style.setProperty('--partially', partially); + root.style.setProperty('--ac', ac); + root.style.setProperty('--selected', selected); + root.style.setProperty('--frozen', frozen); + root.style.setProperty('--untouched', untouched); + root.style.setProperty('--theme-text-color', theme_text_color); + root.style.setProperty('--theme-background-color', theme_background_color); + for (let i in resolver.rank_frozen) { + if (resolver.rank_frozen[i].rank_show % 2 == 0) { + for (let problemid in resolver.rank_frozen[i].problem) { + let per = round2(resolver.rank_frozen[i].problem[problemid].old_point / resolver.total_points[problemid] * 100); + let linear = `linear-gradient(90deg, ${partially} ${per}%, ${primary_color} ${per}%)`; + $('#rank-' + i + ' .p-' + problemid + ' .pro-score.partially').css("background", linear); + } + } else { + for (let problemid in resolver.rank_frozen[i].problem) { + let per = round2(resolver.rank_frozen[i].problem[problemid].old_point / resolver.total_points[problemid] * 100); + let linear = `linear-gradient(90deg, ${partially} ${per}%, ${secondary_color} ${per}%)`; + $('#rank-' + i + ' .p-' + problemid + ' .pro-score.partially').css("background", linear); + } + } + } + } + + +{% endcompress %} \ No newline at end of file diff --git a/templates/resolver/resolver.html b/templates/resolver/resolver.html index 3309425..b0008d8 100644 --- a/templates/resolver/resolver.html +++ b/templates/resolver/resolver.html @@ -1,7 +1,7 @@ - + Contest Resolver @@ -14,29 +14,29 @@ - + - +
        -
        Rank
        -
        -
        Name
        -
        -
        Score
        +
        Rank
        +
        +
        Name
        +
        +
        Score
        -
        X
        -
        Y
        -
        Z
        +
        X
        +
        Y
        +
        Z
        {% include "resolver/media-js.html" %} - + \ No newline at end of file diff --git a/templates/runtime-version-fragment.html b/templates/runtime-version-fragment.html index 0457b83..321ecee 100644 --- a/templates/runtime-version-fragment.html +++ b/templates/runtime-version-fragment.html @@ -1,12 +1,12 @@ {% for name, versions in runtime_versions -%} - {%- if versions -%} - {%- if versions[0] != versions|last -%} - {{ name }} {{ versions[0] }} - {{ versions|last }} - {%- else -%} - {{ name }} {{ versions[0] }} - {%- endif -%} + {%- if versions -%} + {%- if versions[0] != versions|last -%} + {{ name }} {{ versions[0] }} - {{ versions|last }} {%- else -%} - {{ name }} + {{ name }} {{ versions[0] }} {%- endif -%} - {%- if not loop.last %}, {% endif -%} + {%- else -%} + {{ name }} + {%- endif -%} + {%- if not loop.last %}, {% endif -%} {%- endfor -%} diff --git a/templates/site-logo-fragment.html b/templates/site-logo-fragment.html index b6a7698..fb86795 100644 --- a/templates/site-logo-fragment.html +++ b/templates/site-logo-fragment.html @@ -1,10 +1,10 @@ {% if request.in_contest_mode and request.participation.contest.logo_override_image %} - {{ SITE_NAME }} + {{ SITE_NAME }} {% elif request.organization %} - {{ SITE_NAME }} + {{ SITE_NAME }} {% elif logo_override_image is defined and logo_override_image %} - {{ SITE_NAME }} + {{ SITE_NAME }} {% else %} - {{ SITE_NAME }} + {{ SITE_NAME }} {% endif %} diff --git a/templates/solution-preview.html b/templates/solution-preview.html index 82e7cb1..1c5028c 100644 --- a/templates/solution-preview.html +++ b/templates/solution-preview.html @@ -1,4 +1,4 @@ {{ preview_data|markdown|reference|str|safe }} {% if REQUIRE_JAX %} -
        +
        {% endif %} \ No newline at end of file diff --git a/templates/stats/base.html b/templates/stats/base.html index 6e72989..406b6c3 100644 --- a/templates/stats/base.html +++ b/templates/stats/base.html @@ -1,15 +1,15 @@ {% extends "base.html" %} {% block js_media %} - {% compress js %} - {% include "stats/media-js.html" %} - {% endcompress %} + {% compress js %} + {% include "stats/media-js.html" %} + {% endcompress %} {% endblock %} {% block content_title %}{% endblock %} {% block title_ruler %}{% endblock %} {% block body %} - {% include "stats/tab.html" %} - {% block chart_body %}{% endblock %} + {% include "stats/tab.html" %} + {% block chart_body %}{% endblock %} {% endblock %} diff --git a/templates/stats/language.html b/templates/stats/language.html index 70ec589..aaa9e9d 100644 --- a/templates/stats/language.html +++ b/templates/stats/language.html @@ -1,45 +1,45 @@ {% extends "stats/base.html" %} {% block media %} - + {% endblock %} {% block chart_body %} -

        {{ _('Submission Statistics') }}

        -
        - -
        +

        {{ _('Submission Statistics') }}

        +
        + +
        -

        {{ _('Submissions by Language') }}

        -
        - -
        +

        {{ _('Submissions by Language') }}

        +
        + +
        -

        {{ _('AC Submissions by Language') }}

        -
        - -
        +

        {{ _('AC Submissions by Language') }}

        +
        + +
        -

        {{ _('Language AC Rate') }}

        -
        - +

        {{ _('Language AC Rate') }}

        +
        +
        {% endblock %} {% block bodyend %} - + {% endblock %} diff --git a/templates/stats/media-js.html b/templates/stats/media-js.html index d6eb09d..cba5683 100644 --- a/templates/stats/media-js.html +++ b/templates/stats/media-js.html @@ -1,110 +1,110 @@ diff --git a/templates/stats/site.html b/templates/stats/site.html index aa67a07..e622b9d 100644 --- a/templates/stats/site.html +++ b/templates/stats/site.html @@ -1,65 +1,65 @@ -{% extends "stats/base.html" %} -{% block media %} - -{% endblock %} - -{% block chart_body %} -
        -
        - -
        -

        {{ _('Submissions') }}

        -
        -
        -
        - -
        -

        {{ _('Contests') }}

        -
        -
        -
        - -
        -

        {{ _('New users') }}

        -
        -
        -
        - -
        -

        {{ _('Groups') }}

        -
        -
        -
        - -
        -

        {{ _('Comments') }}

        -
        -
        -
        - -
        -

        {{ _('Chat messages') }}

        -
        -{% endblock %} - -{% block bodyend %} - -{% endblock %} +{% extends "stats/base.html" %} +{% block media %} + +{% endblock %} + +{% block chart_body %} +
        +
        + +
        +

        {{ _('Submissions') }}

        +
        +
        +
        + +
        +

        {{ _('Contests') }}

        +
        +
        +
        + +
        +

        {{ _('New users') }}

        +
        +
        +
        + +
        +

        {{ _('Groups') }}

        +
        +
        +
        + +
        +

        {{ _('Comments') }}

        +
        +
        +
        + +
        +

        {{ _('Chat messages') }}

        +
        +{% endblock %} + +{% block bodyend %} + +{% endblock %} diff --git a/templates/stats/tab.html b/templates/stats/tab.html index 92ede48..5dfef09 100644 --- a/templates/stats/tab.html +++ b/templates/stats/tab.html @@ -1,6 +1,6 @@ -{% extends "tabs-base.html" %} - -{% block tabs %} - {{ make_tab('language', 'fa-list', url('language_stats'), _('Language')) }} - {{ make_tab('site', 'fa-list', url('site_stats'), _('Site')) }} +{% extends "tabs-base.html" %} + +{% block tabs %} + {{ make_tab('language', 'fa-list', url('language_stats'), _('Language')) }} + {{ make_tab('site', 'fa-list', url('site_stats'), _('Site')) }} {% endblock %} \ No newline at end of file diff --git a/templates/status/judge-status-table.html b/templates/status/judge-status-table.html index 6617795..7a86514 100644 --- a/templates/status/judge-status-table.html +++ b/templates/status/judge-status-table.html @@ -1,67 +1,67 @@ - {{ _('Judge') }} - {% if see_all_judges %} - {{ _('Online') }} - {% endif %} - {{ _('Uptime') }} - {{ _('Ping') }} - {{ _('Load') }} - {{ _('Runtimes') }} + {{ _('Judge') }} + {% if see_all_judges %} + {{ _('Online') }} + {% endif %} + {{ _('Uptime') }} + {{ _('Ping') }} + {{ _('Load') }} + {{ _('Runtimes') }} {% for judge in judges %} - - - {% if perms.judge.change_judge %} - {{ judge.name }} - {% else %} - {{ judge.name }} - {% endif %} - - {% if see_all_judges %} - - {% if judge.online %} - - {% else %} - - {% endif %} - + + + {% if perms.judge.change_judge %} + {{ judge.name }} + {% else %} + {{ judge.name }} + {% endif %} + + {% if see_all_judges %} + + {% if judge.online %} + + {% else %} + {% endif %} - - {% if judge.online %} - {{ judge.uptime|timedelta("simple") }} - {% else %} - {{ _('N/A') }} - {% endif %} - - - {% if judge.online and judge.ping_ms %} - {{ judge.ping_ms|floatformat(3) }} ms - {% else %} - {{ _('N/A') }} - {% endif %} - - - {% if judge.online %} - {{ judge.load|floatformat(3) }} - {% else %} - {{ _('N/A') }} - {% endif %} - - - {% if judge.online %} - {% for key, info in judge.runtime_versions -%} - {{ info.name }} - {%- if not loop.last %}, {% endif %} - {%- endfor %} - {% else %}{{ _('N/A') }}{% endif %} - - + + {% endif %} + + {% if judge.online %} + {{ judge.uptime|timedelta("simple") }} + {% else %} + {{ _('N/A') }} + {% endif %} + + + {% if judge.online and judge.ping_ms %} + {{ judge.ping_ms|floatformat(3) }} ms + {% else %} + {{ _('N/A') }} + {% endif %} + + + {% if judge.online %} + {{ judge.load|floatformat(3) }} + {% else %} + {{ _('N/A') }} + {% endif %} + + + {% if judge.online %} + {% for key, info in judge.runtime_versions -%} + {{ info.name }} + {%- if not loop.last %}, {% endif %} + {%- endfor %} + {% else %}{{ _('N/A') }}{% endif %} + + {% else %} - - {{ _('There are no judges available at this time.') }} - - + + {{ _('There are no judges available at this time.') }} + + {% endfor %} diff --git a/templates/status/judge-status.html b/templates/status/judge-status.html index dac5cb1..4e8f87f 100644 --- a/templates/status/judge-status.html +++ b/templates/status/judge-status.html @@ -1,23 +1,23 @@ {% extends "base.html" %} {% block js_media %} - {% include "status/media-js.html" %} + {% include "status/media-js.html" %} {% endblock %} {% block media %} - {% include "status/media-css.html" %} - {% block content_media %}{% endblock %} + {% include "status/media-css.html" %} + {% block content_media %}{% endblock %} {% endblock %} {% block title_ruler %}{% endblock %} {% block title_row %} - {% set tab = 'judges' %} - {% include "status/status-tabs.html" %} + {% set tab = 'judges' %} + {% include "status/status-tabs.html" %} {% endblock %} {% block body %} - - {% include "status/judge-status-table.html" %} -
        + + {% include "status/judge-status-table.html" %} +
        {% endblock %} \ No newline at end of file diff --git a/templates/status/language-list.html b/templates/status/language-list.html index 31b5dd3..bb08829 100644 --- a/templates/status/language-list.html +++ b/templates/status/language-list.html @@ -1,58 +1,58 @@ {% extends "base.html" %} {% block media %} - + .table td { + text-align: left; + } + {% endblock %} {% block title_ruler %}{% endblock %} {% block title_row %} - {% set tab = 'runtimes' %} - {% include "status/status-tabs.html" %} + {% set tab = 'runtimes' %} + {% include "status/status-tabs.html" %} {% endblock %} {% block body %} - - - - - - - - - - {% for language in languages %} - {# All online languages have runtime_versions, even if we're not going to display them #} - {% if language.runtime_versions %} - - - - - - {% endif %} - {% endfor %} - -
        {{ _('ID') }}{{ _('Name') }}{{ _('Runtime Info') }}
        {{ language.short_display_name }}{{ language.name }} - {{ runtime_versions(language.runtime_versions()) }} - {% if language.description %} -
        - {{ language.description|markdown|safe }} -
        - {% endif %} -
        + + + + + + + + + + {% for language in languages %} + {# All online languages have runtime_versions, even if we're not going to display them #} + {% if language.runtime_versions %} + + + + + + {% endif %} + {% endfor %} + +
        {{ _('ID') }}{{ _('Name') }}{{ _('Runtime Info') }}
        {{ language.short_display_name }}{{ language.name }} + {{ runtime_versions(language.runtime_versions()) }} + {% if language.description %} +
        + {{ language.description|markdown|safe }} +
        + {% endif %} +
        {% endblock %} \ No newline at end of file diff --git a/templates/status/media-css.html b/templates/status/media-css.html index 49658bf..a60fb41 100644 --- a/templates/status/media-css.html +++ b/templates/status/media-css.html @@ -1,14 +1,14 @@ \ No newline at end of file diff --git a/templates/status/media-js.html b/templates/status/media-js.html index a5b1cb1..6d3df3c 100644 --- a/templates/status/media-js.html +++ b/templates/status/media-js.html @@ -1,62 +1,62 @@ \ No newline at end of file diff --git a/templates/status/status-tabs.html b/templates/status/status-tabs.html index 1dd737e..6381810 100644 --- a/templates/status/status-tabs.html +++ b/templates/status/status-tabs.html @@ -1,7 +1,7 @@ {% extends "tabs-base.html" %} {% block tabs %} - {{ make_tab('judges', 'fa-server', url('status_all'), _('Judges')) }} - {{ make_tab('runtimes', 'fa-code', url('runtime_list'), _('Runtimes')) }} - {{ make_tab('matrix', 'fa-table', url('version_matrix'), _('Version Matrix')) }} + {{ make_tab('judges', 'fa-server', url('status_all'), _('Judges')) }} + {{ make_tab('runtimes', 'fa-code', url('runtime_list'), _('Runtimes')) }} + {{ make_tab('matrix', 'fa-table', url('version_matrix'), _('Version Matrix')) }} {% endblock %} diff --git a/templates/status/versions.html b/templates/status/versions.html index 1c0a991..1f56e03 100644 --- a/templates/status/versions.html +++ b/templates/status/versions.html @@ -3,40 +3,40 @@ {% block title_ruler %}{% endblock %} {% block title_row %} - {% set tab = 'matrix' %} - {% include "status/status-tabs.html" %} + {% set tab = 'matrix' %} + {% include "status/status-tabs.html" %} {% endblock %} {% block body %} - - - - {% for judge in judges %} - - {% endfor %} - - {% for language in languages %} - - - {% for judge in judges %} - {% set versions = matrix[judge][language.id] %} - - {% endfor %} - +
        {{ judge }}
        {{ language.name }} - {%- for version in versions -%} - {{ version.name }}{% if version.version %} {{ version.version }}{% endif %} - {% if not loop.last %}
        {% endif %} - {%- else -%} - — - {%- endfor -%} -
        + + + {% for judge in judges %} + + {% endfor %} + + {% for language in languages %} + + + {% for judge in judges %} + {% set versions = matrix[judge][language.id] %} + {% endfor %} -
        {{ judge }}
        {{ language.name }} + {%- for version in versions -%} + {{ version.name }}{% if version.version %} {{ version.version }}{% endif %} + {% if not loop.last %}
        {% endif %} + {%- else -%} + — + {%- endfor -%} +
        + + {% endfor %} + {% endblock %} diff --git a/templates/submission/info-base.html b/templates/submission/info-base.html index 0511994..d6c8961 100644 --- a/templates/submission/info-base.html +++ b/templates/submission/info-base.html @@ -1,16 +1,16 @@ {% extends "common-content.html" %} {% block header %} - - {{ submission.date|date(_("N j, Y, g:i a")) }} - {%- if perms.judge.change_submission and submission.judged_on %} - on {{ submission.judged_on.name }} - {% endif %} -
        - {{ submission.language }} - {% if perms.judge.change_submission %} - [{{ _('Admin') }}] - {% endif %} -         + + {{ submission.date|date(_("N j, Y, g:i a")) }} + {%- if perms.judge.change_submission and submission.judged_on %} + on {{ submission.judged_on.name }} + {% endif %} +
        + {{ submission.language }} + {% if perms.judge.change_submission %} + [{{ _('Admin') }}] + {% endif %}         +         {% endblock %} diff --git a/templates/submission/internal-error-message.html b/templates/submission/internal-error-message.html index c8b3f30..5ab1edc 100644 --- a/templates/submission/internal-error-message.html +++ b/templates/submission/internal-error-message.html @@ -1,18 +1,18 @@

        - {% if request.user == submission.user.user %} - {% trans trimmed %} - An internal error occurred while grading, and the {{ SITE_NAME }} administrators have been notified.
        - In the meantime, try resubmitting in a few seconds. - {% endtrans %} - {% else %} - {{ _('An internal error occurred while grading.') }} - {% endif %} + {% if request.user == submission.user.user %} + {% trans trimmed %} + An internal error occurred while grading, and the {{ SITE_NAME }} administrators have been notified.
        + In the meantime, try resubmitting in a few seconds. + {% endtrans %} + {% else %} + {{ _('An internal error occurred while grading.') }} + {% endif %}

        {% if submission.error and request.user.is_authenticated %} - {% if request.profile.id in submission.problem.editor_ids or perms.judge.edit_all_problem %} -

        -

        {{ _('Error information') }}

        - {{ submission.error|highlight('pytb', linenos=False) }} - {% endif %} + {% if request.profile.id in submission.problem.editor_ids or perms.judge.edit_all_problem %} +

        +

        {{ _('Error information') }}

        + {{ submission.error|highlight('pytb', linenos=False) }} + {% endif %} {% endif %} \ No newline at end of file diff --git a/templates/submission/list.html b/templates/submission/list.html index 67caf04..91ae124 100644 --- a/templates/submission/list.html +++ b/templates/submission/list.html @@ -1,261 +1,261 @@ {% extends "three-column-content.html" %} {% block three_col_js %} - - - {% compress js %} - - {% if request.user.is_authenticated and perms.judge.rejudge_submission %} - - {% endif %} - - - - {% endcompress %} - + + {% if request.in_contest_mode %} + window.current_contest = '{{request.participation.contest.key}}'; + {% else %} + window.current_contest = null; + {% endif %} + {% if dynamic_user_id %} + window.dynamic_user_id = {{dynamic_user_id}}; + {% else %} + window.dynamic_user_id = null; + {% endif %} + {% if dynamic_problem_id %} + window.dynamic_problem_id = {{dynamic_problem_id}}; + {% else %} + window.dynamic_problem_id = null; + {% endif %} + {% if show_problem %} + window.show_problem = 1; + {% else %} + window.show_problem = 0; + {% endif %} {% endif %} + {% if results_json %} + window.results_json = {{ results_json }}; + {% endif %} + + + {% compress js %} + + {% if request.user.is_authenticated and perms.judge.rejudge_submission %} + + {% endif %} + + + + {% endcompress %} + + {% if dynamic_update and last_msg %} + + {% endif %} {% endblock %} {% block title_ruler %}{% endblock %} @@ -263,133 +263,133 @@ {% block title_row %}{% endblock %} {% block three_col_media %} - {% if perms.judge.change_submission and perms.judge.rejudge_submission %} - - {% endif %} - + {% if perms.judge.change_submission and perms.judge.rejudge_submission %} + {% endif %} + + {% endblock %} {% block middle_title %} -
        +
        -

        {{content_title}}

        +

        {{content_title}}

        -
        +
        {% endblock %} {% block middle_content %} -
        -
        - {{ _('You were disconnected. Refresh to show latest updates.') }} -
        - -
        - {% set profile_id = request.profile.id if request.user.is_authenticated else 0 %} - {% for submission in submissions %} -
        - {% with problem_name=show_problem and submission.problem.i18n_name %} - {% include "submission/row.html" %} - {% endwith %} -
        - {% endfor %} -
        - {% if page_obj.num_pages > 1 %} -
        {% include "list-pages.html" %}
        - {% endif %} +
        +
        + {{ _('You were disconnected. Refresh to show latest updates.') }}
        + +
        + {% set profile_id = request.profile.id if request.user.is_authenticated else 0 %} + {% for submission in submissions %} +
        + {% with problem_name=show_problem and submission.problem.i18n_name %} + {% include "submission/row.html" %} + {% endwith %} +
        + {% endfor %} +
        + {% if page_obj.num_pages > 1 %} +
        {% include "list-pages.html" %}
        + {% endif %} +
        {% endblock %} {% block right_sidebar %} -{% if results_json %} + {% if results_json %}
        -
        -
        -

        {{ _('Filter submissions') }}

        -
        -
        -
        - - -
        -
        - - -
        -
        - {{ _('Go') }} -
        -
        -
        -
        -
        -
        -

        {{ _('Statistics') }}

        -
        -
        - -
        -
        - {{ _('Total:') }} -
        -
        -
        -
        +
        +
        +

        {{ _('Filter submissions') }}

        +
        +
        +
        + + +
        +
        + + +
        +
        + {{ _('Go') }} +
        +
        +
        +
        +
        +

        {{ _('Statistics') }}

        +
        +
        + +
        +
        + {{ _('Total:') }} +
        +
        +
        +
        +
        -{% endif %} + {% endif %} {% endblock %} {% block left_sidebar %} -
        - {{ make_tab_item('all_submissions_list', 'fa fa-list', all_submissions_link, _('All')) }} - {% if my_submissions_link or tab == 'my_submissions_tab' %} - {{ make_tab_item('my_submissions_tab', 'fa fa-user', my_submissions_link, _('Mine')) }} - {% endif %} - {% if best_submissions_link %} - {{ make_tab_item('best_submissions_list', 'fa fa-bar-chart', best_submissions_link, _('Best')) }} - {% endif %} - {% if page_type == 'user_submissions_tab' %} - {{ make_tab_item('user_submissions_tab', 'fa fa-user', None, _("%(user)s", user=tab_username)) }} - {% endif %} - {% if perms.judge.change_submission %} - {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_submission_changelist'), _('Admin')) }} - {% endif %} -
        +
        + {{ make_tab_item('all_submissions_list', 'fa fa-list', all_submissions_link, _('All')) }} + {% if my_submissions_link or tab == 'my_submissions_tab' %} + {{ make_tab_item('my_submissions_tab', 'fa fa-user', my_submissions_link, _('Mine')) }} + {% endif %} + {% if best_submissions_link %} + {{ make_tab_item('best_submissions_list', 'fa fa-bar-chart', best_submissions_link, _('Best')) }} + {% endif %} + {% if page_type == 'user_submissions_tab' %} + {{ make_tab_item('user_submissions_tab', 'fa fa-user', None, _("%(user)s", user=tab_username)) }} + {% endif %} + {% if perms.judge.change_submission %} + {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_submission_changelist'), _('Admin')) }} + {% endif %} +
        {% endblock %} \ No newline at end of file diff --git a/templates/submission/row.html b/templates/submission/row.html index a0f4ade..e25933f 100644 --- a/templates/submission/row.html +++ b/templates/submission/row.html @@ -1,94 +1,94 @@ {% set can_view = submission_layout(submission, profile_id, request.user, editable_problem_ids, completed_problem_ids) %}
        -
        - {%- if submission.is_graded -%} - {%- if submission.status in ('IE', 'CE', 'AB') -%} - --- - {%- else -%} - {{ submission.case_points|floatformat(0) }} / {{ submission.case_total|floatformat(0) }} - {%- endif -%} - {%- else -%} - - {%- endif -%} -
        -
        - {% if in_hidden_subtasks_contest and submission.is_graded %} - - {% set ns = namespace(is_first=False) %} - {% for batch in submission.batches %} - {% if batch.id %} - {{ '+' if ns.is_first else '' }} - {% set ns.is_first = True %} - - {{ batch.points|floatformat(0) }} - - {% endif %} - {% endfor %} - - {% else %} - {% if not in_hidden_subtasks_contest or submission.status in ('IE', 'CE', 'AB') %} - {{ submission.short_status }} | - {% endif %} - {{ submission.language.short_display_name }} - {% endif %} -
        +
        + {%- if submission.is_graded -%} + {%- if submission.status in ('IE', 'CE', 'AB') -%} + --- + {%- else -%} + {{ submission.case_points|floatformat(0) }} / {{ submission.case_total|floatformat(0) }} + {%- endif -%} + {%- else -%} + + {%- endif -%} +
        +
        + {% if in_hidden_subtasks_contest and submission.is_graded %} + + {% set ns = namespace(is_first=False) %} + {% for batch in submission.batches %} + {% if batch.id %} + {{ '+' if ns.is_first else '' }} + {% set ns.is_first = True %} + + {{ batch.points|floatformat(0) }} + + {% endif %} + {% endfor %} + + {% else %} + {% if not in_hidden_subtasks_contest or submission.status in ('IE', 'CE', 'AB') %} + {{ submission.short_status }} | + {% endif %} + {{ submission.language.short_display_name }} + {% endif %} +
        - {% if show_problem %} -
        {{ problem_name }}
        + {% if show_problem %} +
        {{ problem_name }}
        + {% endif %} +
        + {{ link_user(submission.user) }} + {{ relative_time(submission.date) }} + {% if not request.in_contest_mode and submission.contest_object_id %} + + + {% endif %} -
        - {{ link_user(submission.user) }} - {{ relative_time(submission.date) }} - {% if not request.in_contest_mode and submission.contest_object_id %} - - - - {% endif %} -
        +
        {% if submission.status == 'G' and not in_hidden_subtasks_contest %} -
        - {%- if submission.current_testcase > 0 -%} - {{ _('Point %(point)s / Case #%(case)s', point=submission.points|floatformat(1), case=submission.current_testcase) }} - {%- else -%} - ... - {%- endif -%} -
        +
        + {%- if submission.current_testcase > 0 -%} + {{ _('Point %(point)s / Case #%(case)s', point=submission.points|floatformat(1), case=submission.current_testcase) }} + {%- else -%} + ... + {%- endif -%} +
        {% endif %} {% if can_view %} -
        - - {{ _('view') }} - - {% if perms.judge.rejudge_submission %} · - - {{ _('rejudge') }} - - {% endif %} - {% if perms.judge.change_submission %} · - - {{ _('admin') }} - - {% endif %} -
        +
        + + {{ _('view') }} + + {% if perms.judge.rejudge_submission %} · + + {{ _('rejudge') }} + + {% endif %} + {% if perms.judge.change_submission %} · + + {{ _('admin') }} + + {% endif %} +
        {% endif %}
        - {% if submission.status in ('QU', 'P', 'G', 'CE', 'IE', 'AB') or in_hidden_subtasks_contest %} -
        ---
        -
        ---
        + {% if submission.status in ('QU', 'P', 'G', 'CE', 'IE', 'AB') or in_hidden_subtasks_contest %} +
        ---
        +
        ---
        + {% else %} + {% if "TLE" != submission.result %} +
        + {{ (submission.time or 0)|floatformat(2) }}s +
        {% else %} - {% if "TLE" != submission.result %} -
        - {{ (submission.time or 0)|floatformat(2) }}s -
        - {% else %} -
        ---
        - {% endif %} -
        {{ (submission.memory_bytes|filesizeformat(True)).replace('i', '') }}
        +
        ---
        {% endif %} +
        {{ (submission.memory_bytes|filesizeformat(True)).replace('i', '') }}
        + {% endif %}
        \ No newline at end of file diff --git a/templates/submission/source.html b/templates/submission/source.html index 8f9b9d8..d41b3a0 100644 --- a/templates/submission/source.html +++ b/templates/submission/source.html @@ -1,64 +1,64 @@ {% extends "submission/info-base.html" %} {% block media %} - + .copy-clipboard { + margin-top: 0; + } + {% endblock %} {% block body %} -
        -
        - - - {% if request.user == submission.user.user or perms.judge.resubmit_other %} - - {% endif %} - {% if perms.judge.rejudge_submission %} -
        -
        - {% csrf_token %} - {{ _('Rejudge') }} - - -
        -
        - {% endif %} -
        -
        -
        -
        - - - - - -
        -
        - {% for line in raw_source.split('\n') %} - - 
        {{ loop.index }}
        -         - {% endfor %} -
        -         		{{ highlighted_source }}
        +
        +
        + + + {% if request.user == submission.user.user or perms.judge.resubmit_other %} + + {% endif %} + {% if perms.judge.rejudge_submission %} +
        +
        + {% csrf_token %} + {{ _('Rejudge') }} + + +
        + {% endif %} +
        +
        +
        +
        + + + + + +
        +
        + {% for line in raw_source.split('\n') %} + + 
        {{ loop.index }}
        +         + {% endfor %} +
        +         		{{ highlighted_source }}
        +
        {% endblock %} diff --git a/templates/submission/status-testcases.html b/templates/submission/status-testcases.html index 58595ea..4d4b435 100644 --- a/templates/submission/status-testcases.html +++ b/templates/submission/status-testcases.html @@ -1,205 +1,205 @@ {% if submission.contest_or_none %} - {% set prefix_length = submission.contest_or_none.problem.output_prefix_override %} + {% set prefix_length = submission.contest_or_none.problem.output_prefix_override %} {% else %} - {% set prefix_length = None %} + {% set prefix_length = None %} {% endif %} {% set is_pretest = submission.is_pretested %} {% if submission.status != 'IE' %} - {% if submission.status == 'QU' %} -

        {{ _('We are waiting for a suitable judge to process your submission...') }}

        - {% elif submission.status == 'P' %} -

        {{ _('Your submission is being processed...') }}

        - {% elif submission.status == 'CE' %} -

        {{ _('Compilation Error') }}

        - 
        {{ submission.error|ansi2html }}
        + {% if submission.status == 'QU' %} +

        {{ _('We are waiting for a suitable judge to process your submission...') }}

        + {% elif submission.status == 'P' %} +

        {{ _('Your submission is being processed...') }}

        + {% elif submission.status == 'CE' %} +

        {{ _('Compilation Error') }}

        + 
        {{ submission.error|ansi2html }}
        + {% else %} + {% if submission.error %} +

        {{ _('Compilation Warnings') }}

        + 
        {{ submission.error|ansi2html }}
        +

        + {% endif %} + {% if is_pretest %} +

        {{ _('Pretest Execution Results') }}

        {% else %} - {% if submission.error %} -

        {{ _('Compilation Warnings') }}

        - 
        {{ submission.error|ansi2html }}
        -

        - {% endif %} - {% if is_pretest %} -

        {{ _('Pretest Execution Results') }}

        - {% else %} -

        {{ _('Execution Results') }}

        - {% endif %} - +

        {{ _('Execution Results') }}

        + {% endif %} + + {% for batch in batches %} + {% if batch.id not in hidden_subtasks %} +
        + {% if batch.id %} + {{ _('Batch ') }}#{{ batch.id }} ({{batch.points|floatformat}} / {{batch.total|floatformat}}): + {% endif %} + {% for case in batch.cases %} + + {% if case.status == 'AC' %} + + {% elif case.status != 'SC' %} + + {% endif %} + + {% endfor %} +
        + {% else %} +
        + {% if batch.id %} + {{ _('Batch ') }}#{{ batch.id }} (??? / {{batch.total|floatformat}}) + {% endif %} +
        + {% endif %} + {% endfor %} +
        + + + {% if submission.is_graded and submission.result != 'AB' and not hidden_subtasks %} + + + + + + + + + + + + + + {% endif %} + + {% for batch in batches %} - {% if batch.id not in hidden_subtasks %} -
        - {% if batch.id %} - {{ _('Batch ') }}#{{ batch.id }} ({{batch.points|floatformat}} / {{batch.total|floatformat}}): - {% endif %} - {% for case in batch.cases %} - - {% if case.status == 'AC' %} - - {% elif case.status != 'SC' %} - - {% endif %} - - {% endfor %} -
        - {% else %} -
        - {% if batch.id %} - {{ _('Batch ') }}#{{ batch.id }} (??? / {{batch.total|floatformat}}) - {% endif %} -
        - {% endif %} - {% endfor %} -
        - -
        {{_('Overall: ')}} + {% if request.in_contest_mode and submission.contest_or_none %} + {% with contest=submission.contest_or_none %} + {{ _('%(points)s/%(total)s', points=contest.points|roundfloat(3), + total=contest.problem.points|floatformat(-1)) }} + {% endwith %} + {% else %} + {{ _('%(points)s/%(total)s', points=submission.points|roundfloat(3), + total=submission.problem.points|floatformat(-1)) }} + {% endif %} + {{submission.long_status}}{{_('Point: ')}} + {{ submission.case_points|floatformat(1) }}/{{ submission.case_total|floatformat(0) }} + + {{_('Time: ')}} + {% if submission.result == "TLE" %} + --- + {% else %} + {{ (submission.time * 1000)|floatformat(0) }} ms + {% endif %} + + {{_('Memory: ')}}{{ submission.memory|kbdetailformat }}
        - {% if submission.is_graded and submission.result != 'AB' and not hidden_subtasks %} - - - - - - - - - - - - - - {% endif %} - - - {% for batch in batches %} - {% if batch.id not in hidden_subtasks %} + {% if batch.id not in hidden_subtasks %} {% if batch.id %} - {% set batch_AC = (batch.points == batch.total) %} - - - - - - - + {% set batch_AC = (batch.points == batch.total) %} + + + + + + + {% endif %} {% for case in batch.cases %} - + - + - {% if can_see_testcases %} - - + - - {% endif %} + {% if curr_data != null %} + {{ _('Answer:') }} + 
        {{ curr_data['answer']|linebreaksbr }}
        + {% endif %} + + {% if case.extended_feedback or case.feedback %} + {{ _('Judge feedback:') }} + {% if case.feedback %} + 
        {{ case.feedback|linebreaksbr }}
        + {% endif %} + {% if case.extended_feedback %} + 
        {{ case.extended_feedback|linebreaksbr }}
        + {% endif %} + {% endif %} + + + + {% endif %} {% endfor %} - {% endif %} + {% endif %} {% endfor %} -
        {{_('Overall: ')}} - {% if request.in_contest_mode and submission.contest_or_none %} - {% with contest=submission.contest_or_none %} - {{ _('%(points)s/%(total)s', points=contest.points|roundfloat(3), - total=contest.problem.points|floatformat(-1)) }} - {% endwith %} - {% else %} - {{ _('%(points)s/%(total)s', points=submission.points|roundfloat(3), - total=submission.problem.points|floatformat(-1)) }} - {% endif %} - {{submission.long_status}}{{_('Point: ')}} - {{ submission.case_points|floatformat(1) }}/{{ submission.case_total|floatformat(0) }} - - {{_('Time: ')}} - {% if submission.result == "TLE" %} - --- - {% else %} - {{ (submission.time * 1000)|floatformat(0) }} ms - {% endif %} - - {{_('Memory: ')}}{{ submission.memory|kbdetailformat }}
        - {{ _('Batch ') }}#{{ batch.id }} - - {% if batch_AC %} - - {% else %} - - {% endif %} - - - {{_('Point')}}: - - {{ _('%(points)s/%(total)s', points=batch.points|floatformat(1), total=batch.total|floatformat(0)) }} -
        + {{ _('Batch ') }}#{{ batch.id }} + + {% if batch_AC %} + + {% else %} + + {% endif %} + + + {{_('Point')}}: + + {{ _('%(points)s/%(total)s', points=batch.points|floatformat(1), total=batch.total|floatformat(0)) }} +
        - {%- if can_see_testcases -%} - - {%- endif -%} - {%- if batch.id -%} - {{ _('Case') }} #{{ loop.index }}: - {%- elif is_pretest -%} - {{ _('Pretest') }} #{{ loop.index }}: - {%- else -%} - {{ _('Test case') }} #{{ loop.index }}: - {%- endif -%} + {%- if can_see_testcases -%} + + {%- endif -%} + {%- if batch.id -%} + {{ _('Case') }} #{{ loop.index }}: + {%- elif is_pretest -%} + {{ _('Pretest') }} #{{ loop.index }}: + {%- else -%} + {{ _('Test case') }} #{{ loop.index }}: + {%- endif -%} - - {%- if case.status == 'SC' %}—{% else %}{{ case.long_status }}{% endif -%} - + + {%- if case.status == 'SC' %}—{% else %}{{ case.long_status }}{% endif -%} + {{_('Point')}}: - {{ case.points|floatformat }}/{{ case.total|floatformat }} + {{ case.points|floatformat }}/{{ case.total|floatformat }} - {%- if case.status != 'SC' -%} - {%- if case.status == 'TLE' -%} - {{_('Time')}}: >{{ (time_limit * 1000)|floatformat(0) }} ms - {%- else -%} - {{_('Time')}}: {{ (case.time * 1000)|floatformat(0) }} ms - {%- endif -%} + {%- if case.status != 'SC' -%} + {%- if case.status == 'TLE' -%} + {{_('Time')}}: >{{ (time_limit * 1000)|floatformat(0) }} ms + {%- else -%} + {{_('Time')}}: {{ (case.time * 1000)|floatformat(0) }} ms {%- endif -%} + {%- endif -%} {% if case.status != 'SC' %}{{_('Memory')}}: {{ case.memory|kbdetailformat }}{% endif %}
        + - {% if submission.is_graded %} -
        - {% if submission.result != "AB" %} - {% if is_pretest and submission.result == "AC" %} -
        - {{ _('Passing pretests does not guarantee a full score on system tests.') }} - {% endif %} - {% else %} - {{ _('Submission aborted!') }} - {% endif %} -
        + {% if submission.is_graded %} +
        + {% if submission.result != "AB" %} + {% if is_pretest and submission.result == "AC" %} +
        + {{ _('Passing pretests does not guarantee a full score on system tests.') }} {% endif %} + {% else %} + {{ _('Submission aborted!') }} + {% endif %} +
        {% endif %} + {% endif %} {% else %} - {% include "submission/internal-error-message.html" %} + {% include "submission/internal-error-message.html" %} {% endif %} diff --git a/templates/submission/status.html b/templates/submission/status.html index 65ba40d..2bbc070 100644 --- a/templates/submission/status.html +++ b/templates/submission/status.html @@ -1,186 +1,186 @@ {% extends "submission/info-base.html" %} {% block media %} - + .case-icons i { + font-size: large; + font-weight: bolder; + cursor: pointer; + } + @media(max-width: 799px) { + .source-ln { + display: none; + } + .source-code { + -webkit-text-size-adjust: none; + padding-left: 0; + } + .source-wrap { + padding: 0.7em; + } + } + {% endblock %} {% block content_js_media %} - - + + {% if not submission.is_graded and last_msg %} + - {% if not submission.is_graded and last_msg %} - - {% endif %} + {% endif %} {% endblock %} {% block body %} -
        -
        - {% if request.user == submission.user.user or perms.judge.resubmit_other %} - - {% endif %} - {% if perms.judge.rejudge_submission %} -
        -
        - {% csrf_token %} - {{ _('Rejudge') }} - - -
        -
        - {% endif %} - -
        -

        {{_('Source code')}}

        -