Merge pull request #156 from bcgov/DIV-1264

DIV-1264: Style and UX updates based on review

edivorce/apps/core/static/css/main.scss

@@ -20,7 +20,7 @@ $color-green-light: #d5e6d8;
 $color-green-dark: #1c5428;
 $color-gold-dark: #925E00;
 $color-gold-light: #FEEABA;
-$color-red-light: #F7D4D5;
+$color-red-light: #F8D8D9;
 $color-red: #D8292F;
 $color-red-dark: #9A1C21;
 
@@ -111,7 +111,7 @@ h4 {
 
 a {
 	color: $brand-links;
-	text-decoration: none;
+	text-decoration: underline;
 	-webkit-transition: all 0.1s ease-in-out;
 	transition: all 0.1s ease-in-out;
 
@@ -528,20 +528,17 @@ div.percent-suffix {
 
 .tooltip-link {
 	color: $brand-links;
-	border-bottom: dotted 1px $brand-links;
 	cursor: pointer;
 
 	&:hover {
+        .content {
+	        border-bottom: dotted 1px $brand-links;
+        }
 		color: $brand-blue;
 		border-bottom-color: $brand-links;
 	}
 }
 
-.tooltip-no-link {
-	@extend .tooltip-link;
-	border-bottom: none;
-}
-
 .collapse-trigger {
 	& > div {
 		color: $color-blue;
@@ -669,17 +666,64 @@ div#other_names_fields {
 
 /* Buttons & Icons*/
 .btn {
-	line-height: initial;
-	padding: 12px 15px;
-}
-
-.btn-primary {
-	background: $brand-buttons;
+    line-height: initial;
+    padding: 12px 15px;
+    text-decoration: none;
     font-weight: bold;
+    color: #ffffff;
+    -webkit-transition: all 0.1s ease-in-out;
+    transition: all 0.1s ease-in-out;
+    font-size: 16px;
+    border: none;
+    border-radius: 4px;
 
-	&:hover {
-		background-color: darken($brand-buttons, 20%);
-	}
+    &:focus {
+        outline: none;
+        box-shadow: none;
+        -webkit-box-shadow: none;
+
+        &:active {
+            outline: none;
+        }
+    }
+
+    &:hover {
+        -webkit-transition: all 0.1s ease-in-out;
+        transition: all 0.1s ease-in-out;
+    }
+
+    &[disabled] {
+        pointer-events: none;
+        cursor: default;
+    }
+
+    &.btn-primary {
+        background: $brand-buttons;
+
+        &:hover {
+            background-color: $color-blue-dark;
+        }
+    }
+
+    &.btn-danger {
+        background-color: $color-red;
+
+        &:hover {
+            background-color: $color-red-dark;
+        }
+    }
+
+    &.btn-success {
+        background-color: $color-green;
+
+        &:hover {
+            background-color: $color-green-dark;
+        }
+    }
+
+    i.fa {
+        color: #ffffff;
+    }
 }
 
 i.fa {
@@ -692,50 +736,16 @@ i.fa {
 	}
 }
 
-i.fa.fa-question-circle {
-	margin-left: 5px;
-}
-
 .form-buttons {
 	margin: 30px 0;
 
 	.btn {
-		font-size: 16px;
-		border: none;
-		border-radius: 4px;
-		padding: 16px;
-		background-color: $brand-buttons;
-		color: #ffffff;
 		margin-bottom: 12px;
-		-webkit-transition: all 0.1s ease-in-out;
-		transition: all 0.1s ease-in-out;
-
-		&:hover {
-			background-color: $brand-blue;
-			-webkit-transition: all 0.1s ease-in-out;
-			transition: all 0.1s ease-in-out;
-		}
+        padding: 16px;
 
-		i.fa {
-			color: #ffffff;
-		}
-
-		&.btn-success {
-			background-color: $color-green;
+        &.btn-success {
 			margin-left: 12px;
-			-webkit-transition: all 0.1s ease-in-out;
-			transition: all 0.1s ease-in-out;
-
-			&:hover {
-				background-color: $color-green-dark;
-				-webkit-transition: all 0.1s ease-in-out;
-				transition: all 0.1s ease-in-out;
-			}
 		}
-        &[disabled] {
-            pointer-events: none;
-            cursor: default;
-        }
 	}
 }
 
@@ -792,24 +802,6 @@ i.fa.fa-question-circle {
     }
 }
 
-.btn-danger {
-    background-color: $color-red;
-    border: 1px solid $color-red;
-    font-weight: bold;
-    &:hover {
-        background-color: lighten($color-red, 5%);
-    }
-}
-
-.btn-success {
-    background-color: $color-green;
-    border: 1px solid $color-green;
-    font-weight: bold;
-    &:hover {
-        background-color: lighten($color-green, 5%);
-    }
-}
-
 .error-text {
     color: $color-red;
     font-weight: bold;
@@ -817,19 +809,12 @@ i.fa.fa-question-circle {
 }
 
 .table-error {
-    border: 2px solid $color-red !important;
-    -webkit-transition: 0.1s ease-in-out all;
-    transition: 0.1s ease-in-out all;
-    margin: -12px -16px;
-    padding: 12px 16px;
-    .warning {
-        color: $color-red;
-        font-size: 14px;
-        font-weight: bolder;
-        display: inline-block;
-        width: 100%;
-        text-align: center;
-    }
+    color: $color-red;
+    font-size: 14px;
+    font-weight: bolder;
+    display: inline-block;
+    width: 100%;
+    text-align: center;
 }
 
 .btn-radio {
@@ -855,8 +840,8 @@ i.fa.fa-question-circle {
         width: 64px;
         height: 64px;
         border-radius: 32px;
-        margin-top: -25.2px;
-        margin-left: -7.2px;
+        margin-top: -24px;
+        margin-left: -6px;
         border: 1px solid $color-grey-medium;
     }
 }
@@ -941,8 +926,7 @@ input {
 	line-height: 1em;
 
 	&:focus {
-		outline: 0;
-		box-shadow: inset 0 1px 1px rgba($color-grey-dark,.075), 0 0 4px rgba($color-grey-medium,.5);
+		outline: none !important;
 	}
 
 	&+i.fa {
@@ -973,10 +957,20 @@ input {
 	}
 }
 
+.checkbox input[type=checkbox],
+.checkbox-inline input[type=checkbox],
+.radio input[type=radio],
+.radio-inline input[type=radio] {
+    width: 18px;
+    height: 18px;
+    margin: 2px 0 0 -30px;
+}
+
 .checkbox label,
 .radio label {
 	margin-bottom: 8px;
 	font-weight: 700;
+    padding-left: 30px;
 
 	&.tight-spacing {
 		margin-bottom: 2px;
@@ -1516,14 +1510,43 @@ textarea {
 
 	table {
 		margin-bottom: 0;
-
-		thead tr {
-			background-color: $brand-blue;
-			color: #fff;
-		}
-        .value-column {
-            width: 30%;
-            min-width: 192px;
+        border-collapse: separate !important;
+        border: none;
+
+        thead th {
+            color: #fff;
+            border-bottom: 1px solid $color-grey-light;
+            border-top: 1px solid $color-grey-light;
+            background-color: $color-blue-dark;
+            &:first-child {
+                border-top-left-radius: 8px;
+            }
+            &:last-child {
+                border-top-right-radius: 8px;
+                border-left: 0;
+            }
+        }
+        tbody {
+            td {
+                border-top: none;
+                &.value-column {
+                    width: 30%;
+                    min-width: 192px;
+                    border-left: none;
+                    vertical-align: middle;
+                    &.contains-error {
+                        border: 2px solid $color-red;
+                    }
+                }
+            }
+            tr:last-child {
+                :first-child {
+                    border-bottom-left-radius: 8px;
+                }
+                :last-child {
+                    border-bottom-right-radius: 8px;
+                }
+            }
         }
 
         thead {
@@ -1543,7 +1566,7 @@ textarea {
 }
 
 /* Specific pages */
-.signing-filing {
+.dashboard-content {
     .question-well {
         margin-top: 15px;
         margin-bottom: 30px;
@@ -1552,42 +1575,48 @@ textarea {
             font-size: 24px;
         }
     }
-    .form-inline {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        -ms-flex-wrap: wrap;
-        flex-wrap: wrap;
-        align-items: center;
-        margin-bottom: 10px;
-        padding: 10px;
+    .form {
         background: $color-grey-lighter;
-        border-radius: 5px;
+        border: 1px solid $color-grey-light;
+        border-radius: 8px;
+        margin-bottom: 10px;
+        padding: 15px;
 
-        label {
-            margin: 0 15px 0 5px;
-            text-align: right;
-        }
+        &-inline {
+            padding: 10px;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            -ms-flex-wrap: wrap;
+            flex-wrap: wrap;
+            align-items: center;
 
-        &:before {
-            display: table;
-            content: " ";
-        }
+            label {
+                margin: 0 15px 0 5px;
+                text-align: right;
+            }
+
+            &:before {
+                display: table;
+                content: " ";
+            }
 
-        input {
-            margin-right: 5px;
-            -webkit-box-flex: 1;
-            -ms-flex: 1;
-            flex: 1;
-            width: 99%;
-            min-width: 200px;
+            input {
+                margin-right: 5px;
+                -webkit-box-flex: 1;
+                -ms-flex: 1;
+                flex: 1;
+                width: 99%;
+                min-width: 200px;
+            }
         }
     }
-}
 
-.dashboard-content {
     p {
         margin-bottom: 15px;
+        &.error-text {
+            margin-bottom: 0px;
+        }
     }
     ul {
         margin-bottom: 30px;
@@ -1871,6 +1900,10 @@ textarea {
 		letter-spacing: 0.1em;
 	}
 
+    a {
+        text-decoration: none;
+    }
+
 	.progress-question {
         display: -webkit-box;
         display: -ms-flexbox;

edivorce/apps/core/static/js/main.js

@@ -44,12 +44,6 @@ $(function () {
         placement:'auto right'
     });
 
-    $('[data-toggle="tooltip-hover"]').tooltip({
-        container: 'body',
-        trigger: 'hover',
-        placement: 'auto right'
-    });
-
     $('textarea').autogrow({onInitialize: true});
 
     // All elements tagged with the following sum related data attributes
@@ -196,16 +190,6 @@ $(function () {
             }
         });
     });
-    $('[data-toggle=tooltip-hover]').hover(function (e) {
-        $('[data-toggle=tooltip]').each(function () {
-            // hide any open popovers when the anywhere else in the body is clicked
-            if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.tooltip').has(e.target).length === 0) {
-                if (!$(e.target).hasClass('keep-tooltip-open') && !$(this).hasClass('keep-tooltip-open')) {
-                    $(this).tooltip('hide');
-                }
-            }
-        });
-    });
 
     // when user click textbox beside radio button, check the associated radio button
     $(".other-textbox").on("click", function () {
@@ -844,6 +828,8 @@ $(function () {
       e.preventDefault();
       window.history.back();
     });
+
+    $('.question-well.step-review.error span.table-error').parent('td').addClass('contains-error');
 });
 
 
@@ -1066,7 +1052,7 @@ var mirrorOnChange = function(e) {
 var deleteAddedField = function(e){
     var field = $('#' + e.data.field_name);
     var button = $('#' + e.data.button_name);
-    $(this).parent('div').remove();
+    $(this).parents('div').first().remove();
 
     //enable btn_add_other_names button
     if (button.prop('id') === "btn_add_other_names"){

edivorce/apps/core/templates/dashboard/final_filing.html

@@ -83,14 +83,14 @@
                     If you have not received a Court File Number, check the
                     <a href="{% url 'dashboard_nav' 'wait_for_number' %}">Wait for Court File</a> step.
                     If you have not sworn / affirmed your affidavits, check the
-                    <a href="{% url 'dashboard_nav' 'swear_forms' %}">Swear/Affirm Forms</a> step.
-                    Enter your Court File Number below:
+                    <a href="{% url 'dashboard_nav' 'swear_forms' %}">Swear / Affirm Forms</a> step.
                 </p>
-                <div>
+                <div class="form">
+                    <p><b>Enter your Court File Number:</b></p>
                     <p class="error-text" hidden id="court-file-error">
                         A Court File Number contains only digits and must be between 4 and 10 digits in length.
                     </p>
-                    <label>{% include "partials/tooltips/court_file_number.html" with text="Court File #" %}</label>
+                    <label>{% include "partials/tooltips/court_file_number.html" %}</label>
                     {% input_field type="number" name="court_file_number" id="court-file-number" class="input-inline" %}
                 </div>
             </div>
@@ -104,10 +104,10 @@
                     </p>
                     <ul>
                         <li>
-                            {% include "partials/tooltips/requisition_form_35.html" %}
+                            {% include "partials/tooltips/forms/requisition_form_35.html" %}
                         </li>
                         <li>
-                            {% include "partials/tooltips/certificate_of_pleading_36.html" %}
+                            {% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}
                         </li>
                     </ul>
                 {% endif %}
@@ -127,12 +127,12 @@
                         in the following order:
                     </p>
                     <ul>
-                        <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
+                        <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
                             signed by both you and your spouse
                         </li>
                         {% if original_marriage_certificate == 'YES' %}
-                            <li>{% include "partials/tooltips/proof_of_marriage.html" %}</li>
-                            <li>{% include "partials/tooltips/affidavit_of_translation.html" %} sworn/affirmed by a translator
+                            <li>{% include "partials/tooltips/forms/proof_of_marriage.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/affidavit_of_translation.html" %} sworn / affirmed by a translator
                                 <ul class="no-margin-bottom">
                                     <li>
                                         Required only if your marriage certificate is NOT in English
@@ -140,24 +140,24 @@
                                 </ul>
                             </li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/joint_divorce_proceedings.html" %}</li>
-                        <li>{% include "partials/tooltips/requisition_form_35.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/draft_final_order_52.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/requisition_form_35.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/draft_final_order_52.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} sworn/affirmed by both you and your spouse</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} sworn / affirmed by both you and your spouse</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %} sworn/affirmed by
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %} sworn / affirmed by
                             both you and your spouse
                         </li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/agreement_to_annual_income_9.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/agreement_to_annual_income_9.html" %}</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_you == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for you</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for you</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_spouse == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for your spouse</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for your spouse</li>
                         {% endif %}
                     </ul>
                     <p>
@@ -195,12 +195,12 @@
                         in the following order:
                     </p>
                     <ul>
-                        <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
+                        <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
                             signed by both you and your spouse
                         </li>
                         {% if original_marriage_certificate == 'YES' %}
-                            <li>{% include "partials/tooltips/proof_of_marriage.html" %}</li>
-                            <li>{% include "partials/tooltips/affidavit_of_translation.html" %} sworn/affirmed by a translator
+                            <li>{% include "partials/tooltips/forms/proof_of_marriage.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/affidavit_of_translation.html" %} sworn / affirmed by a translator
                                 <ul class="no-margin-bottom">
                                     <li>
                                         Required only if your marriage certificate is NOT in English
@@ -208,21 +208,21 @@
                                 </ul>
                             </li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/joint_divorce_proceedings.html" %}</li>
-                        <li>{% include "partials/tooltips/requisition_form_35.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/draft_final_order_52.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/requisition_form_35.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/draft_final_order_52.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} sworn/affirmed by you</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} sworn / affirmed by you</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %}
-                            sworn/affirmed by you
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %}
+                            sworn / affirmed by you
                         </li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/agreement_to_annual_income_9.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/agreement_to_annual_income_9.html" %}</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_you == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for you</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for you</li>
                         {% endif %}
                     </ul>
                     <p>
@@ -256,20 +256,20 @@
                         {% endif %}
                     </ul>
                     <p>
-                        Once sworn/affirmed and filed, you will receive a {% include "partials/tooltips/court_file_number.html" %}.
+                        Once sworn / affirmed and filed, you will receive a {% include "partials/tooltips/court_file_number.html" %}.
                         This number will be used if you need to file any additional documentation.
                     </p>
                     <h2>Spouse - Document Requirements</h2>
                     <p class="no-margin-bottom">
-                        The following sworn/affirmed affidavits still remain to be filed:
+                        The following sworn / affirmed affidavits still remain to be filed:
                     </p>
                     <ul>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} - sworn/affirmed by your spouse</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} - sworn / affirmed by your spouse</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" %} - sworn/affirmed by your spouse</li>
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" %} - sworn / affirmed by your spouse</li>
                         {% if derived.wants_other_orders and name_change_spouse == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} - for your spouse</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} - for your spouse</li>
                         {% endif %}
                     </ul>
                     <p>
@@ -344,14 +344,14 @@
 {% block sidebarText %}
     <p>
         An application for divorce can be completed in one step or two steps depending on
-        how you are swearing/affirming your affidavit(s).
+        how you are swearing / affirming your affidavit(s).
         The two steps include an initial filing and a final filing.
         The initial filing is where you will start the proceeding for divorce
         by filing your Notice of Joint Family Claim.
     </p>
     <p>
         The final filing is the application asking the court to order the divorce
-        and includes your sworn/affirmed affidavit(s) and other supporting documents.
+        and includes your sworn / affirmed affidavit(s) and other supporting documents.
     </p>
 {% endblock %}
 

edivorce/apps/core/templates/dashboard/help_saving_pdf.html

@@ -72,7 +72,7 @@
             OR<br />
           FInd the file: On your computer, find where you saved the document
           and double-click it.</li>
-        <li>View and/or print your form.</li>
+        <li>View and / or print your form.</li>
     </ol>
 </div>
 
@@ -92,7 +92,7 @@
         <li>When Adobe Reader is open, go to File, then to Open, then go to
           your &ldquo;Downloads&rdquo; folder (or to where you saved the
           document).</li>
-        <li>View and/or print your form.</li>
+        <li>View and / or print your form.</li>
     </ol>
 </div>
 

edivorce/apps/core/templates/dashboard/initial_filing.html

@@ -59,29 +59,29 @@
         <div class="upload-area">
             {% if how_to_sign == 'Together' and signing_location == 'In-person' %}
                 <div>
-                    <p>The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
+                    <p>The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
                         automatically filed for you.</p>
                 </div>
             {% elif how_to_sign == 'Separately' and signing_location_you == 'In-person' %}
                 <div>
-                    <p>The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
+                    <p>The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
                         automatically filed for you.</p>
                 </div>
             {% else %}
                 <p>The following forms will be automatically filed for you:</p>
                 <ul>
-                    <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}</li>
-                    <li>{% include "partials/tooltips/requisition_form_35.html" %}</li>
-                    <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}</li>
+                    <li>{% include "partials/tooltips/forms/requisition_form_35.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                 </ul>
                 <p>
                     The following forms will be submitted for you but
-                    require {% include "partials/tooltips/swear_affirm.html" with text="swearing/affirming" %}
+                    require {% include "partials/tooltips/swear_affirm.html" with text="swearing / affirming" %}
                     before filing (see next step for details)
                 </p>
                 <ul>
-                    <li>{% include "partials/tooltips/form_child_support_37.html" %}</li>
-                    <li>{% include "partials/tooltips/form_desk_order_38.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/child_support_37.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/desk_order_38.html" %}</li>
                 </ul>
             {% endif %}
             <div id="vue-app">
@@ -155,7 +155,7 @@
         The registry staff will review the documents you have submitted for filing
         and providing that all required fields have been properly completed,
         they will process the $210.00 fee, assign a file number to the documents
-        and stamp/seal them.
+        and stamp / seal them.
     </p>
     <p>
         Note: There is an additional $7.00 fee for submitting each package online.

edivorce/apps/core/templates/dashboard/next_steps.html

@@ -14,13 +14,15 @@
             the next steps to complete your filing.
         </p>
         <p>
-            Please return to this page once you have completed the
-            <a href="{% url 'dashboard_nav' 'final_filing' %}">Final Filing</a> step.
+            <b>
+                Please return to this page once you have completed the
+                <a href="{% url 'dashboard_nav' 'final_filing' %}">Final Filing</a> step.
+            </b>
         </p>
     {% else %}
         {% if how_to_file == 'Online' %}
             <p>
-                You have successfully completed filing online.
+                <b>You have successfully completed filing online.</b>
             </p>
             <p>
                 <b>Your {% include "partials/tooltips/online_package_number.html" with with_cso=True %} is {{ final_filing_package_number }}</b>

edivorce/apps/core/templates/dashboard/order_certificate.html

@@ -3,28 +3,30 @@
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
 {% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
+{% block container_col %}dashboard-content{% endblock %}
 
 {% block content %}
     <h1>Order a Certificate of Divorce (Optional)</h1>
-    <p>$40 for each Certificate of Divorce (as of March 2013)</p>
     <p>
         Anytime after 31 days have passed and the divorce has become final, you can go back to the registry to ask for a Certificate of Divorce Form
         (F56).
     </p>
+    <p>There is a $40 charge for each Certificate of Divorce issued.</p>
     <p>
-        This step isn't mandatory. If you don't go to the court registry to get a Certificate of Divorce, your divorce will still be legal. If you
-        ever have to show legal proof of your divorce, you can use your divorce order. However, you may prefer just to show a certificate rather than
-        all the details in the order.
+        This step isn't mandatory. If you don't go to the court registry to get a Certificate of Divorce, your divorce will still be legal.
+        If you ever have to show legal proof of your divorce, you can use your divorce order.
+        However, you may prefer just to show a certificate rather than all the details in the order.
     </p>
     <p>
         For details on
-        <a href="https://familylaw.lss.bc.ca/guides/divorce/divJoint_step8.php" target="_blank">how to apply for a Certificate of Divorce</a>
+        <a href="https://www2.gov.bc.ca/gov/content/life-events/divorce/family-justice/family-law/separation-divorce/how-do-i-get-my-divorce-certificate" target="_blank">
+            how to apply for a Certificate of Divorce</a>
         refer to the Legal Services Society website.
     </p>
     <h3>Out of Country Certificate of Divorce Requirements</h3>
     <p>
         If you are requesting a Certificate of Divorce for use outside Canada, please check with the requirements around the Certificate itself.
-        A hand-signed and/or sealed Certificate of Divorce may be required.
+        A hand-signed and / or sealed Certificate of Divorce may be required.
     </p>
     <p>
         For details on how to apply, please complete the following form for a Hand-Signed and Sealed Certificate of Divorce.
@@ -46,7 +48,7 @@
         It is required if you are getting remarried and for many other government purposes.
         If you are requesting a Certificate of Divorce for use outside Canada, please check with the requirements
         around the Certificate itself.
-        A hand-signed and/or sealed Certificate of Divorce may be required.
+        A hand-signed and / or sealed Certificate of Divorce may be required.
     </p>
     <p>
         Note: You don't always need a Certificate of Divorce as the divorce order is also a legal document.

edivorce/apps/core/templates/dashboard/print_form.html

@@ -225,7 +225,7 @@
                         <p>
                             You'll notice that some of the information in the affidavit is the same as what's in your Notice of
                             Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and
-                            the judge/master must have sworn evidence to make a decision, you must swear or affirm that the
+                            the judge / master must have sworn evidence to make a decision, you must swear or affirm that the
                             information in these affidavits is true.
                         </p>
                     </div>
@@ -289,7 +289,7 @@
                         <p>
                             You'll notice that some of the information in the affidavit is the same as what's in your Notice of
                             Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and
-                            the judge/master must have sworn evidence to make a decision, you must swear or affirm that the
+                            the judge / master must have sworn evidence to make a decision, you must swear or affirm that the
                             information in these affidavits is true.
                         </p>
                     </div>
@@ -322,7 +322,7 @@
                         <p>
                             You'll notice that some of the information in the affidavit is the same as what's in your Notice of
                             Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and
-                            the judge/master must have sworn evidence to make a decision, you must swear or affirm that the
+                            the judge / master must have sworn evidence to make a decision, you must swear or affirm that the
                             information in these affidavits is true.
                         </p>
                     </div>
@@ -455,53 +455,19 @@
         <ul>
             {% if original_marriage_certificate == 'YES' %}
                 <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Proof of marriage</b>
-                <br /><br />
-                To get a divorce, you need an original marriage certificate or certified true copy of your registration of marriage to prove you are married.
-                There are other options described in this tool if you can't get a copy of your marriage certificate or registration of marriage.
-                <br /><br />
-                - Does not require signatures.
-                ">Proof of marriage<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
+                {% include "partials/tooltips/forms/proof_of_marriage.html" %}
                     Original or certified Marriage Certificate or Registration of Divorce. If not in English, also provide
-                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                          data-html="true"
-                          title="
-                <b>Affidavit of Translation</b>
-                <br /><br />
-                The Affidavit of Translation is an affidavit which is sworn by a translator before a notary, lawyer or commissioner for taking Affidavits.
-                The original certificate of marriage should be exhibited to the Affidavit of Translation together with the translation of the translator.
-                ">Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span>
-                    and English translation.
+                    {% include "partials/tooltips/forms/affidavit_of_translation.html" with text="Affidavit of Translation"%}
+                    and the English translation.
                 </li>
             {% endif %}
             <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Registration of Divorce form</b>
-                <br /><br />
-                This form is for a central divorce registry in Ottawa.
-                They use the form to check to make sure there is no other divorce proceeding pending in Canada.
-                They also keep track of all divorces in Canada.
-                <br /><br />
-                - Does not require signatures.
-                ">Completed Registration of Divorce form (Federal)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                {% include "partials/tooltips/forms/registration_of_divorce.html" %}
             </li>
             {% if derived.wants_other_orders %}
                 {% if name_change_you == 'YES' or name_change_spouse == 'YES' %}
                     <li>
-                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                          data-html="true"
-                          title="
-                    <b>Identification of Applicant (VSA 512)</b>
-                    <br /><br />
-                    This form is used by the Court to notify Vital Statistics of court-ordered legal changes of name.
-                    <br /><br />
-                    - Does not require signatures.
-                    ">Completed Identification of Applicant (VSA 512)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                        {% include "partials/tooltips/forms/identification_of_applicant.html" with text="Completed Identification of Applicant (VSA 512)" %}
                         for anyone requesting a name change
                         <ul>
                             {% if name_change_you == 'YES' %}
@@ -514,16 +480,7 @@
             {% endif %}
             {% if derived.has_children_of_marriage %}
                 <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Agreement as to Annual Income (F9)</b>
-                <br /><br />
-                This form is used if both you and your spouse agree on the income of the person who will be paying child support.
-                It is used instead of a Financial Statement (F8) if you need to provide the court with proof of income.
-                <br /><br />
-                - Does not require signatures.
-                ">Completed Agreement as to Annual Income (F9)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                {% include "partials/tooltips/forms/agreement_to_annual_income_9.html" with text="Completed Agreement as to Annual Income (F9)" %}
                 </li>
             {% endif %}
         </ul>

edivorce/apps/core/templates/dashboard/sign_file_options.html

@@ -6,16 +6,16 @@
 
 {% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
-{% block container_col %}signing-filing{% endblock %}
+{% block container_col %}dashboard-content{% endblock %}
 
 {% block content %}
     <h1>Signing and Filing Options</h1>
     <h3>Signing Options</h3>
     <p>
         To complete your application for divorce, you must
-        {% include "partials/tooltips/swear_affirm.html" with text="swear/affirm and sign" %}
-        your {% include "partials/tooltips/affidavit.html" %}. The affidavit(s) must be sworn/affirmed and
-        signed by both you and your spouse. You have a choice on how you will both swear/affirm and sign.
+        {% include "partials/tooltips/swear_affirm.html" with text="swear / affirm and sign" %}
+        your {% include "partials/tooltips/affidavit.html" %}. The affidavit(s) must be sworn / affirmed and
+        signed by both you and your spouse. You have a choice on how you will both swear / affirm and sign.
     </p>
     <div class="question-well">
         <h3>Select how you would like to {% include "partials/tooltips/swear_affirm.html" %}
@@ -26,19 +26,19 @@
             {% else %}
                 {% input_field type="radio" name="how_to_sign" value="Together" id="sign-together" %}
             {% endif %}
-            We will swear/affirm and sign Together using the same affidavit(s)</label></div>
+            We will swear / affirm and sign Together using the same affidavit(s)</label></div>
         <div class="list-item-description">
-            <p>You must both go together to the registry or to a commissioner for taking affidavits to swear/affirm and sign the affidavit(s).
+            <p>You must both go together to the registry or to a commissioner for taking affidavits to swear / affirm and sign the affidavit(s).
                 This option costs less (less filing fees) and is typically faster and easier for both of you.</p>
-            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}.
+            <p>There are strict rules for when you can swear / affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}.
                 You must do it:</p>
             <ul>
-                <li>At the same time as you are filing your {% include "partials/tooltips/joint_family_claim_1.html" %}
-                    (You can file the Notice and swear/affirm and sign your affidavit at
+                <li>At the same time as you are filing your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}
+                    (You can file the Notice and swear / affirm and sign your affidavit at
                     the registry (or virtually with the registry) at the same time.)
                 </li>
                 <p style="margin-top: 20px">OR</p>
-                <li>After you've filed your {% include "partials/tooltips/joint_family_claim_1.html" %}.
+                <li>After you've filed your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}.
                     (You can file the Notice first, and then come back into this tool or go to the registry to file your affidavit(s).)
                 </li>
             </ul>
@@ -49,21 +49,21 @@
             {% else %}
                 {% input_field type="radio" name="how_to_sign" value="Separately" id="sign-separately" %}
             {% endif %}
-            We will swear/affirm and sign Separately our own affidavit(s)</label></div>
+            We will swear / affirm and sign Separately our own affidavit(s)</label></div>
         <div class="list-item-description">
-            <p>You can each swear/affirm and sign your own version of the affidavit (you can go separately to the registry or a commissioner for
-                taking affidavits to swear/affirm and sign the affidavit(s)).</p>
-            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}.
+            <p>You can each swear / affirm and sign your own version of the affidavit (you can go separately to the registry or a commissioner for
+                taking affidavits to swear / affirm and sign the affidavit(s)).</p>
+            <p>There are strict rules for when you can swear / affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}.
                 You must:</p>
             <ul>
                 <li>Swear/affirm and sign one person’s affidavit(s) at the same time as you are filing
-                    your {% include "partials/tooltips/joint_family_claim_1.html" %} (You can file the
+                    your {% include "partials/tooltips/forms/joint_family_claim_1.html" %} (You can file the
                     Notice and swear your affidavit at the registry (or virtually with the registry) at the same time.)
-                    This would allow one party to swear/affirm and sign their affidavit(s) before the Notice has been filed.
+                    This would allow one party to swear / affirm and sign their affidavit(s) before the Notice has been filed.
                 </li>
                 <p style="margin-top: 20px">OR</p>
                 <li>Swear/affirm and sign both parties’ affidavit(s) after you've filed
-                    your {% include "partials/tooltips/joint_family_claim_1.html" %}. (You can file the Notice first,
+                    your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}. (You can file the Notice first,
                     and then come back into this tool or go to the registry to file your affidavit(s).)
                 </li>
             </ul>
@@ -79,17 +79,9 @@
         <li>a printer (or a print service)</li>
         <li>payment for filing fees (see More Information sidebar for more information)</li>
         <li>a copy of your marriage certificate (from any jurisdiction)</li>
-        <li><span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                  data-html="true"
-                  title="
-                <b>Registration of Joint Divorce Proceedings (JUS280)</b>
-                <br /><br />
-                This form is for a central divorce registry in Ottawa. They use the form to check to make sure there is no other divorce proceeding pending in Canada. They also keep track of all divorces in Canada.
-                <br />- Does not require signatures.">
-          Registration of Divorce Proceedings<i class="fa fa-question-circle" aria-hidden="true"></i></span> form
-        </li>
+        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" with text="Registration of Divorce Proceedings" %} form</li>
         <li>Both you and your spouse to sign some of the same documents</li>
-        <li>You will need to have your affidavit(s) sworn/affirmed (see above)</li>
+        <li>You will need to have your affidavit(s) sworn / affirmed (see above)</li>
         <li>Photo ID</li>
     </ul>
     {% if where_were_you_married_country == 'Canada' %}
@@ -129,7 +121,7 @@
         </div>
     {% endif %}
     {% if virtual_swearing_enabled %}
-        <h3 id="signing-location" hidden>Swear/Affirm and Signing Location</h3>
+        <h3 id="signing-location" hidden>Swear / Affirm and Signing Location</h3>
         <div class="question-well" id="signing-location-together" hidden>
             <h3>Select where you would like to {% include "partials/tooltips/swear_affirm.html" %} your affidavit(s):</h3>
             <div class="radio"><label>

edivorce/apps/core/templates/dashboard/swear_forms.html

@@ -9,11 +9,11 @@
     <h1>Swear / Affirm Forms</h1>
     {% if how_to_file == 'In-person' %}
         <p>Now that you have reviewed and printed all of your forms, you’ll need to get your
-            affidavits {% include "partials/tooltips/swear_affirm.html" with text="sworn/affirmed" %}.</p>
+            affidavits {% include "partials/tooltips/swear_affirm.html" with text="sworn / affirmed" %}.</p>
     {% elif how_to_file == 'Online' %}
         <p>
             <b>You must have a Court File Number in order to proceed</b>
-            with {% include "partials/tooltips/swear_affirm.html" with text="swearing/affirming" %} your affidavits.
+            with {% include "partials/tooltips/swear_affirm.html" with text="swearing / affirming" %} your affidavits.
             If you do not have a {% include "partials/tooltips/court_file_number.html" %} return to the <a
                 href="{% url 'dashboard_nav' 'wait_for_number' %}">
             Wait for Court File Number</a> step.
@@ -26,13 +26,13 @@
     {% endif %}
     <p class="no-margin-bottom">
         You’ll need to have printed copies of the following form(s) with you
-        for {% include "partials/tooltips/swear_affirm.html" with text="swearing/affirming" %}:
+        for {% include "partials/tooltips/swear_affirm.html" with text="swearing / affirming" %}:
     </p>
     <ul>
         {% if derived.has_children_of_marriage %}
-            <li>{% include "partials/tooltips/form_child_support_37.html" %}</li>
+            <li>{% include "partials/tooltips/forms/child_support_37.html" %}</li>
         {% endif %}
-        <li>{% include "partials/tooltips/form_desk_order_38.html" %}</li>
+        <li>{% include "partials/tooltips/forms/desk_order_38.html" %}</li>
     </ul>
     {% if how_to_sign == 'Together' and signing_location == 'Virtual' %}
         <div>
@@ -85,15 +85,14 @@
                     {% include "partials/tooltips/commissioner.html" %}.</b>
             </p>
             <p class="no-margin-bottom">
-                Prepare for swearing/affirming and signing by ensuring you:
+                Prepare for swearing / affirming and signing by ensuring you:
             </p>
             <ul>
                 <li>Have print outs with you of all of your affidavits ready to sign</li>
                 <li>Have your photo ID ready to show.</li>
             </ul>
             <p class="no-margin-bottom">
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %}
-                at the court registry then you should also:
+                If you are planning to swear / affirm and sign at the court registry then you should also:
             </p>
             <ul>
                 <li>Have print outs of all your completed documentation with you</li>
@@ -103,8 +102,7 @@
             </p>
             {% include "partials/filing_location.html" %}
             <p>
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %} with a lawyer, notary or other commissioner please contact
-                them directly.
+                If you are planning to swear / affirm with a lawyer, notary or other commissioner please contact them directly.
             </p>
         </div>
     {% elif how_to_sign == 'Separately' and signing_location_you == 'In-person' and signing_location_spouse == 'In-person' %}
@@ -114,18 +112,18 @@
                     a {% include "partials/tooltips/commissioner.html" %}.</b>
             </p>
             <p class="no-margin-bottom">
-                Prepare for swear/affirm and signing by ensuring you:
+                Prepare for swear / affirm and signing by ensuring you:
             </p>
             <ul>
                 <li>Have print outs with you of all of your affidavits ready to sign</li>
                 <li>Have photo ID ready to show.</li>
             </ul>
             <p class="no-margin-bottom">
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %}
-                at the court registry then you should also have print outs of all your completed documents with you.
+                If you are planning to swear / affirm at the court registry then you should also have print outs of all your
+                completed documents with you.
             </p>
             <p>
-                Once you have filed, your spouse will be able to sign/swear and file their affidavits at the court registry.
+                Once you have filed, your spouse will be able to sign / swear and file their affidavits at the court registry.
                 Your spouse will require the {% include "partials/tooltips/court_file_number.html" %} provided to you at the time of your filing.
             </p>
             <p>
@@ -133,7 +131,7 @@
             </p>
             {% include "partials/filing_location.html" %}
             <p>
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %} with a lawyer, notary or other commissioner please contact
+                If you are planning to swear / affirm with a lawyer, notary or other commissioner please contact
                 them directly.
             </p>
         </div>
@@ -162,18 +160,17 @@
                     {% include "partials/tooltips/commissioner.html" %}.</b>
             </p>
             <p class="no-margin-bottom">
-                Have your spouse prepare for their swearing/affirming and signing the affidavit(s) by ensuring they:
+                Have your spouse prepare for their swearing / affirming and signing the affidavit(s) by ensuring they:
             </p>
             <ul>
                 <li>Have print outs with them of all of their affidavits ready to sign</li>
                 <li>Have photo ID ready to show.</li>
             </ul>
             <p class="no-margin-bottom">
-                If they are planning to {% include "partials/tooltips/swear_affirm.html" with text="swear/affirm and sign" %}
-                at the court registry then they should also:
+                If they are planning to swear / affirm and sign at the court registry then they should also:
             </p>
             <ul>
-                <li>Have your {% include "partials/tooltips/court_file_number.html" %} ready
+                <li>Have the {% include "partials/tooltips/court_file_number.html" %} ready
                     (received when your initial filing is reviewed by the Court Registry)
                 </li>
                 <li>Have print outs of all completed documents with them</li>
@@ -183,7 +180,7 @@
             </p>
             {% include "partials/filing_location.html" %}
             <p>
-                If they are planning to {% include "partials/tooltips/swear_affirm.html" %} with a lawyer, notary or other commissioner please contact
+                If they are planning to swear / affirm with a lawyer, notary or other commissioner please contact
                 them directly.
             </p>
         </div>
@@ -200,8 +197,7 @@
                 <li>Have your photo ID ready to show.</li>
             </ul>
             <p class="no-margin-bottom">
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %}
-                at the court registry then you should also:
+                If you are planning to swear / affirm at the court registry then you should also:
             </p>
             <ul>
                 <li>Have print outs of all your completed documentation with you</li>
@@ -211,14 +207,12 @@
             </p>
             {% include "partials/filing_location.html" %}
             <p>
-                If you are planning to {% include "partials/tooltips/swear_affirm.html" %} with a lawyer, notary or other commissioner please contact
-                them directly.
+                If you are planning to swear / affirm with a lawyer, notary or other commissioner please contact them directly.
             </p>
             <hr/>
             <p>
                 <b>Your spouse will {% include "partials/tooltips/swear_affirm.html" %} in a {% include "partials/tooltips/virtual_session.html" %}
-                    with the
-                    court registry.</b>
+                    with the court registry.</b>
             </p>
             <p class="no-margin-bottom">
                 The process for a virtual session is as follows:
@@ -240,12 +234,12 @@
             Once Swearing Is Complete
         </h2>
         <p>
-            When you have completed the swearing/affirming process you can click the Next button on this page to proceed to the Final Filing step
+            When you have completed the swearing / affirming process you can click the Next button on this page to proceed to the Final Filing step
             where you can learn more about how to submit the remaining documents to the court registry.
         </p>
         <div class="bg-danger">
             <span>
-                Please note: <b>sworn/affirmed affidavits must be filed within 30 days of swearing/affirming them.</b>
+                Please note: <b>sworn / affirmed affidavits must be filed within 30 days of swearing / affirming them.</b>
             </span>
         </div>
     </div>
@@ -267,7 +261,7 @@
 {% block sidebarText %}
     <h3>What is swearing / affirming?</h3>
     <p>
-        Affidavits you file with the court must be sworn/affirmed with a commissioner for taking affidavits.
+        Affidavits you file with the court must be sworn / affirmed with a commissioner for taking affidavits.
         To swear or affirm an affidavit, you must meet with a commissioner for taking affidavits.
         The commissioner (often a lawyer, notary public or registry clerk) will check your photo id to make
         sure you are who you say you are, ask you if you understand the contents of your affidavit,
@@ -276,18 +270,18 @@
         themselves.
     </p>
     <p>
-        There are two ways to swear/affirm your affidavits: with a commissioner at the court registry
+        There are two ways to swear / affirm your affidavits: with a commissioner at the court registry
         or with a notary or lawyer of your choosing.
     </p>
     <p>
         Based on your choices on the Signing and Filing Options step of this tool, this page will give you
-        instructions on how you can swear or/and affirm your affidavits.
+        instructions on how you can swear or / and affirm your affidavits.
     </p>
     <p>
         Also based on your choices on the Signing and Filing Options step of this tool, you and your spouse
         may sign your affidavits together or separately.
     </p>
     <p>
-        <i> Once your affidavits are sworn/affirmed they must be filed with the court within 30 days.</i>
+        <i> Once your affidavits are sworn / affirmed they must be filed with the court within 30 days.</i>
     </p>
 {% endblock %}

edivorce/apps/core/templates/dashboard/wait_for_number.html

@@ -9,7 +9,7 @@
     <h1>Wait for Court File Number</h1>
     {% if initial_filing_submitted == 'True' %}
         <p>
-            You’ve successfully completed your initial filing with the Court Registry.
+            <b>You’ve successfully completed your initial filing with the Court Registry.</b>
         </p>
         <p>
             <b>Your {% include "partials/tooltips/online_package_number.html" with with_cso=True %} is {{ initial_filing_package_number }}</b>
@@ -42,8 +42,10 @@
             the next steps to complete your filing.
         </p>
         <p>
-            Please return to this page once you have completed the
-            <a href="{% url 'dashboard_nav' 'initial_filing' %}">Initial Filing</a> step.
+            <b>
+                Please return to this page once you have completed the
+                <a href="{% url 'dashboard_nav' 'initial_filing' %}">Initial Filing</a> step.
+            </b>
         </p>
     {% endif %}
 {% endblock %}

edivorce/apps/core/templates/legal.html

@@ -10,7 +10,7 @@
     <a href="https://www2.gov.bc.ca/gov/content/justice/about-bcs-justice-system/jac" target="_blank">Justice Access Centres</a>
     and <a href="https://www2.gov.bc.ca/gov/content/life-events/divorce/family-justice/who-can-help/family-justice-counsellors" target="_blank">Family Justice Centres</a> 
     across BC have Family Justice Counsellors and Child Support Officers specially trained to help families resolve 
-    their issues about guardianship, parenting arrangements (time and responsibilities), contact and child/spousal support. 
+    their issues about guardianship, parenting arrangements (time and responsibilities), contact and child / spousal support.
     There is no charge for their services.  
     Services are available whether you are looking to establish or vary existing arrangements; and may include 
     provision of legal information and information on court processes and options for resolution, mediation and referrals.

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

@@ -8,10 +8,10 @@
             <option value="with assumed name of" {% if alias_type == 'with assumed name of' %} selected {% endif %}>With assumed name of</option>
         </select>
     {% endcomment %}
-    <div class="label-group">
+    <span class="label-group">
         <label>Also known as</label>
         <input type="button" class="btn btn-danger btn-delete-name form-control pull-right" value="Delete" />
-    </div>
+    </span>
     <div class="form-group name-group alias-body">
         <div>
             <p>First Name</p>

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

@@ -21,7 +21,7 @@
     </a>
     <a href="{% url 'dashboard_nav' 'wait_for_number' %}" class="progress-question {% if active_page == 'wait_for_number' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-clock-o" aria-hidden="true"></i></span>
-        <span class="progress-content">Wait for Court File #</span>
+        <span class="progress-content">Wait for Court File Number</span>
     </a>
 {% endif %}
     <a href="{% url 'dashboard_nav' 'swear_forms' %}" class="progress-question {% if active_page == 'swear_forms' %} active {% endif %}">

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_b.html

@@ -3,7 +3,7 @@
 <div class="question-well fact-sheets {% if derived.fact_sheet_b_error %}error{% endif %}">
     <h1>Shared Living Arrangement (Fact Sheet B)</h1>
     <p>
-        Since you have previously indicated that the child/children will live with both parents more or less equally
+        Since you have previously indicated that the child / children will live with both parents more or less equally
         (between 40 to 60% of the time with each parent) we need you to answer the questions below, even if you have a Separation Agreement or
         existing Court Order.<br>
         <b>This information is needed for the Judge. You will be able to indicate a different child support amount in a following step.</b>
@@ -81,17 +81,7 @@
         </tr>
         <tr>
             <td class="fact-sheet-question">Annual income as per
-                <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" target="_blank">Federal Child Support
-                    Guidelines</a>
-                <span class="tooltip-link"
-                      data-toggle="tooltip"
-                      data-placement="right"
-                      data-html="true"
-                      title="<b>Federal Child Support Guidelines</b><br />
-                  This is a copy of an official work that is published by the Government of Canada and that this copy has
-                  not been produced in affiliation with, or with the endorsement of the Government of Canada."><i class="fa fa-question-circle"
-                                                                                                                  aria-hidden="true"></i>
-                        </span>
+                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" %}
             </td>
             <td class="fact-sheet-answer" readonly>
                 <div class="dollar-prefix">
@@ -134,13 +124,8 @@
                     <div>
                         <p>
                             To figure out how much child support the
-                            <span class="tooltip-link"
-                                  data-toggle="tooltip"
-                                  data-placement="right"
-                                  data-html="true"
-                                  title="<b>Payor</b><br />The person who pays child support.">
-                                        payor<i class="fa fa-question-circle" aria-hidden="true"></i>
-                                    </span> will be paying under the guidelines:
+                            {% include "partials/tooltips/children/payor.html" %}
+                            will be paying under the guidelines:
                         </p>
                         <ul>
                             <li>
@@ -149,17 +134,8 @@
                                 (effective from November 22, 2017) to calculate the correct amount of child support.
                             </li>
                             <li>
-                                Refer to the <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" target="_blank">
-                                Federal Child Support Tables</a>
-                                <span class="tooltip-link"
-                                      data-toggle="tooltip"
-                                      data-placement="right"
-                                      data-html="true"
-                                      title="<b>Federal Child Support Guidelines</b><br />
-                                  This is a copy of an official work that is published by the Government of Canada and that this copy has
-                                  not been produced in affiliation with, or with the endorsement of the Government of Canada."><i
-                                        class="fa fa-question-circle" aria-hidden="true"></i>
-                                        </span>.
+                                Refer to the
+                                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" text="Federal Child Support Tables" %}.
                                 Make sure you view the table pertaining to the province where the payor lives
                             </li>
                         </ul>
@@ -189,18 +165,8 @@
         <tr>
             <td class="fact-sheet-question">
                 Special or extraordinary expenses (as per
-                <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/section-7.html" target="_blank">Section 7 of the Federal Child
-                    Support Guidelines</a>
-                <span class="tooltip-link"
-                      data-toggle="tooltip"
-                      data-placement="right"
-                      data-html="true"
-                      title="<b>Federal Child Support Guidelines</b><br />
-                  This is a copy of an official work that is published by the Government of Canada and that this copy has
-                  not been produced in affiliation with, or with the endorsement of the Government of Canada."><i class="fa fa-question-circle"
-                                                                                                                  aria-hidden="true"></i>
-                        </span>
-                ) to be paid monthly
+                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/section-7.html" text="Section 7 of the Federal Child Support Guidelines" %})
+                to be paid monthly
             </td>
             <td class="fact-sheet-answer" readonly>
                 <div class="dollar-prefix">

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_c.html

@@ -27,7 +27,7 @@
 
                 <p>
                     As per
-                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" link_text="sections 15 to 20" %}
+                    {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" text="sections 15 to 20" %}
                     of the Federal Child Support Guidelines
                 </p>
                 <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
@@ -39,10 +39,9 @@
                 <div class="collapse" id="collapse_calculate_annual_income_spouse">
                     <div>
                         The Federal Child Support Guidelines, Step-by-Step Guide has a
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/w1-f1.html#s1" link_text="worksheet" %}
+                        {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/w1-f1.html#s1" text="worksheet" %}
                         you can use to help calculate your annual income. Step-by-step instructions are also detailed in the
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" link_text="Step-by-Step Guide" %}
-                        .
+                        {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" text="Step-by-Step Guide" %}.
                     </div>
                 </div>
             </td>
@@ -55,8 +54,7 @@
         <tr>
             <td class="fact-sheet-question">
                 <p>What is the 'Guideline' amount for child support payable by your spouse (as per
-                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-11.html#h-15" link_text="Federal Child Support Tables" %}
-                    )?
+                    {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-11.html#h-15" text="Federal Child Support Tables" %})?
                 </p>
                 {% include "partials/inline_question_determine_amount_to_pay.html" with collapse_target_id="collapse_calculate_amount_to_pay" %}
             </td>
@@ -78,10 +76,9 @@
         <tr>
             <td class="fact-sheet-question">
                 <p>Your annual income?</p>
-
                 <p>
                     As per
-                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" link_text="sections 15 to 20" %}
+                    {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" text="sections 15 to 20" %}
                     of the Federal Child Support Guidelines
                 </p>
 
@@ -94,11 +91,10 @@
                 <div class="collapse" id="collapse_calculate_annual_income_you">
                     <div>
                         The Federal Child Support Guidelines, Step-by-Step Guide has a
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/w1-f1.html#s1" link_text="worksheet" %}
+                        {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/w1-f1.html#s1" text="worksheet" %}
                         you can use to
                         help calculate your annual income. Step-by-step instructions are also detailed in the
-                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" link_text="Step-by-Step Guide" %}
-                        .
+                        {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" text="Step-by-Step Guide" %}.
                     </div>
                 </div>
             </td>
@@ -111,8 +107,7 @@
         <tr>
             <td class="fact-sheet-question">
                 <p>What is the 'Guideline' amount for child support payable by you (as per
-                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-11.html#h-15" link_text="Federal Child Support Tables" %}
-                    )?
+                    {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-11.html#h-15" text="Federal Child Support Tables" %})?
                 </p>
 
                 {% include "partials/inline_question_determine_amount_to_pay.html" with collapse_target_id="collapse_calculate_claimant_amounts" %}

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_d.html

@@ -2,7 +2,7 @@
 <div class="question-well fact-sheets {% if derived.fact_sheet_d_error %}error{% endif %}">
     <h1>Child(ren) 19 Years or Older (Fact Sheet D)</h1>
     <p>
-        Since you have previously indicated that you have a child/children 19 years of age or older for whom support
+        Since you have previously indicated that you have a child / children 19 years of age or older for whom support
         is claimed, you will need to answer the next set of questions.
     </p>
 

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_e.html

@@ -4,24 +4,7 @@
     <p>
         The Child Support Guidelines tables contain the base amounts for child support. If you our your spouse feel
         that the child support amount will not leave enough money, you can claim that you will suffer
-        <span class="tooltip-link"
-              data-toggle="tooltip" data-placement="right" data-html="true"
-              title="
-                    <b>Undue hardship</b>
-                    <p>
-                        Circumstances that show the amount of child support under the child support guidelines is too
-                        high or low. Must create &quot;undue&quot; (exceptional, excessive or disproportionate) difficulty
-                        for the person making the claim.
-                     </p>
-                     <p>
-                     A term used by the Child Support Guidelines to describe circumstances when payment of the table
-                     amount of child support would cause financial difficulty for the payor or the recipient, potentially
-                     justifying an award of support in an amount different than the table amount. See &quot;child support,&quot;
-                     &quot;Child Support Guidelines&quot; and &quot;table amount.&quot;
-                     </p>
-                    ">
-                    undue hardship<i class="fa fa-question-circle" aria-hidden="true"></i>.
-            </span>
+        {% include "partials/tooltips/children/undue_hardship.html" %}
     </p>
 
     <div class="btn-radio-group" data-toggle="buttons">
@@ -76,15 +59,7 @@
             <tr class="list-builder-header">
                 <th class="table-bordered">Debt name</th>
                 <th class="table-bordered">What are the
-                    <span class="tooltip-link"
-                          data-toggle="tooltip" data-placement="right" data-html="true"
-                          title="
-                                    <b>Terms of this Debt</b>
-                                    <p>For example, how much is owed, what is the rate of interest,
-                                    when it must be repaid.</p>
-                                    ">
-                                terms of this debt<i class="fa fa-question-circle" aria-hidden="true"></i>
-                            </span>?
+                    {% include "partials/tooltips/children/terms_of_debt.html" %}?
                 </th>
                 <th class="table-bordered">Monthly amount</th>
                 <th></th>
@@ -176,7 +151,7 @@
             </tbody>
         </table>
 
-        <p><strong>Supporting dependent child/children from another relationship.</strong></p>
+        <p><strong>Supporting dependent child / children from another relationship.</strong></p>
         <p>
             List the names of any other children for whom you have a legal duty to make support payments to.
             Do not include the names of any children for whom you are asking for support for as a part of this
@@ -252,21 +227,7 @@
         <p>
             Enter the name (s) and income for any other persons in your household (e.g. co-parent, step parent)
             who have a
-            <span class="tooltip-link"
-                  data-toggle="tooltip"
-                  data-placement="right"
-                  data-html="true"
-                  title="<b>Duty to support</b><br />
-                          Parents and guardians have a responsibility (duty) under the law to financially support their
-                          children, whether or not they see or take care of the children.  A parent, for the purposes
-                          of child support, may include a stepparent if they were living together, in a relationship,
-                          with the child’s parent and the child during the child’s life.  The duty of a stepparent or
-                          non-parent guardian to provide support is secondary to that of the child’s parents.">
-                    duty to support<i class="fa fa-question-circle" aria-hidden="true"></i>
-                </span>
-
-
-            a child.
+            {% include "partials/tooltips/children/duty_to_support.html" %} a child.
         </p>
         <table id="income_others" class="list-builder list-builder-compact">
             <thead>

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_f.html

@@ -10,14 +10,12 @@
         factoring in the family's lifestyle.
     </p>
 
-    <p>
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
          data-target="#collapseIncomeNeeded" aria-controls="collapseIncomeNeeded">
         <div>
             Whose income is needed?
         </div>
     </div>
-    </p>
 
     <div class="collapse" id="collapseIncomeNeeded">
         <div>
@@ -54,7 +52,7 @@
             </ul>
             <p>
                 Source: The
-                {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" link_text="Federal Child Support Guidelines" %}
+                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step5-etap5.html#h7" %}
                 Department of Justice
             </p>
 

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_f_table.html

@@ -24,10 +24,12 @@
             <td class="fact-sheet-question">
                 <p>
                     What is the monthly
-                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Child Support Guidelines" %}
+                    {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" text="Child Support Guidelines" %}
                     amount for $150,000?
                 </p>
-                {% include "partials/inline_question_determine_amount_to_pay.html" with collapse_target_id="collapse_guideline_amount" %}
+                {% with 'collapse_guideline_amount_'|add:claimant_id as collapse_id %}
+                    {% include "partials/inline_question_determine_amount_to_pay.html" with collapse_target_id=collapse_id %}
+                {% endwith %}
             </td>
             <td class="fact-sheet-answer">
                 {% lookup_context 'child_support_amount_under_high_income_'|add:claimant_id|add:"_error" as question_error %}
@@ -39,7 +41,7 @@
         <tr>
             <td class="fact-sheet-question">
                 What is the % of income over $150,000 from the
-                {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Child Support Guidelines" %}
+                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" text="Child Support Guidelines" %}
                 ?
             </td>
             <td class="fact-sheet-answer">
@@ -58,14 +60,16 @@
                     What is the monthly child support amount to be paid on the portion of income over
                     $150,000?
                 </p>
+                {% with 'collapse_high_income_amounts_'|add:claimant_id as collapse_id %}
                 <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
-                     data-target="#collapse_high_income_amounts"
-                     aria-controls="collapse_high_income_amounts">
+                     data-target="#{{ collapse_id }}"
+                     aria-controls="{{ collapse_id }}">
                     <div>
                         How can I determine this amount?
                     </div>
                 </div>
-                <div class="collapse" id="collapse_high_income_amounts">
+                <div class="collapse" id="{{ collapse_id }}">
+                    {% endwith %}
                     <div>
                         <p>
                             The child support tables only show an amount for the first $150,000 of income.
@@ -89,7 +93,7 @@
                         </ul>
                         <p>
                             Source:
-                            {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Federal Child Support Guidelines" %}
+                            {% include "partials/tooltips/children/federal_guidelines.html" with link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" %}
                             , Department of Justice
                         </p>
                     </div>
@@ -151,8 +155,7 @@
         </h3>
         <p>
             Discuss the conditions, means, needs and other circumstances of the child, and the financial
-            ability of
-            each parent to support the child/children.
+            ability of each parent to support the child / children.
         </p>
         <div>
             {% input_field type="textarea" name="reason_child_support_amount_"|add:claimant_id class="fact-sheet-input form-control response-textarea" maxlength="1000" rows="6" %}

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

@@ -14,13 +14,8 @@
         </p>
         <p>
             To figure out how much child support the
-            <span class="tooltip-link"
-                  data-toggle="tooltip"
-                  data-placement="right"
-                  data-html="true"
-                  title="<b>Payor</b><br />The person who pays child support.">
-                payor<i class="fa fa-question-circle" aria-hidden="true"></i>
-            </span> will be paying under the guidelines:
+            {% include "partials/tooltips/children/payor.html" %}
+            will be paying under the guidelines:
         </p>
         <ul>
             <li>
@@ -29,16 +24,8 @@
                 (effective from November 22, 2017) to calculate the correct amount of child support.
             </li>
             <li>
-                Refer to the <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" target="_blank">
-                Federal Child Support Tables</a>
-                <span class="tooltip-link"
-                      data-toggle="tooltip"
-                      data-placement="right"
-                      data-html="true"
-                      title="<b>Federal Child Support Guidelines</b><br />
-          This is a copy of an official work that is published by the Government of Canada and that this copy has
-          not been produced in affiliation with, or with the endorsement of the Government of Canada."><i class="fa fa-question-circle" aria-hidden="true"></i>
-                </span>.
+                Refer to the
+                {% include "partials/tooltips/children/federal_guidelines.html" with link="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/index.html" text="Federal Child Support Tables" %}.
                 Make sure you view the table pertaining to the province where the payor lives
             </li>
         </ul>

edivorce/apps/core/templates/partials/tooltips/affidavit.html

@@ -1,8 +1,14 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Affidavit</b>
-                <br /><br />
-                An affidavit is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book)
-                or affirm (non-religious promise) to be true.">
-          {% if text %}{{ text }}{% else %}affidavit(s){% endif %}<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Affidavit
+{% endblock %}
+
+{% block inner %}
+    An affidavit is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book)
+    or affirm (non-religious promise) to be true.
+{% endblock %}
+
+{% block label %}
+    affidavit(s)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/affidavit_of_translation.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Affidavit of Translation</b>
-                <br /><br />
-                The Affidavit of Translation is an affidavit which is sworn by a translator before a notary,
-                lawyer or commissioner for taking Affidavits.
-                The original certificate of marriage should be exhibited to the Affidavit of Translation together
-                with the translation of the translator.">
-          Affidavit of Translation (F30)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/agreement_to_annual_income_9.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Agreement as to Annual Income (F9)</b>
-                <br /><br />
-                This form is completed by registry staff after your application has been reviewed by them.
-                It shows the judge that your application has been checked and is complete.
-                <br /><br />
-                - Does not require signatures when filed online.">
-          Agreement as to Annual Income (F9)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/an_agreement.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    An Agreement
+{% endblock %}
+
+{% block inner %}
+    A written document that sets out how you and your spouse have agreed
+    to deal with parenting, support, and / or property.
+{% endblock %}
+
+{% block label %}
+    an agreement
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/application.html

@@ -0,0 +1,18 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Application
+{% endblock %}
+
+{% block inner %}
+    An application is a request to the court for an order or judgment
+    which occurs during the course of a court proceeding. What this means
+    is an application is what you are seeking from the court and the
+    draft order is the outcome of what is being sought. The draft order
+    includes the full details (e.g. child support to be paid by payor or
+    payee, by when, how, etc). of what you want the court to grant.
+{% endblock %}
+
+{% block label %}
+    application
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/base.html

@@ -0,0 +1,5 @@
+<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="
+    <b>{% block title %}{% endblock %}</b>
+    <br /><br />
+    {% block inner %}{% endblock %}"><span class=" content">{% if text %}{{ text }}{% else %}{% block label %}{% endblock %}{% endif %}
+</span><i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/certificate_of_pleading_36.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Certificate of Pleadings Form (F36)</b>
-                <br /><br />
-                This form is completed by registry staff after your application has been reviewed by them.
-                It shows the judge that your application has been checked and is complete.
-                <br /><br />
-                - Does not require signatures when filed online.">
-          Certificate of Pleadings Form (F36)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/children/child_support.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Child Support
+{% endblock %}
+
+{% block inner %}
+    Parents have a duty under the law to support their children,
+    even if one parent doesn't see or take care of the children.
+    The money one parent pays to the other parent to help provide
+    for the daily needs of the children is called child support or
+    maintenance.
+{% endblock %}
+
+{% block label %}
+    child support
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/children_of_marriage.html

@@ -0,0 +1,31 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Children of the Marriage
+{% endblock %}
+
+{% block inner %}
+    The <a href='http://wiki.clicklaw.bc.ca/index.php?title=Divorce
+            Act' target='_blank'>Divorce Act</a> defines child of the marriage as:
+    <br><br>
+    Child of the marriage means a child of two spouses or former
+    spouses who, at the material time,
+    <ol type='a'>
+        <li>
+            is under the age of majority and who has not withdrawn from
+            their charge, or
+        </li>
+        <li>
+            is the age of majority or over and under their charge but
+            unable, by reason of illness, disability or other cause, to
+            withdraw from their charge or to obtain the necessaries of life;
+            (enfant à charge)?
+        </li>
+    </ol>
+    More details on the <a href='http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/step2-etap2.html' target='_blank'>
+    definition of &quot;child of the marriage&quot;</a> can be found on the Department of Justice website.
+{% endblock %}
+
+{% block label %}
+    children of the marriage
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/court_order.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court Order
+{% endblock %}
+
+{% block inner %}
+    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 $900 on a monthly basis to help cover
+    the costs of supporting the children.
+{% endblock %}
+
+{% block label %}
+    court order
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/custody.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Custody
+{% endblock %}
+
+{% block inner %}
+    Under the Divorce Act, where and with whom a child lives, and the guardian's rights and responsibilities for the child.
+    Under the BC Child, Family and Community Service Act, custody is similar.
+{% endblock %}
+
+{% block label %}
+    custody
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/duty_to_support.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Duty to Support
+{% endblock %}
+
+{% block inner %}
+    Parents and guardians have a responsibility (duty) under the law to financially support their
+    children, whether or not they see or take care of the children.  A parent, for the purposes
+    of child support, may include a stepparent if they were living together, in a relationship,
+    with the child’s parent and the child during the child’s life.  The duty of a stepparent or
+    non-parent guardian to provide support is secondary to that of the child’s parents.
+{% endblock %}
+
+{% block label %}
+    duty to support
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/education_expenses.html

@@ -0,0 +1,18 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Educational expenses
+{% endblock %}
+
+{% block inner %}
+    <ul>
+        <li>Tutoring</li>
+        <li>
+            Private school (if the child was attending private school before the separation and the parents can afford the expense
+        </li>
+    </ul>
+{% endblock %}
+
+{% block label %}
+    educational expenses
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/enforceable.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Enforceable
+{% endblock %}
+
+{% block inner %}
+    Enforcing an order means making sure that what the court ordered is done,
+    or executed. Usually you want to collect money that is owing to you.
+{% endblock %}
+
+{% block label %}
+    enforced
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/exhibit.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Exhibit
+{% endblock %}
+
+{% block inner %}
+    A document, record, or object admitted as evidence in court or before a tribunal. A document
+    attached to and made part of an affidavit.
+{% endblock %}
+
+{% block label %}
+    exhibit
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/extracurricular_expense.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Extracurricular Activities
+{% endblock %}
+
+{% block inner %}
+    Expenses for activities in which the child excels and is shown to be particularly gifted
+    (for example, expenses for a child who is a gifted figure skater, but not expenses for
+    general skating lessons)
+{% endblock %}
+
+{% block label %}
+    extracurricular activities
+{% endblock %}

edivorce/apps/core/templates/partials/tooltip_link_federal_child_support_guidelines.html → edivorce/apps/core/templates/partials/tooltips/children/federal_guidelines.html

@@ -1,11 +1,15 @@
-<a href="{{ reference_link }}" target="_blank">
-    {{ link_text }}
+<a href="{{ link }}" target="_blank">
+    {% if text %}
+        {{ text }}
+    {% else %}
+        Federal Child Support Guidelines
+    {% endif %}
 </a>
-<span class="tooltip-no-link"
+<span class="tooltip-link"
       data-toggle="tooltip"
       data-placement="right"
       data-html="true"
-      title="<b>Federal Child Support Guidelines</b><br />
+      title="<b>Federal Child Support Guidelines</b>
+      <br /><br />
 This is a copy of an official work that is published by the Government of Canada and that this copy has
-not been produced in affiliation with, or with the endorsement of the Government of Canada."><i class="fa fa-question-circle" aria-hidden="true"></i>
-</span>
+not been produced in affiliation with, or with the endorsement of the Government of Canada."><i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/children/health_expenses.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Health Related Expenses
+{% endblock %}
+
+{% block inner %}
+    Includes orthodontic treatments, counselling, physiotherapy, occupational
+    therapy, speech therapy, hearing therapy, prescription drugs, hearing aids, glasses,
+    and contact lenses
+{% endblock %}
+
+{% block label %}
+    Health related expenses
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/in_arrears.html

@@ -0,0 +1,13 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    In Arrears
+{% endblock %}
+
+{% block inner %}
+    Arrears are past support payments that haven't been paid.
+{% endblock %}
+
+{% block label %}
+    in arrears
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/order_respecting_arrangements.html

@@ -0,0 +1,18 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Order Respecting Parenting Arrangements or Contact
+{% endblock %}
+
+{% block inner %}
+    Under the Family Law Act (in either Provincial Court or Supreme Court), a court order dealing with
+    guardianship, parenting time, allocation of parenting responsibilities, or contact with a child. Under
+    the Divorce Act in Supreme Court, a court order dealing with custody and access.
+    <br/><br/>
+    &quot;Arrangements for parenting&quot; refers to who will be responsible for making decisions about the children and if and how they will
+    spend time with each parent.
+{% endblock %}
+
+{% block label %}
+    order about parenting arrangements or contact
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/parental_responsibilities.html

@@ -0,0 +1,21 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Parental Responsibilities
+{% endblock %}
+
+{% block inner %}
+    The responsibilities guardians have for the children in their care, including decisions about daily care, education, religious upbringing,
+    extracurricular activities, etc. After separation or divorce, guardians can share parental responsibilities in whatever way that's in the child's
+    best interests, as decided by agreement or court order.
+    <br /><br />
+    When a child's parents live together, both parents are the child's guardians (have guardianship).
+    When the parents separate, both parents continue to be guardians unless they agree to change this or a court orders a change.
+    A court can give guardianship of a child to a non-parent.
+    Guardians are responsible for making all decisions about their child, including about daily care and supervision, education, health care,
+    cultural or religious upbringing, and where the child will live.
+{% endblock %}
+
+{% block label %}
+    parental responsibilities
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/parenting_time.html

@@ -0,0 +1,13 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Parenting Time
+{% endblock %}
+
+{% block inner %}
+    The time that a guardian spends with a child and is responsible for the care and supervision of the child.
+{% endblock %}
+
+{% block label %}
+    parenting time
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/payor.html

@@ -0,0 +1,13 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Payor
+{% endblock %}
+
+{% block inner %}
+    The person who pays child support.
+{% endblock %}
+
+{% block label %}
+    payor
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/proportionate_share.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Proportionate Share
+{% endblock %}
+
+{% block inner %}
+    Proportionate share means that the amount determined to be payable by each parent is calculated in
+    relation to their respective incomes. For example, if claimant 1 earns $65k and claimant 2 earns $35K,
+    claimant 1’s share is 65% and claimant 2’s share is 35%. To calculate your proportionate share, divide
+    your income by the total of both your incomes, then multiply this number (usually a decimal form, such as
+    0.65) by the actual cost of special or extraordinary expenses.
+{% endblock %}
+
+{% block label %}
+    proportionate shares
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/proposed_in_order.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Proposed in the Order
+{% endblock %}
+
+{% block inner %}
+    When you file your completed divorce forms at the court registry they will include the "order"
+    you want made. Basically you're asking the court (via a judge) to approve what you are asking for
+    and / or have agreed upon (e.g. monthly child support amount).
+{% endblock %}
+
+{% block label %}
+    proposed in the order
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/special_extra_expenses.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Special and Extraordinary Expenses
+{% endblock %}
+
+{% block inner %}
+    Special expenses are over and above the regular cost of living for a child,
+    such as the cost of child care or post-secondary education. Extraordinary
+    expenses are for education, programs, or extracurricular activities that meet
+    the child's needs, such as for tutoring or private school, or for other
+    activities at which the child excels.
+{% endblock %}
+
+{% block label %}
+    special and extraordinary expenses
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/terms_of_debt.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Terms of this Debt
+{% endblock %}
+
+{% block inner %}
+    For example, how much is owed, what is the rate of interest,
+    when it must be repaid.
+{% endblock %}
+
+{% block label %}
+    terms of this debt
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/children/undue_hardship.html

@@ -0,0 +1,20 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Undue Hardship
+{% endblock %}
+
+{% block inner %}
+    Circumstances that show the amount of child support under the child support guidelines is too
+    high or low. Must create "undue" (exceptional, excessive or disproportionate) difficulty
+    for the person making the claim.
+    <br/><br/>
+    A term used by the Child Support Guidelines to describe circumstances when payment of the table
+    amount of child support would cause financial difficulty for the payor or the recipient, potentially
+    justifying an award of support in an amount different than the table amount. See &quot;child support,&quot;
+    &quot;Child Support Guidelines&quot; and &quot;table amount.&quot;
+{% endblock %}
+
+{% block label %}
+    undue hardship
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/collusion.html

@@ -0,0 +1,13 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Collusion
+{% endblock %}
+
+{% block inner %}
+    Basically this statement confirms that you and your spouse haven’t lied or tried to deceive the court
+    in any way (for example, saying that you’ve been separated for longer than you have been).
+    It is a legal requirement that you confirm you are providing accurate and complete information.
+{% endblock %}
+
+{% block label %}collusion{% endblock %}

edivorce/apps/core/templates/partials/tooltips/commissioner.html

@@ -1,12 +1,18 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Commissioner</b>
-                <br /><br />
-                A Commissioner for Taking Affidavits is a person appointed or designated under the Evidence Act to administer oaths and affirmations
-                and to take affidavits and declarations. A person may be eligible for appointment as a Commissioner for Taking Affidavits if their
-                employment, or work with a volunteer organization, involves administering oaths or affirmations, or taking affidavits or statutory
-                declarations, as permitted, authorized or required by law. Lawyers and notaries public are always commissioners for taking affidavits,
-                as are family justice counsellors and many court registry staff. There is also usually a commissioner for taking affidavits at each
-                Service BC office throughout the province.">
-          commissioner<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Commissioner
+{% endblock %}
+
+{% block inner %}
+    A Commissioner for Taking Affidavits is a person appointed or designated under the Evidence Act to administer oaths and affirmations
+    and to take affidavits and declarations. A person may be eligible for appointment as a Commissioner for Taking Affidavits if their
+    employment, or work with a volunteer organization, involves administering oaths or affirmations, or taking affidavits or statutory
+    declarations, as permitted, authorized or required by law. Lawyers and notaries public are always commissioners for taking affidavits,
+    as are family justice counsellors and many court registry staff. There is also usually a commissioner for taking affidavits at each
+    Service BC office throughout the province.
+{% endblock %}
+
+{% block label %}
+    commissioner
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/court_file_number.html

@@ -1,9 +1,14 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Court File Number</b>
-                <br /><br />
-                This is the filing # given by the Court Registry to your spouse when they filed their portion
-                of the documents. If unknown, please check with your spouse before entering your Court File #.">
-          {% if text %}{{ text }}{% else %}Court File Number{% endif %}
-    <i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court File Number
+{% endblock %}
+
+{% block inner %}
+    This is the filing # given by the Court Registry to your spouse when they filed their portion
+    of the documents. If unknown, please check with your spouse before entering your Court File Number
+{% endblock %}
+
+{% block label %}
+    Court File Number
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/court_order.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court Order
+{% endblock %}
+
+{% block inner %}
+    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.
+{% endblock %}
+
+{% block label %}
+    Court order
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/court_registrar.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court Registrar
+{% endblock %}
+
+{% block inner %}
+    An officer of the court who has the power to make certain decisions
+    (such as whether or not a divorce application without an original marriage certificate will be accepted).
+{% endblock %}
+
+{% block label %}
+    court registrar
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/court_registry.html

@@ -1,19 +1,24 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Court Registry</b>
-                <br /><br />
-                You have selected to file at the following Ministry of Attorney General Court Registry location:
-                <br />
-                <br />
-                {% if court_registry_for_filing %}
-                    {{ court_registry_for_filing }}
-                    <br />
-                    {{ court_registry_for_filing_address }}
-                    <br />
-                    {{ court_registry_for_filing_postal_code }}
-                {% else %}
-                    No Court Registry was chosen
-                {% endif %}
-                ">
-          Court Registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court Registry
+{% endblock %}
+
+{% block inner %}
+    You have selected to file at the following Ministry of Attorney General Court Registry location:
+    <br/>
+    <br/>
+    {% if court_registry_for_filing %}
+        {{ court_registry_for_filing }}
+        <br/>
+        {{ court_registry_for_filing_address }}
+        <br/>
+        {{ court_registry_for_filing_postal_code }}
+    {% else %}
+        No Court Registry was chosen
+    {% endif %}
+{% endblock %}
+
+{% block label %}
+    Court Registry
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/draft_final_order_52.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Draft Final Order Form (F52)</b>
-                <br /><br />
-                This will be your divorce order once the judge has signed it.
-                It sets out the court order.
-                <br /><br />
-                - Requires signature by both you and your spouse (but not a signature in front of a commissioner)">
-          Draft Final Order Form (F52)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/draft_of_order.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Draft of the Order
+{% endblock %}
+
+{% block inner %}
+    A draft final order sets out what orders (decisions) you want the
+    court to make (what you want the judge to approve). The draft final
+    order is reviewed by a judge or master. If the judge or master makes
+    the order you ask for, they'll sign the <b>draft order</b> you filed
+    and it becomes your <b>final court order</b>.
+{% endblock %}
+
+{% block label %}
+    draft of the order
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/family_debt.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Family Debt
+{% endblock %}
+
+{% block inner %}
+    Money owed to others accumulated during a relationship or to
+    maintain family property after separation. The law assumes that
+    both spouses are equally responsible for the debt unless an equal
+    division would be “significantly unfair.”
+{% endblock %}
+
+{% block label %}
+    family debt
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/family_property.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Family Property
+{% endblock %}
+
+{% block inner %}
+    The asset acquired by either spouse during the course of the
+    relationship, plus any increase in the value of excluded
+    properties. The law assumes that you're both entitled to an equal
+    share of family property unless an equal division would be
+    significantly unfair.
+{% endblock %}
+
+{% block label %}
+    family property
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/file.html

@@ -1,7 +1,13 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>File</b>
-                <br /><br />
-                Need tooltip text still">
-          file<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    File
+{% endblock %}
+
+{% block inner %}
+    Need tooltip text still
+{% endblock %}
+
+{% block label %}
+    file
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/form_child_support_37.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Child Support Affidavit (F37)</b>
-                <br /><br />
-                This form gives facts about your children and child support, including the order you're asking the court for.
-                You must also attach your separation agreement or court orders about children to this form as exhibits.
-                <br /><br />
-                - Required swearing/affirming and signatures by both you and your spouse in front of a commissioner.">
-          Child Support Affidavit (F37)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/form_desk_order_38.html

@@ -1,9 +0,0 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Affidavit - Desk Order Divorce Form (F38)</b>
-                <br /><br />
-                This form sets out all the facts of your marriage and separation for the court and gives information about parenting time if you have children.
-                It requires swearing/affirming and signatures by both you and your spouse in front of a commissioner.">
-          {% if text %}{{ text }}{% else %}Affidavit — Desk Order Divorce Form (F38){% endif %}
-    <i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Affidavit of Translation
+{% endblock %}
+
+{% block inner %}
+    The Affidavit of Translation is an affidavit which is sworn by a translator before a notary,
+    lawyer or commissioner for taking Affidavits.
+    The original certificate of marriage should be exhibited to the Affidavit of Translation together
+    with the translation of the translator.
+{% endblock %}
+
+{% block label %}
+    Affidavit of Translation (F30)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Agreement as to Annual Income (F9)
+{% endblock %}
+
+{% block inner %}
+    This form is completed by registry staff after your application has been reviewed by them.
+    It shows the judge that your application has been checked and is complete.
+    <br/><br/>
+    - Does not require signatures when filed online.
+{% endblock %}
+
+{% block label %}
+    Agreement as to Annual Income (F9)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Certificate of Pleadings Form (F36)
+{% endblock %}
+
+{% block inner %}
+    This form is completed by registry staff after your application has been reviewed by them.
+    It shows the judge that your application has been checked and is complete.
+    <br/><br/>
+    - Does not require signatures when filed online.
+{% endblock %}
+
+{% block label %}
+    Certificate of Pleadings Form (F36)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Child Support Affidavit (F37)
+{% endblock %}
+
+{% block inner %}
+    This form gives facts about your children and child support, including the order you're asking the court for.
+    You must also attach your separation agreement or court orders about children to this form as exhibits.
+    <br/><br/>
+    - Required swearing / affirming and signatures by both you and your spouse in front of a commissioner.
+{% endblock %}
+
+{% block label %}
+    Child Support Affidavit (F37)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Affidavit - Desk Order Divorce Form (F38)
+{% endblock %}
+
+{% block inner %}
+    <br/><br/>
+    This form sets out all the facts of your marriage and separation for the court and gives information about parenting time if you have children.
+    It requires swearing / affirming and signatures by both you and your spouse in front of a commissioner.
+{% endblock %}
+
+{% block label %}
+    Affidavit — Desk Order Divorce Form (F38)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Draft Final Order Form (F52)
+{% endblock %}
+
+{% block inner %}
+    This will be your divorce order once the judge has signed it.
+    It sets out the court order.
+    <br/><br/>
+    - Requires signature by both you and your spouse (but not a signature in front of a commissioner)">
+{% endblock %}
+
+{% block label %}
+    Draft Final Order Form (F52)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Identification of Applicant (VSA 512)
+{% endblock %}
+
+{% block inner %}
+    This form is used by the Court to notify Vital Statistics of court-ordered legal changes of name.
+    <br/><br/>
+    - Does not require signatures.
+{% endblock %}
+
+{% block label %}
+    Identification of Applicant (VSA 512)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Registration of Joint Divorce Proceedings (JUS280)
+{% endblock %}
+
+{% block inner %}
+    This form is for a central divorce registry in Ottawa.
+    They use the form to check to make sure there is no other divorce proceeding pending in Canada.
+    They also keep track of all divorces in Canada.
+    <br/><br/>
+    - Does not require signatures.
+{% endblock %}
+
+{% block label %}
+    Registration of Joint Divorce Proceedings (JUS280)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Notice of Joint Family Claim Form (F1)
+{% endblock %}
+
+{% block inner %}
+    This form starts your divorce proceeding.
+    It gives the court details about you and your spouse, your marriage and separation, and what you're asking the court for.
+    <br/><br/>
+    - Does not require signatures when filed online.
+{% endblock %}
+
+{% block label %}
+    Notice of Joint Family Claim
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Proof of marriage
+{% endblock %}
+
+{% block inner %}
+    To get a divorce, you need an original marriage certificate or certified true copy of your registration of marriage to prove you are married.
+    There are other options described in this tool if you can't get a copy of your marriage certificate or registration of marriage.
+    <br/><br/>
+    - Does not require signatures.
+{% endblock %}
+
+{% block label %}
+    Proof of marriage
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Registration of Divorce form
+{% endblock %}
+
+{% block inner %}
+    This form is for a central divorce registry in Ottawa.
+    They use the form to check to make sure there is no other divorce proceeding pending in Canada.
+    They also keep track of all divorces in Canada.
+    <br/><br/>
+    - Does not require signatures.
+{% endblock %}
+
+{% block label %}
+    Completed Registration of Divorce form (Federal)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Requisition Form (F35)
+{% endblock %}
+
+{% block inner %}
+    This form is a request to the Court for your application for divorce.
+    It tells the court that you want a divorce and outlines all the documents you are filing in support of your application.
+    <br/><br/>
+    - Does not require signatures when filed online.
+{% endblock %}
+
+{% block label %}
+    Requisition Form (F35)
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Separation Agreement
+{% endblock %}
+
+{% block inner %}
+    A document that sets out how you and your spouse have agreed to deal with things like parenting support
+    and property after you separate (Provincial family law calls it an agreement).
+    There's no official form to use for drafting up a separation agreement.
+{% endblock %}
+
+{% block label %}
+    Separation agreement
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/identification_of_applicant.html

@@ -1,9 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Identification of Applicant (VSA 512)</b>
-                <br /><br />
-                This form is used by the Court to notify Vital Statistics of court-ordered legal changes of name.
-                <br /><br />
-                - Does not require signatures.">
-          Identification of Applicant (VSA 512)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/joint_divorce.html

@@ -0,0 +1,16 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Joint Divorce
+{% endblock %}
+
+{% block inner %}
+    Joint divorce means making an application for a divorce together with your spouse.
+    It means that you and your spouse agree about getting a divorce and that you
+    agree about all of the family law issues relevant to your situation, such as spousal
+    support, and the division of family property and debts.
+{% endblock %}
+
+{% block label %}
+    joint divorce
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/joint_divorce_proceedings.html

@@ -1,11 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Registration of Joint Divorce Proceedings (JUS280)</b>
-                <br /><br />
-                This form is for a central divorce registry in Ottawa.
-                They use the form to check to make sure there is no other divorce proceeding pending in Canada.
-                They also keep track of all divorces in Canada.
-                <br /><br />
-                - Does not require signatures.">
-          Registration of Joint Divorce Proceedings (JUS280)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html

@@ -1,9 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Notice of Joint Family Claim Form (F1)</b>
-                <br /><br />
-                This form starts your divorce proceeding. It gives the court details about you and your spouse, your marriage and separation, and what you're asking the court for.
-                <br /><br />
-                - Does not require signatures when filed online.">
-          {% if text %}{{ text }}{% else %}Notice of Joint Family Claim{% endif %}<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/legally_married.html

@@ -0,0 +1,19 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Legally Married
+{% endblock %}
+
+{% block inner %}
+    Legally married is defined as: when two people agree
+    to live together in a partnership made legally
+    binding by a religous or legal ceremony.
+    <br/><br/>
+    To prove you were legally married you will need to
+    provide a marriage certificate issued in the country
+    where you were married.
+{% endblock %}
+
+{% block label %}
+    Legally married
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/live_separate_apart.html

@@ -0,0 +1,25 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Living Separate and Apart
+{% endblock %}
+
+{% block inner %}
+    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 or your spouse have clearly communicated your
+        intention for a permanent separation (and are starting to act
+        upon it).
+    <br><br>
+    This could mean:
+    <ul>
+        <li>You're living in separate rooms</li>
+        <li>You're sleeping in separate beds</li>
+        <li>There's no sexual relationship</li>
+    </ul>
+{% endblock %}
+
+{% block label %}
+    living separate and apart
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/marriage_like.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Marriage Like Relationship
+{% endblock %}
+
+{% block inner %}
+    The term "common-law relationship" is often used to
+    refer to a marriage-like relationship that has lasted a certain
+    length of time, usually one or two years.
+{% endblock %}
+
+{% block label %}
+    marriage like
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/master.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Master
+{% endblock %}
+
+{% block inner %}
+    A master is a judicial officer of the Supreme Court who can hear and
+    decide certain applications, including interim applications for
+    parenting or support orders.
+{% endblock %}
+
+{% block label %}
+    master
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/online_package_number.html

@@ -1,8 +1,14 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>CSO Online Package #</b>
-                <br /><br />
-                This is the filing # given by the Court Registry to your spouse when they filed their portion
-                of the documents. If unknown, please check with your spouse before entering your Court File #.">
-          {% if with_cso %}CSO {% endif %}Online Package #<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    CSO Online Package #
+{% endblock %}
+
+{% block inner %}
+    This is the filing # given by the Court Registry to your spouse when they filed their portion
+    of the documents. If unknown, please check with your spouse before entering your Court File Number.
+{% endblock %}
+
+{% block label %}
+    {% if with_cso %}CSO {% endif %}Online Package #
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/order.html

@@ -0,0 +1,11 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Orders
+{% endblock %}
+
+{% block inner %}
+    A type of court ruling a judge or master makes that sets out what you must do or not do.
+{% endblock %}
+
+{% block label %}order{% endblock %}

edivorce/apps/core/templates/partials/tooltips/ordinary_residence.html

@@ -0,0 +1,33 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Ordinary Residence
+{% endblock %}
+
+{% block inner %}
+    Ordinary Residence
+    <ul>
+        <li>The place where a person resides in the ordinary course
+            of his or her day to day
+        </li>
+        <li>You do not lose your ordinary residence in a place when
+            you leave for a temporary purpose (e.g. go to school in
+            another province)
+        </li>
+    </ul><br/>
+    Not an Ordinary Residence
+    <ul>
+        <li>If you have travelled to another place to live and work
+            indefinitely (even though you ultimately intend to return to
+            the prior home)
+        </li>
+    </ul>
+    <p>A detailed explanation of the
+        <a href='http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html'
+           target='_blank'>meaning of ordinary residence</a> can be
+        found on the Department of Justice website.</p>
+{% endblock %}
+
+{% block label %}
+    ordinary residence
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/original_marriage_certificate.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Original Marriage Certificate
+{% endblock %}
+
+{% block inner %}
+    The marriage certificate you received at the church —
+    or any other place where you were married — isn't acceptable in court. You can get a  marriage certificate
+    or a certified copy of the registration of marriage from
+    <a target='_blank' href='https://www2.gov.bc.ca/gov/content?id=1CC89B10AE964BFABB99D1A4AADC38BF'>Vital Statistics</a>
+    (an office run by the provincial government).
+{% endblock %}
+
+{% block label %}
+    marriage certificate
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/proof_of_marriage.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Proof of marriage</b>
-                <br /><br />
-                To get a divorce, you need an original marriage certificate or certified true copy of your registration of marriage to prove you are married.
-                There are other options described in this tool if you can't get a copy of your marriage certificate or registration of marriage.
-                <br /><br />
-                - Does not require signatures.">
-          Proof of marriage<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/provincial_court.html

@@ -0,0 +1,13 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Provincial Court
+{% endblock %}
+
+{% block inner %}
+    The lower level trial court which deals with small claims, family, youth criminal offenders, criminal and traffic matters.
+{% endblock %}
+
+{% block label %}
+    Provincial Court
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/registration_marriage_certificate.html

@@ -0,0 +1,22 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Registration Marriage Certificate
+{% endblock %}
+
+{% block inner %}
+    The Registration of Marriage is the document issued by Vital Statistics
+    (an office run by the provincial government) along with the Marriage License. This document would have been signed by you, your
+    spouse, the person who married you (the officiant), and your wedding ceremony witnesses. Within 48 hours of the wedding, the officiant
+    would have submitted the registration to the Vital Statistics Agency where the registration information becomes a permanent legal record.
+    Vital Statistics cannot issue a marriage certificate until the marriage is registered.
+    <br/><br/>
+    For more information, please refer to the
+    <a href='http://www2.gov.B.C..ca/gov/content/life-events/marriages/marriage-registration/certified-copies-and-certified-electronic-extracts-of-a-marriage-registration'
+       target='_blank'>Marriage Registration page</a>
+    on the  B.C. Government website.
+{% endblock %}
+
+{% block label %}
+    registration of marriage
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/registry.html

@@ -0,0 +1,14 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Court Registry
+{% endblock %}
+
+{% block inner %}
+    A registry is where you file your divorce documents. Registries are located in courthouses
+    <a target='_blank' href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx'>around the province</a>.
+{% endblock %}
+
+{% block label %}
+    registry
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/requisition_form_35.html

@@ -1,10 +0,0 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Requisition Form (F35)</b>
-                <br /><br />
-                This form is a request to the Court for your application for divorce.
-                It tells the court that you want a divorce and outlines all the documents you are filing in support of your application.
-                <br /><br />
-                - Does not require signatures when filed online.">
-          Requisition Form (F35)<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/templates/partials/tooltips/sole_divoroce.html

@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Sole Divorce
+{% endblock %}
+
+{% block inner %}
+    You're filing for divorce but your spouse isn't involved in the application process.
+    Only you will provide the information on the forms and sign them.<br/>
+    If you are seeking a sole divorce you can find the required forms on the using
+    <a href=&quot;https://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms&quot;
+       target=&quot;_blank&quot;>Supreme Court of B.C. website</a>
+{% endblock %}
+
+{% block label %}
+    sole divorce
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/supreme_court.html

@@ -0,0 +1,15 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Supreme Court
+{% endblock %}
+
+{% block inner %}
+    The higher level trial court. This court also hears appeals from
+    the Provincial Court, and sometimes reviews the decisions of certain
+    provincial tribunals and public decision-making bodies.
+{% endblock %}
+
+{% block label %}
+    Supreme Court
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/swear_affirm.html

@@ -1,14 +1,21 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Swear/Affirm</b>
-                <br /><br />
-                An &quot;affidavit&quot; is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book) or affirm
-        (non-religious promise) to be true. After you swear or affirm, the affidavit is evidence of the facts it sets out, just as if you took the
-        stand in a courtroom to provide those facts.
-        <br /><br />
-        To swear or affirm an affidavit, you must meet with a commissioner for taking oaths. The
-        commissioner (often a lawyer, notary public or registry clerk) will check your photo id to make sure you are who you say you are, ask you if
-        you understand the contents of your affidavit, then ask you to swear or affirm that the contents are true. The commissioner will then watch
-        you sign the document before signing it themselves.">
-    {% if text %}{{ text }}{% else %}swear/affirm{% endif %}<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Swear / Affirm
+{% endblock %}
+
+{% block inner %}
+    An &quot;affidavit&quot; is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book)
+    or affirm (non-religious promise) to be true.
+    After you swear or affirm, the affidavit is evidence of the facts it sets out,
+    just as if you took the stand in a courtroom to provide those facts.
+    <br/><br/>
+    To swear or affirm an affidavit, you must meet with a commissioner for taking oaths.
+    The commissioner (often a lawyer, notary public or registry clerk) will check your photo id to make sure you are who you say you are,
+    ask you if you understand the contents of your affidavit, then ask you to swear or affirm that the contents are true.
+    The commissioner will then watch you sign the document before signing it themselves.
+{% endblock %}
+
+{% block label %}
+    swear / affirm
+{% endblock %}

edivorce/apps/core/templates/partials/tooltips/virtual_session.html

@@ -1,12 +1,18 @@
-<span class="tooltip-link" data-toggle="{% if hover %}tooltip-hover{% else %}tooltip{% endif %}" data-placement="right"
-      data-html="true"
-      title="
-                <b>Virtual Session</b>
-                <br /><br />
-                When you select Virtual Session you will be contacted via email by the court registry to setup an online
-                signing of your affidavit(s). Note that you will require a smart phone with a camera that runs iOS
-                version X or Android version Y or a computer with a camera running Windows or MacOS. During the session
-                both you and the court registry clerk will sign your forms separately and then upload them back in this
-                tool. When you choose this option you will also need to scan and upload the unsigned affidavit(s) to
-                this site before the virtual session.">
-          virtual session<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Virtual Session
+{% endblock %}
+
+{% block inner %}
+    When you select Virtual Session you will be contacted via email by the court registry to setup an online
+    signing of your affidavit(s). Note that you will require a smart phone with a camera that runs iOS
+    version X or Android version Y or a computer with a camera running Windows or MacOS. During the session
+    both you and the court registry clerk will sign your forms separately and then upload them back in this
+    tool. When you choose this option you will also need to scan and upload the unsigned affidavit(s) to
+    this site before the virtual session.
+{% endblock %}
+
+{% block label %}
+    virtual session
+{% endblock %}

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

@@ -200,7 +200,7 @@
 
               <li>
                 {% if responses.which_claimant == 'both' %}We{% else %}I{% endif %}
-                have sworn/affirmed a child support affidavit in Form F37, and
+                have sworn / affirmed a child support affidavit in Form F37, and
               </li>
 
               <li>

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

@@ -31,36 +31,12 @@
 
     <div class="radio"><label>
         {% input_field type="radio" name="married_marriage_like" value="Legally married" class="keep-tooltip-open" data_target_id="cannot_divorce_common_law" data_reveal_target="false" data_target_class="not-disqualified" data_reveal_class="true" %}
-        Legally married<i class="fa fa-question-circle"
-                          data-toggle="tooltip"
-                          data-placement="right"
-                          data-html="true"
-                          title="
-                          <b>LEGALLY MARRIED</b>
-                          <br /><br />
-                          Legally married is defined as: when two people agree
-                          to live together in a partnership made legally
-                          binding by a religous or legal ceremony.
-                          <br /><br />
-                          To prove you were legally married you will need to
-                          provide a marriage certificate issued in the country
-                          where you were married."
-                          aria-hidden="true"></i>
+        {% include "partials/tooltips/legally_married.html" %}
     </label></div>
 
     <div class="radio"><label>
         {% input_field type="radio"  name="married_marriage_like" value="Living together in a marriage like relationship" class="keep-tooltip-open" data_target_id="cannot_divorce_common_law" data_reveal_target="true" data_target_class="not-disqualified" data_reveal_class="false" %}
-        Living together in a
-        <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-              data-html="true"
-              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.">
-          marriage like<i class="fa fa-question-circle" aria-hidden="true"></i>
-        </span>
+        Living together in a {% include "partials/tooltips/marriage_like.html" %}
         (also known as common law) relationship
     </label></div>
 
@@ -120,30 +96,10 @@
 {% endblock %}
 
 {% block sidebarText %}
-    <p>This tool is for those seeking
-        <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-          data-html="true"
-          title="
-            <b>Joint divorce</b>
-            <br /><br />
-            Joint divorce means making an application for a divorce together with your spouse.
-             It means that you and your spouse agree about getting a divorce and that you
-             agree about all of the family law issues relevant to your situation, such as spousal
-             support, and the division of family property and debts.">
-            joint divorce<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
-        If you are seeking a
-        <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-              data-html="true"
-              title="
-                <b>Sole divorce</b>
-                <br /><br />
-                You're filing for divorce but your spouse isn't involved in the application process.
-                Only you will provide the information on the forms and sign them.<br />
-                If you are seeking a sole divorce you can find the required forms on the using
-                <a href=&quot;https://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms&quot;
-                target=&quot;_blank&quot;>Supreme Court of B.C. website</a>">
-                sole divorce<i class="fa fa-question-circle" aria-hidden="true"></i></span> you can find the required forms
-        on the using <a href="https://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms"
-                target="_blank">Supreme Court of B.C. website</a>
+    <p>This tool is for those seeking {% include "partials/tooltips/joint_divorce.html" %}.
+        If you are seeking a {% include "partials/tooltips/sole_divoroce.html" %}.
+        you can find the required forms on the using
+        <a href="https://www2.gov.bc.ca/gov/content/justice/courthouse-services/documents-forms-records/court-forms/sup-family-forms" target="_blank">
+            Supreme Court of B.C. website</a>
     </p>
 {% endblock %}

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

@@ -87,33 +87,8 @@
     </div>
 
     <p>In order to apply for a divorce in B.C., you or your spouse must have
-    been a regular resident in B.C (the legal term is
-        <span class="tooltip-link"
-              data-toggle="tooltip" data-placement="right" data-html="true"
-              title="
-                <b>Ordinarily resident</b>
-                <br /><br />
-                Ordinarily Resident
-                <ul>
-                  <li>the place where a person resides in the ordinary course
-                  of his or her day to day</li>
-                  <li>you do not lose your ordinary resident in a place when
-                  you leave for a temporary purpose (e.g. go to school in
-                  another province)</li>
-                </ul><br/>
-                Not an Ordinarily Resident
-                <ul>
-                  <li>If you have travelled to another place to live and work
-                  indefinitely (even though you ultimately intend to return to
-                  the prior home)</li>
-                </ul>
-                <p>A detailed explanation of the
-                  <a href='http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html'
-                    target='_blank'>meaning of ordinarily resident</a> can be
-                  found on the Department of Justice website.</p>
-                ">
-            ordinarily resident<i class="fa fa-question-circle" aria-hidden="true"></i>
-        </span>) for at least one year immediately before starting the proceeding.
+    been a regular resident in B.C (the legal term is {% include "partials/tooltips/ordinary_residence.html" %})
+        for at least one year immediately before starting the proceeding.
     </p>
 
     <div class="information-message bg-danger" id="divorce_precondition" hidden>