From e5df1a02ac3a460052e0bfcca49e19e1d25dd78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pracha=C5=99?= <jan.prachar@gmail.com> Date: Fri, 22 Apr 2022 17:56:13 +0200 Subject: [PATCH] =?UTF-8?q?Vylep=C5=A1en=C3=AD=20UX=20na=20v=C3=BDsledkovc?= =?UTF-8?q?e=20a=20Tabulce=20=C5=99e=C5=A1en=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mo/web/org_score.py | 2 +- mo/web/templates/org_contest_solutions.html | 15 +++++++++++---- mo/web/templates/org_score.html | 3 +-- mo/web/templates/parts/org_solution_table.html | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/mo/web/org_score.py b/mo/web/org_score.py index 07e34f7f..f926c16d 100644 --- a/mo/web/org_score.py +++ b/mo/web/org_score.py @@ -200,7 +200,7 @@ def org_score(round_id: Optional[int] = None, hier_id: Optional[int] = None, ct_ task.code ) if ctx.rights.can_edit_points(): - title += ' <a href="{}" title="Editovat body" class="icon">✎</a>'.format( + title += ' <a href="{}" title="Editovat body" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span></a>'.format( url_for('org_contest_task_points', ct_id=local_ct_id, task_id=task.task_id), ) columns.append(Column(key=f'task_{task.task_id}', name=task.code, title=title)) diff --git a/mo/web/templates/org_contest_solutions.html b/mo/web/templates/org_contest_solutions.html index 44ecc07e..5c902e50 100644 --- a/mo/web/templates/org_contest_solutions.html +++ b/mo/web/templates/org_contest_solutions.html @@ -50,7 +50,7 @@ Odkazem v záhlaví se lze dostat na podrobný výpis odevzdání všech účast {% for task in tasks[4*i:4*(i+1)] %}<th colspan=4> <a href="{{ ctx.url_for('org_contest_task', task_id=task.task_id) }}">{{ task.code }}</a> {% if rights.can_edit_points() %} - <a title="Editovat body" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}" class="icon pull-right">✎</a> + <a class="btn btn-xs btn-default" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}"><span class="glyphicon glyphicon-pencil"></span> Zadat body</a> {% endif %} {% endfor %} <th rowspan=2>Body celkem @@ -117,11 +117,18 @@ Odkazem v záhlaví se lze dostat na podrobný výpis odevzdání všech účast <tfoot> <tr><td><td> {% for task in tasks[4*i:4*(i+1)] %} - <td colspan=4> - <a class='btn btn-xs btn-primary' href="{{ ctx.url_for('org_generic_batch_download', task_id=task.task_id) }}"><span class="glyphicon glyphicon-cloud-download"></span> Stáhnout</a> + <td> + <a class='btn btn-xs btn-default' href="{{ ctx.url_for('org_generic_batch_download', task_id=task.task_id) }}" title="Stáhnout ZIP řešení úlohy {{ task.code }}"><span class="glyphicon glyphicon-cloud-download"></span></a> + <td> {% if rights.can_upload_feedback() %} - <a class='btn btn-xs btn-primary' href="{{ ctx.url_for('org_generic_batch_upload', task_id=task.task_id) }}">Nahrát opravy</a> + <a class='btn btn-xs btn-default' href="{{ ctx.url_for('org_generic_batch_upload', task_id=task.task_id) }}" title="Nahrát ZIP opravených řešení úlohy {{ task.code }}"><span class="glyphicon glyphicon-cloud-upload"></span></a> {% endif %} + <td> + {% if rights.can_edit_points() %} + <a class="btn btn-xs btn-default" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}" title="Editovat body k úloze {{ task.code }}"><span class="glyphicon glyphicon-pencil"></span></a> + {% endif %} + <td> + <a class="btn btn-xs btn-primary" href="{{ ctx.url_for('org_contest_task', task_id=task.task_id) }}" title="Podrobný výpis odevzdaných řešení k úloze {{ task.code }}"><span class="glyphicon glyphicon-search"></span></a> {% endfor %} <td> </tfoot> diff --git a/mo/web/templates/org_score.html b/mo/web/templates/org_score.html index 962fd8a9..27271744 100644 --- a/mo/web/templates/org_score.html +++ b/mo/web/templates/org_score.html @@ -26,9 +26,8 @@ Výsledky {{ round.name|round_genitive|lower }}{% if public %} {{ round.year }}. {% endblock %} {% block body %} -<p>Export pod tabulkou obsahuje sloupce navíc. {% if contest and contest.state == RoundState.grading or round.state == RoundState.grading %} -Rozkliknutím bodů se lze dostat na detail daného řešení. +<p>Rozkliknutím bodů se lze dostat na detail daného řešení. {% endif %} {% set master = round.master %} diff --git a/mo/web/templates/parts/org_solution_table.html b/mo/web/templates/parts/org_solution_table.html index 89daf385..a138bab1 100644 --- a/mo/web/templates/parts/org_solution_table.html +++ b/mo/web/templates/parts/org_solution_table.html @@ -22,7 +22,7 @@ finální (ve výchozím stavu poslední nahrané).{% elif rights.can_upload_sol <th>Poznámky <th>Přidělené body {% if not for_user and not site and rights.can_edit_points() and not points_form %} - <a title="Editovat body" href="{{ ctx.url_for('org_contest_task_points') }}" class="icon pull-right">✎</a> + <a class="btn btn-xs btn-default" title="Editovat body" href="{{ ctx.url_for('org_contest_task_points') }}"><span class="glyphicon glyphicon-pencil"></span></a> {% endif %} <th>Akce </tr> -- GitLab