diff --git a/mo/web/templates/org_contest_user.html b/mo/web/templates/org_contest_user.html index f4a4944e46447e869d5fd3357d29cea9fa167447..c0420489eaa4faa094e9cdcb0039a012d132603c 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 f9b25110c6bbb99209ebd3f5647134d148ca17ac..4cdbe0bc68203db7f8f4a5c0841f8dae40188ddc 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 49f9b8f4cd800c7084b8120ff6e9d430ba323164..e6b1d7b066232b290bbc33c5ff185cb910ef4dcf 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 51d9027b4efec843b05a47a408c6ca3f0060d905..839868169385401f09ddd1475a36892949a86c1c 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 c4e9308c16d2dfea137c21e3ac2c1c33d4c8cd36..1930c9abd4ac0c848efd86d52c18577a4fa82c35 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 32308295ab3757e3044308856810e9b2b888b6cc..acb0086de6868f64c8227b524c28f36b87e5d43a 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 %}