Browse Source

Merge branch 'master' of https://github.com/bcgov/eDivorce

pull/160/head
Mike Olund 8 years ago
parent
commit
0ac384e977
10 changed files with 19 additions and 19 deletions
  1. +1
    -1
      edivorce/apps/core/templates/partials/review_user_responses.html
  2. +2
    -2
      edivorce/apps/core/templates/prequalification/step_04.html
  3. +2
    -2
      edivorce/apps/core/templates/prequalification/step_05.html
  4. +5
    -5
      edivorce/apps/core/templates/prequalification/step_06.html
  5. +1
    -1
      edivorce/apps/core/templates/question/01_orders.html
  6. +1
    -1
      edivorce/apps/core/templates/question/02_claimant.html
  7. +1
    -1
      edivorce/apps/core/templates/question/03_respondent.html
  8. +1
    -1
      edivorce/apps/core/templates/question/07_property.html
  9. +4
    -4
      edivorce/apps/core/templates/question/09_other_questions.html
  10. +1
    -1
      edivorce/apps/core/templates/question/10_location.html

+ 1
- 1
edivorce/apps/core/templates/partials/review_user_responses.html View File

@ -31,7 +31,7 @@
{% else %}
<table class="table table-bordered">
<tr>
<td><em>No answered questions</em></td>
<td>No answered questions</td>
</tr>
</table>
{% endif %}

+ 2
- 2
edivorce/apps/core/templates/prequalification/step_04.html View File

@ -28,7 +28,7 @@
</label>
</div>
<p><em>Legally, the court is only concerned with
<p>Legally, the court is only concerned with
<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
title='<b>Children for the Marriage</b><br /><br /><p>The <a href="http://wiki.clicklaw.bc.ca/index.php?title=Divorce Act" target="_blank">Divorce Act</a> defines child of the marriage as:</p>
<p>Child of the marriage means a child of two spouses or former spouses who, at the material time,</p>
@ -42,7 +42,7 @@
Act, and you do not need to include their information in your
divorce documents. Or, if you wish, you can name them in your
documents, and indicate that they are over 19 and independent,
and no longer requiring support.</em></p>
and no longer requiring support.</p>
</div>
<div id="has_children" hidden>


+ 2
- 2
edivorce/apps/core/templates/prequalification/step_05.html View File

@ -46,8 +46,8 @@
</label>
</div>
<p><em>The marriage certificate you received at the church — or any other place where you were married — isn't
acceptable in court. You need the certificate that was issued to you by the government.</em></p>
<p>The marriage certificate you received at the church — or any other place where you were married — isn't
acceptable in court. You need the certificate that was issued to you by the government.</p>
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseExample" aria-controls="collapseExample">
<div>


+ 5
- 5
edivorce/apps/core/templates/prequalification/step_06.html View File

@ -17,8 +17,8 @@
<h3>What is your reason (grounds) for asking for a divorce?</h3>
<p>
<em>The only way you will be granted a divorce in Canada is if you can prove to the courts that your marriage
has broken down and cannot be repaired.</em>
The only way you will be granted a divorce in Canada is if you can prove to the courts that your marriage
has broken down and cannot be repaired.
</p>
<div class="question-well">
<div class="radio">
@ -91,10 +91,10 @@
</div>
<div class="not-disqualified">
<p><em>For example:</em></p>
<p>For example:</p>
<ul>
<li><em>Your spouse has been physically abusive or mentally cruel to you</em></li>
<li><em>Your spouse has committed adultery</em></li>
<li>Your spouse has been physically abusive or mentally cruel to you</li>
<li>Your spouse has committed adultery</li>
</ul>
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_which_grounds_select" aria-controls="collapse_which_grounds_select">


+ 1
- 1
edivorce/apps/core/templates/question/01_orders.html View File

@ -90,7 +90,7 @@
<div class="question-well">
<div class="checkbox"><label>{% input_field type="checkbox" name="want_which_orders" value="Other orders" %}<b>Other orders</b></label></div>
<p><em>For example, a name change.</em></p>
<p>For example, a name change.</p>
</div>
</div>


+ 1
- 1
edivorce/apps/core/templates/question/02_claimant.html View File

@ -114,7 +114,7 @@
<div class="question-well">
<h3>What is your occupation?</h3>
<div>{% input_field type="text" name="occupation_you" class="form-block input-wide response-textbox" %}</div>
<p><em>This refers to the type of work you do. For example, janitor, banker, student, nurse etc.</em></p>
<p>This refers to the type of work you do. For example, janitor, banker, student, nurse etc.</p>
</div>
<div class="question-well">


+ 1
- 1
edivorce/apps/core/templates/question/03_respondent.html View File

@ -125,7 +125,7 @@
<div class="question-well">
<h3>What is your spouse's occupation?</h3>
<div>{% input_field type="text" name="occupation_spouse" class="form-block input-wide response-textbox" %}</div>
<p><em>This refers to the type of work you do. For example, janitor, banker, student, nurse etc.</em></p>
<p>This refers to the type of work you do. For example, janitor, banker, student, nurse etc.</p>
</div>
<div class="question-well">


+ 1
- 1
edivorce/apps/core/templates/question/07_property.html View File

@ -41,7 +41,7 @@
<h3>How have you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} agreed to deal with your property and debt?</h3>
<div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="Equal division" data_target_id="property_debt_division_method" data_reveal_target="false" %}<em>Equal division</em> of family property and debt</label></div>
<div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="Unequal division" data_target_id="property_debt_division_method" data_reveal_target="true" %}<em>Unequal division</em> of family property and family debt</label></div>
<p><em>Note: the court will only order an unequal division when an equal division is significantly unfair.</em></p>
<p>Note: the court will only order an unequal division when an equal division is significantly unfair.</p>
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_unequal_division" aria-controls="collapse_unequal_division">
<div>


+ 4
- 4
edivorce/apps/core/templates/question/09_other_questions.html View File

@ -33,9 +33,9 @@
</div>
<div>
<p><em>If you don’t live within 30 km of a court registry, you must provide a fax number or email address.
<p>If you don’t live within 30 km of a court registry, you must provide a fax number or email address.
If you main address is a PO box, you can list this instead of the fax or email but you must also list
an address that’s not a PO box.</em></p>
an address that’s not a PO box.</p>
<p>Fax number (optional)</p>
{% input_field type="text" name="address_to_send_official_document_fax_you" class="form-block input-wide response-textbox" %}
@ -67,9 +67,9 @@
</div>
<div>
<p><em>If your spouse doesn’t live within 30 km of a court registry, your spouse must provide a fax number or email address.
<p>If your spouse doesn’t live within 30 km of a court registry, your spouse must provide a fax number or email address.
If your spouse's main address is a PO box, your spouse can list this instead of the fax or email but your spouse must also list
an address that’s not a PO box.</em></p>
an address that’s not a PO box.</p>
<p>Fax number (optional)</p>
{% input_field type="text" name="address_to_send_official_document_fax_spouse" class="form-block input-wide response-textbox" %}


+ 1
- 1
edivorce/apps/core/templates/question/10_location.html View File

@ -20,7 +20,7 @@
</p>
<div class="question-well">
<h3>Where will you be filing for divorce?</h3>
<p><em>Select a city to find the nearest Supreme Court Registry</em></p>
<p>Select a city to find the nearest Supreme Court Registry</p>
<select class="response-dropdown form-control" name="court_registry_for_filing">
<option value="" disabled selected>Please select</option>
{% for registry in registries %}


Loading…
Cancel
Save