From b0464b2fdfbb0f9532339038c7882ecb4bffb009 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 4 Feb 2022 11:49:50 +1300
Subject: [PATCH] Enotic fixes

---
 CRM/Admin/Form/Preferences/Contribute.php           | 3 +++
 templates/CRM/Admin/Form/Preferences/Contribute.tpl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Contribute.php b/CRM/Admin/Form/Preferences/Contribute.php
index e835e335e8..0072d060be 100644
--- a/CRM/Admin/Form/Preferences/Contribute.php
+++ b/CRM/Admin/Form/Preferences/Contribute.php
@@ -54,6 +54,7 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
         'html_type' => 'text',
         'title' => ts('Due Date'),
         'weight' => 3,
+        'description' => '',
       ],
       'due_date_period' => [
         'html_type' => 'select',
@@ -84,11 +85,13 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
         'html_type' => 'text',
         'title' => ts('Tax Term'),
         'weight' => 7,
+        'description' => '',
       ],
       'tax_display_settings' => [
         'html_type' => 'select',
         'title' => ts('Tax Display Settings'),
         'weight' => 8,
+        'description' => '',
         'option_values' => [
           'Do_not_show' => ts('Do not show breakdown, only show total - i.e %1', [
             1 => CRM_Utils_Money::format(120),
diff --git a/templates/CRM/Admin/Form/Preferences/Contribute.tpl b/templates/CRM/Admin/Form/Preferences/Contribute.tpl
index bea7787bfc..0c40f27567 100644
--- a/templates/CRM/Admin/Form/Preferences/Contribute.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Contribute.tpl
@@ -7,7 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-block crm-form-block crm-{$formName}-block">
+<div class="crm-block crm-form-block crm--block">
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {include file="CRM/Form/basicFormFields.tpl"}
 
@@ -20,7 +20,7 @@
             <td class="label"></td>
             <td>
               {$form.$htmlField.html} {$form.$htmlField.label}
-              {if $desc}
+              {if $fieldSpec.description}
                 <br /><span class="description">{$fieldSpec.description}</span>
               {/if}
             </td>
-- 
2.25.1