From 09edaa14c775d515d97e83dbe08c8a0bc40ab25a Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Thu, 23 Mar 2017 17:07:40 -0700 Subject: [PATCH] Fixed DIV-370 --- edivorce/apps/core/templates/partials/name_with_alias.html | 2 +- edivorce/apps/core/templates/pdf/form1.html | 4 ++-- edivorce/apps/core/templates/pdf/form35.html | 4 ++-- edivorce/apps/core/templates/pdf/form36.html | 4 ++-- edivorce/apps/core/templates/pdf/form38.html | 4 ++-- edivorce/apps/core/templates/pdf/form38_we.html | 4 ++-- edivorce/apps/core/templates/pdf/form52.html | 7 ++++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/edivorce/apps/core/templates/partials/name_with_alias.html b/edivorce/apps/core/templates/partials/name_with_alias.html index 21522e2a..d8e05082 100644 --- a/edivorce/apps/core/templates/partials/name_with_alias.html +++ b/edivorce/apps/core/templates/partials/name_with_alias.html @@ -1,5 +1,5 @@ {% load input_field %} - + {{ name }} {% if other_names and use_other_name == 'YES' %} {% multiple_values_to_list source=other_names as values %} diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index e6427178..faf972ff 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -35,10 +35,10 @@  

- 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' %}

- 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' %}

  diff --git a/edivorce/apps/core/templates/pdf/form35.html b/edivorce/apps/core/templates/pdf/form35.html index 21815ba8..d3554c32 100644 --- a/edivorce/apps/core/templates/pdf/form35.html +++ b/edivorce/apps/core/templates/pdf/form35.html @@ -32,11 +32,11 @@ In the Supreme Court of British Columbia

- 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 %}   {% endif %}

- 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 %}   {% endif %}

diff --git a/edivorce/apps/core/templates/pdf/form36.html b/edivorce/apps/core/templates/pdf/form36.html index 887b159f..4d556df3 100644 --- a/edivorce/apps/core/templates/pdf/form36.html +++ b/edivorce/apps/core/templates/pdf/form36.html @@ -31,11 +31,11 @@ In the Supreme Court of British Columbia

- 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 %}   {% endif %}

- 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 %}   {% endif %}

diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html index aea33e2b..077f1861 100644 --- a/edivorce/apps/core/templates/pdf/form38.html +++ b/edivorce/apps/core/templates/pdf/form38.html @@ -41,10 +41,10 @@ In the Supreme Court of British Columbia

- 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' %}

- 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' %}

AFFIDAVIT - DESK ORDER DIVORCE diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html index b443329d..7e162d37 100644 --- a/edivorce/apps/core/templates/pdf/form38_we.html +++ b/edivorce/apps/core/templates/pdf/form38_we.html @@ -43,10 +43,10 @@ In the Supreme Court of British Columbia

- 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' %}

- 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' %}

AFFIDAVIT - DESK ORDER DIVORCE diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index f7574c13..c902d54f 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -32,10 +32,10 @@ In the Supreme Court of British Columbia

- 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' %}

- 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' %}

FINAL ORDER @@ -81,7 +81,8 @@

- Subject to section 12 of the Divorce Act (Canada), claimant 1 {% if responses.name_you %}{{name_you}}{% else %}[name]{% endif %}, and claimant 2 {% if responses.name_spouse %}{{ name_spouse }}{% else %}[name]{% endif %}, who were married at + Subject to section 12 of the Divorce Act (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 %}[name]{% 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 %}[name]{% 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 }}