From 43574b4e4e0087ddf7fd195b5818ce9b6dc91c27 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Mon, 16 Nov 2020 16:42:35 -0800
Subject: [PATCH] Changed the implementaion of tooltip includes to remove
 coniditional logic from the base class. "Blocks are evaluated before they are
 included. This means that a template that includes blocks from another will
 contain blocks that have already been evaluated and rendered..."

---
 .../apps/core/templates/partials/tooltips/affidavit.html    | 2 +-
 .../apps/core/templates/partials/tooltips/an_agreement.html | 2 +-
 .../apps/core/templates/partials/tooltips/application.html  | 2 +-
 .../templates/partials/tooltips/children/child_support.html | 2 +-
 .../partials/tooltips/children/children_of_marriage.html    | 2 +-
 .../templates/partials/tooltips/children/court_order.html   | 2 +-
 .../core/templates/partials/tooltips/children/custody.html  | 2 +-
 .../partials/tooltips/children/duty_to_support.html         | 2 +-
 .../partials/tooltips/children/education_expenses.html      | 2 +-
 .../templates/partials/tooltips/children/enforceable.html   | 2 +-
 .../core/templates/partials/tooltips/children/exhibit.html  | 2 +-
 .../partials/tooltips/children/extracurricular_expense.html | 2 +-
 .../partials/tooltips/children/health_expenses.html         | 2 +-
 .../templates/partials/tooltips/children/in_arrears.html    | 2 +-
 .../tooltips/children/order_respecting_arrangements.html    | 2 +-
 .../tooltips/children/parental_responsibilities.html        | 2 +-
 .../partials/tooltips/children/parenting_time.html          | 2 +-
 .../core/templates/partials/tooltips/children/payor.html    | 2 +-
 .../partials/tooltips/children/proportionate_share.html     | 2 +-
 .../partials/tooltips/children/proposed_in_order.html       | 2 +-
 .../partials/tooltips/children/special_extra_expenses.html  | 2 +-
 .../templates/partials/tooltips/children/terms_of_debt.html | 2 +-
 .../partials/tooltips/children/undue_hardship.html          | 2 +-
 .../apps/core/templates/partials/tooltips/collusion.html    | 4 +++-
 .../apps/core/templates/partials/tooltips/commissioner.html | 2 +-
 .../core/templates/partials/tooltips/court_file_number.html | 2 +-
 .../apps/core/templates/partials/tooltips/court_order.html  | 2 +-
 .../core/templates/partials/tooltips/court_registrar.html   | 2 +-
 .../core/templates/partials/tooltips/court_registry.html    | 2 +-
 .../core/templates/partials/tooltips/draft_of_order.html    | 2 +-
 .../apps/core/templates/partials/tooltips/family_debt.html  | 2 +-
 .../core/templates/partials/tooltips/family_property.html   | 2 +-
 edivorce/apps/core/templates/partials/tooltips/file.html    | 2 +-
 .../partials/tooltips/forms/affidavit_of_translation.html   | 2 +-
 .../tooltips/forms/agreement_to_annual_income_9.html        | 2 +-
 .../partials/tooltips/forms/certificate_of_pleading_36.html | 2 +-
 .../templates/partials/tooltips/forms/child_support_37.html | 2 +-
 .../templates/partials/tooltips/forms/desk_order_38.html    | 2 +-
 .../partials/tooltips/forms/draft_final_order_52.html       | 2 +-
 .../tooltips/forms/identification_of_applicant.html         | 2 +-
 .../partials/tooltips/forms/joint_divorce_proceedings.html  | 2 +-
 .../partials/tooltips/forms/joint_family_claim_1.html       | 2 +-
 .../partials/tooltips/forms/proof_of_marriage.html          | 2 +-
 .../partials/tooltips/forms/registration_of_divorce.html    | 2 +-
 .../partials/tooltips/forms/requisition_form_35.html        | 2 +-
 .../partials/tooltips/forms/separation_agreement.html       | 2 +-
 .../core/templates/partials/tooltips/joint_divorce.html     | 2 +-
 .../templates/partials/tooltips/live_separate_apart.html    | 2 +-
 edivorce/apps/core/templates/partials/tooltips/master.html  | 2 +-
 .../templates/partials/tooltips/online_package_number.html  | 6 +++++-
 edivorce/apps/core/templates/partials/tooltips/order.html   | 4 +++-
 .../templates/partials/tooltips/ordinary_residence.html     | 2 +-
 .../partials/tooltips/original_marriage_certificate.html    | 2 +-
 .../core/templates/partials/tooltips/provincial_court.html  | 2 +-
 .../tooltips/registration_marriage_certificate.html         | 2 +-
 .../apps/core/templates/partials/tooltips/registry.html     | 2 +-
 .../apps/core/templates/partials/tooltips/sole_divorce.html | 2 +-
 .../core/templates/partials/tooltips/supreme_court.html     | 2 +-
 .../apps/core/templates/partials/tooltips/swear_affirm.html | 2 +-
 .../core/templates/partials/tooltips/virtual_session.html   | 2 +-
 60 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/edivorce/apps/core/templates/partials/tooltips/affidavit.html b/edivorce/apps/core/templates/partials/tooltips/affidavit.html
index 4c8fdae3..57baba27 100644
--- a/edivorce/apps/core/templates/partials/tooltips/affidavit.html
+++ b/edivorce/apps/core/templates/partials/tooltips/affidavit.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    affidavit(s)
+    {% if text %}{{ text }}{% else %}affidavit(s){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/an_agreement.html b/edivorce/apps/core/templates/partials/tooltips/an_agreement.html
index b87a71cf..16fecf6f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/an_agreement.html
+++ b/edivorce/apps/core/templates/partials/tooltips/an_agreement.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    an agreement
+    {% if text %}{{ text }}{% else %}an agreement{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/application.html b/edivorce/apps/core/templates/partials/tooltips/application.html
index a3f44ab8..ebd60a47 100644
--- a/edivorce/apps/core/templates/partials/tooltips/application.html
+++ b/edivorce/apps/core/templates/partials/tooltips/application.html
@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    application
+    {% if text %}{{ text }}{% else %}application{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/child_support.html b/edivorce/apps/core/templates/partials/tooltips/children/child_support.html
index 9b0d11e0..444c1934 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/child_support.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/child_support.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    child support
+{% if text %}{{ text }}{% else %}child support{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/children_of_marriage.html b/edivorce/apps/core/templates/partials/tooltips/children/children_of_marriage.html
index beb4797e..29c05370 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/children_of_marriage.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/children_of_marriage.html
@@ -27,5 +27,5 @@
 {% endblock %}
 
 {% block label %}
-    children of the marriage
+    {% if text %}{{ text }}{% else %}children of the marriage{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/court_order.html b/edivorce/apps/core/templates/partials/tooltips/children/court_order.html
index 2c47d054..65194d8f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/court_order.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/court_order.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    court order
+    {% if text %}{{ text }}{% else %}court order{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/custody.html b/edivorce/apps/core/templates/partials/tooltips/children/custody.html
index ec6a1e6c..06b6a524 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/custody.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/custody.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    custody
+    {% if text %}{{ text }}{% else %}custody{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/duty_to_support.html b/edivorce/apps/core/templates/partials/tooltips/children/duty_to_support.html
index 32970174..ba9c18f6 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/duty_to_support.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/duty_to_support.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    duty to support
+    {% if text %}{{ text }}{% else %}duty to support{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/education_expenses.html b/edivorce/apps/core/templates/partials/tooltips/children/education_expenses.html
index c5dce557..6bb0bb45 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/education_expenses.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/education_expenses.html
@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    educational expenses
+    {% if text %}{{ text }}{% else %}educational expenses{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/enforceable.html b/edivorce/apps/core/templates/partials/tooltips/children/enforceable.html
index 3e074b69..8c4d5f50 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/enforceable.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/enforceable.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    enforced
+    {% if text %}{{ text }}{% else %}enforced{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/exhibit.html b/edivorce/apps/core/templates/partials/tooltips/children/exhibit.html
index d0d6998e..cca8bf26 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/exhibit.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/exhibit.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    exhibit
+    {% if text %}{{ text }}{% else %}exhibit{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/extracurricular_expense.html b/edivorce/apps/core/templates/partials/tooltips/children/extracurricular_expense.html
index deafb6e6..ad18bd10 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/extracurricular_expense.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/extracurricular_expense.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    extracurricular activities
+    {% if text %}{{ text }}{% else %}extracurricular activities{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/health_expenses.html b/edivorce/apps/core/templates/partials/tooltips/children/health_expenses.html
index e13119fd..125559a2 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/health_expenses.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/health_expenses.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Health related expenses
+    {% if text %}{{ text }}{% else %}Health related expenses{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/in_arrears.html b/edivorce/apps/core/templates/partials/tooltips/children/in_arrears.html
index 4ff05624..d99d9d98 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/in_arrears.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/in_arrears.html
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    in arrears
+    {% if text %}{{ text }}{% else %}in arrears{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/order_respecting_arrangements.html b/edivorce/apps/core/templates/partials/tooltips/children/order_respecting_arrangements.html
index b0529569..f4d8ba01 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/order_respecting_arrangements.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/order_respecting_arrangements.html
@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    order about parenting arrangements or contact
+    {% if text %}{{ text }}{% else %}order about parenting arrangements or contact{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/parental_responsibilities.html b/edivorce/apps/core/templates/partials/tooltips/children/parental_responsibilities.html
index fefc0806..fec86d2f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/parental_responsibilities.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/parental_responsibilities.html
@@ -17,5 +17,5 @@
 {% endblock %}
 
 {% block label %}
-    parental responsibilities
+    {% if text %}{{ text }}{% else %}parental responsibilities{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/parenting_time.html b/edivorce/apps/core/templates/partials/tooltips/children/parenting_time.html
index 450f9dcf..8392a0de 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/parenting_time.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/parenting_time.html
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    parenting time
+    {% if text %}{{ text }}{% else %}parenting time{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/payor.html b/edivorce/apps/core/templates/partials/tooltips/children/payor.html
index c1230b73..953589b4 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/payor.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/payor.html
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    payor
+    {% if text %}{{ text }}{% else %}payor{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/proportionate_share.html b/edivorce/apps/core/templates/partials/tooltips/children/proportionate_share.html
index 50eec95f..072340cf 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/proportionate_share.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/proportionate_share.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    proportionate shares
+    {% if text %}{{ text }}{% else %}proportionate shares{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/proposed_in_order.html b/edivorce/apps/core/templates/partials/tooltips/children/proposed_in_order.html
index f227da93..7cd19840 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/proposed_in_order.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/proposed_in_order.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    proposed in the order
+    {% if text %}{{ text }}{% else %}proposed in the order{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/special_extra_expenses.html b/edivorce/apps/core/templates/partials/tooltips/children/special_extra_expenses.html
index da2512f3..5cb0e34d 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/special_extra_expenses.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/special_extra_expenses.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    special and extraordinary expenses
+    {% if text %}{{ text }}{% else %}special and extraordinary expenses{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/terms_of_debt.html b/edivorce/apps/core/templates/partials/tooltips/children/terms_of_debt.html
index ce5dbd0f..084a4399 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/terms_of_debt.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/terms_of_debt.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    terms of this debt
+    {% if text %}{{ text }}{% else %}terms of this debt{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/children/undue_hardship.html b/edivorce/apps/core/templates/partials/tooltips/children/undue_hardship.html
index 3bf76a13..d56c1926 100644
--- a/edivorce/apps/core/templates/partials/tooltips/children/undue_hardship.html
+++ b/edivorce/apps/core/templates/partials/tooltips/children/undue_hardship.html
@@ -16,5 +16,5 @@
 {% endblock %}
 
 {% block label %}
-    undue hardship
+    {% if text %}{{ text }}{% else %}undue hardship{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/collusion.html b/edivorce/apps/core/templates/partials/tooltips/collusion.html
index f0712147..42cb6f47 100644
--- a/edivorce/apps/core/templates/partials/tooltips/collusion.html
+++ b/edivorce/apps/core/templates/partials/tooltips/collusion.html
@@ -10,4 +10,6 @@
     It is a legal requirement that you confirm you are providing accurate and complete information.
 {% endblock %}
 
-{% block label %}collusion{% endblock %}
\ No newline at end of file
+{% block label %}
+    {% if text %}{{ text }}{% else %}collusion{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/commissioner.html b/edivorce/apps/core/templates/partials/tooltips/commissioner.html
index 2787e7f0..f96d7730 100644
--- a/edivorce/apps/core/templates/partials/tooltips/commissioner.html
+++ b/edivorce/apps/core/templates/partials/tooltips/commissioner.html
@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    commissioner
+    {% if text %}{{ text }}{% else %}commissioner{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_file_number.html b/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
index 04c0839c..8557ff9b 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    Court File Number
+    {% if text %}{{ text }}{% else %}Court File Number{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_order.html b/edivorce/apps/core/templates/partials/tooltips/court_order.html
index 68ecfa30..c1582ab1 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_order.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_order.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Court order
+    {% if text %}{{ text }}{% else %}Court order{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_registrar.html b/edivorce/apps/core/templates/partials/tooltips/court_registrar.html
index 939e845c..aefcde70 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_registrar.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_registrar.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    court registrar
+    {% if text %}{{ text }}{% else %}court registrar{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_registry.html b/edivorce/apps/core/templates/partials/tooltips/court_registry.html
index 87483240..8f904038 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_registry.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_registry.html
@@ -20,5 +20,5 @@
 {% endblock %}
 
 {% block label %}
-    Court Registry
+    {% if text %}{{ text }}{% else %}Court Registry{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/draft_of_order.html b/edivorce/apps/core/templates/partials/tooltips/draft_of_order.html
index 049f9270..4551f157 100644
--- a/edivorce/apps/core/templates/partials/tooltips/draft_of_order.html
+++ b/edivorce/apps/core/templates/partials/tooltips/draft_of_order.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    draft of the order
+    {% if text %}{{ text }}{% else %}draft of the order{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/family_debt.html b/edivorce/apps/core/templates/partials/tooltips/family_debt.html
index e19c1ca4..ceac1fb1 100644
--- a/edivorce/apps/core/templates/partials/tooltips/family_debt.html
+++ b/edivorce/apps/core/templates/partials/tooltips/family_debt.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    family debt
+    {% if text %}{{ text }}{% else %}family debt{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/family_property.html b/edivorce/apps/core/templates/partials/tooltips/family_property.html
index 6eed0c2f..12a723d5 100644
--- a/edivorce/apps/core/templates/partials/tooltips/family_property.html
+++ b/edivorce/apps/core/templates/partials/tooltips/family_property.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    family property
+    {% if text %}{{ text }}{% else %}family property{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/file.html b/edivorce/apps/core/templates/partials/tooltips/file.html
index 229dcc8e..9faa0c46 100644
--- a/edivorce/apps/core/templates/partials/tooltips/file.html
+++ b/edivorce/apps/core/templates/partials/tooltips/file.html
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    file
+    {% if text %}{{ text }}{% else %}file{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html b/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html
index 10a87963..aeddb4b6 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Affidavit of Translation (F30)
+    {% if text %}{{ text }}{% else %}Affidavit of Translation (F30){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html b/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html
index 9c84e708..e0a137b0 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Agreement as to Annual Income (F9)
+    {% if text %}{{ text }}{% else %}Agreement as to Annual Income (F9){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html b/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html
index b3f4ccfe..ad5d9417 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Certificate of Pleadings Form (F36)
+    {% if text %}{{ text }}{% else %}Certificate of Pleadings Form (F36){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html b/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html
index 17c59385..36d7e896 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Child Support Affidavit (F37)
+    {% if text %}{{ text }}{% else %}Child Support Affidavit (F37){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html b/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html
index b390ff8e..5eeec24f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Affidavit — Desk Order Divorce Form (F38)
+    {% if text %}{{ text }}{% else %}Affidavit — Desk Order Divorce Form (F38){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html b/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html
index 2ee1e219..2aab05b0 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Draft Final Order Form (F52)
+    {% if text %}{{ text }}{% else %}Draft Final Order Form (F52){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html b/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html
index ad4f16ab..a1df27e9 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Identification of Applicant (VSA 512)
+    {% if text %}{{ text }}{% else %}Identification of Applicant (VSA 512){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html
index f9f4078d..e941adc2 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    Registration of Joint Divorce Proceedings (JUS280)
+    {% if text %}{{ text }}{% else %}Registration of Joint Divorce Proceedings (JUS280){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
index 5b62ad87..9d434e36 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Notice of Joint Family Claim
+    {% if text %}{{ text }}{% else %}Notice of Joint Family Claim{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html b/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html
index b7966801..d887979e 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Proof of marriage
+    {% if text %}{{ text }}{% else %}Proof of marriage{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html
index 3ec42a2f..e246aa8c 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    Completed Registration of Divorce form (Federal)
+    {% if text %}{{ text }}{% else %}Completed Registration of Divorce form (Federal){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html b/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html
index ef40b372..2310c6c5 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    Requisition Form (F35)
+    {% if text %}{{ text }}{% else %}Requisition Form (F35){% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html b/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html
index 7c7f2a09..6ffdb29f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Separation agreement
+    {% if text %}{{ text }}{% else %}Separation agreement{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/joint_divorce.html b/edivorce/apps/core/templates/partials/tooltips/joint_divorce.html
index 91fa2273..6d0d4f97 100644
--- a/edivorce/apps/core/templates/partials/tooltips/joint_divorce.html
+++ b/edivorce/apps/core/templates/partials/tooltips/joint_divorce.html
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block label %}
-    joint divorce
+    {% if text %}{{ text }}{% else %}joint divorce{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/live_separate_apart.html b/edivorce/apps/core/templates/partials/tooltips/live_separate_apart.html
index 88629632..b613784e 100644
--- a/edivorce/apps/core/templates/partials/tooltips/live_separate_apart.html
+++ b/edivorce/apps/core/templates/partials/tooltips/live_separate_apart.html
@@ -21,5 +21,5 @@
 {% endblock %}
 
 {% block label %}
-    living separate and apart
+    {% if text %}{{ text }}{% else %}living separate and apart{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/master.html b/edivorce/apps/core/templates/partials/tooltips/master.html
index c2c29880..119fbe0a 100644
--- a/edivorce/apps/core/templates/partials/tooltips/master.html
+++ b/edivorce/apps/core/templates/partials/tooltips/master.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    master
+    {% if text %}{{ text }}{% else %}master{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/online_package_number.html b/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
index cadd878d..20435c43 100644
--- a/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
+++ b/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
@@ -10,5 +10,9 @@
 {% endblock %}
 
 {% block label %}
-    {% if with_cso %}CSO {% endif %}Online Package #
+    {% if text %}
+        {{ text }}
+    {% else %}
+        {% if with_cso %}CSO {% endif %}Online Package #
+    {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/order.html b/edivorce/apps/core/templates/partials/tooltips/order.html
index e2793246..8f26aa74 100644
--- a/edivorce/apps/core/templates/partials/tooltips/order.html
+++ b/edivorce/apps/core/templates/partials/tooltips/order.html
@@ -8,4 +8,6 @@
     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 %}
+{% block label %}
+    {% if text %}{{ text }}{% else %}order{% endif %}
+{% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/ordinary_residence.html b/edivorce/apps/core/templates/partials/tooltips/ordinary_residence.html
index 3f7122d9..4788b553 100644
--- a/edivorce/apps/core/templates/partials/tooltips/ordinary_residence.html
+++ b/edivorce/apps/core/templates/partials/tooltips/ordinary_residence.html
@@ -29,5 +29,5 @@
 {% endblock %}
 
 {% block label %}
-    ordinary residence
+    {% if text %}{{ text }}{% else %}ordinary residence{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/original_marriage_certificate.html b/edivorce/apps/core/templates/partials/tooltips/original_marriage_certificate.html
index a5c338d0..69d437d8 100644
--- a/edivorce/apps/core/templates/partials/tooltips/original_marriage_certificate.html
+++ b/edivorce/apps/core/templates/partials/tooltips/original_marriage_certificate.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    marriage certificate
+    {% if text %}{{ text }}{% else %}marriage certificate{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/provincial_court.html b/edivorce/apps/core/templates/partials/tooltips/provincial_court.html
index 430d8158..ab30e73f 100644
--- a/edivorce/apps/core/templates/partials/tooltips/provincial_court.html
+++ b/edivorce/apps/core/templates/partials/tooltips/provincial_court.html
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    Provincial Court
+    {% if text %}{{ text }}{% else %}Provincial Court{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/registration_marriage_certificate.html b/edivorce/apps/core/templates/partials/tooltips/registration_marriage_certificate.html
index aaeb8f4f..0b03b061 100644
--- a/edivorce/apps/core/templates/partials/tooltips/registration_marriage_certificate.html
+++ b/edivorce/apps/core/templates/partials/tooltips/registration_marriage_certificate.html
@@ -18,5 +18,5 @@
 {% endblock %}
 
 {% block label %}
-    registration of marriage
+    {% if text %}{{ text }}{% else %}registration of marriage{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/registry.html b/edivorce/apps/core/templates/partials/tooltips/registry.html
index 28e2ab48..6d8653cf 100644
--- a/edivorce/apps/core/templates/partials/tooltips/registry.html
+++ b/edivorce/apps/core/templates/partials/tooltips/registry.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    registry
+    {% if text %}{{ text }}{% else %}registry{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/sole_divorce.html b/edivorce/apps/core/templates/partials/tooltips/sole_divorce.html
index 83a857c4..7cc49a47 100644
--- a/edivorce/apps/core/templates/partials/tooltips/sole_divorce.html
+++ b/edivorce/apps/core/templates/partials/tooltips/sole_divorce.html
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block label %}
-    sole divorce
+    {% if text %}{{ text }}{% else %}sole divorce{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/supreme_court.html b/edivorce/apps/core/templates/partials/tooltips/supreme_court.html
index 612fd45e..7d032798 100644
--- a/edivorce/apps/core/templates/partials/tooltips/supreme_court.html
+++ b/edivorce/apps/core/templates/partials/tooltips/supreme_court.html
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    Supreme Court
+    {% if text %}{{ text }}{% else %}Supreme Court{% endif %}
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/swear_affirm.html b/edivorce/apps/core/templates/partials/tooltips/swear_affirm.html
index 193d2a5e..88954310 100644
--- a/edivorce/apps/core/templates/partials/tooltips/swear_affirm.html
+++ b/edivorce/apps/core/templates/partials/tooltips/swear_affirm.html
@@ -17,5 +17,5 @@
 {% endblock %}
 
 {% block label %}
-    swear / affirm
+    {% if text %}{{ text }}{% else %}swear / affirm{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/virtual_session.html b/edivorce/apps/core/templates/partials/tooltips/virtual_session.html
index be396cc6..5c6abd00 100644
--- a/edivorce/apps/core/templates/partials/tooltips/virtual_session.html
+++ b/edivorce/apps/core/templates/partials/tooltips/virtual_session.html
@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    virtual session
+    {% if text %}{{ text }}{% else %}virtual session{% endif %}
 {% endblock %}
\ No newline at end of file