From 372ab8229fb2b16ee9401d6b2ca7d683cd241abf Mon Sep 17 00:00:00 2001 From: Foley Lynn Date: Mon, 20 Mar 2017 11:33:09 -0700 Subject: [PATCH] Resolving conflict on overview page --- .../apps/core/templates/prequalification/step_02.html | 10 +++++----- .../apps/core/templates/prequalification/step_05.html | 4 ++-- edivorce/apps/core/templates/question/04_marriage.html | 2 +- edivorce/apps/core/templates/question/06_support.html | 8 ++++---- edivorce/apps/core/templates/question/07_property.html | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/edivorce/apps/core/templates/prequalification/step_02.html b/edivorce/apps/core/templates/prequalification/step_02.html index 39e22130..c7e055fb 100644 --- a/edivorce/apps/core/templates/prequalification/step_02.html +++ b/edivorce/apps/core/templates/prequalification/step_02.html @@ -86,9 +86,9 @@ {% endblock %} -{% block sidebar %} - -{% endblock %} -{% block sidebarText %} - +{% block sidebarNav %} + {% endblock %} +{% block sidebar %} + +{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html index 2e3c9e0a..248b3c07 100644 --- a/edivorce/apps/core/templates/prequalification/step_05.html +++ b/edivorce/apps/core/templates/prequalification/step_05.html @@ -171,12 +171,12 @@

An 11½-minute video excerpted from "Helping Clients Prepare Divorce Documents That Don't Bounce," a workshop by lawyer J.P. Boyd at the October 2006 LSS Provincial Training Conference for Legal Advocates.

-

Certified Copy of a Marriage Registration

+

Certified Copy of a Marriage Registration

-

Certified Electronic Extract of a Marriage Registration

+

Certified Electronic Extract of a Marriage Registration

{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/question/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html index 18b43f47..ac272ff3 100644 --- a/edivorce/apps/core/templates/question/04_marriage.html +++ b/edivorce/apps/core/templates/question/04_marriage.html @@ -143,7 +143,7 @@ {% block sidebarText %}
-

The Laws about People in Relationships

+

The Laws about People in Relationships

The two laws in B.C. that you may need to know about are the provincial Family Law Act and the federal Divorce act. The Family Law Act applies to all married and unmarried spouses. The Divorce Act only applies to married spouses.

diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html index 255c1b16..62b67bbe 100644 --- a/edivorce/apps/core/templates/question/06_support.html +++ b/edivorce/apps/core/templates/question/06_support.html @@ -163,7 +163,7 @@ {% block sidebarText %}
-

How is spousal support decided?

+

How is spousal support decided?

Spousal Support Advisory Guidelines
@@ -174,13 +174,13 @@ spousal support.

-

How is spousal support enforced?

+

How is spousal support enforced?

Many couples come to an agreement about spousal support without going to court. Agreements that are filed with the court can be enforced — they have the same force as a court order. They can also be set aside (cancelled) if the situation changes.

If you're trying to negotiate an agreement, consider the factors listed under When should spousal support be paid? (above) and the amount of support listed in the Spousal Support Advisory Guidelines. Get advice from a lawyer about what is fair.

-

What financial information you will need to provide

+

What financial information you will need to provide

When one spouse applies for spousal support, both spouses will have to provide financial information to each other and to the court. You will have to share detailed documents showing your income, assets, and debt. Both Supreme and Provincial Court have rules setting out exactly what needs to be shared and when.

Be aware that the law requires you to provide "full and true" information to the other party, whether you're negotiating an agreement or making or responding to a court application. There can be serious consequences if you don't. There may be financial penalties, and the court could make changes to your agreement or order.

In the Supreme Court, both parties must fill out a @@ -190,7 +190,7 @@

There are two types of laws (statutory or statute-based and common-law or case-based).

-

Statute-based law

+

Statute-based law

{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html index 0a6c2f39..38724bea 100644 --- a/edivorce/apps/core/templates/question/07_property.html +++ b/edivorce/apps/core/templates/question/07_property.html @@ -157,7 +157,7 @@ {% block sidebarText %}
-

Where to Find Out More About Dealing with Property and Debt

+

Where to Find Out More About Dealing with Property and Debt

For more information about dealing with Property and Debt, please visit:

-

Excluded property includes:

+

Excluded property includes:

  • any property that each spouse owned before the relationship started
  • gifts and inheritances given to only one spouse during the relationship;