Add UI for action bar
This commit is contained in:
parent
f9e9df6056
commit
b75a52fe74
22 changed files with 543 additions and 333 deletions
|
@ -2,10 +2,12 @@
|
|||
|
||||
{% block content_js_media %}
|
||||
{% include "comments/media-js.html" %}
|
||||
{% include "actionbar/media-js.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content_media %}
|
||||
{% include "comments/media-css.html" %}
|
||||
{% include "actionbar/media-css.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
|
@ -29,6 +31,8 @@
|
|||
{{ solution.content|markdown|reference|str|safe }}
|
||||
</div>
|
||||
<hr>
|
||||
{% include "actionbar/list.html" %}
|
||||
<br>
|
||||
{% include "comments/list.html" %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
@ -52,14 +52,22 @@
|
|||
{% endfor %}, *{{problem.points | int}}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class='blog-description content-description'>
|
||||
{% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
|
||||
{{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
{% if problem.pdf_description %}
|
||||
<embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf" style="margin-top: 0.5em">
|
||||
{% endif %}
|
||||
<div class="blog-description">
|
||||
<div class='content-description'>
|
||||
{% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
|
||||
{{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
{% if problem.pdf_description %}
|
||||
<embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf" style="margin-top: 0.5em">
|
||||
{% endif %}
|
||||
</div>
|
||||
{% set include_hr = True %}
|
||||
{% set hide_actionbar_comment = True %}
|
||||
{% set pagevote = problem.pagevote %}
|
||||
{% include "actionbar/list.html" %}
|
||||
|
||||
{% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
|
||||
<br>
|
||||
<a href="#" class="view-statement-src">{{ _('View source') }}</a>
|
||||
<pre class="statement-src" style="display: none">{{ problem.description|str }}</pre>
|
||||
<hr>
|
||||
|
|
|
@ -59,9 +59,11 @@
|
|||
}
|
||||
</style>
|
||||
{% endif %}
|
||||
{% include "actionbar/media-css.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block three_col_js %}
|
||||
{% include "actionbar/media-js.html" %}
|
||||
<script>
|
||||
window.point_start = {{point_start}};
|
||||
window.point_end = {{point_end}};
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{% extends "common-content.html" %}
|
||||
{% block content_media %}
|
||||
{% include "comments/media-css.html" %}
|
||||
{% include "actionbar/media-css.html" %}
|
||||
<style>
|
||||
.title-state {
|
||||
font-size: 2em;
|
||||
|
@ -79,6 +80,7 @@
|
|||
|
||||
{% block content_js_media %}
|
||||
{% include "comments/media-js.html" %}
|
||||
{% include "actionbar/media-js.html" %}
|
||||
{% if request.in_contest_mode %}
|
||||
<script type="text/javascript">
|
||||
window.register_contest_notification("{{url('contest_clarification_ajax', request.participation.contest.key)}}");
|
||||
|
@ -394,15 +396,17 @@
|
|||
|
||||
{% block post_description_end %}
|
||||
{% if request.user.is_authenticated and not request.profile.mute %}
|
||||
<a href="{{ url('new_problem_ticket', problem.code) }}" class="clarify">
|
||||
<i class="fa fa-flag" style="margin-right:0.5em"></i>
|
||||
{%- if contest_problem and contest_problem.contest.use_clarifications and request.profile.current_contest.live -%}
|
||||
{%- if contest_problem and contest_problem.contest.use_clarifications and request.profile.current_contest.live -%}
|
||||
<a href="{{ url('new_problem_ticket', problem.code) }}" class="clarify">
|
||||
<i class="fa fa-flag" style="margin-right:0.5em"></i>
|
||||
{{ _('Request clarification') }}
|
||||
{%- else -%}
|
||||
{{ _('Report an issue') }}
|
||||
{%- endif -%}
|
||||
</a>
|
||||
<div style="clear: both"></div>
|
||||
</a>
|
||||
<div style="clear: both"></div>
|
||||
{%- else -%}
|
||||
{% set actionbar_report_url = url('new_problem_ticket', problem.code) %}
|
||||
{% include "actionbar/list.html" %}
|
||||
<br>
|
||||
{%- endif -%}
|
||||
{% endif %}
|
||||
{% if not (contest_problem and contest_problem.contest.use_clarifications) %}
|
||||
<div id="comment-announcement-container">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue