Skip to content

Commit 81410bd

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 fa1b8d7 commit 81410bd

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
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
@@ -950,6 +950,7 @@ public function sourceAction(
950950
'originalSubmission' => $originalSubmission,
951951
'allowEdit' => $this->allowEdit(),
952952
'otherSubmissions' => $otherSubmissions,
953+
'fill_height' => true,
953954
]);
954955
}
955956

@@ -1069,6 +1070,7 @@ public function editSourceAction(Request $request, Submission $submission, #[Map
10691070
'files' => $files,
10701071
'form' => $form,
10711072
'selected' => $rank,
1073+
'fill_height' => true,
10721074
];
10731075
if ($request->isXmlHttpRequest()) {
10741076
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div id="{{ editor_id }}-wrapper">
1+
<div id="{{ editor_id }}-wrapper" class="flex-pass">
22
{# Mark the first tab that is shown as active. #}
33
{% set extra_css_classes = "active" %}
44
<ul class="nav nav-tabs source-tab-nav align-items-end">
@@ -52,10 +52,10 @@
5252
});
5353
</script>
5454
{% set extra_css_classes = "show active" %}
55-
<div class="tab-content source-tab">
55+
<div class="tab-content source-tab flex-pass">
5656
{%- for name, name_files in files %}
5757
{% set diff_id = "diff-" ~ name %}
58-
<div class="tab-pane fade {{ extra_css_classes }}" id="{{ diff_id }}-tab" role="tabpanel">
58+
<div class="tab-pane fade flex-pass {{ extra_css_classes }}" id="{{ diff_id }}-tab" role="tabpanel">
5959
{{ showDiff(editor_id, diff_id, submission.submitid, name, name_files) }}
6060
</div>
6161
{% set extra_css_classes = "" %}

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>

0 commit comments

Comments
 (0)