Merge branch 'feature'

edivorce/apps/core/templates/pdf/form1.html

@@ -175,7 +175,8 @@
                     <td colspan="2"> <i class="fa {% if responses.no_reconciliation_possible == 'agree' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There is no possibility of reconciliation. </td>
                 </tr>
                 <tr>
-                    <td colspan="2"> <i class="fa {% if responses.no_collusion == 'No collusion' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There has been no collusion, as defined in section 11 (4) of the <em> Divorce Act </em> (Canada), in relation to this claim for divorce. </td>
+                    {% check_list source=responses.no_collusion value='No collusion' as is_no_collusion %}
+                    <td colspan="2"> <i class="fa {% if is_no_collusion %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} There has been no collusion, as defined in section 11 (4) of the <em> Divorce Act </em> (Canada), in relation to this claim for divorce. </td>
                 </tr>
             </tbody>
         </table>

edivorce/apps/core/templates/prequalification/step_01.html

@@ -28,7 +28,7 @@
                                          title="<b>MARRIAGE LIKE RELATIONSHIP</b><br /><br />The term &quot;common-law relationship&quot;
                                  is often used to refer to a marriage-like relationship that has lasted a certain length of time,
                                  usually one or two years. Used in some federal laws to refer to a marriage-like relationship of
-                                 a year or longer." aria-hidden="true"></i> (also know as common law) relationship</label>
+                                 a year or longer." aria-hidden="true"></i> (also known as common law) relationship</label>
 </div>
 
 <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="true" data-target="#collapse_lived_two_years" aria-controls="collapse_lived_two_year">

edivorce/apps/core/templates/prequalification/step_03.html

@@ -75,7 +75,7 @@
 </div>
 
 <div class="question-well">
-    <h3>Did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} try and reconcile after you separated <span id="separation_date_span">{% if separation_date %} on {{ separation_date }}{% endif %}</span>?</h3>
+    <h3>Did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} try to reconcile after you separated <span id="separation_date_span">{% if separation_date %} on {{ separation_date }}{% endif %}</span>?</h3>
     <div class="radio"><label>{% input_field type="radio" name="try_reconcile_after_separated" value="NO" data_target_id="reconciliation_period" data_reveal_target="false" %}
         No, {% if name_spouse %} {{ name_spouse }} {% else %} my spouse {% endif %} and I have not reconciled (gotten back together)</label>
     </div>

edivorce/apps/core/templates/prequalification/step_05.html

@@ -60,7 +60,7 @@
 </div>
 
 <div class="reveal" id="marriage_certificate" hidden>
-    <h3>Will you be providing the marriage certificate or registration of marriage at a later date</h3>
+    <h3>Will you be providing the marriage certificate or registration of marriage at a later date?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
@@ -68,7 +68,7 @@
         </label>
 
         <label class="btn btn-radio btn-radio-long">
-            {% input_field type="radio" name="provide_certificate_later" autocomplete="off" value="NO" data_target_id="reason_not_providing" data_reveal_target="true" data_related_id="provide_later_date" %} No, it is impossible to obtain a marriage certificate (or registration of marriage
+            {% input_field type="radio" name="provide_certificate_later" autocomplete="off" value="NO" data_target_id="reason_not_providing" data_reveal_target="true" data_related_id="provide_later_date" %} No, it is impossible to obtain a marriage certificate (or registration of marriage)
         </label>
     </div>
 
@@ -124,7 +124,7 @@
 </div>
 
 <div>
-    <h3>Is you marriage certificate or registration of marriage in English?</h3>
+    <h3>Is your marriage certificate or registration of marriage in English?</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
@@ -137,13 +137,13 @@
     </div>
 
     <div class="information-message bg-danger" id="certificate_in_english" hidden>
-        <p>Sorry but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The
+        <p>Sorry, but at this point in time you will need to complete your application for divorce using the Supreme Court of B.C. forms (PDF). The
             <a href="http://www.ag.gov.bc.ca/courts/other/supreme/2010SupRules/info/index_family.htm" target="_blank">forms</a>
             can be found on the Court Services Branch web site.</p>
         <p>A <a href="http://www.familylaw.lss.bc.ca/guides/divorce/divJoint_courtForms.php" target="_blank">listing of forms</a>
             that may be required for a Joint Divorce can also be found on the Family Law web site. </p>
         <p><b>Proof of MarriageTranslation</b><br/>
-            You need to get your proof of marriage translated by a certified translator if it is not t in English.
+            You need to get your proof of marriage translated by a certified translator if it is not in English.
             Ask the translator to give you an Affidavit of Translation. You'll then need to file at the court registry
             both the original marriage certificate/registration of marriage and the Affidavit of Translation
             <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" data-html="true"

edivorce/apps/core/templates/question/11_review.html

@@ -6,7 +6,7 @@
 
 {% block content %}
 
-<h1><small>Step 11</small> Review</h1>
+<h1><small>Step 11:</small>Review</h1>
 <ul>
     <li>
         <h4>Pre-qualification questions</h4>