From 4abc205e5e4bdf51e249a94a47744835ee98b09c Mon Sep 17 00:00:00 2001 From: Foley Lynn Date: Fri, 24 Feb 2017 11:14:01 -0800 Subject: [PATCH] Reverted to full fontawesome package to fix weasyprint incompatability --- edivorce/apps/core/static/css/weasyprint.css | 31 -------- edivorce/apps/core/templates/pdf/form1.html | 79 ++++++++++---------- edivorce/apps/core/templates/pdf/form35.html | 16 ++-- edivorce/apps/core/templates/pdf/form52.html | 4 +- 4 files changed, 50 insertions(+), 80 deletions(-) diff --git a/edivorce/apps/core/static/css/weasyprint.css b/edivorce/apps/core/static/css/weasyprint.css index aaeddaa9..b5a535c9 100644 --- a/edivorce/apps/core/static/css/weasyprint.css +++ b/edivorce/apps/core/static/css/weasyprint.css @@ -1,34 +1,3 @@ -/*** Slimmed down Font-Awesome icons, thanks to http://fontello.com ***/ -@font-face { - font-family: 'fa-slim'; - src: url('../fonts/fa-slim.eot?98608185'); - src: url('../fonts/fa-slim.eot?98608185#iefix') format('embedded-opentype'), - url('../fonts/fa-slim.woff?98608185') format('woff'), - url('../fonts/fa-slim.ttf?98608185') format('truetype'), - url('../fonts/fa-slim.svg?98608185#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} - -.fa { - font-family: "fa-slim"; - font-style: normal; - font-weight: normal; - speak: none; - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - font-variant: normal; - text-transform: none; - line-height: 1em; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -/*** end font awesome ***/ - @media screen { .print-wrapper { font-size: 15px; diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index 2b3d1cda..a9e12726 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -12,6 +12,7 @@ + @@ -48,23 +49,23 @@ Claimant 1 and Claimant 2: - {% else %} icon-check-empty"> {% endif %} began to live together in a marriage-like relationship on [dd/mm/yyyy] + {% else %} fa-square-o" aria-hidden="true"> {% endif %} began to live together in a marriage-like relationship on [dd/mm/yyyy] {% if responses.when_were_you_live_married_like %} {{ responses.when_were_you_live_married_like }} {% else %}   {% endif %} - {% else %} icon-check-empty"> {% endif %} were married on [dd/mm/yyyy] + {% else %} fa-square-o" aria-hidden="true"> {% endif %} were married on [dd/mm/yyyy] {% if responses.when_were_you_married %} {{ responses.when_were_you_married }} {% else %}   {% endif %} - {% else %} icon-check-empty"> {% endif %} separated on + {% else %} fa-square-o" aria-hidden="true"> {% endif %} separated on {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mmm/yyyy]{% endif %} - were divorced from each other by order made on [dd/mm/yyyy] + were divorced from each other by order made on [dd/mm/yyyy]   - were never married + were never married @@ -75,7 +76,7 @@ - + @@ -114,14 +115,14 @@ @@ -140,16 +141,16 @@ - + - + - + @@ -159,12 +160,12 @@ - - +
Claimant 1 and Claimant 2 are asking for a divorce order. Claimant 1 and Claimant 2 are asking for a divorce order.
A Personal information:
Marital status immediately before marriage: -

{% else %} icon-check-empty"> {% endif %} never married

-

{% else %} icon-check-empty"> {% endif %} divorced

-

{% else %} icon-check-empty"> {% endif %} widowed

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} never married

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} divorced

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} widowed

 -

{% else %} icon-check-empty"> {% endif %} never married

-

{% else %} icon-check-empty"> {% endif %} divorced

-

{% else %} icon-check-empty"> {% endif %} widowed

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} never married

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} divorced

+

{% else %} fa-square-o" aria-hidden="true"> {% endif %} widowed
B Grounds for claim for divorce:
[If divorce is claimed as a result of having lived separate and apart, complete paragraph (i).]
(i) {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have lived separate and apart since {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mm/yyyy]{% endif %} (i) {% else %} fa-square-o" aria-hidden="true"> {% endif %} Claimant 1 and Claimant 2 have lived separate and apart since {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mm/yyyy]{% endif %}
AND
[Check whichever one of the following boxes is correct and complete any required information.]
{% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have not lived together since then {% else %} fa-square-o" aria-hidden="true"> {% endif %} Claimant 1 and Claimant 2 have not lived together since then
{% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have lived together again during the following period(s), in an unsuccessful attempt to reconcile: [give dates of period(s)] {% else %} fa-square-o" aria-hidden="true"> {% endif %} Claimant 1 and Claimant 2 have lived together again during the following period(s), in an unsuccessful attempt to reconcile: [give dates of period(s)]

From:  

From:  

From:  

 [If divorce is claimed on grounds other than having lived separate and apart, complete paragraph (ii) by checking both of the following boxes and completing the required information.]
(ii) Other grounds , under section 8 (2) (b) of the Divorce Act (Canada):   + (ii) Other grounds , under section 8 (2) (b) of the Divorce Act (Canada):  

[state the grounds]
AND
There has been no condonation of any act relied on under section 8 (2) (b) of the Divorce Act (Canada) as a ground for divorce.		 AND
There has been no condonation of any act relied on under section 8 (2) (b) of the Divorce Act (Canada) as a ground for divorce.
@@ -174,10 +175,10 @@ C Claimant 1 and Claimant 2 confirm that: [Check both of the following boxes.] - {% else %} icon-check-empty"> {% endif %} There is no possibility of reconciliation. + {% else %} fa-square-o" aria-hidden="true"> {% endif %} There is no possibility of reconciliation. - {% else %} icon-check-empty"> {% endif %} There has been no collusion, as defined in section 11 (4) of the Divorce Act (Canada), in relation to this claim for divorce. + {% else %} fa-square-o" aria-hidden="true"> {% endif %} There has been no collusion, as defined in section 11 (4) of the Divorce Act (Canada), in relation to this claim for divorce. @@ -187,17 +188,17 @@ D Proof of marriage:
[Check whichever one of the following boxes is correct and complete any required information.] - {% else %} icon-check-empty"> {% endif %} A certificate of marriage or registration of marriage has been filed. + {% else %} fa-square-o" aria-hidden="true"> {% endif %} A certificate of marriage or registration of marriage has been filed. - {% else %} icon-check-empty"> {% endif %} A certificate of marriage or registration of marriage is not being filed with this notice of joint family claim because + {% else %} fa-square-o" aria-hidden="true"> {% endif %} A certificate of marriage or registration of marriage is not being filed with this notice of joint family claim because {% if responses.provide_certificate_later_reason and responses.original_marriage_certificate == 'NO' and responses.provide_certificate_later == 'YES' %} {{ responses.provide_certificate_later_reason }} {% else %}   {% endif %}

[state the reasons]

and the certificate will be filed before this claim is set down for trial or an application is made for an order of divorce.

- {% else %} icon-check-empty"> {% endif %} It is impossible to obtain a certificate of marriage or registration of marriage because: + {% else %} fa-square-o" aria-hidden="true"> {% endif %} It is impossible to obtain a certificate of marriage or registration of marriage because:  {% if responses.not_provide_certificate_reason and responses.original_marriage_certificate == 'NO' and not responses.provide_certificate_later == 'YES' %} {{ responses.not_provide_certificate_reason }} {% else %}   {% endif %}

[state the reasons]

@@ -214,13 +215,13 @@ Children: [Check whichever one of the following boxes is correct and complete any required information.] - {% else %} icon-check-empty"> {% endif %} There are no children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act . + {% else %} fa-square-o" aria-hidden="true"> {% endif %} There are no children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act . [OR] - {% else %} icon-check-empty"> {% endif %} There are children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act , and those children are: + {% else %} fa-square-o" aria-hidden="true"> {% endif %} There are children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act , and those children are: @@ -261,7 +262,7 @@ - - - + - +
A Claimant 1 and Claimant 2 are asking for the following order respecting arrangements for parenting or contact:   + A Claimant 1 and Claimant 2 are asking for the following order respecting arrangements for parenting or contact:  

[set out terms of proposed order] @@ -269,17 +270,17 @@

B Claimant 1 and Claimant 2 are asking for an order for child support as follows:   + B Claimant 1 and Claimant 2 are asking for an order for child support as follows:  

[set out terms of proposed order]

C Claimant 1 and Claimant 2 are asking for the orders under paragraphs A and B of this section under the following statute(s): [Check one or both of the following boxes, as applicable.] C Claimant 1 and Claimant 2 are asking for the orders under paragraphs A and B of this section under the following statute(s): [Check one or both of the following boxes, as applicable.]
the Divorce Act (Canada) the Family Law Act the Divorce Act (Canada) the Family Law Act
@@ -290,7 +291,7 @@ - - + - +
{% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support as follows: + {% else %} fa-square-o" aria-hidden="true"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support as follows: {% if responses.spouse_support_details %} {{responses.spouse_support_details }} {% else %}   {% endif %}

[set out terms of proposed order] @@ -298,11 +299,11 @@

{% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support under [Check one or both of the following boxes, as applicable.] {% else %} fa-square-o" aria-hidden="true"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support under [Check one or both of the following boxes, as applicable.]
{% else %} icon-check-empty"> {% endif %} the Divorce Act (Canada) - {% else %} icon-check-empty"> {% endif %} the Family Law Act {% else %} fa-square-o" aria-hidden="true"> {% endif %} the Divorce Act (Canada) + {% else %} fa-square-o" aria-hidden="true"> {% endif %} the Family Law Act
@@ -316,13 +317,13 @@ A Property claims under the Family Law Act - Claimant 1 and Claimant 2 are asking for an order for:
[Check whichever one of the following boxes is correct and complete any required information in relation to family property and family debt, as those terms are defined in the Family Law Act.] + Claimant 1 and Claimant 2 are asking for an order for:
[Check whichever one of the following boxes is correct and complete any required information in relation to family property and family debt, as those terms are defined in the Family Law Act.] - {% else %} icon-check-empty"> {% endif %} an equal division of family property and family debt + {% else %} fa-square-o" aria-hidden="true"> {% endif %} an equal division of family property and family debt - {% else %} icon-check-empty"> {% endif %} an unequal division of family property and family debt as follows:   + {% else %} fa-square-o" aria-hidden="true"> {% endif %} an unequal division of family property and family debt as follows:  

[set out details of proposed division]

@@ -332,7 +333,7 @@ B Other property claims - Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows: + Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows:   @@ -344,7 +345,7 @@ - - +
Claimant 1 and Claimant 2 are asking for an order in the following terms:   + Claimant 1 and Claimant 2 are asking for an order in the following terms:  

[set out terms of proposed order]

@@ -388,7 +389,7 @@ Signature of

- Claimant 1 lawyer for Claimant 1 + Claimant 1 lawyer for Claimant 1

 
[ @@ -408,7 +409,7 @@ Signature of

- Claimant 2 lawyer for Claimant 2 + Claimant 2 lawyer for Claimant 2

 
[ diff --git a/edivorce/apps/core/templates/pdf/form35.html b/edivorce/apps/core/templates/pdf/form35.html index c30252f3..961b7c10 100644 --- a/edivorce/apps/core/templates/pdf/form35.html +++ b/edivorce/apps/core/templates/pdf/form35.html @@ -58,22 +58,22 @@ [Check all of the following boxes and file the following with this requisition.]

- draft of the order sought; + draft of the order sought;

- proof that the case is an undefended family law case; + proof that the case is an undefended family law case;

- certificate of the registrar in Form F36; + certificate of the registrar in Form F36;

- filing fee. + filing fee.

[Check the following box and file the following with this requisition unless a response to family claim or response to counterclaim has been filed or unless this case is a joint family law case within the meaning of Rule 2-2 of the Supreme Court Family Rules.]

- proof of service of the notice of family claim or counterclaim, as the case may be. + proof of service of the notice of family claim or counterclaim, as the case may be.

[Check the following box and file the following document with this requisition if @@ -87,13 +87,13 @@ (b) the family law case includes a claim for child support.]

- Child Support Affidavit in Form F37. + Child Support Affidavit in Form F37.

[Check the following box and file the following document with this requisition if a divorce is sought.]

- affidavit in Form F38. + affidavit in Form F38.

@@ -101,7 +101,7 @@
Date: [dd/mmm/yyyy]  
Signature of filing party lawyer for filing party(ies) 		 
Signature of filing party lawyer for filing party(ies)
diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index cf030794..89f84185 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -114,7 +114,7 @@

-  
Signature of
party lawyer for [name of party(ies)] +  
Signature of
party lawyer for [name of party(ies)]

[type or print name] @@ -122,7 +122,7 @@

-  
Signature of
party lawyer for [name of party(ies)] +  
Signature of
party lawyer for [name of party(ies)]

[type or print name]