Skip to content

Commit 68bb8cc

Browse files
KevinjilKevinjil
committed
Reformat submission_diff
No functional changes intended.
1 parent c97ff7a commit 68bb8cc

File tree

1 file changed

+54
-56
lines changed

1 file changed

+54
-56
lines changed

‎webapp/templates/jury/partials/submission_diff.html.twig‎

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,64 @@
11
<div id="{{ editor_id }}-wrapper">
2-
{# Mark the first tab that is shown as active. #}
3-
{% set extra_css_classes = "active" %}
4-
<ul class="nav nav-tabs source-tab-nav align-items-end">
5-
{%- for name, name_files in files %}
6-
{% set diff_id = "diff-" ~ name %}
7-
{% if name_files[submission.submitid] is defined %}
8-
{% set rank = name_files[submission.submitid].rank %}
9-
{% else %}
10-
{% set rank = null %}
11-
{% endif %}
12-
<li class="nav-item">
13-
<a id="{{ diff_id }}-link" class="nav-link {{ extra_css_classes }}" data-bs-toggle="tab" data-rank="{{ rank }}" href="#{{ diff_id }}-tab" role="tab"><i class="fas fa-fw fa-file"></i> {{ name }}</a>
14-
</li>
15-
{% set extra_css_classes = "" %}
16-
{%- endfor %}
2+
{# Mark the first tab that is shown as active. #}
3+
{% set extra_css_classes = "active" %}
4+
<ul class="nav nav-tabs source-tab-nav align-items-end">
5+
{%- for name, name_files in files %}
6+
{% set diff_id = "diff-" ~ name %}
7+
{% if name_files[submission.submitid] is defined %}
8+
{% set rank = name_files[submission.submitid].rank %}
9+
{% else %}
10+
{% set rank = null %}
11+
{% endif %}
12+
<li class="nav-item">
13+
<a id="{{ diff_id }}-link" class="nav-link {{ extra_css_classes }}" data-bs-toggle="tab" data-rank="{{ rank }}" href="#{{ diff_id }}-tab" role="tab"><i class="fas fa-fw fa-file"></i> {{ name }}</a>
14+
</li>
15+
{% set extra_css_classes = "" %}
16+
{%- endfor %}
1717

18-
<li class="nav-item flex-grow-1 text-end mb-1">
19-
<a class="download btn btn-secondary btn-sm"
20-
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: 0}) }}">
21-
<i class="fas fa-download"></i> Download
18+
<li class="nav-item flex-grow-1 text-end mb-1">
19+
<a class="download btn btn-secondary btn-sm" href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: 0}) }}">
20+
<i class="fas fa-download"></i> Download
21+
</a>
22+
{% if allowEdit %}
23+
<a class="edit btn btn-secondary btn-sm" href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: 0}) }}">
24+
<i class="fas fa-pencil-alt"></i> Edit
2225
</a>
23-
{% if allowEdit %}
24-
<a class="edit btn btn-secondary btn-sm"
25-
href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: 0}) }}">
26-
<i class="fas fa-pencil-alt"></i> Edit
27-
</a>
28-
{% endif %}
29-
<div class="btn-group">
30-
<a href="#" role="button" class="btn btn-secondary btn-sm pe-none" aria-disabled="true"><i class="fas fa-code-branch"></i></a>
31-
<select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against">
32-
<option value="" data-tag="no-diff">No diff</option>
33-
{%- for other in otherSubmissions %}
26+
{% endif %}
27+
<div class="btn-group">
28+
<a href="#" role="button" class="btn btn-secondary btn-sm pe-none" aria-disabled="true"><i class="fas fa-code-branch"></i></a>
29+
<select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against">
30+
<option value="" data-tag="no-diff">No diff</option>
31+
{%- for other in otherSubmissions %}
3432
<option value="{{ other.submitid }}" data-url="{{ path('jury_submission', {submitId: other.submitid}) }}" {%- if other.tag %} data-tag="{{ other.tag }}" {%- endif %}>
3533
s{{ other.submitid }} {%- if other.tag %} ({{ other.tag }}) {%- endif %}
3634
</option>
37-
{%- endfor %}
38-
</select>
39-
</div>
40-
<div class="diff-mode btn-group">
41-
<a href="#" role="button" class="btn btn-secondary btn-sm pe-none" aria-disabled="true"><i class="fas fa-plus-minus"></i></a>
42-
{%- for mode_id, mode in diff_modes %}
35+
{%- endfor %}
36+
</select>
37+
</div>
38+
<div class="diff-mode btn-group">
39+
<a href="#" role="button" class="btn btn-secondary btn-sm pe-none" aria-disabled="true"><i class="fas fa-plus-minus"></i></a>
40+
{%- for mode_id, mode in diff_modes %}
4341
<input type="radio" class="btn-check" name="{{ editor_id }}-mode" id="{{ editor_id }}-{{ mode_id }}" value="{{ mode_id }}" autocomplete="off">
4442
<label class="btn btn-outline-secondary btn-sm" for="{{ editor_id }}-{{ mode_id }}">{{ mode.name }}</label>
45-
{%- endfor %}
46-
</div>
47-
</li>
48-
</ul>
49-
<script>
50-
$(() => {
51-
require(['vs/editor/editor.main'], () => {
52-
initDiffEditor('{{ editor_id }}');
43+
{%- endfor %}
44+
</div>
45+
</li>
46+
</ul>
47+
<script>
48+
$(() => {
49+
require(['vs/editor/editor.main'], () => {
50+
initDiffEditor('{{ editor_id }}');
51+
});
5352
});
54-
});
55-
</script>
56-
{% set extra_css_classes = "show active" %}
57-
<div class="tab-content source-tab">
58-
{%- for name, name_files in files %}
59-
{% set diff_id = "diff-" ~ name %}
60-
<div class="tab-pane fade {{ extra_css_classes }}" id="{{ diff_id }}-tab" role="tabpanel">
61-
{{ showDiff(editor_id, diff_id, submission.submitid, name, name_files) }}
62-
</div>
63-
{% set extra_css_classes = "" %}
64-
{%- endfor %}
65-
</div>
53+
</script>
54+
{% set extra_css_classes = "show active" %}
55+
<div class="tab-content source-tab">
56+
{%- for name, name_files in files %}
57+
{% set diff_id = "diff-" ~ name %}
58+
<div class="tab-pane fade {{ extra_css_classes }}" id="{{ diff_id }}-tab" role="tabpanel">
59+
{{ showDiff(editor_id, diff_id, submission.submitid, name, name_files) }}
60+
</div>
61+
{% set extra_css_classes = "" %}
62+
{%- endfor %}
63+
</div>
6664
</div>

0 commit comments

Comments
 (0)