From 73b3255878e6867d4c0c3fa96106613675002b96 Mon Sep 17 00:00:00 2001 From: ariannedee Date: Thu, 5 Nov 2020 17:20:02 -0800 Subject: [PATCH] DIV-1242: Move form tooltips --- .../templates/dashboard/final_filing.html | 56 +++++++++---------- .../templates/dashboard/initial_filing.html | 14 ++--- .../core/templates/dashboard/print_form.html | 55 ++---------------- .../dashboard/sign_file_options.html | 22 +++----- .../core/templates/dashboard/swear_forms.html | 4 +- .../{ => forms}/affidavit_of_translation.html | 0 .../agreement_to_annual_income_9.html | 0 .../certificate_of_pleading_36.html | 0 .../child_support_37.html} | 0 .../desk_order_38.html} | 0 .../{ => forms}/draft_final_order_52.html | 0 .../identification_of_applicant.html | 0 .../joint_divorce_proceedings.html | 0 .../{ => forms}/joint_family_claim_1.html | 2 +- .../{ => forms}/proof_of_marriage.html | 0 .../forms/registration_of_divorce.html | 17 ++++++ .../{ => forms}/requisition_form_35.html | 0 .../{ => forms}/separation_agreement.html | 0 edivorce/apps/core/templates/success.html | 2 +- 19 files changed, 69 insertions(+), 103 deletions(-) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/affidavit_of_translation.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/agreement_to_annual_income_9.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/certificate_of_pleading_36.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{form_child_support_37.html => forms/child_support_37.html} (100%) rename edivorce/apps/core/templates/partials/tooltips/{form_desk_order_38.html => forms/desk_order_38.html} (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/draft_final_order_52.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/identification_of_applicant.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/joint_divorce_proceedings.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/joint_family_claim_1.html (83%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/proof_of_marriage.html (100%) create mode 100644 edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/requisition_form_35.html (100%) rename edivorce/apps/core/templates/partials/tooltips/{ => forms}/separation_agreement.html (100%) diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html index 042fbed1..3d11ef96 100644 --- a/edivorce/apps/core/templates/dashboard/final_filing.html +++ b/edivorce/apps/core/templates/dashboard/final_filing.html @@ -104,10 +104,10 @@

{% endif %} @@ -127,12 +127,12 @@ in the following order:

@@ -195,12 +195,12 @@ in the following order:

@@ -265,11 +265,11 @@

diff --git a/edivorce/apps/core/templates/dashboard/initial_filing.html b/edivorce/apps/core/templates/dashboard/initial_filing.html index ef2bbb6e..1c39c398 100644 --- a/edivorce/apps/core/templates/dashboard/initial_filing.html +++ b/edivorce/apps/core/templates/dashboard/initial_filing.html @@ -59,20 +59,20 @@

{% if how_to_sign == 'Together' and signing_location == 'In-person' %}
-

The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be +

The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be automatically filed for you.

{% elif how_to_sign == 'Separately' and signing_location_you == 'In-person' %}
-

The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be +

The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be automatically filed for you.

{% else %}

The following forms will be automatically filed for you:

The following forms will be submitted for you but @@ -80,8 +80,8 @@ before filing (see next step for details)

{% endif %}
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index b5612cbe..dbc42508 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -455,53 +455,19 @@
    {% if original_marriage_certificate == 'YES' %}
  • - Proof of marriage. + {% include "partials/tooltips/forms/proof_of_marriage.html" %} Original or certified Marriage Certificate or Registration of Divorce. If not in English, also provide - Affidavit of Translation - and English translation. + {% include "partials/tooltips/forms/affidavit_of_translation.html" with text="Affidavit of Translation"%} + and the English translation.
    • {% endif %}
  • - Completed Registration of Divorce form (Federal) + {% include "partials/tooltips/forms/registration_of_divorce.html" %}
    • {% if derived.wants_other_orders %} {% if name_change_you == 'YES' or name_change_spouse == 'YES' %}
  • - Completed Identification of Applicant (VSA 512) + {% include "partials/tooltips/forms/identification_of_applicant.html" with text="Completed Identification of Applicant (VSA 512)" %} for anyone requesting a name change
      {% if name_change_you == 'YES' %} @@ -514,16 +480,7 @@ {% endif %} {% if derived.has_children_of_marriage %}
    • - Completed Agreement as to Annual Income (F9) + {% include "partials/tooltips/forms/agreement_to_annual_income_9.html" with text="Completed Agreement as to Annual Income (F9)" %}
      • {% endif %}
    diff --git a/edivorce/apps/core/templates/dashboard/sign_file_options.html b/edivorce/apps/core/templates/dashboard/sign_file_options.html index 515c0b7a..86a40a64 100644 --- a/edivorce/apps/core/templates/dashboard/sign_file_options.html +++ b/edivorce/apps/core/templates/dashboard/sign_file_options.html @@ -30,15 +30,15 @@

    You must both go together to the registry or to a commissioner for taking affidavits to swear/affirm and sign the affidavit(s). This option costs less (less filing fees) and is typically faster and easier for both of you.

    -

    There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}. +

    There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}. You must do it:

      -
    • At the same time as you are filing your {% include "partials/tooltips/joint_family_claim_1.html" %} +
    • At the same time as you are filing your {% include "partials/tooltips/forms/joint_family_claim_1.html" %} (You can file the Notice and swear/affirm and sign your affidavit at the registry (or virtually with the registry) at the same time.)

      • OR

      -
    • After you've filed your {% include "partials/tooltips/joint_family_claim_1.html" %}. +
    • After you've filed your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}. (You can file the Notice first, and then come back into this tool or go to the registry to file your affidavit(s).)
    @@ -53,17 +53,17 @@

    You can each swear/affirm and sign your own version of the affidavit (you can go separately to the registry or a commissioner for taking affidavits to swear/affirm and sign the affidavit(s)).

    -

    There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}. +

    There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}. You must:

    • Swear/affirm and sign one person’s affidavit(s) at the same time as you are filing - your {% include "partials/tooltips/joint_family_claim_1.html" %} (You can file the + your {% include "partials/tooltips/forms/joint_family_claim_1.html" %} (You can file the Notice and swear your affidavit at the registry (or virtually with the registry) at the same time.) This would allow one party to swear/affirm and sign their affidavit(s) before the Notice has been filed.

      • OR

    • Swear/affirm and sign both parties’ affidavit(s) after you've filed - your {% include "partials/tooltips/joint_family_claim_1.html" %}. (You can file the Notice first, + your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}. (You can file the Notice first, and then come back into this tool or go to the registry to file your affidavit(s).)
    @@ -79,15 +79,7 @@
  • a printer (or a print service)
  • payment for filing fees (see More Information sidebar for more information)
  • a copy of your marriage certificate (from any jurisdiction)
    • -
  • - Registration of Divorce Proceedings form -
    • +
  • {% include "partials/tooltips/forms/joint_divorce_proceedings.html" with text="Registration of Divorce Proceedings" %} form
  • Both you and your spouse to sign some of the same documents
  • You will need to have your affidavit(s) sworn/affirmed (see above)
  • Photo ID
    • diff --git a/edivorce/apps/core/templates/dashboard/swear_forms.html b/edivorce/apps/core/templates/dashboard/swear_forms.html index a1bc5e55..6617b4a1 100644 --- a/edivorce/apps/core/templates/dashboard/swear_forms.html +++ b/edivorce/apps/core/templates/dashboard/swear_forms.html @@ -30,9 +30,9 @@

      {% if derived.has_children_of_marriage %} -
    • {% include "partials/tooltips/form_child_support_37.html" %}
      • +
    • {% include "partials/tooltips/forms/child_support_37.html" %}
      • {% endif %} -
    • {% include "partials/tooltips/form_desk_order_38.html" %}
      • +
    • {% include "partials/tooltips/forms/desk_order_38.html" %}
    {% if how_to_sign == 'Together' and signing_location == 'Virtual' %}
    diff --git a/edivorce/apps/core/templates/partials/tooltips/affidavit_of_translation.html b/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/affidavit_of_translation.html rename to edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html diff --git a/edivorce/apps/core/templates/partials/tooltips/agreement_to_annual_income_9.html b/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/agreement_to_annual_income_9.html rename to edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html diff --git a/edivorce/apps/core/templates/partials/tooltips/certificate_of_pleading_36.html b/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/certificate_of_pleading_36.html rename to edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html diff --git a/edivorce/apps/core/templates/partials/tooltips/form_child_support_37.html b/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/form_child_support_37.html rename to edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html diff --git a/edivorce/apps/core/templates/partials/tooltips/form_desk_order_38.html b/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/form_desk_order_38.html rename to edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html diff --git a/edivorce/apps/core/templates/partials/tooltips/draft_final_order_52.html b/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/draft_final_order_52.html rename to edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html diff --git a/edivorce/apps/core/templates/partials/tooltips/identification_of_applicant.html b/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/identification_of_applicant.html rename to edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html diff --git a/edivorce/apps/core/templates/partials/tooltips/joint_divorce_proceedings.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/joint_divorce_proceedings.html rename to edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html diff --git a/edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html similarity index 83% rename from edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html rename to edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html index 765b6344..5b62ad87 100644 --- a/edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html +++ b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html @@ -6,7 +6,7 @@ {% block inner %} This form starts your divorce proceeding. - It gives the court details about you and your spouse, your marriage and separation, and what you'reasking the court for. + It gives the court details about you and your spouse, your marriage and separation, and what you're asking the court for.

    - Does not require signatures when filed online. {% endblock %} diff --git a/edivorce/apps/core/templates/partials/tooltips/proof_of_marriage.html b/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/proof_of_marriage.html rename to edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html new file mode 100644 index 00000000..3ec42a2f --- /dev/null +++ b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html @@ -0,0 +1,17 @@ +{% extends "partials/tooltips/base.html" %} + +{% block title %} + Registration of Divorce form +{% endblock %} + +{% block inner %} + This form is for a central divorce registry in Ottawa. + They use the form to check to make sure there is no other divorce proceeding pending in Canada. + They also keep track of all divorces in Canada. +

    + - Does not require signatures. +{% endblock %} + +{% block label %} + Completed Registration of Divorce form (Federal) +{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/partials/tooltips/requisition_form_35.html b/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/requisition_form_35.html rename to edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html diff --git a/edivorce/apps/core/templates/partials/tooltips/separation_agreement.html b/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html similarity index 100% rename from edivorce/apps/core/templates/partials/tooltips/separation_agreement.html rename to edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html index b7561053..19dfe1da 100644 --- a/edivorce/apps/core/templates/success.html +++ b/edivorce/apps/core/templates/success.html @@ -11,7 +11,7 @@

    You will need the following documents to move forward with the divorce request:

    • Marriage certificate
      • -
    • {% include "partials/tooltips/separation_agreement.html" %} (if applicable)
      • +
    • {% include "partials/tooltips/forms/separation_agreement.html" %} (if applicable)
    • {% include "partials/tooltips/court_order.html" %} (if applicable)