Updated progress indicator links and minor updates

edivorce/apps/core/templates/partials/alias_field.html

@@ -7,5 +7,5 @@
         <option value="with assumed name of" {% if alias_type == 'with assumed name of' %} selected {% endif %}>With assumed name of</option>
     </select>
     {% input_field type="text" name=name value=value multiple="true" class="form-block input-wide response-textbox" %}
-    <button class="btn-delete-name">Delete</button>
+    <input type="button" class="btn-delete-name" value="Delete" />
 </div>

edivorce/apps/core/templates/partials/reconciliation_period.html

@@ -2,5 +2,5 @@
 <div style="display: inline-flex">
     <p><label>From: <span class="date-picker-group">{% input_field type="text" name="reconciliation_period" value=from multiple='true' class="date-pickers reconciliation-from-date" placeholder="DD/MM/YYYY" %}</span></label></p>
     <p><label>To: <span class="date-picker-group">{% input_field type="text" name="reconciliation_period" value=to multiple='true' class="date-pickers reconciliation-to-date" placeholder="DD/MM/YYYY" %}</span></label></p>
-    <button class="btn-delete-period">Delete</button>
+    <input type="button" class="btn-delete-period" value="Delete" />
 </div>

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

@@ -305,7 +305,8 @@
                     <td> <i class="fa {% if responses.deal_with_property_debt == 'equal division' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} an equal division of family property and family debt </td>
                 </tr>
                 <tr>
-                    <td> <i class="fa {% if responses.deal_with_property_debt == 'unequal division' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} an unequal division of family property and family debt as follows: <span class="form-entry form-textarea not-complete">&nbsp;</span>
+                    <td> <i class="fa {% if responses.deal_with_property_debt == 'unequal division' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} an unequal division of family property and family debt as follows:
+                        <span class="form-entry form-textarea not-complete">{% if responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt }} {% else %}&nbsp;{% endif %}</span>
                     </td>
                 </tr>
                 <tr>
@@ -313,7 +314,7 @@
                 </tr>
                 <tr>
                     <td> <i class="fa fa-square-o" aria-hidden="true"></i> Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows:
-                        <span class="form-entry form-textarea not-complete">&nbsp;</span> </td>
+                        <span class="form-entry form-textarea not-complete">{% if responses.other_property_claims %} {{ responses.other_property_claims }} {% else %}&nbsp;{% endif %}</span> </td>
                 </tr>
             </tbody>
         </table>

edivorce/apps/core/templates/progress.html

@@ -1,59 +1,64 @@
 <div class="col-flex progress-column">
     <h4>Questionnaire</h4>
 
-    <a href="#" class="progress-question">
+    <a href="{% url 'prequalification' '01' %}" class="progress-question complete">
         <span class="progress-icon"><i class="fa fa-share-alt" aria-hidden="true"></i></span>
         <span class="progress-content">Qualifying Questions</span>
+        <span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span>
     </a>
-    <a href="#" class="progress-question complete">
+    <a href="{% url 'question_steps' '01_orders' %}" class="progress-question complete">
         <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 1</small><br />What Are You Asking For?</span>
-        <span class="progress-status"><i class="fa fa-check" aria-hidden="true"></i></span>
+        {% if which_orders == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question active">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
+    <a href="{% url 'question_steps' '02_claimant' %}" class="progress-question active">
+        <span class="progress-icon"><i class="fa fa-info" aria-hidden="true"></i></span>
         <span class="progress-content"><small>Step 2</small><br />Your information</span>
-        <span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span>
+        {% if your_information == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 3</small><br />Your information</span>
+    <a href="{% url 'question_steps' '03_respondent' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-user" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 3</small><br />Your spouse</span>
+        {% if your_spouse == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 4</small><br />Your information</span>
-    </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 5</small><br />Your information</span>
+    <a href="{% url 'question_steps' '04_marriage' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-link" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 4</small><br />Your marriage</span>
+        {% if your_marriage == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 6</small><br />Your information</span>
+    <a href="{% url 'question_steps' '05_separation' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-chain-broken" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 5</small><br />Your separation</span>
+        {% if your_separation == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 7</small><br />Your information</span>
+    <a href="{% url 'question_steps' '06_support' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-life-ring" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 6</small><br />Spousal support</span>
+        {% if spousal_support == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 8</small><br />Your information</span>
+    <a href="{% url 'question_steps' '07_property' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 7</small><br />Property and debt</span>
+        {% if property_and_debt == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 9</small><br />Your information</span>
+    <a href="{% url 'question_steps' '08_other_orders' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-gavel" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 8</small><br />Other orders</span>
+        {% if other_orders == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 10</small><br />Your information</span>
+    <a href="{% url 'question_steps' '09_other_questions' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-question" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 9</small><br />Other questions</span>
+        {% if other_questions == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 11</small><br />Your information</span>
+    <a href="{% url 'question_steps' '10_location' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-location-arrow" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 10</small><br />Filing locations</span>
+        {% if filing_locations == 'Started' %}<span class="progress-status"><i class="fa fa-adjust" aria-hidden="true"></i></span> {% endif %}
     </a>
-    <a href="#" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content"><small>Step 12</small><br />Your information</span>
+    <a href="{% url 'question_steps' '11_review' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-file" aria-hidden="true"></i></span>
+        <span class="progress-content"><small>Step 11</small><br />Review</span>
     </a>
 
 

edivorce/apps/core/templates/question/01_orders.html

@@ -89,10 +89,12 @@
             <h2>Time limit to apply for court order </h2>
             <p>If you were <b>married</b>, you must apply to divide property within two years after you get an order for divorce.</p>
             <p>If you were living in a <b>marriage-like relationship</b> for at least two years, you must apply within two years of the date you separated.</p>
-            <div style="border:solid">
-                <h2>(Dev note:  Display this alert message if the user has indicated that they have lived in a marriage like relationship)</h2>
-                <p>In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.</p>
-            </div>
+            <!-- TODO Confirm exact section to show -->
+            {% if married_marriage_like == "Living together in a marriage like relationship" %}
+                <div>
+                    <p>In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.</p>
+                </div>
+            {% endif %}
             <p><em>For more information, please refer to  the following fact sheets on the  Legal Services Society website:</em></p>
                 <ul>
                     <li><a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/dividePropertyAndDebts.php" target="_blank">How to Divide Property and Debts</a></li>

edivorce/apps/core/templates/question/05_separation.html

@@ -0,0 +1,105 @@
+{% extends 'base.html' %}
+{% load input_field %}
+
+{% block title %}{{ block.super }}: Reason For Divorce{% endblock %}
+
+{% block content %}
+
+
+<h1><small>Step 5:</small>Your Separation</h1>
+<div class="question-well">
+    <p>
+        For this next question, we need to confirm that there is no chance you and your spouse will be getting back together.
+        By selecting "I agree" this shows the court that you and your spouse have thoroughly thought out your request for divorce.
+    </p>
+    <h3>There is no possibility my spouse and I will get back together (reconciliation).</h3>
+    <div class="radio"><label>{% input_field type="radio" name="no_reconciliation_possible" value="agree" %}I agree</label></div>
+    <div class="radio"><label>{% input_field type="radio" name="no_reconciliation_possible" value="disagree" %}I disagree</label></div>
+</div>
+
+<!-- TODO: Confirm with JA and remove this part-->
+<div class="question-well" hidden>
+    <div>
+        <p><em>Ok, this next questions uses some legal terminology so we'll help you understand what is being asked.</em></p>
+
+        <p><em>We’re legally required to ask that you confirm that you and (!!insert spouse name) haven’t lied or
+            tried to deceive the court in any way. This is called “collusion”. An example of collusion is both
+            of you saying that you’ve been separated for longer than you actually have been.</em></p>
+
+        <p><em>Please confirm that there’s been no collusion in this claim for divorce. The court can refuse to
+            grant a divorce if you and your spouse have not been honest (collusion) about your marriage and
+            separation details.</em></p>
+    </div>
+
+    <div>
+        <h3>There has been no collusion
+            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+           title="<b>COURT REGISTRY</b><br /><br />A central office (for the B.C. Supreme Court) at which
+           the court files for each court proceeding in that district are maintained, and at which legal documents,
+           can be filed, searched for and reviewed" aria-hidden="true"></i>,
+            as defined in section 11(4) of the Divorce Act (Canada), in relation to this claim for divorce.</h3>
+        <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="agree" %}I agree</label></div>
+        <div class="radio"><label>{% input_field type="radio" name="no_collusion" value="disagree" %}I disagree</label></div>
+    </div>
+</div>
+
+<div class="question-well">
+    <p>
+        We’re legally required to ask that you confirm that you and {% if responses.name_spouse %} {{ responses.name_spouse }} {% else %} your spouse {% endif %}
+        haven’t lied or tried to deceive the court in any way. This is called “collusion
+        <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
+       title="<b>Collusion</b><br /><br />Basically this statement confirms that you and your spouse haven’t lied or tried to deceive the court in any way
+       (for example, saying that you’ve been separated for longer than you have been). It is a legal requirement that you confirm you are providing accurate
+       and complete information. Apologies if you are offended with this question." aria-hidden="true"></i>
+        ”. An example of collusion is both
+        of you saying that you’ve been separated for longer than you actually have been.
+    </p>
+    <div class="checkbox-group">
+        <div class="checkbox">
+            <label>
+                {% input_field type="checkbox" name="no_collusion" value="No collusion" %} My spouse and I have not engaged in collusion to deceive the court in any way.
+            </label>
+        </div>
+    </div>
+</div>
+
+<div style="display: flex">
+    <form action="{% url 'question_steps' '04_marriage' %}">
+        <input type="submit" value="Back"/>
+    </form>
+    <form action="#">
+        <input type="submit" value="Save"/>
+    </form>
+    <form action="{% url 'question_steps' '06_support' %}">
+        <input type="submit" value="Next"/>
+    </form>
+</div>
+
+
+{% endblock %}
+{% block sidebarText %}
+    <div>
+        <p>Most divorces use the one-year separation ground. But you can also apply for a divorce earlier on the basis of adultery or physical or mental cruelty. If you ask for a divorce for one of these reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.</p>
+        <p>If you're asking for a divorce and you expect it to be uncontested (you and your spouse both agree with the divorce), you must have earlier court orders or an agreement settling all your issues. A judge won't order a divorce unless he or she is satisfied that reasonable arrangements have been made for the support of the children.</p>
+    </div>
+    <div>
+        <h2>How can you prove you're separated if you and your spouse still live together?</h2>
+        <p>You and your spouse might have decided to end your relationship, but for financial or other reasons, you can't live separately. You might have to prove to a court that you and your spouse have actually separated so that you can get a divorce and/or divide up the assets you have as a couple.</p>
+        <p>A list of activities and behaviours that the courts consider to be indicators of a couple being separated can be found on the
+            <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/howToProveYouAreSeparatedIfYouStillLiveTogether.php" target="_blank">Legal Services Society web site.</a></p>
+    </div>
+    <div>
+        <p>You can also get a divorce if:</p>
+        <ul>
+            <li>you or your spouse has committed adultery (been unfaithful) that hasn't been forgiven, or</li>
+            <li>your spouse treated you with physical or mental cruelty that you haven't forgiven, which makes it impossible for you to continue to live together.</li>
+        </ul>
+        <p>To get a divorce for these reasons you have to prove these things in court.</p>
+        <p>
+            The majority of divorces are uncontested or undefended divorces (about 80 percent). That means that the divorcing couple have settled on how they're going to settle their parenting, support, and property issues. But they still need a court order for the divorce.
+        </p>
+    </div>
+    <div>
+        <a href="http://bcfamilylawresource.blogspot.ca/2010/12/ins-and-outs-of-separation-part-iv.html" target="_blank">http://bcfamilylawresource.blogspot.ca/2010/12/ins-and-outs-of-separation-part-iv.html</a>
+    </div>
+{% endblock %}