|
4 | 4 | {% endif %} |
5 | 5 |
|
6 | 6 | <div class="table-wrapper"> |
7 | | - <table class="data-table table table-striped table-hover table-sm" style="width:100%;"> |
| 7 | + <table class="data-table table table-hover table-sm" style="width:100%;"> |
8 | 8 | <thead class="thead-light"> |
9 | 9 | <tr> |
10 | 10 | <th scope="col">time</th> |
11 | | - <th scope="col">from</th> |
12 | | - <th scope="col">to</th> |
13 | 11 | {% if includeSubject %} |
14 | 12 | <th scope="col">subject</th> |
15 | 13 | {% endif %} |
|
26 | 24 | {{ clarification.submittime | printtime(null, clarification.contest) }} |
27 | 25 | </a> |
28 | 26 | </td> |
29 | | - {%- if clarification.sender is null %} |
30 | | - {%- set sender = 'Jury' %} |
31 | | - {%- if clarification.recipient is null %} |
32 | | - {%- set recipient = 'All' %} |
33 | | - {%- else %} |
34 | | - {%- set recipient = clarification.recipient.effectiveName %} |
35 | | - {%- endif %} |
36 | | - {%- else %} |
37 | | - {%- set recipient = 'Jury' %} |
38 | | - {%- set sender = clarification.sender.effectiveName %} |
| 27 | + {%- set prefix = '' %} |
| 28 | + {%- if clarification.sender is null and clarification.recipient is not null %} |
| 29 | + {%- set prefix = 'Reply to ' ~ clarification.recipient.effectiveName ~ ': ' %} |
39 | 30 | {%- endif %} |
40 | 31 |
|
41 | | - <td> |
42 | | - <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}" title="{{ sender }}"> |
43 | | - {{ sender | u.truncate(teamname_max_length, '…') }} |
44 | | - </a> |
45 | | - </td> |
46 | | - <td> |
47 | | - <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}" title="{{ recipient }}"> |
48 | | - {{ recipient | u.truncate(teamname_max_length, '…') }} |
49 | | - </a> |
50 | | - </td> |
51 | 32 | {% if includeSubject %} |
52 | 33 | <td> |
53 | 34 | <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}"> |
54 | 35 | {%- if clarification.problem -%} |
55 | | - problem {{ clarification.contestProblem | problemBadge -}} |
| 36 | + {{ clarification.contestProblem | problemBadge -}} |
56 | 37 | {%- elseif clarification.category -%} |
57 | 38 | {{- categories[clarification.category]|default('general') -}} |
58 | 39 | {%- else -%} |
|
64 | 45 |
|
65 | 46 | <td> |
66 | 47 | <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}"> |
67 | | - {{ clarification.summary | markdown_to_html | sanitize_html('app.clarification_sanitizer') }} |
| 48 | + {{ prefix }} <i>{{ clarification.summary |
| 49 | + | markdown_to_html |
| 50 | + | replace({'<p>': '', '</p>': ''}) |
| 51 | + | sanitize_html('app.clarification_sanitizer') |
| 52 | + | raw |
| 53 | + }}</i> |
68 | 54 | </a> |
69 | 55 | </td> |
70 | 56 | </tr> |
|
0 commit comments