diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index 21fc0c08..cfde0aea 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -87,49 +87,55 @@ - -
-
- $40 per affidavit (if sworn at a court registry) -

- Since your divorce won't require an appearance before a judge, you must fill out and swear/affirm an Affidavit Desk Order Divorce Form (F38). This document sets out the facts of your marriage and separation. -

-

- Please follows these steps to ensure your affidavit does not get rejected: -

-
-
- -

- Affidavit Desk Order Divorce Form (F38) - signing separately -

-

- Claimant 1 -

- Preview | Print -

- Claimant 2 -

- Preview | Print + {% if married_marriage_like == 'Legally married' %} + + +
+
+ $40 per affidavit (if sworn at a court registry) +

+ Since your divorce won't require an appearance before a judge, you must fill out and swear/affirm an Affidavit Desk Order Divorce Form (F38). This document sets out the facts of your marriage and separation. +

+

+ Please follows these steps to ensure your affidavit does not get rejected: +

+
+
+ +

+ Affidavit Desk Order Divorce Form (F38) - signing separately +

+

+ Claimant 1 +

+ Preview | Print +

+ Claimant 2 +

+ Preview | Print + + {% endif %} +{% if married_marriage_like == 'Legally married' %}

Signing Your Affidavit Forms

- The affidavit will need to be sworn or affirmed. You can either jointly prepare one Affidavit — Desk Order Divorce form (F38) or complete two versions and swear/affirm them separately. + The affidavit will need to be sworn or affirmed. You can either jointly prepare one Affidavit — Desk + Order Divorce form (F38) or complete two versions and swear/affirm them separately.

@@ -140,15 +146,21 @@
The affidavit can be signed and sworn/affirmed by both of you when at the registry. -

Either you or your spouse can sign and swear/affirm ahead of time, but the 2nd party will need to sign when at the registry.

-

If one of you decides to swear/affirm ahead of time, at the time of filing the application, both affidavits must have been notarized within 30 days prior to filing.

+

Either you or your spouse can sign and swear/affirm ahead of time, but the 2nd party will need to + sign when at the registry.

+

If one of you decides to swear/affirm ahead of time, at the time of filing the application, both + affidavits must have been notarized within 30 days prior to filing.

+{% endif %}
-

Other Documents to Take to the Court Registry

+

+ {% if married_marriage_like == 'Legally married' %}Other{% endif %} + Documents to Take to the Court Registry +

-

If you have other court orders or a written separation agreement, they should also be attached to your Affidavit — Desk Order Divorce Form (F38). Note that these agreements or orders must not contradict what's in your divorce application.

+

+ If you have other court orders or a written separation agreement, they should also be + attached{% if married_marriage_like == 'Legally married' %} to your Affidavit — Desk + Order Divorce Form (F38){% endif %}. Note that these agreements or orders must not + contradict what's in your divorce application. +

{% endblock %} diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index 1e8cd154..8d8d58a8 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -141,8 +141,11 @@ def dashboard_nav(request, nav_step): """ Dashboard: All other pages """ + user = __get_bceid_user(request) + responses_dict = get_responses_from_db(user) + responses_dict['active_page'] = nav_step template_name = 'dashboard/%s.html' % nav_step - return render(request, template_name=template_name, context={'active_page': nav_step}) + return render(request, template_name=template_name, context=responses_dict) @bceid_required