Changeset 9052 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

26 Jul 2012, 06:20:35 (12 years ago)

Author:

Henrik Bettermann

Message:

Display all text fields properly.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• layout.py (modified) (1 diff)
• pdf.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py

@@ -221 +221 @@
             self.widgets['next_kin_address'].cssClass = 'span8'
             self.widgets['next_kin_address'].height = 6
+        if self.widgets.get('notice'):
+            self.widgets['notice'].cssClass = 'span8'
+            self.widgets['notice'].height = 6
         if self.widgets.get('description'):
             self.widgets['description'].cssClass = 'span12'

main/waeup.kofa/trunk/src/waeup/kofa/browser/pdf.py

@@ -83 +83 @@
 
     Main things fixed here:
-
+    If html code:
     - remove newlines (not visible in HTML but visible in PDF)
     - add <br> tags after <div> (as divs break lines in HTML but not in PDF)
+    If not html code:
+    - just replace newlines by <br> tags
     """
-    # Add br tag if widgets contain div tags
-    # which are not supported by reportlab
-    html = html.replace('</div>', '</div><br />')
-    html = html.replace('\n', '')
+    if '</' in html:
+        # Add br tag if widgets contain div tags
+        # which are not supported by reportlab
+        html = html.replace('</div>', '</div><br />')
+        html = html.replace('\n', '')
+    else:
+        html = html.replace('\n', '<br />')
     return html