From b5d2d1494541c2d69b7f8fac2cb8cb8f80f9f49c Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Fri, 24 Aug 2018 11:58:00 -0700
Subject: [PATCH] DIV-884: Updated F52 formatting.

---
 edivorce/apps/core/static/css/weasyprint.css |  7 ++++-
 edivorce/apps/core/templates/pdf/form52.html | 27 +++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/edivorce/apps/core/static/css/weasyprint.css b/edivorce/apps/core/static/css/weasyprint.css
index da66e2c3..66f80fc3 100644
--- a/edivorce/apps/core/static/css/weasyprint.css
+++ b/edivorce/apps/core/static/css/weasyprint.css
@@ -287,6 +287,11 @@ ol.force-break-last > li:last-child {
   page-break-before: always;
 }
 
+.avoid-break-alone {
+  page-break-before: avoid;
+  page-break-inside: avoid;
+}
+
 .fake-checkbox {
   display: inline-block;
   width: 18px;
@@ -297,7 +302,7 @@ ol.force-break-last > li:last-child {
 }
 
 .sig-line-text .fake-checkbox {
-  margin-left: 0.5em; 
+  margin-left: 0.5em;
   margin-right: 0.5em;
 }
 
diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html
index af31ecbd..bea6a141 100644
--- a/edivorce/apps/core/templates/pdf/form52.html
+++ b/edivorce/apps/core/templates/pdf/form52.html
@@ -61,11 +61,9 @@
             Family Rules, and on considering the evidence put forward;
         </p>
 
-    {% if derived.wants_divorce_order %}
+        {% if derived.wants_divorce_order %}
             <p>THIS COURT ORDERS that</p>
-
-            <ol class="numbered-paragraphs force-break-last">
-            <li>
+            <p>
                 Subject to section 12 of the <em>Divorce Act</em> (Canada), claimant 1,
                 {% if responses.name_you %}{% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you %}{% else %}<span class="form-entry not-complete"></span>{% endif %},
                 and claimant 2,
@@ -86,21 +84,15 @@
                 {% else %}<span class="form-entry not-complete"></span>{% endif %},
                 are divorced from each other, the divorce to take effect on
                 {% effective_date %}.
-            </li>
-    {% endif %}
-
-    {% if responses.children_of_marriage == 'YES' and responses.special_extraordinary_expenses == 'YES' %}
-                {{ responses.describe_order_special_extra_expenses|striptags|linebreaksli }}
-    {% endif %}
-            </ol>
-
-        <div>
+            </p>
+        {% endif %}
+    <div>
 
     {% if derived.wants_spousal_support or derived.wants_property_division or derived.wants_child_support or derived.wants_other_orders %}
             <p>THIS COURT ORDERS that BY CONSENT:</p>
     {% endif %}
 
-            <ol class="numbered-paragraphs force-break-last">
+            <ol class="numbered-paragraphs">
     {% if derived.wants_spousal_support %}
                 <li>{{ responses.spouse_support_details }}&nbsp;</li>
     {% endif %}
@@ -126,6 +118,10 @@
         {% endfor %}
     {% endif %}
 
+    {% if responses.children_of_marriage == 'YES' and responses.special_extraordinary_expenses == 'YES' %}
+                {{ responses.describe_order_special_extra_expenses|striptags|linebreaksli }}
+    {% endif %}
+
     {% if derived.wants_other_orders %}
         {% if responses.name_change_you == 'YES' %}
                 <li>
@@ -148,7 +144,7 @@
         {% endif %}
     {% endif %}
             </ol>
-
+        <div class="avoid-break-alone">
             <p>
                 THE FOLLOWING PARTIES APPROVE THE FORM OF THIS ORDER AND
                 CONSENT TO EACH OF THE ORDERS, IF ANY, THAT ARE INDICATED ABOVE
@@ -200,6 +196,7 @@
                 </tr>
                 </tbody>
             </table>
+        </div>
 
             <small class="bottom">Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce</small>
         </div>