From be79cb58fcae6c4dc29ef53e8d20e9eb1af6a60c Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:08:29 -0700
Subject: [PATCH 1/7] DIV-875: Moved inline expandable support text.

---
 .../question/06_children_income_expenses.html | 120 ++++++------------
 1 file changed, 40 insertions(+), 80 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index 7026d804..fd903f5d 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -72,6 +72,46 @@
                 </li>
             </ul>
         </div>
+
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
+             data-target="#collapseSpouseFedGuidelines" aria-controls="collapseSpouseFedGuidelines">
+            <div>
+                What are the Federal Child Support Guidelines?
+            </div>
+        </div>
+        <div class="collapse" id="collapseSpouseFedGuidelines">
+            <div>
+                <p>
+                    The Federal Guidelines are a set of rules and tables used to determine child support when
+                    parents
+                    divorce. They are the law. Their main goals are:
+                </p>
+                <ul>
+                    <li>
+                        to establish a fair standard of support for children so that they continue to benefit from
+                        both
+                        parents’ incomes after the separation or divorce;
+                    </li>
+                    <li>
+                        to reduce conflict and tension between parents by making the calculation of child support
+                        more
+                        objective;
+                    </li>
+                    <li>
+                        to ensure that parents and children in similar situations are treated the same; and
+                    </li>
+                    <li>
+                        to make the legal process more efficient and encourage settlements by giving courts and
+                        parents guidance about child support.
+                    </li>
+                </ul>
+                <p>
+                    Source:
+                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h12" link_text="Federal Child Support Guidelines Step-by-Step Guide" %}
+                    , Department of Justice
+                </p>
+            </div>
+        </div>
     </div>
 
     <div id="annual_gross_income_question">
@@ -81,46 +121,6 @@
                 {% money_input_field name="annual_gross_income" value="" class="money form-block response-textbox positive-float" %}
             </div>
 
-            <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
-                 data-target="#collapseFedGuidelines" aria-controls="collapseFedGuidelines">
-                <div>
-                    What are the Federal Child Support Guidelines?
-                </div>
-            </div>
-            <div class="collapse" id="collapseFedGuidelines">
-                <div>
-                    <p>
-                        The Federal Guidelines are a set of rules and tables used to determine child support when
-                        parents
-                        divorce. They are the law. Their main goals are:
-                    </p>
-                    <ul>
-                        <li>
-                            to establish a fair standard of support for children so that they continue to benefit from
-                            both
-                            parents’ incomes after the separation or divorce;
-                        </li>
-                        <li>
-                            to reduce conflict and tension between parents by making the calculation of child support
-                            more
-                            objective;
-                        </li>
-                        <li>
-                            to ensure that parents and children in similar situations are treated the same; and
-                        </li>
-                        <li>
-                            to make the legal process more efficient and encourage settlements by giving courts and
-                            parents guidance about child support.
-                        </li>
-                    </ul>
-                    <p>
-                        Source:
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h12" link_text="Federal Child Support Guidelines Step-by-Step Guide" %}
-                        , Department of Justice
-                    </p>
-                </div>
-            </div>
-
             <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
                  data-target="#collapseIncome" aria-controls="collapseIncome">
                 <div>
@@ -147,46 +147,6 @@
                 {% money_input_field name="spouse_annual_gross_income" value="" class="money form-block response-textbox positive-float" %}
             </div>
 
-            <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
-                 data-target="#collapseSpouseFedGuidelines" aria-controls="collapseSpouseFedGuidelines">
-                <div>
-                    What are the Federal Child Support Guidelines?
-                </div>
-            </div>
-            <div class="collapse" id="collapseSpouseFedGuidelines">
-                <div>
-                    <p>
-                        The Federal Guidelines are a set of rules and tables used to determine child support when
-                        parents
-                        divorce. They are the law. Their main goals are:
-                    </p>
-                    <ul>
-                        <li>
-                            to establish a fair standard of support for children so that they continue to benefit from
-                            both
-                            parents’ incomes after the separation or divorce;
-                        </li>
-                        <li>
-                            to reduce conflict and tension between parents by making the calculation of child support
-                            more
-                            objective;
-                        </li>
-                        <li>
-                            to ensure that parents and children in similar situations are treated the same; and
-                        </li>
-                        <li>
-                            to make the legal process more efficient and encourage settlements by giving courts and
-                            parents guidance about child support.
-                        </li>
-                    </ul>
-                    <p>
-                        Source:
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h12" link_text="Federal Child Support Guidelines Step-by-Step Guide" %}
-                        , Department of Justice
-                    </p>
-                </div>
-            </div>
-
             <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
                  data-target="#collapseSpouseIncome" aria-controls="collapseSpouseIncome">
                 <div>

From ac0e4b2ac09ae089ca68bed1bc757da2d634f562 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:17:07 -0700
Subject: [PATCH 2/7] DIV-879: Changed wording and example of special expenses
 question.

---
 .../core/templates/question/06_children_income_expenses.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index fd903f5d..a8b57366 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -507,7 +507,7 @@
     <div class="question-well">
         <h3>Please describe the order you are asking for regarding Special and Extraordinary Expenses</h3>
         <p>
-            If you're not sure how to write what you are asking for, you can refer to the
+            If you're not sure how to write what you are asking for, you can refer to section "G" of the
             <a href="http://www.courts.gov.bc.ca/supreme_court/practice_and_procedure/family_law_orders/picklist_family_orders.pdf" target="_blank">
                 The Supreme Court Family Order Pick List</a>
             which sets out standard terms for most of the usual orders made in family cases.
@@ -521,8 +521,7 @@
         </p>
         <blockquote>
             <p>
-                The parties agree that the following expenses shall be considered special or extraordinary expenses for
-                the child(ren): Happy Day Summer Camp.
+                PARTYNAME will pay to PARTYNAME the sum of $ AMOUNT per month commencing on STARTDATE and continuing on the [1st, 15th, 31,st etc ]day of each month thereafter for the child(ren)'s special or extraordinary expenses.
             </p>
             <p>
                 No other expenses will be considered special or extraordinary unless agreed to by the parties in advance

From b032d207137c264f35c27912eff892613020950e Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:20:07 -0700
Subject: [PATCH 3/7] DIV-882: Added description.

---
 .../apps/core/templates/question/06_children_what_for.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html
index b84f0a65..e0466cb9 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -291,8 +291,8 @@
         </h3>
         <p>
             You need to include each of the orders you want pertaining to guardianship, parental responsibilities and
-            parenting time, and contact with the child.  You will need to write them as if a Judge is telling you to do it.
-            If you are not sure how to phrase what you are asking for, you can refer to the
+            parenting time, and contact with the child. You will need to write them as if a Judge is telling you to do it.
+            If you are not sure how to phrase what you are asking for, you can refer to sections "C" and "D" of the
             <a href="http://www.courts.gov.bc.ca/supreme_court/practice_and_procedure/family_law_orders/picklist_family_orders.pdf" target="_blank">
                 Supreme Court Family Order Pick List</a> which sets out standard terms for most of the usual orders made in family cases.
         </p>

From 7b52276c5bd9ba31bbdbe8e649433f76940d08d2 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:32:24 -0700
Subject: [PATCH 4/7] DIV-886: Moved collapsible support text.

---
 .../templates/question/06_children_facts.html | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_facts.html b/edivorce/apps/core/templates/question/06_children_facts.html
index 88106b23..0c4f75e8 100644
--- a/edivorce/apps/core/templates/question/06_children_facts.html
+++ b/edivorce/apps/core/templates/question/06_children_facts.html
@@ -51,22 +51,6 @@
                         Note: This includes time that a parent is responsible for the children, even if they are not
                         physically with that parent (for example the child is at school).
                     </p>
-                </td>
-                <td class="fact-sheet-answer">
-                    <div class="percent-suffix">
-                        {% input_field type="number" name="time_spent_with_you" class="fact-sheet-input" min="0" placeholder="enter number" %}
-                        <label> %</label>
-                    </div>
-                </td>
-                <td class="fact-sheet-answer">
-                    <div class="percent-suffix">
-                        {% input_field type="number" name="time_spent_with_spouse" class="fact-sheet-input" min="0" placeholder="enter number" %}
-                        <label> %</label>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="3">
                     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_percentage_time" aria-controls="collapse_percentage_time">
                         <div>
                             How do I determine the percentage of time spent with each parent?
@@ -88,6 +72,20 @@
                         </div>
                     </div>
                 </td>
+                <td class="fact-sheet-answer">
+                    <div class="percent-suffix">
+                        {% input_field type="number" name="time_spent_with_you" class="fact-sheet-input" min="0" placeholder="enter number" %}
+                        <label> %</label>
+                    </div>
+                </td>
+                <td class="fact-sheet-answer">
+                    <div class="percent-suffix">
+                        {% input_field type="number" name="time_spent_with_spouse" class="fact-sheet-input" min="0" placeholder="enter number" %}
+                        <label> %</label>
+                    </div>
+                </td>
+            </tr>
+            <tr>
             </tr>
             <tr>
                 <td class="fact-sheet-question">Annual income as per

From 9b74386ef682a3d59e981f3f08b204147c7bc6e6 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:36:08 -0700
Subject: [PATCH 5/7] DIV-874: Updated determining your income question text.

---
 .../question/06_children_income_expenses.html        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index a8b57366..f8e667e4 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -18,16 +18,8 @@
                 {% input_field type="radio" name="how_will_calculate_income" autocomplete="off" value="using specific rules" data_invert_target="#agreement_entered_message" data_reveal_target="true" %}
                 Calculate your income using the
                 <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" target="_blank">
-                    specific rules
-                </a> set out in the Federal Guidelines (
-                <span class="tooltip-link keep-tooltip-open"
-                  data-toggle="tooltip"
-                  data-placement="right"
-                  data-html="true"
-                  title="<b>Sections 15 to 20</b><br />Details the rules the court considers when determining income.">
-                sections 15 to 20<i class="fa fa-question-circle" aria-hidden="true"></i>
-                </span>
-                )
+                    specific rules (sections 15 to 20)
+                </a> set out in the Federal Guidelines
             </label>
             <p>
                 Under these rules, the total income shown on line 150 of your most recent income tax return or your

From 6557b16a0a9bd7debfe3da6d3c658dfebe069c88 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 17:40:17 -0700
Subject: [PATCH 6/7] DIV-876: Updated help text for spouse's annual income.

---
 .../templates/question/06_children_income_expenses.html  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index f8e667e4..6fe9e29e 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -148,9 +148,12 @@
             <div class="collapse" id="collapseSpouseIncome">
                 <div>
                     <p>
-                        A spouse’s annual income is determined using the sources of income set out under the heading
-                        “Total income” in the T1 General form issued by the Canada Revenue Agency and is adjusted in
-                        accordance with Schedule III.
+                        The Federal Child Support Guidelines, Step-by-Step Guide has a
+                        <a href="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/w1-f1.html#s1"
+                           target="_blank">worksheet</a> you can use to help
+                        calculate your spouse's annual income. Step-by-step instructions are also detailed in the
+                        <a href="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7"
+                           target="_blank">Step-by-Step Guide</a>.
                     </p>
                 </div>
             </div>

From 34491d91fadcbe2198103336e4376d3c33581486 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 22 Aug 2018 18:03:39 -0700
Subject: [PATCH 7/7] DIV-887: Updated old date and link for child support
 table lookup tool.

---
 .../partials/inline_question_determine_amount_to_pay.html     | 4 ++--
 edivorce/apps/core/templates/question/06_children_facts.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/edivorce/apps/core/templates/partials/inline_question_determine_amount_to_pay.html b/edivorce/apps/core/templates/partials/inline_question_determine_amount_to_pay.html
index d1b2e155..d0309feb 100644
--- a/edivorce/apps/core/templates/partials/inline_question_determine_amount_to_pay.html
+++ b/edivorce/apps/core/templates/partials/inline_question_determine_amount_to_pay.html
@@ -24,9 +24,9 @@
         </p>
         <ul>
             <li>
-                Use the <a href="http://www.justice.gc.ca/eng/fl-df/child-enfant/look-rech.asp" target="_blank">
+                Use the <a href="http://www.justice.gc.ca/eng/fl-df/child-enfant/2017/look-rech.asp" target="_blank">
                 Child Support Table Lookup tool</a>
-                (effective from December 31, 2011) to calculate the correct amount of child support.
+                (effective from November 22, 2017) to calculate the correct amount of child support.
             </li>
             <li>
                 Refer to the <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" target="_blank">
diff --git a/edivorce/apps/core/templates/question/06_children_facts.html b/edivorce/apps/core/templates/question/06_children_facts.html
index 0c4f75e8..9cf9c56c 100644
--- a/edivorce/apps/core/templates/question/06_children_facts.html
+++ b/edivorce/apps/core/templates/question/06_children_facts.html
@@ -147,7 +147,7 @@
                                 <li>
                                     Use the <a href="http://www.justice.gc.ca/eng/fl-df/child-enfant/2017/look-rech.asp" target="_blank">
                                     Child Support Table Lookup tool</a>
-                                    (effective from December 31, 2011) to calculate the correct amount of child support.
+                                    (effective from November 22, 2017) to calculate the correct amount of child support.
                                 </li>
                                 <li>
                                     Refer to the <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" target="_blank">