Skip to content

Commit 9491555

Browse files
committed
Implement Nicky his feedback
1 parent 49e01d8 commit 9491555

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

webapp/templates/jury/clarification.html.twig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
{% endif %}
2020

2121
{% for clar in list %}
22-
<div style="height: 100px;"></div>
23-
<div>Pure body:<br>{{ clar.body }}</div>
24-
<div>Markdown converted:<br>{{ clar.body | markdown_to_html }}</div>
25-
<div>DOMjudge Markdown converted:<br>{{ clar.body | domjudgeMarkdownToHtml }}</div>
26-
<div>Sanitized:<br>{{ clar.body | sanitize_html('app.clarification_sanitizer') }}</div>
27-
<div>All:<br>{{ clar.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
28-
<div>DOMjudge all:<br>{{ clar.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
2922
<div class="card mb-3 {% if clar.from_team is not defined %}border-primary{% endif %}">
3023
<div class="card-header">
3124
<div class="row">
@@ -117,7 +110,7 @@
117110

118111
<hr/>
119112

120-
<div class="card-text">{{ clar.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
113+
<div class="card-text">{{ clar.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
121114

122115
</div>
123116
</div>

webapp/templates/jury/config.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
{{ errors[option.name] }}
219219
</div>
220220
{% endif %}
221-
<div class="small text-muted">{{ option.description | markdown_to_html }}</div>
221+
<div class="small text-muted">{{ option.description | domjudgeMarkdownToHtml }}</div>
222222
</div>
223223
</li>
224224
{% endfor %}

webapp/templates/jury/config_check.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
{% if testresult.escape is not defined or testresult.escape %}
100100
{% set description = description | escape %}
101101
{% endif %}
102-
{{ description | markdown_to_html }}
102+
{{ description | domjudgeMarkdownToHtml }}
103103
</div>
104104
</div>
105105
</div>

webapp/templates/jury/export/clarifications.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<tr>
9999
<td><b>Content</b></td>
100100
<td colspan="5">
101-
<div class="card-text">{{ clarification.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
101+
<div class="card-text">{{ clarification.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
102102
</td>
103103
</tr>
104104
{% if clarification.replies is not empty %}
@@ -114,7 +114,7 @@
114114
</b>
115115
</td>
116116
<td colspan="5">
117-
<div class="card-text">{{ reply.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
117+
<div class="card-text">{{ reply.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
118118
</td>
119119
</tr>
120120
{% endfor %}

webapp/templates/team/partials/clarification.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<hr/>
4141

4242
<div class="card-text">
43-
{{ clarification.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}
43+
{{ clarification.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}
4444
</div>
4545
</div>
4646
</div>

webapp/templates/team/partials/clarification_list.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
<td class="clarification-text">
6666
<a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}">
67-
{{ clarification.summary | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}
67+
{{ clarification.summary | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}
6868
</a>
6969
<script>
7070
MathJax.typeset([document.getElementsByClassName('card-body')]);

0 commit comments

Comments
 (0)