Fixed DIV-399, 394, 369, 383, 385, 386, 389, 390

edivorce/apps/core/templates/pdf/form1.html

@@ -190,7 +190,7 @@
                     <td colspan="2"> <strong> C. Claimant 1 and Claimant 2 confirm that: </strong> [<em>Check both of the following boxes.</em>] </td>
                 </tr>
                 <tr>
-                    <td colspan="2"> <i class="fa {% if responses.no_reconciliation_possible == 'agree' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There is no possibility of reconciliation. </td>
+                    <td colspan="2"> <i class="fa {% if responses.no_reconciliation_possible == 'I agree' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There is no possibility of reconciliation. </td>
                 </tr>
                 <tr>
                     {% check_list source=responses.no_collusion value='I agree' as is_no_collusion %}

edivorce/apps/core/templates/question/02_claimant.html

@@ -132,14 +132,13 @@
     <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_you" value="Do not live in B.C." %}Do not live in B.C.</label></div>
 
     <p>In order to apply for a divorce in B.C., you or your spouse must have been a regular resident in B.C (the legal term is
-        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
-                        &quot;ordinary residence&quot; is not a phrase capable of precise definition. At its simplest level, ordinary residence connotes
-                        something more than mere temporary presence in a place. It refers to the place in which a person's lifestyle is centered
-                        and to which the person regularly returns if his or her presence is not continuous.<br/><br/>
+        <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />
                         Ordinarily Resident<ul><li>the place where a person resides in the ordinary course of his or her day to day</li>
                         <li>you do not lose your ordinary resident in a place when you leave for a temporary purpose (e.g. go to school in
                         another province)</li></ul><br/>Not an Ordinarily Resident<ul><li>If you have travelled to another place to live and work indefinitely
-                        (even though you ultimately intend to return to the prior home)</li></ul>">ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>) for at least one year immediately before starting the proceeding.
+                        (even though you ultimately intend to return to the prior home)</li></ul><p>A detailed explanation of the
+                        <a href='http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html' target='_blank'>meaning of ordinarily resident</a> can be found on the Department of Justice website.</p>">
+            ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>) for at least one year immediately before starting the proceeding.
     </p>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample" aria-controls="collapseExample">
@@ -183,6 +182,9 @@
 {% block formBack %}{% prev_step step='claimant' %}{% endblock %}
 {% block formNext %}{% next_step step='claimant' %}{% endblock %}
 
-{% block sidebarText %}
-<p>The Meaning of "Ordinary Residence" and "Habitual Residence" in the Common Law Provinces in a Family Law Context: <a href="http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html" target="_blank">http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html</a></p>
+{% block sidebarNav %}
+<!-- no sidebar -->
+{% endblock %}
+{% block sidebar %}
+<!-- no sidebar -->
 {% endblock %}

edivorce/apps/core/templates/question/03_respondent.html

@@ -145,14 +145,13 @@
     <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="lived_in_bc_spouse" value="Do not live in B.C." %}Do not live in B.C.</label></div>
 
     <p>In order to apply for a divorce in B.C., you or your spouse must have been a regular resident in B.C (the legal term is ordinarily resident
-    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />Unfortunately  there is no clear cut definition for the term &quot;ordinarily resident.&quot;<br/><br/>
-                        &quot;ordinary residence&quot; is not a phrase capable of precise definition. At its simplest level, ordinary residence connotes
-                        something more than mere temporary presence in a place. It refers to the place in which a person's lifestyle is centered
-                        and to which the person regularly returns if his or her presence is not continuous.<br/><br/>
+    <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Ordinarily resident</b><br /><br />
                         Ordinarily Resident<ul><li>the place where a person resides in the ordinary course of his or her day to day</li>
                         <li>you do not lose your ordinary resident in a place when you leave for a temporary purpose (e.g. go to school in
                         another province)</li></ul><br/>Not an Ordinarily Resident<ul><li>If you have travelled to another place to live and work indefinitely
-                        (even though you ultimately intend to return to the prior home)</li></ul>">ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                        (even though you ultimately intend to return to the prior home)</li></ul><p>A detailed explanation of the
+                        <a href='http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html' target='_blank'>meaning of ordinarily resident</a> can be found on the Department of Justice website.</p>">
+        ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i></span>
     ) for at least one year immediately before starting the proceeding.
     </p>
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample" aria-controls="collapseExample">
@@ -194,6 +193,9 @@
 {% block formBack %}{% prev_step step='respondent' %}{% endblock %}
 {% block formNext %}{% next_step step='respondent' %}{% endblock %}
 
-{% block sidebarText %}
-<p>The Meaning of "Ordinary Residence" and "Habitual Residence" in the Common Law Provinces in a Family Law Context: <a href="http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html" target="_blank">http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html</a></p>
+{% block sidebarNav %}
+<!-- no sidebar -->
+{% endblock %}
+{% block sidebar %}
+<!-- no sidebar -->
 {% endblock %}

edivorce/apps/core/templates/question/04_marriage.html

@@ -146,9 +146,4 @@
     <h3>The Laws about People in Relationships</h3>
     <p>The two laws in B.C. that you may need to know about are the provincial Family Law Act and the federal Divorce act. The Family Law Act applies to all married and unmarried spouses. The Divorce Act only applies to married spouses.</p>
 </div>
-<div>
-    <p>When two people who have been living together in a marriage, or a marriage-like relationship (sometimes called a common-law relationship), decide not to live together any more, they are separated.</p>
-    <p>There is no such thing as a "legal" separation. If you are living apart, you are separated.</p>
-    <p>It is possible to be separated and still living in the same home where a clear intention of a permanent separation has been communicated and acted upon.</p>
-</div>
 {% endblock %}

edivorce/apps/core/templates/question/06_support.html

@@ -67,7 +67,7 @@
             <p>
                 For help on what factors to consider, and details to include in your spousal support agreement, refer to the online tool,
                 <a href="http://www.familylaw.lss.bc.ca/guides/separation/supportSpouse.php" target="_blank">How to Write Your Own Separation Agreement</a>,
-                produced by the Legal Services Society.
+                on the Family Law in B.C. website.
             </p>
             <p>
                 You may also find Clicklaw's wikibook on <a href="http://wiki.clicklaw.bc.ca/index.php/Spousal_Support" target="_blank">Spousal Support</a> helpful.
@@ -87,7 +87,6 @@
             <ul>
                 <li>You were married</li>
                 <li>You lived together in a marriage-like relationship for at least two years, or</li>
-                <li>The roles and functions of each spouse during the relationship, and</li>
                 <li>You lived in a marriage-like relationship for less than two years, but you have a child together (This recognizes that having a child together also creates interdependence between the couple that may result in a need for spousal support.)</li>
             </ul>
             <p>
@@ -128,7 +127,7 @@
             </p>
             <p>
                 For more  information on
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php" target="_blank">which laws apply</a> to your situation please refer to the Legal Services Society web site.
+                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php" target="_blank">which laws apply</a> to your situation please refer to the Family Law of B.C. website.
             </p>
         </div>
     </div>

edivorce/apps/core/templates/question/07_property.html

@@ -139,7 +139,7 @@
                 <h1 class="modal-title">Property and Debt</h1>
             </div>
             <div class="modal-body">
-                <p>Okay {{ name_you }}, next up let's go over some questions pertaining to the division of property and debt. The answers you provide will be used to populate what's called a Draft Final Order (Form 52). </p>
+                <p>{{ name_you }}, next up let's go over some questions pertaining to the division of property and debt. The answers you provide will be used to populate what's called a Draft Final Order (Form 52). </p>
                 <p>A draft final order sets out what orders (decisions) you want the court to make. This will be reviewed by a judge or master.  If the judge or master makes the order you ask for, they'll sign the draft order you filed and it becomes your final court order.</p>
                 <p>If there's a problem with your order and the judge or master doesn't approve it, the court registry will let you know. You might have to draft another version of the order or appear in court to give the judge or master more information about what you wrote in the order.</p>
             </div>

edivorce/apps/core/templates/question/11_review.html

@@ -182,7 +182,7 @@
 {% block formbuttons %}
 
 <div class="form-buttons clearfix">
-	<a class="btn btn-success pull-right" href="{% url 'overview' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+	<a class="btn btn-success pull-right" href="{% url 'dashboard_nav' 'print_form' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
 </div>
 
 {% endblock %}