Browse Source

DIV-480 - More fixes to form 52

pull/160/head
Mike Olund 8 years ago
parent
commit
7f88926c9c
2 changed files with 53 additions and 59 deletions
  1. +1
    -9
      edivorce/apps/core/templates/partials/name_with_alias.html
  2. +52
    -50
      edivorce/apps/core/templates/pdf/form52.html

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

@ -1,10 +1,2 @@
{% load input_field %} {% load input_field %}
<span class="{{class_name}}">
{{ 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 %}
</span>
<span class="{{class_name}}">{{ 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 %}</span>

+ 52
- 50
edivorce/apps/core/templates/pdf/form52.html View File

@ -83,8 +83,8 @@
</p> </p>
<p class="schIndent1"> <p class="schIndent1">
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"></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"></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"></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"></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 %} {% 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}}; {{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 }} {% if responses.where_were_you_married_country == 'Other' %} {{ responses.where_were_you_married_other_country }}
@ -112,57 +112,59 @@
<p class="schIndent1"> <p class="schIndent1">
3 <span class="form-entry not-complete">&nbsp;</span> 3 <span class="form-entry not-complete">&nbsp;</span>
</p> </p>
<p class="force-break">
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:
</p>
{% endcomment %} {% endcomment %}
<br><br>
<div class="avoid-break">
<p>
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:
</p>
<table class="table sig-table">
<tbody>
<tr>
<td class="sig-col4 underline">&nbsp;</td>
<td style="width:10px">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;</td>
</tr>
<tr>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 1 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 1<span
class="form-entry not-complete"></span>
</p>
</td>
<td>&nbsp;</td>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 2 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 2<span
class="form-entry not-complete"></span>
</p>
</td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">By the Court.</td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;<br><br></td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">Registrar</td>
</tr>
</tbody>
</table>
<small>Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce</small>
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td class="sig-col4 underline">&nbsp;</td>
<td style="width:10px">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;</td>
</tr>
<tr>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 1 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 1
</p>
</td>
<td>&nbsp;</td>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 2 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 2
</p>
</td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">By the Court.</td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;<br><br></td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">Registrar</td>
</tr>
</tbody>
</table>
<small>Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce</small>
</div>
</div> </div>
</body> </body>

Loading…
Cancel
Save