Redesign UI

judge/jinja2/__init__.py

@@ -8,7 +8,7 @@ from statici18n.templatetags.statici18n import inlinei18n
 
 from judge.highlight_code import highlight_code
 from judge.user_translations import gettext
-from . import (camo, datetime, filesize, gravatar, language, markdown, rating, reference, render, social,
+from . import (camo, chat, datetime, filesize, gravatar, language, markdown, rating, reference, render, social,
                spaceless, submission, timedelta)
 from . import registry
 

judge/jinja2/camo.py

@@ -1,9 +1,8 @@
 from judge.utils.camo import client as camo_client
 from . import registry
 
-
 @registry.filter
 def camo(url):
     if camo_client is None:
         return url
-    return camo_client.rewrite_url(url)
+    return camo_client.rewrite_url(url)

judge/jinja2/chat.py

@@ -0,0 +1,6 @@
+from . import registry
+from chat_box.utils import encrypt_url
+
+@registry.function
+def chat_param(request_profile, profile):
+    return encrypt_url(request_profile.id, profile.id)

judge/jinja2/markdown/__init__.py

@@ -12,6 +12,7 @@ from lxml.etree import ParserError, XMLSyntaxError
 from judge.highlight_code import highlight_code
 from judge.jinja2.markdown.lazy_load import lazy_load as lazy_load_processor
 from judge.jinja2.markdown.math import MathInlineGrammar, MathInlineLexer, MathRenderer
+from judge.jinja2.markdown.spoiler import SpoilerInlineGrammar, SpoilerInlineLexer, SpoilerRenderer
 from judge.utils.camo import client as camo_client
 from judge.utils.texoid import TEXOID_ENABLED, TexoidRenderer
 from .. import registry
@@ -26,15 +27,15 @@ class CodeSafeInlineGrammar(mistune.InlineGrammar):
     emphasis = re.compile(r'^\*((?:\*\*|[^\*])+?)()\*(?!\*)')  # *word*
 
 
-class AwesomeInlineGrammar(MathInlineGrammar, CodeSafeInlineGrammar):
+class AwesomeInlineGrammar(MathInlineGrammar, SpoilerInlineGrammar, CodeSafeInlineGrammar):
     pass
 
 
-class AwesomeInlineLexer(MathInlineLexer, mistune.InlineLexer):
+class AwesomeInlineLexer(MathInlineLexer, SpoilerInlineLexer, mistune.InlineLexer):
     grammar_class = AwesomeInlineGrammar
 
 
-class AwesomeRenderer(MathRenderer, mistune.Renderer):
+class AwesomeRenderer(MathRenderer, SpoilerRenderer, mistune.Renderer):
     def __init__(self, *args, **kwargs):
         self.nofollow = kwargs.pop('nofollow', True)
         self.texoid = TexoidRenderer() if kwargs.pop('texoid', False) else None
@@ -128,7 +129,6 @@ def markdown(value, style, math_engine=None, lazy_load=False):
     markdown = mistune.Markdown(renderer=renderer, inline=AwesomeInlineLexer,
                                 parse_block_html=1, parse_inline_html=1)
     result = markdown(value)
-
     if post_processors:
         try:
             tree = html.fromstring(result, parser=html.HTMLParser(recover=True))

judge/jinja2/markdown/math.py

@@ -64,4 +64,4 @@ class MathRenderer(mistune.Renderer):
     def math(self, math):
         if self.mathoid is None or not math:
             return r'\(%s\)' % mistune.escape(str(math))
-        return self.mathoid.inline_math(math)
+        return self.mathoid.inline_math(math)

judge/jinja2/markdown/spoiler.py

@@ -0,0 +1,27 @@
+import re
+import mistune
+
+
+class SpoilerInlineGrammar(mistune.InlineGrammar):
+    spoiler = re.compile(r'^\|\|(.+?)\s+([\s\S]+?)\s*\|\|')
+
+
+class SpoilerInlineLexer(mistune.InlineLexer):
+    grammar_class = SpoilerInlineGrammar
+
+    def __init__(self, *args, **kwargs):
+        self.default_rules.insert(0, 'spoiler')
+        super(SpoilerInlineLexer, self).__init__(*args, **kwargs)
+        
+    def output_spoiler(self, m):
+        return self.renderer.spoiler(m.group(1), m.group(2))
+
+
+class SpoilerRenderer(mistune.Renderer):
+    def spoiler(self, summary, text):
+        return '''<details>
+            <summary style="color: brown">
+                <span class="spoiler-summary">%s</span>
+            </summary>
+            <div class="spoiler-text">%s</div>
+        </details>''' % (summary, text)

judge/views/problem.py

@@ -21,7 +21,7 @@ from django.utils.functional import cached_property
 from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _, gettext_lazy
-from django.views.generic import ListView, View
+from django.views.generic import DetailView, ListView, View
 from django.views.generic.base import TemplateResponseMixin
 from django.views.generic.detail import SingleObjectMixin
 
@@ -154,13 +154,10 @@ class ProblemRaw(ProblemMixin, TitleMixin, TemplateResponseMixin, SingleObjectMi
             ))
 
 
-class ProblemDetail(ProblemMixin, SolvedProblemMixin, CommentedDetailView):
+class ProblemDetail(ProblemMixin, SolvedProblemMixin, DetailView):
     context_object_name = 'problem'
     template_name = 'problem/problem.html'
 
-    def get_comment_page(self):
-        return 'p:%s' % self.object.code
-
     def get_context_data(self, **kwargs):
         context = super(ProblemDetail, self).get_context_data(**kwargs)
         user = self.request.user
@@ -221,6 +218,21 @@ class ProblemDetail(ProblemMixin, SolvedProblemMixin, CommentedDetailView):
         return context
 
 
+class ProblemComments(ProblemMixin, TitleMixin, CommentedDetailView):
+    context_object_name = 'problem'
+    template_name = 'problem/comments.html'
+
+    def get_title(self):
+        return _('Disscuss {0}').format(self.object.name)
+
+    def get_content_title(self):
+        return format_html(_(u'Discuss <a href="{1}">{0}</a>'), self.object.name,
+                           reverse('problem_detail', args=[self.object.code]))
+
+    def get_comment_page(self):
+        return 'p:%s' % self.object.code
+
+
 class LatexError(Exception):
     pass