diff --git a/edivorce/apps/core/templates/partials/name_with_alias.html b/edivorce/apps/core/templates/partials/name_with_alias.html index d8e05082..1b3ef2a9 100644 --- a/edivorce/apps/core/templates/partials/name_with_alias.html +++ b/edivorce/apps/core/templates/partials/name_with_alias.html @@ -1,10 +1,2 @@ {% load input_field %} - - {{ name }} - {% if other_names and use_other_name == 'YES' %} - {% multiple_values_to_list source=other_names as values %} - {% for alias_type, value in values %} - {% if value != '' %} {{alias_type}} {{value}} {% endif %} - {% endfor %} - {% endif %} - \ No newline at end of file +{{ name }}{% if other_names and use_other_name == 'YES' %}{% multiple_values_to_list source=other_names as values %}{% for alias_type, value in values %}{% if value != '' %} {{alias_type}} {{value}}{% endif %}{% endfor %}{% endif %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index 27c4b9c4..d07d758f 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -83,8 +83,8 @@
- 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 %}{% 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 %}{% 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 %}{% 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 %}{% 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 }} @@ -112,57 +112,59 @@
3
-- THE FOLLOWING PARTIES APPROVE THE FORM OF THIS ORDER AND CONSENT TO EACH OF THE ORDERS, IF ANY, THAT ARE INDICATED ABOVE AS BEING BY CONSENT: -
+ {% endcomment %} -+ THE FOLLOWING PARTIES APPROVE THE FORM OF THIS ORDER AND CONSENT TO EACH OF THE ORDERS, IF ANY, THAT ARE INDICATED ABOVE AS BEING BY CONSENT: +
-| - | - | - |
|
- Signature of -- Claimant 1 lawyer for Claimant 1 - - |
- - |
- Signature of -- Claimant 2 lawyer for Claimant 2 - - |
-
| - | - | By the Court. | -
| - | - | |
-
| - | - | Registrar | -
| + | + | + |
|
+ Signature of ++ Claimant 1 lawyer for Claimant 1 + + |
+ + |
+ Signature of ++ Claimant 2 lawyer for Claimant 2 + + |
+
| + | + | By the Court. | +
| + | + | |
+
| + | + | Registrar | +