Merge branch 'jk/issue-222' into 'devel'

user_contest.html: Přesunutí informece o formátu odevzdávání

See merge request !84

mo/web/templates/user_contest.html

@@ -17,6 +17,18 @@
 {% endblock %}
 {% block body %}
 
+{% if round.ct_tasks_start is not none %}
+	{% if round.ct_submit_end is not none %}
+		<p class="small"><i>Od {{ round.ct_tasks_start|time_and_timedelta }} do {{ round.ct_submit_end|time_and_timedelta }}.</i></p>
+	{% else %}
+		<p class="small"><i>Od {{ round.ct_tasks_start|time_and_timedelta }}.</i></p>
+	{% endif %}
+{% else %}
+	{% if round.ct_submit_end is not none %}
+		<p class="small"><i>Do {{ round.ct_submit_end|time_and_timedelta }}.</i></p>
+	{% endif %}
+{% endif %}
+
 {% if state == RoundState.preparing %}
 <p>
 	Soutěžní kolo se <b>připravuje</b>{% if round.ct_tasks_start and round.ct_tasks_start > g.now %},

mo/web/templates/user_index.html

@@ -25,7 +25,6 @@
 					{% if contest.ct_task_statement_available() %}
 					<a class='btn btn-xs btn-success' href='{{ url_for('user_task_statement', id=contest.contest_id) }}'>Zadání</a>
 					{% endif %}
-					{% if state != RoundState.preparing %}
 					<a class='btn btn-xs btn-primary' href='{{ url_for('user_contest', id=contest.contest_id) }}'>
 					{% if state == RoundState.running %}
 						Odevzdat řešení
@@ -37,7 +36,6 @@
 						Detail kola
 					{% endif %}
 					</a>
-					{% endif %}
 			{% endfor %}
 	</table>
 {% else %}