Skip to content

Commit 6e09e91

Browse files
authored
Merge branch 'main' into remove-fpc-default
2 parents f06d975 + f4acfa0 commit 6e09e91

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cms/server/admin/templates/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h4 class="alert">Failed to log in.</h4>
2626
<div class="section">
2727
<label>
2828
<span>Username</span>
29-
<input type="text" name="username">
29+
<input type="text" name="username" autofocus>
3030
</label>
3131
</div>
3232
<div class="section">

cms/server/admin/templates/task.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ <h2 id="title_task_configuration" class="toggling_on">Task configuration</h2>
134134
<td>
135135
<span class="info" title="Programming languages that contestants can use to solve this task.
136136
If none are selected, all contest languages are allowed.
137-
Otherwise, only the selected languages (which must be a subset of contest languages) are allowed."></span>
137+
Otherwise, only the selected languages are allowed."></span>
138138
Allowed programming languages
139139
</td>
140140
<td class="wrapping-options">
141141
{% for lang in LANGUAGES %}
142-
<label><input type="checkbox" name="allowed_languages" value="{{ lang.name }}" {{ "checked" if task.allowed_languages is none or lang.name in (task.allowed_languages or []) else "" }}>{{ lang.name }}</label>
142+
<label><input type="checkbox" name="allowed_languages" value="{{ lang.name }}" {{ "checked" if task.allowed_languages is not none and lang.name in task.allowed_languages else "" }}>{{ lang.name }}</label>
143143
{% endfor %}
144144
</td>
145145
</tr>

cms/server/contest/templates/contest.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ <h1>{% trans %}Welcome{% endtrans %}</h1>
100100
<div class="control-group">
101101
<label class="control-label" for="username">{% trans %}Username{% endtrans %}</label>
102102
<div class="controls">
103-
<input type="text" class="input-xlarge" name="username" id="username">
103+
<input type="text" class="input-xlarge" name="username" id="username" autofocus>
104104
</div>
105105
</div>
106106
<div class="control-group">

0 commit comments

Comments
 (0)