wip3

seantis · Nov 6, 2024 · ef2ffb5 · ef2ffb5
1 parent 0d847e6
commit ef2ffb5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 118 deletions.
diff --git a/src/privatim/reporting/report.py b/src/privatim/reporting/report.py
@@ -7,7 +7,7 @@
 
 from privatim.i18n import translate, _
 from privatim.layouts.layout import DEFAULT_TIMEZONE
-from privatim.utils import datetime_format
+from privatim.utils import datetime_format, strip_p_tags
 from pyramid.renderers import render
 from weasyprint import HTML  # type: ignore
 

diff --git a/src/privatim/reporting/template/report.pt b/src/privatim/reporting/template/report.pt
@@ -40,8 +40,26 @@
         font-family: "DM Sans", sans-serif;
     }
 
+    /* Preserve all text formatting */
+    strong, b {
+        font-weight: bold!important;
+    }
+
+    em, i {
+        font-style: italic!important;
+    }
+
+    u {
+        text-decoration: underline;
+    }
+
+    .make-line-breaks-in-p {
+        white-space: pre-line;
+    }
+
     p, textarea.form-control {
         line-height: 1.3;
+        text-align: justify;
         font-size: 1.05rem;
     }
 
@@ -113,7 +131,7 @@
         <ul tal:repeat="item meeting.agenda_items" class="agenda-items-list">
             <li>
                 <h3 tal:content="h.Markup(repeat.item.index + 1) + h.Markup('. ') + h.Markup(item.title)"></h3>
-                <p tal:content="h.Markup(item.description)"></p>
+                <p tal:content="h.Markup(item.description)" class="make-line-breaks-in-p"></p>
             </li>
         </ul>
 

diff --git a/src/privatim/static/css/custom.css b/src/privatim/static/css/custom.css
@@ -447,7 +447,6 @@ input[type="color"]:focus,
     position: relative;
 }
 
-
 .timeline::before {
     content: '';
     position: absolute;

diff --git a/src/privatim/static/css/report.css b/src/privatim/static/css/report.css