From 0c749532036c6b9b42f0900ce8c102f2dcc70112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pracha=C5=99?= <jan.prachar@gmail.com>
Date: Thu, 11 Mar 2021 19:51:34 +0100
Subject: [PATCH] Change pre white-space to pre-line
---
mo/web/templates/org_contest_user.html | 2 +-
mo/web/templates/org_org.html | 2 +-
mo/web/templates/org_submit_list.html | 4 ++--
mo/web/templates/org_user.html | 2 +-
mo/web/templates/org_user_edit.html | 2 +-
mo/web/templates/user_contest_task.html | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mo/web/templates/org_contest_user.html b/mo/web/templates/org_contest_user.html
index f4a4944e..c0420489 100644
--- a/mo/web/templates/org_contest_user.html
+++ b/mo/web/templates/org_contest_user.html
@@ -36,7 +36,7 @@
<tr><td>Škola:<td><a href='{{ url_for('org_place', id=pant.school) }}'>{{ pant.school_place.name }}</a>
<tr><td>Třída:<td>{{ pant.grade }}
<tr><td>Rok narození:<td>{{ pant.birth_year }}
- <tr><td>Poznámka:<td style="white-space: pre;">{{ user.note }}
+ <tr><td>Poznámka:<td style="white-space: pre-line;">{{ user.note }}
<thead>
<tr><th colspan='2'>Účast v kole
</thead>
diff --git a/mo/web/templates/org_org.html b/mo/web/templates/org_org.html
index f9b25110..4cdbe0bc 100644
--- a/mo/web/templates/org_org.html
+++ b/mo/web/templates/org_org.html
@@ -12,7 +12,7 @@
<tr><td>Účet založen:<td>{{ user.created_at|timeformat }}
<tr><td>Poslední přihlášení:<td>{{ user.last_login_at|timeformat }}
{% if user.reset_at %}<tr><td>Reset hesla:<td>{{ user.reset_at|timeformat }}{% endif %}
-<tr><td>Poznámka:<td style="white-space: pre;">{{ user.note }}
+<tr><td>Poznámka:<td style="white-space: pre-line;">{{ user.note }}
</table>
<div class="btn-group" role="group">
diff --git a/mo/web/templates/org_submit_list.html b/mo/web/templates/org_submit_list.html
index 49f9b8f4..e6b1d7b0 100644
--- a/mo/web/templates/org_submit_list.html
+++ b/mo/web/templates/org_submit_list.html
@@ -16,9 +16,9 @@
{% if solution.points is not none %}{{solution.points}}{% else %}<span class="unknown">?</span>{% endif %}
{% if sc.task.max_points is not none %}<span class="hint"> / {{ sc.task.max_points }}</span>{% endif %}
<tr title="Viditelná účastníkovi po uzavření kola">
- <th>Poznámka k řešení:<td style="white-space: pre;">{{ solution.note|or_dash }}</td>
+ <th>Poznámka k řešení:<td style="white-space: pre-line;">{{ solution.note|or_dash }}</td>
<tr title="Viditelná jen organizátorům">
- <th>Interní poznámka:<td style="white-space: pre;">{{ solution.org_note|or_dash }}</td>
+ <th>Interní poznámka:<td style="white-space: pre-line;">{{ solution.org_note|or_dash }}</td>
{% endif %}
</table>
diff --git a/mo/web/templates/org_user.html b/mo/web/templates/org_user.html
index 51d9027b..83986816 100644
--- a/mo/web/templates/org_user.html
+++ b/mo/web/templates/org_user.html
@@ -12,7 +12,7 @@
<tr><td>Účet založen:<td>{{ user.created_at|timeformat }}
<tr><td>Poslední přihlášení:{% if user.last_login_at %}<td>{{ user.last_login_at|timeformat }}{% else %}<td class="error"><i>Zatím nepřihlášen</i>{% endif %}
{% if user.reset_at %}<tr><td>Reset hesla:<td>{{ user.reset_at|timeformat }}{% endif %}
-<tr><td>Poznámka:<td style="white-space: pre;">{{ user.note }}
+<tr><td>Poznámka:<td style="white-space: pre-line;">{{ user.note }}
</table>
<div class="btn-group" role="group">
diff --git a/mo/web/templates/org_user_edit.html b/mo/web/templates/org_user_edit.html
index c4e9308c..1930c9ab 100644
--- a/mo/web/templates/org_user_edit.html
+++ b/mo/web/templates/org_user_edit.html
@@ -9,7 +9,7 @@
<tr><td>E-mail:</td><td>{{ user.email|mailto }}</td></tr>
{% if user.is_admin %}<tr><td>Správce:</td><td>ano</td></tr>{% endif %}
{% if user.is_org %}<tr><td>Organizátor:</td><td>ano</td></tr>{% endif %}
-<tr><td>Poznámka:</td><td style="white-space: pre;">{{ user.note }}</td></tr>
+<tr><td>Poznámka:</td><td style="white-space: pre-line;">{{ user.note }}</td></tr>
</table>
<a href='{% if is_org %}{{ url_for('org_org', id=user.user_id) }}{% else %}{{ url_for('org_user', id=user.user_id) }}{% endif %}'>Zpět na detail</a>
diff --git a/mo/web/templates/user_contest_task.html b/mo/web/templates/user_contest_task.html
index 32308295..acb0086d 100644
--- a/mo/web/templates/user_contest_task.html
+++ b/mo/web/templates/user_contest_task.html
@@ -50,7 +50,7 @@
({{ sol.final_feedback_obj.pages|inflected('stránka', 'stránky', 'stránek') }}, {{ sol.final_feedback_obj.bytes }} bajtů)
{% endif %}
{% if sol.note %}
- <tr><th>Poznámka od organizátorů:<td style="white-space: pre;">{{ sol.note }}
+ <tr><th>Poznámka od organizátorů:<td style="white-space: pre-line;">{{ sol.note }}
{% endif %}
</table>
{% else %}
--
GitLab