From 91c777c4f57fe40d8eb9f5b087e9a3c52ccc6d4f Mon Sep 17 00:00:00 2001 From: Charles Shin Date: Thu, 2 Mar 2017 19:15:23 -0800 Subject: [PATCH] Updated progress indicator links and minor updates --- .../core/templates/partials/alias_field.html | 2 +- .../partials/reconciliation_period.html | 2 +- edivorce/apps/core/templates/pdf/form1.html | 5 +- edivorce/apps/core/templates/progress.html | 79 +++++++------ .../core/templates/question/01_orders.html | 10 +- .../templates/question/05_separation.html | 105 ++++++++++++++++++ 6 files changed, 158 insertions(+), 45 deletions(-) create mode 100644 edivorce/apps/core/templates/question/05_separation.html diff --git a/edivorce/apps/core/templates/partials/alias_field.html b/edivorce/apps/core/templates/partials/alias_field.html index 01a28dd3..2edad018 100644 --- a/edivorce/apps/core/templates/partials/alias_field.html +++ b/edivorce/apps/core/templates/partials/alias_field.html @@ -7,5 +7,5 @@ {% input_field type="text" name=name value=value multiple="true" class="form-block input-wide response-textbox" %} - + \ No newline at end of file diff --git a/edivorce/apps/core/templates/partials/reconciliation_period.html b/edivorce/apps/core/templates/partials/reconciliation_period.html index 57f5002f..cc498be7 100644 --- a/edivorce/apps/core/templates/partials/reconciliation_period.html +++ b/edivorce/apps/core/templates/partials/reconciliation_period.html @@ -2,5 +2,5 @@

- +
\ No newline at end of file diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index b6c2764a..fb51fbd4 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -305,7 +305,8 @@ {% else %} fa-square-o" aria-hidden="true"> {% endif %} an equal division of family property and family debt - {% else %} fa-square-o" aria-hidden="true"> {% 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: + {% if responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt }} {% else %} {% endif %} @@ -313,7 +314,7 @@ 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: -   + {% if responses.other_property_claims %} {{ responses.other_property_claims }} {% else %} {% endif %} diff --git a/edivorce/apps/core/templates/progress.html b/edivorce/apps/core/templates/progress.html index b6a85d9e..c28827d8 100644 --- a/edivorce/apps/core/templates/progress.html +++ b/edivorce/apps/core/templates/progress.html @@ -1,59 +1,64 @@

Questionnaire

- + Qualifying Questions + - + Step 1
What Are You Asking For? - + {% if which_orders == 'Started' %} {% endif %} - - + + Step 2
Your information - + {% if your_information == 'Started' %} {% endif %} - - - Step 3
Your information + + + Step 3
Your spouse + {% if your_spouse == 'Started' %} {% endif %} - - - Step 4
Your information - - - - Step 5
Your information + + + Step 4
Your marriage + {% if your_marriage == 'Started' %} {% endif %} - - - Step 6
Your information + + + Step 5
Your separation + {% if your_separation == 'Started' %} {% endif %} - - - Step 7
Your information + + + Step 6
Spousal support + {% if spousal_support == 'Started' %} {% endif %} - - - Step 8
Your information + + + Step 7
Property and debt + {% if property_and_debt == 'Started' %} {% endif %} - - - Step 9
Your information + + + Step 8
Other orders + {% if other_orders == 'Started' %} {% endif %} - - - Step 10
Your information + + + Step 9
Other questions + {% if other_questions == 'Started' %} {% endif %} - - - Step 11
Your information + + + Step 10
Filing locations + {% if filing_locations == 'Started' %} {% endif %} - - - Step 12
Your information + + + Step 11
Review diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html index 31c1955c..fd1440bb 100644 --- a/edivorce/apps/core/templates/question/01_orders.html +++ b/edivorce/apps/core/templates/question/01_orders.html @@ -89,10 +89,12 @@

Time limit to apply for court order

If you were married, you must apply to divide property within two years after you get an order for divorce.

If you were living in a marriage-like relationship for at least two years, you must apply within two years of the date you separated.

-
-

(Dev note: Display this alert message if the user has indicated that they have lived in a marriage like relationship)

-

In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.

-
+ + {% if married_marriage_like == "Living together in a marriage like relationship" %} +
+

In order to be considered a spouse for the purpose of dividing property or debt you must have lived together in a marriage-like relationship for at least two years.

+
+ {% endif %}

For more information, please refer to the following fact sheets on the Legal Services Society website: