Browse Source

Fixed DIV-370

pull/160/head
Charles Shin 8 years ago
parent
commit
09edaa14c7
7 changed files with 15 additions and 14 deletions
  1. +1
    -1
      edivorce/apps/core/templates/partials/name_with_alias.html
  2. +2
    -2
      edivorce/apps/core/templates/pdf/form1.html
  3. +2
    -2
      edivorce/apps/core/templates/pdf/form35.html
  4. +2
    -2
      edivorce/apps/core/templates/pdf/form36.html
  5. +2
    -2
      edivorce/apps/core/templates/pdf/form38.html
  6. +2
    -2
      edivorce/apps/core/templates/pdf/form38_we.html
  7. +4
    -3
      edivorce/apps/core/templates/pdf/form52.html

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

@ -1,5 +1,5 @@
{% load input_field %}
<span class="form-entry_claimant">
<span class="{{class_name}}">
{{ name }}
{% if other_names and use_other_name == 'YES' %}
{% multiple_values_to_list source=other_names as values %}


+ 2
- 2
edivorce/apps/core/templates/pdf/form1.html View File

@ -35,10 +35,10 @@
&nbsp;
</p>
<p>
Claimant 1:{% 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 %}
Claimant 1:{% 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 class_name='form-entry_claimant' %}
</p>
<p>
Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
</p>
<p>
&nbsp;


+ 2
- 2
edivorce/apps/core/templates/pdf/form35.html View File

@ -32,11 +32,11 @@
<em> In the Supreme Court of British Columbia </em>
</p>
<p>
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 %}
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 class_name='form-entry_claimant' %}
{% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
</p>
<p>
Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
{% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
</p>
<h2 class="text-center">


+ 2
- 2
edivorce/apps/core/templates/pdf/form36.html View File

@ -31,11 +31,11 @@
<em> In the Supreme Court of British Columbia </em>
</p>
<p>
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 %}
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 class_name='form-entry_claimant' %}
{% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
</p>
<p>
Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Claimant 2: {% if responses.name_spouse %} {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
{% else %} <span class="form-entry not-complete">&nbsp;</span> {% endif %}
</p>
<h2 align="center">


+ 2
- 2
edivorce/apps/core/templates/pdf/form38.html View File

@ -41,10 +41,10 @@
<em>In the Supreme Court of British Columbia</em>
</p>
<p>
Claimant: {% 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 %}
Claimant: {% 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 class_name='form-entry_claimant' %}
</p>
<p>
Respondent: {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Respondent: {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
</p>
<p class="text-center">
<strong>AFFIDAVIT - DESK ORDER DIVORCE</strong>


+ 2
- 2
edivorce/apps/core/templates/pdf/form38_we.html View File

@ -43,10 +43,10 @@
<em>In the Supreme Court of British Columbia</em>
</p>
<p>
Claimant 1: {% 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 %}
Claimant 1: {% 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 class_name='form-entry_claimant' %}
</p>
<p>
Claimant 2: {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Claimant 2: {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
</p>
<p class="text-center">
<strong>AFFIDAVIT - DESK ORDER DIVORCE</strong>


+ 4
- 3
edivorce/apps/core/templates/pdf/form52.html View File

@ -32,10 +32,10 @@
<em> In the Supreme Court of British Columbia </em>
</p>
<p>
Claimant 1:{% 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 %}
Claimant 1:{% 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 class_name='form-entry_claimant' %}
</p>
<p>
Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
Claimant 2:{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse class_name='form-entry_claimant' %}
</p>
<h2 align="center">
FINAL ORDER
@ -81,7 +81,8 @@
</p>
<p class="schIndent1">
Subject to section 12 of the <em>Divorce Act</em> (Canada), claimant 1 {% if responses.name_you %}{{name_you}}{% else %}<span class="form-entry not-complete">[<em>name</em>]</span>{% endif %}, and claimant 2 {% if responses.name_spouse %}{{ name_spouse }}{% else %}<span class="form-entry not-complete">[<em>name</em>]</span>{% endif %}, who were married at
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">[<em>name</em>]</span>{% endif %}
, and claimant 2 {% if responses.name_spouse %}{% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}{% else %}<span class="form-entry not-complete">[<em>name</em>]</span>{% endif %}, who were married at
{% if responses.where_were_you_married_city and responses.where_were_you_married_prov and responses.where_were_you_married_country %}
{{responses.where_were_you_married_city}}; {{responses.where_were_you_married_prov}};
{% if responses.where_were_you_married_country == 'Other' %} {{ responses.where_were_you_married_other_country }}


Loading…
Cancel
Save