Updated questions name

edivorce/apps/core/templates/partials/review_user_responses.html

@@ -2,8 +2,8 @@
     <table class="table table-bordered table-striped">
         <thead>
             <tr>
-                <th>Questions</th>
-                <th>User response</th>
+                <th>Question</th>
+                <th>Response</th>
             </tr>
         </thead>
         <tbody>

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

@@ -305,8 +305,8 @@
                     <td colname="c2"> <i class="fa {% if responses.spouse_support_act %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support under [<em>Check one or both of the following boxes, as applicable.</em>] </td>
                 </tr>
                 <tr>
-                    <td> <i class="fa {% if responses.spouse_support_act == 'divorce' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} the <em> Divorce Act </em> (Canada)
-                         <i class="fa {% if responses.spouse_support_act == 'family' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} the <em> Family Law Act </em> </td>
+                    <td> <i class="fa {% if responses.spouse_support_act == 'The Divorce Act (Canada)' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} the <em> Divorce Act </em> (Canada)
+                         <i class="fa {% if responses.spouse_support_act == 'The Family Law Act' %} fa-check-square-o" aria-hidden="true"></i>{% else %} fa-square-o" aria-hidden="true"></i> {% endif %} the <em> Family Law Act </em> </td>
                 </tr>
             </tbody>
         </table>
@@ -322,11 +322,11 @@
                     <td> <i class="fa {% if order_wanted %} fa-check-square-o {% else %} fa-square-o {% endif %}" aria-hidden="true"></i> Claimant 1 and Claimant 2 are asking for an order for: <br /><em> </td>
                 </tr>
                 <tr>
-                    <td> <i class="fa {% if responses.deal_with_property_debt == 'equal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an equal division of family property and family debt </td>
+                    <td> <i class="fa {% if responses.deal_with_property_debt == 'Equal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an equal division of family property and family debt </td>
                 </tr>
                 <tr>
-                    <td> <i class="fa {% if responses.deal_with_property_debt == 'unequal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an unequal division of family property and family debt as follows:
-                        <span class="form-entry form-textarea not-complete">{% if responses.deal_with_property_debt == 'unequal division' and responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt|linebreaksul }} {% else %}&nbsp;{% endif %}</span>
+                    <td> <i class="fa {% if responses.deal_with_property_debt == 'Unequal division' %} fa-check-square-o {% else %} fa-square-o{% endif %}" aria-hidden="true"></i> an unequal division of family property and family debt as follows:
+                        <span class="form-entry form-textarea not-complete">{% if responses.deal_with_property_debt == 'Unequal division' and responses.how_to_divide_property_debt %} {{ responses.how_to_divide_property_debt|linebreaksul }} {% else %}&nbsp;{% endif %}</span>
                     </td>
                 </tr>
                 <tr>

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

@@ -88,7 +88,7 @@
                 {% else %} {{responses.where_were_you_married_country}}{% endif %}
             {% else %}<span class="form-entry not-complete">[<em>place</em>]</span>{% endif %}
             on {% if responses.when_were_you_married %} {{ responses.when_were_you_married }} {% else %}<span class="form-entry not-complete">[<em>dd/mmm/yyyy</em>]</span>{% endif %}, are divorced from each other,
-            {% if responses.divorce_take_effect_on == 'the 31st day after' %}
+            {% if responses.divorce_take_effect_on == 'the 31st day after the date of this order' %}
                 the divorce to take effect on the 31st day after the date of this order.
             {% else %}
                 the divorce to take effect on {% if responses.divorce_take_effect_on_specific_date %}{{ responses.divorce_take_effect_on_specific_date }}{% else %}<span class="form-entry not-complete">[<em>dd/mmm/yyyy</em>]</span>{% endif %}.

edivorce/apps/core/templates/question/06_support.html

@@ -100,8 +100,8 @@
 
 <div class="question-well">
     <h3>Please indicate which act you are asking for support under.</h3>
-    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="divorce" data_target_id="family_law_time_limit" data_reveal_target="false" %}the Divorce Act (Canada)</label> - <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html" target="_blank">view the Divorce Act</a></div>
-    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="family" data_target_id="family_law_time_limit" data_reveal_target="true" %}the Family Law Act</label> - <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01" target="_blank">view the Family Law Act</a></div>
+    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="The Divorce Act (Canada)" data_target_id="family_law_time_limit" data_reveal_target="false" %}The Divorce Act (Canada)</label> - <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html" target="_blank">view the Divorce Act</a></div>
+    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="The Family Law Act" data_target_id="family_law_time_limit" data_reveal_target="true" %}The Family Law Act</label> - <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01" target="_blank">view the Family Law Act</a></div>
 
     <div class="information-message bg-danger" id="family_law_time_limit" hidden>
         <h2>Time limit to apply for court order</h2>

edivorce/apps/core/templates/question/07_property.html

@@ -39,8 +39,8 @@
 
 <div class="question-well">
     <h3>How have you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} agreed to deal with your property and debt?</h3>
-    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="equal division" data_target_id="property_debt_division_method" data_reveal_target="false" %}<b>Equal division</b> of family property and debt</label></div>
-    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="unequal division" data_target_id="property_debt_division_method" data_reveal_target="true" %}<b>Unequal division</b> of family property and family debt</label></div>
+    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="Equal division" data_target_id="property_debt_division_method" data_reveal_target="false" %}<b>Equal division</b> of family property and debt</label></div>
+    <div class="radio"><label>{% input_field type="radio" name="deal_with_property_debt" value="Unequal division" data_target_id="property_debt_division_method" data_reveal_target="true" %}<b>Unequal division</b> of family property and family debt</label></div>
     <p><em>Note: the court will only order an unequal division when an equal division is significantly unfair.</em></p>
 
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_unequal_division" aria-controls="collapse_unequal_division">

edivorce/apps/core/templates/question/09_other_questions.html

@@ -82,7 +82,7 @@
 
 <div class="question-well">
     <h2>Divorce is to take effect on:</h2>
-    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="the 31st day after" %}the 31st day after the date of this order</label></div>
+    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="the 31st day after the date of this order" %}the 31st day after the date of this order</label></div>
     <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="specific date" %}a specific date
         <span class="input-group date date-picker-group" data-allow-future-date="true">
             {% input_field type="text" name="divorce_take_effect_on_specific_date" id="effect_date" class="date-picker-future other-textbox input-inline form-control" tabindex="-1" placeholder="DD/MM/YYYY" %}