From 7de854e739daa4c3b020d5a28ceb13cad79479ca Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 7 Mar 2017 11:56:51 -0800
Subject: [PATCH] Fixed DIV-133 and DIV-144

---
 edivorce/apps/core/static/js/controllers.js              | 9 +++++++++
 .../apps/core/templates/prequalification/step_03.html    | 6 +++---
 .../apps/core/templates/prequalification/step_05.html    | 2 +-
 edivorce/apps/core/templates/question/11_review.html     | 4 ++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/edivorce/apps/core/static/js/controllers.js b/edivorce/apps/core/static/js/controllers.js
index f62c63e6..f825cede 100644
--- a/edivorce/apps/core/static/js/controllers.js
+++ b/edivorce/apps/core/static/js/controllers.js
@@ -20,6 +20,15 @@ var reveal = function(el) {
             $(related_id).show();
         }
     }
+
+    if (el.prop('name') == "provide_certificate_later" || el.prop('name') == "original_marriage_certificate"){
+        if ($('input[name=provide_certificate_later]:checked').val() == 'NO' && $('input[name=original_marriage_certificate]:checked').val() == 'NO') {
+            $('#is_certificate_in_english').hide();
+        }
+        else {
+            $('#is_certificate_in_english').show();
+        }
+    }
 };
 
 // Controls Checkbox behaviour for children_financial_support
diff --git a/edivorce/apps/core/templates/prequalification/step_03.html b/edivorce/apps/core/templates/prequalification/step_03.html
index fef2f6a4..3d17e1e9 100644
--- a/edivorce/apps/core/templates/prequalification/step_03.html
+++ b/edivorce/apps/core/templates/prequalification/step_03.html
@@ -11,7 +11,7 @@
     <h3>When did you and your spouse separate (legally this is referred to as living separate and apart)
         <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>Living separate and apart</b><br /><br /><p>You or your spouse have decided to end the marriage. In general one separates by moving out.
-       However it is possible to be separated but still live under the same roof as long as either you our your spouse,
+       However, it is possible to be separated but still live under the same roof as long as either you our your spouse
        have clearly communicated  your intention for a permanent separation (and are starting to act upon it).</p>
         <p>This could mean:</p><ul><li>You're living in separate rooms</li><li>You're sleeping in separate beds</li><li>There's no sexual relationship</li>" aria-hidden="true"></i>?
     </h3>
@@ -58,8 +58,8 @@
 
 <div class="information-message bg-danger" id="separation_date_alert" hidden>
     <p>
-        The date you entered indicates you've been separated for less than one year You can use this online tool to start working
-        on the divorce forms, however you will not be able to file your documents at the registry until
+        The date you entered indicates you've been separated for less than one year. You can use this online tool to start working
+        on the divorce forms, however, you will not be able to file your documents at the registry until
         the one year separation period has passed.
     </p>
     <p>Under the Divorce Act, a divorce may be granted on one of three grounds:</p>
diff --git a/edivorce/apps/core/templates/prequalification/step_05.html b/edivorce/apps/core/templates/prequalification/step_05.html
index 6e6cfa6e..7b9fb62f 100644
--- a/edivorce/apps/core/templates/prequalification/step_05.html
+++ b/edivorce/apps/core/templates/prequalification/step_05.html
@@ -126,7 +126,7 @@
 </div>
 
 
-<div class="question-well">
+<div class="question-well" id="is_certificate_in_english">
     <h3>Is your marriage certificate or registration of marriage in English?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
diff --git a/edivorce/apps/core/templates/question/11_review.html b/edivorce/apps/core/templates/question/11_review.html
index 73318e60..32a6c146 100644
--- a/edivorce/apps/core/templates/question/11_review.html
+++ b/edivorce/apps/core/templates/question/11_review.html
@@ -62,3 +62,7 @@
 {% block formbuttons %}
 <!-- no formbuttons -->
 {% endblock %}
+
+{% block sidebar %}
+<!-- no sidebar -->
+{% endblock %}