Skip to content

Commit 45b0817

Browse files
committed
Stretch the code viewers using flex-pass
This includes the source code and diff viewer for submissions and the executables editor for the system configuration.
1 parent fdfac15 commit 45b0817

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

webapp/public/style_domjudge.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ body.static {
3636
min-height: calc(100vh - 1px);
3737
}
3838

39-
.flex-pass {
39+
.flex-pass,
40+
.flex-pass > form {
4041
display: flex;
4142
flex-direction: column;
4243
flex: 1;
@@ -771,7 +772,9 @@ blockquote {
771772
}
772773

773774
.editor {
774-
width: 100%;
775-
height: 80vh;
776775
border: 1px solid grey;
776+
flex: 1;
777+
height: 0;
778+
min-height: 100px; /* Prefer a double scrollbar over not displaying code at all */
779+
width: 100%;
777780
}

webapp/src/Controller/Jury/ExecutableController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ public function viewAction(
371371
'default_compare' => (string)$this->config->get('default_compare'),
372372
'default_run' => (string)$this->config->get('default_run'),
373373
'default_full_debug' => (string)$this->config->get('default_full_debug'),
374+
'fill_height' => true,
374375
]));
375376
}
376377

webapp/src/Controller/Jury/SubmissionController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,7 @@ public function sourceAction(
924924
'originalFiles' => $originalFiles,
925925
'originalFileStats' => $originalFileStats,
926926
'allowEdit' => $this->allowEdit(),
927+
'fill_height' => true,
927928
]);
928929
}
929930

@@ -1043,6 +1044,7 @@ public function editSourceAction(Request $request, Submission $submission, #[Map
10431044
'files' => $files,
10441045
'form' => $form,
10451046
'selected' => $rank,
1047+
'fill_height' => true,
10461048
];
10471049
if ($request->isXmlHttpRequest()) {
10481050
return $this->render('jury/submission_edit_source_modal.html.twig', $twigData);

webapp/templates/jury/executable.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@
103103
</li>
104104
{%- endfor %}
105105
</ul>
106-
<div class="tab-content source-tab">
106+
<div class="tab-content source-tab flex-pass">
107107
{%- for idx, filename in filenames %}
108-
<div class="tab-pane fade {% if (selected is null and loop.first) or selected == idx %}show active{% endif %}" id="source-{{ idx }}"
108+
<div class="tab-pane flex-pass fade {% if (selected is null and loop.first) or selected == idx %}show active{% endif %}" id="source-{{ idx }}"
109109
role="tabpanel">
110110
<div class="mb-1">
111111
<a class="btn btn-secondary btn-sm"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
</ul>
4747
{# Mark the first pane that is shown as active. #}
4848
{% set extra_css_classes = "show active" %}
49-
<div class="tab-content source-tab">
49+
<div class="tab-content source-tab flex-pass">
5050
{%- for filePair in oldFileStats.changedfiles %}
51-
<div class="tab-pane fade {{ extra_css_classes }}" id="diff-{{ filePair.1.submitfileid }}" role="tabpanel">
51+
<div class="tab-pane flex-pass fade {{ extra_css_classes }}" id="diff-{{ filePair.1.submitfileid }}" role="tabpanel">
5252
{% set diff_id = "diff" ~ filePair.1.submitfileid %}
5353
<div class="mb-1">
5454
<a class="btn btn-secondary btn-sm"

webapp/templates/jury/submission_edit_source.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
}
4444
}
4545
</script>
46-
<div class="tab-content source-tab">
46+
<div class="tab-content source-tab flex-pass">
4747
{%- for idx, file in files %}
4848

49-
<div class="tab-pane fade {% if (selected is null and loop.first) or selected == file.rank %}show active{% endif %}"
49+
<div class="tab-pane flex-pass fade {% if (selected is null and loop.first) or selected == file.rank %}show active{% endif %}"
5050
id="source-{{ file.rank }}" data-rank="{{ file.rank }}" role="tabpanel">
5151
{{ file.sourcecode | codeEditor(idx, submission.language.editorLanguage, true) }}
5252
</div>

webapp/templates/jury/submission_source.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
{%- endfor %}
5454

5555
</ul>
56-
<div class="tab-content source-tab">
56+
<div class="tab-content source-tab flex-pass">
5757
{%- for file in files %}
58-
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="source-{{ file.rank }}"
58+
<div class="tab-pane flex-pass fade {% if loop.first %}show active{% endif %}" id="source-{{ file.rank }}"
5959
role="tabpanel">
6060
<div class="mb-1">
6161
<a class="btn btn-secondary btn-sm"

0 commit comments

Comments
 (0)