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..."

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 %}

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 %}

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

@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    application
+    {% if text %}{{ text }}{% else %}application{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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

@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    custody
+    {% if text %}{{ text }}{% else %}custody{% endif %}
 {% endblock %}

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 %}

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 %}

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

@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    enforced
+    {% if text %}{{ text }}{% else %}enforced{% endif %}
 {% endblock %}

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

@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    exhibit
+    {% if text %}{{ text }}{% else %}exhibit{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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

@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    payor
+    {% if text %}{{ text }}{% else %}payor{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}
+{% block label %}
+    {% if text %}{{ text }}{% else %}collusion{% endif %}
+{% endblock %}

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

@@ -14,5 +14,5 @@
 {% endblock %}
 
 {% block label %}
-    commissioner
+    {% if text %}{{ text }}{% else %}commissioner{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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

@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block label %}
-    file
+    {% if text %}{{ text }}{% else %}file{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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

@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block label %}
-    master
+    {% if text %}{{ text }}{% else %}master{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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

@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block label %}
-    registry
+    {% if text %}{{ text }}{% else %}registry{% endif %}
 {% endblock %}

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 %}

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 %}

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 %}

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 %}