Merge branch 'devel'

mo/web/templates/org_round.html

@@ -104,11 +104,13 @@
 			{% if can_manage_round %}
 			<td><div class="btn-group">
 				<a class="btn btn-xs btn-primary" href="{{ url_for('org_round_task_edit', id=round.round_id, task_id=task.task_id) }}">Editovat</a>
+				{% if task.sol_count == 0 %}
 				<form action="" method="POST" onsubmit="return confirm('Opravdu nenávratně smazat?')" class="btn-group">
 					{{ form_delete_task.csrf_token() }}
 					<input type="hidden" name="delete_task_id" value="{{ task.task_id }}">
 					<button type="submit" class="btn btn-xs btn-danger">Smazat</button>
 				</form>
+				{% endif %}
 				{% if g.user.is_admin %}
 				<a class="btn btn-xs btn-default" href="{{ log_url('task', task.task_id) }}">Historie</a>
 				{% endif %}

mo/web/templates/org_submit_list.html

@@ -66,7 +66,7 @@ Existuje více než jedna verze řešení, finální je podbarvená.
 			<td{% if late %} class='sol-warn'{% endif %}>{{ p.uploaded_at|timeformat }}
 			<td>{% if p.broken %}nekorektní PDF{% else %}{{ p.pages|or_dash }}{% endif %}
 			<td>{{ p.bytes|or_dash }}
-			<td>{{ p.uploaded_by_obj|user_link }}
+			<td>{% if p.uploaded_by_obj == sc.user %}<i>účastník</i>{% else %}{{ p.uploaded_by_obj|user_link }}{% endif %}
 			<td>{% if late %}<span class='sol-warn'>({{ late }})</span> {% endif %}{{ p.note }}
 			<td><div class="btn-group">
 				<a class='btn btn-xs btn-primary' href='{{ paper_link(p) }}'>Stáhnout</a>