From 80d6eec7df0b3fb5886f556ab0dd43ca7a0e079c Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Mon, 20 Mar 2017 13:30:06 -0700
Subject: [PATCH] Fixed DIV-236 and DIV-347: remove back to dashboard for
 overview and typo

---
 edivorce/apps/core/templates/base.html                 | 5 +++--
 edivorce/apps/core/templates/question/02_claimant.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html
index c1ce6c52..35c7dc18 100644
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@@ -67,8 +67,9 @@
                 <div class="container-fluid">
                     <div class="row">
                         <div class="col-md-5">
-                            {% if request.bceid_user.is_authenticated %}
-                                <div class="mid_banner-dash"><a href="{% url 'overview' %}">
+                            {% url 'overview' as overview_url %}
+                            {% if request.bceid_user.is_authenticated and request.path != overview_url %}
+                                <div class="mid_banner-dash"><a href="{{overview_url}}">
                                     <i class="fa fa-arrow-circle-o-left" aria-hidden="true"></i>Back to Dashboard</a>
                                 </div>
                             {% endif %}
diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index 73454239..cada7b42 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -64,7 +64,7 @@
                 <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="<b>Court Orders</b><br /><br />A record of a decision made by a judge or master that
                                        tells you or your spouse what you must do (or not do).  For example: The court has made an order that
                                        your spouse must pay you $250 on a monthly basis to help pay off your combined debt">court order(s)<i class="fa fa-question-circle" aria-hidden="true"></i></span> . Any names you provide will be used on the final court order for the purposes of executing
-                or following up on the orders. For example, if you and your spouse will be dividing property, land titles will likely want to see the name in the court order match what is on the title. This wold also apply to pensions, RRSPs, etc. The
+                or following up on the orders. For example, if you and your spouse will be dividing property, the Land Titles will likely want to see the name in the court order match what is on the title. This would also apply to pensions, RRSPs, etc. The
                 order for divorce is also used to create linkages between names.</p>
             <p>You may want to take a look at the names that you have used on any legal and business agreements/contracts to ensure you are providing the courts with all variations of your name.</p>
         </div>