diff options
| author | Andrea Lepori <alepori@student.ethz.ch> | 2022-03-23 19:24:09 +0100 |
|---|---|---|
| committer | Andrea Lepori <alepori@student.ethz.ch> | 2022-03-23 19:24:21 +0100 |
| commit | 7dfc0383561cb9f13282e7779b919f5b17859f86 (patch) | |
| tree | d2f3ed554dfd259025845c7f93e02254e1a8beb3 /client/templates | |
| parent | initial support of user switcher (diff) | |
| parent | in case of error redirect to home page (diff) | |
| download | scout-subs-7dfc0383561cb9f13282e7779b919f5b17859f86.tar.gz scout-subs-7dfc0383561cb9f13282e7779b919f5b17859f86.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'client/templates')
| -rw-r--r-- | client/templates/client/approve_doc_pdf.html | 5 | ||||
| -rw-r--r-- | client/templates/client/doc_create.html | 18 | ||||
| -rw-r--r-- | client/templates/client/doc_edit.html | 14 | ||||
| -rw-r--r-- | client/templates/client/index.html | 2 |
4 files changed, 30 insertions, 9 deletions
diff --git a/client/templates/client/approve_doc_pdf.html b/client/templates/client/approve_doc_pdf.html index 3ed4d86..db1478e 100644 --- a/client/templates/client/approve_doc_pdf.html +++ b/client/templates/client/approve_doc_pdf.html @@ -29,15 +29,12 @@ <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> </div> <br><br><br><br> - <br><br><br><br> - <br><br><br><br> - <br><br><br><br> <div class="row"> <div class="col s4 offset-s1"> <div class="input-field"> diff --git a/client/templates/client/doc_create.html b/client/templates/client/doc_create.html index ce5f39d..71bdbbe 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> @@ -135,6 +135,18 @@ {% endif %} <div class="row"> <div class="col s12"> + <div class="card red"> + <div class="card-content"> + <p style="color:white"><b> + Attenzione: il documento non sarà valido fino a quando non viene approvato. Selezionare + il documento dalla pagina principale per approvarlo. + </b></p> + </div> + </div> + </div> + </div> + <div class="row"> + <div class="col s12"> <br> <a class="btn waves-effect waves-light {{color}}" onclick="window.history.back();" > <i class="material-icons left">navigate_before</i>Indietro diff --git a/client/templates/client/doc_edit.html b/client/templates/client/doc_edit.html index a9cc056..40deb26 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> @@ -98,6 +98,18 @@ {% endif %} <div class="row"> <div class="col s12"> + <div class="card red"> + <div class="card-content"> + <p style="color:white"><b> + Attenzione: il documento non sarà valido fino a quando non viene approvato. Selezionare + il documento dalla pagina principale per approvarlo. + </b></p> + </div> + </div> + </div> + </div> + <div class="row"> + <div class="col s12"> <br> <a class="btn waves-effect waves-light {{color}}" onclick="window.history.back();" > <i class="material-icons left">navigate_before</i>Indietro 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> |