aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Lepori <alepori@student.ethz.ch>2022-01-11 15:21:12 +0100
committerAndrea Lepori <alepori@student.ethz.ch>2022-01-11 15:21:35 +0100
commit77dfb2dd619863cf2a18893aa5f3de03b7eaa006 (patch)
treed0f8f23c13371bb098ca139de12f1c69cbc174c5
parentcreate db migrations (diff)
downloadscout-subs-77dfb2dd619863cf2a18893aa5f3de03b7eaa006.tar.gz
scout-subs-77dfb2dd619863cf2a18893aa5f3de03b7eaa006.zip
correct linebreaks written in python
Diffstat (limited to '')
-rw-r--r--client/templates/client/approve_doc_pdf.html2
-rw-r--r--client/templates/client/doc_create.html6
-rw-r--r--client/templates/client/doc_edit.html2
-rw-r--r--client/templates/client/index.html2
-rw-r--r--server/templates/server/doc_type.html2
-rw-r--r--version.txt2
6 files changed, 8 insertions, 8 deletions
diff --git a/client/templates/client/approve_doc_pdf.html b/client/templates/client/approve_doc_pdf.html
index 3ed4d86..ae993f0 100644
--- a/client/templates/client/approve_doc_pdf.html
+++ b/client/templates/client/approve_doc_pdf.html
@@ -29,7 +29,7 @@
<br>
<br>
Inoltre accetto e prendo nota della seguente clausula aggiuntiva: <br>
- {{doc.document_type.custom_message_text}}
+ {{doc.document_type.custom_message_text | linebreaksbr}}
{% endif %}
</p>
</div>
diff --git a/client/templates/client/doc_create.html b/client/templates/client/doc_create.html
index ce5f39d..c1db432 100644
--- a/client/templates/client/doc_create.html
+++ b/client/templates/client/doc_create.html
@@ -98,9 +98,9 @@
<div class="row">
<div class="col s12">
<div class="card {{color}}">
- <div class="card-content">
- <p style="color:white"><b>
- {{custom_message_text}}
+ <div class="card-content" style="color:white">
+ <p><b>
+ {{custom_message_text | linebreaksbr}}
</b></p>
</div>
</div>
diff --git a/client/templates/client/doc_edit.html b/client/templates/client/doc_edit.html
index a9cc056..3af3584 100644
--- a/client/templates/client/doc_edit.html
+++ b/client/templates/client/doc_edit.html
@@ -56,7 +56,7 @@
<div class="card {{color}}">
<div class="card-content">
<p style="color:white"><b>
- {{custom_message_text}}
+ {{custom_message_text | linebreaksbr}}
</b></p>
</div>
</div>
diff --git a/client/templates/client/index.html b/client/templates/client/index.html
index e31ce34..1885dd1 100644
--- a/client/templates/client/index.html
+++ b/client/templates/client/index.html
@@ -76,7 +76,7 @@
<br>
<br>
Inoltre accetto e prendo nota della seguente clausula aggiuntiva: <br>
- {{doc.document_type.custom_message_text}}
+ {{doc.document_type.custom_message_text | linebreaksbr}}
{% endif %}
<br>
<br>
diff --git a/server/templates/server/doc_type.html b/server/templates/server/doc_type.html
index 8b2131d..4f8fe6f 100644
--- a/server/templates/server/doc_type.html
+++ b/server/templates/server/doc_type.html
@@ -213,7 +213,7 @@
<i class="material-icons">message</i>Messaggio aggiuntivo
</div>
<div class="collapsible-body"><span>
- {{doctype.custom_message_text}}
+ {{doctype.custom_message_text | linebreaksbr}}
</span></div>
</li>
{% endif %}
diff --git a/version.txt b/version.txt
index 02b14dc..a897277 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
version=0.4
-rev=25
+rev=26