Merge pull request #26397 from larssandergreen/Remove-unneeded-text-o…

…n-Campaign,-Pledge-etc Remove unneeded description text on Campaign, Pledge, Tell a Friend, etc
civicrm · Jun 6, 2023 · f0648c8 · f0648c8
2 parents 4832c7e + ad3979c
commit f0648c8
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 64 deletions.
diff --git a/CRM/Campaign/Form/Petition.php b/CRM/Campaign/Form/Petition.php
@@ -206,10 +206,10 @@ public function buildQuickForm() {
     $this->addElement('checkbox', 'is_share', ts('Add footer region with Twitter, Facebook and LinkedIn share buttons and scripts?'));
 
     // is active ?
-    $this->add('checkbox', 'is_active', ts('Is Active?'));
+    $this->add('checkbox', 'is_active', ts('Active?'));
 
     // is default ?
-    $this->add('checkbox', 'is_default', ts('Is Default?'));
+    $this->add('checkbox', 'is_default', ts('Default?'));
 
     // add buttons
     $this->addButtons(

diff --git a/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl b/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl
@@ -37,7 +37,7 @@
       </tr>
       <tr class="crm-grant-form-block-amount_requested">
          <td class="label">{$form.amount_requested.label}</td>
-         <td>{$form.amount_requested.html}<br /><span class="description">{ts}Amount requested for grant in original currency (if different).{/ts}</span></td>
+         <td>{$form.amount_requested.html}</td>
       </tr>
       <tr class="crm-grant-form-block-amount_granted">
          <td class="label">{$form.amount_granted.label}</td>
@@ -50,16 +50,12 @@
       <tr class="crm-grant-form-block-decision_date">
          <td class="label">{$form.decision_date.label}</td>
          <td>
-           {$form.decision_date.html}<br />
-           <span class="description">{ts}Date on which the grant decision was finalized.{/ts}</span>
-         </td>
+           {$form.decision_date.html}</td>
       </tr>
       <tr class="crm-grant-form-block-money_transfer_date">
         <td class="label">{$form.money_transfer_date.label}</td>
         <td>
-          {$form.money_transfer_date.html}<br />
-          <span class="description">{ts}Date on which the grant money was transferred.{/ts}</span>
-        </td>
+          {$form.money_transfer_date.html}</td>
       </tr>
       <tr class="crm-grant-form-block-grant_due_date">
         <td class="label">{$form.grant_due_date.label}</td>

diff --git a/templates/CRM/Campaign/Form/Petition.tpl b/templates/CRM/Campaign/Form/Petition.tpl
@@ -46,14 +46,12 @@
       <tr class="crm-campaign-survey-form-block-profile_id">
         <td class="label">{$form.contact_profile_id.label}</td>
         <td>{$form.contact_profile_id.html}&nbsp;<span class="profile-links"></span>
-
           <div class="description">{ts}Fields about the contact you want to collect.{/ts}</div>
         </td>
       </tr>
       <tr class="crm-campaign-survey-form-block-profile_id">
         <td class="label">{$form.profile_id.label}</td>
         <td>{$form.profile_id.html}&nbsp;<span class="profile-links"></span>
-
           <div class="description">{ts}Fields about the petition.{/ts}</div>
           <div class="profile-create">
             <a href="{crmURL p='civicrm/admin/uf/group/add' q='reset=1&action=add'}"
@@ -64,19 +62,12 @@
       <tr class="crm-campaign-survey-form-block-thankyou_title">
         <td
           class="label">{$form.thankyou_title.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='thankyou_title' id=$surveyId}{/if}</td>
-        <td>{$form.thankyou_title.html}<br/>
-
-          <div class="description">{ts}This title will be displayed at the top of the thank-you page.{/ts}</div>
-        </td>
+        <td>{$form.thankyou_title.html}</td>
       </tr>
       <tr class="crm-campaign-survey-form-block-thankyou_text">
         <td
           class="label">{$form.thankyou_text.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='thankyou_text' id=$surveyId}{/if}</td>
-        <td>{$form.thankyou_text.html}<br/>
-
-          <div
-            class="description">{ts}Enter text (and optional HTML layout tags) for the thank-you message that will appear at the top of the thank-you page.{/ts}</div>
-        </td>
+        <td>{$form.thankyou_text.html}</td>
       </tr>
       <tr class="crm-campaign-survey-form-block-bypass_confirm">
         <td class="label">{$form.bypass_confirm.label}</td>
@@ -90,15 +81,11 @@
       </tr>
       <tr class="crm-campaign-survey-form-block-is_active">
         <td class="label">{$form.is_active.label}</td>
-        <td>{$form.is_active.html}
-          <div class="description">{ts}Is this petition active?{/ts}</div>
-        </td>
+        <td>{$form.is_active.html}</td>
       </tr>
       <tr class="crm-campaign-survey-form-block-is_default">
         <td class="label">{$form.is_default.label}</td>
-        <td>{$form.is_default.html}
-          <div class="description">{ts}Is this the default petition?{/ts}</div>
-        </td>
+        <td>{$form.is_default.html}</td>
       </tr>
       <tr class="crm-campaign-survey-form-block-links">
         <td class="label"><label>{ts}Links to sign this petition{/ts}</label></td>

diff --git a/templates/CRM/Campaign/Form/Survey/Main.tpl b/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -18,19 +18,16 @@
   <table class="form-layout-compressed">
    <tr class="crm-campaign-survey-main-form-block-title">
        <td class="label">{$form.title.label}</td>
-       <td class="view-value">{$form.title.html}
-         <div class="description">{ts}Title of the survey.{/ts}</div></td>
+       <td class="view-value">{$form.title.html}</td>
    </tr>
    <tr class="crm-campaign-survey-main-form-block-campaign_id">
      <td class="label">{$form.campaign_id.label}</td>
-     <td class="view-value">{$form.campaign_id.html}
-        <div class="description">{ts}Select the campaign for which survey is created.{/ts}</div>
+     <td class="view-value">{$form.campaign_id.html}</div>
       </td>
    </tr>
    <tr class="crm-campaign-survey-main-form-block-activity_type_id">
        <td class="label">{$form.activity_type_id.label}</td>
-       <td class="view-value">{$form.activity_type_id.html}
-         <div class="description">{ts}Select the Activity Type.{/ts}</div></td>
+       <td class="view-value">{$form.activity_type_id.html}</td>
    </tr>
    <tr class="crm-campaign-survey-main-form-block-instructions">
        <td class="label">{$form.instructions.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='instructions' id=$surveyId}{/if}</td>
@@ -49,17 +46,15 @@
    <tr class="crm-campaign-survey-main-form-block-release_frequency">
        <td class="label">{$form.release_frequency.label}</td>
        <td class="view-value">{$form.release_frequency.html}
-      <div class="description">{ts}Reserved respondents are released if they haven't been surveyed within this number of days. The Respondent Processor script must be run periodically to release respondents.{/ts} {docURL page="user/initial-set-up/scheduled-jobs"}</div> </td>
+      <div class="description">{ts}Reserved respondents are released if they haven't been surveyed within this number of days. The Respondent Processor script must be run periodically to release respondents.{/ts} {docURL page="user/initial-set-up/scheduled-jobs"}</div></td>
    </tr>
    <tr class="crm-campaign-survey-main-form-block-is_active">
        <td class="label">{$form.is_active.label}</td>
-       <td class="view-value">{$form.is_active.html}
-      <div class="description">{ts}Is this survey active?{/ts}</div></td>
+       <td class="view-value">{$form.is_active.html}</td>
    </tr>
    <tr class="crm-campaign-survey-main-form-block-is_default">
        <td class="label">{$form.is_default.label}</td>
-       <td class="view-value">{$form.is_default.html}
-     <div class="description">{ts}Is this the default survey?{/ts}</div></td>
+       <td class="view-value">{$form.is_default.html}</td>
    </tr>
    <tr class="crm-campaign-form-block-custom_data">
        <td colspan="2">

diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
@@ -46,7 +46,7 @@
         <tr>
           <td class="label">{$form.attachFile_1.label}</td>
           <td>{$form.attachFile_1.html}&nbsp;{$form.attachDesc_1.html}<a href="#" class="crm-hover-button crm-clear-attachment" style="visibility: hidden;" title="{ts}Clear{/ts}"><i class="crm-i fa-times" aria-hidden="true"></i></a>
-            <div class="description">{ts}Browse to the <strong>file</strong> you want to upload.{/ts}{if $maxAttachments GT 1} {ts 1=$maxAttachments}You can have a maximum of %1 attachment(s).{/ts}{/if} {ts 1=$config->maxFileSize}Each file must be less than %1M in size. You can also add a short description.{/ts}</div>
+            <div class="description">{if $maxAttachments GT 1} {ts 1=$maxAttachments}You can have a maximum of %1 attachment(s).{/ts}{/if} {ts 1=$config->maxFileSize}Each file must be less than %1M in size. You can also add a short description.{/ts}</div>
           </td>
         </tr>
         {if $form.tag_1}

diff --git a/templates/CRM/Friend/Form/Friend.tpl b/templates/CRM/Friend/Form/Friend.tpl
@@ -56,10 +56,7 @@
               {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_tell_friend' field='suggested_message' id=$friendId}
          {/if}
      </td>
-     <td>{$form.suggested_message.html}<br />
-               <span class="description">{ts 1=$enduser}Provides the %1 with suggested text for their personalized message to their friends.{/ts}
-         </span>
-     </td>
+     <td>{$form.suggested_message.html}</td>
         </tr>
         <tr class="crm-friend-manage-form-block-general_link">
      <td class="label">{$form.general_link.label}</td>
@@ -80,10 +77,7 @@
               {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_tell_friend' field='thankyou_text' id=$friendId}
          {/if}
      </td>
-     <td>{$form.tf_thankyou_text.html}<br />
-               <span class="description">{ts 1=$enduser}Your message thanking the %1 for helping to spread the word. You may include HTML tags to add formatting or links.{/ts}
-         </span>
-     </td>
+     <td>{$form.tf_thankyou_text.html}</td>
         </tr>
     </table>
     </div>

diff --git a/templates/CRM/Pledge/Form/Pledge.hlp b/templates/CRM/Pledge/Form/Pledge.hlp
@@ -0,0 +1,22 @@
+{*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+*}
+{htxt id='id-financial_type_id-title'}
+  {ts}Financial Type{/ts}
+{/htxt}
+{htxt id='id-financial_type_id'}
+{ts}Sets the default financial type for payments against this pledge.{/ts}
+{/htxt}
+
+{htxt id='id-contribution_page_id-title'}
+  {ts}Self-service Payments Page{/ts}
+{/htxt}
+{htxt id='id-contribution_page_id'}
+{ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts}
+{/htxt}
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -60,31 +60,28 @@
           </tr>
           <tr class="crm-pledge-form-block-frequency_day">
             <td class="label nowrap">{$form.frequency_day.label}</td>
-            <td>{$form.frequency_day.html} {ts}day of the period{/ts}<br />
-              <span class="description">{ts}This applies to weekly, monthly and yearly payments.{/ts}</span>
+            <td>{$form.frequency_day.html} {ts}day of the period{/ts}
             </td>
           </tr>
           <tr class="crm-pledge-form-block-create_date">
             <td class="label">{$form.create_date.label}</td>
             <td>
-              {$form.create_date.html}<br />
-              <span class="description">{ts}Date when pledge was made by the contributor.{/ts}</span>
+              {$form.create_date.html}
             </td>
           </tr>
 
           <tr class="crm-pledge-form-block-start_date">
             <td class="label">{$form.start_date.label}</td>
             <td>
-              {$form.start_date.html}<br />
-              <span class="description">{ts}Date of first pledge payment.{/ts}</span>
+              {$form.start_date.html}
             </td>
           </tr>
 
         {if $email and $outBound_option != 2}
             {if !empty($form.is_acknowledge)}
           <tr class="crm-pledge-form-block-is_acknowledge">
             <td class="label">{$form.is_acknowledge.label}</td>
-            <td>{$form.is_acknowledge.html}<br />
+            <td>{$form.is_acknowledge.html}
               <span class="description">{ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts}</span>
             </td>
           </tr>
@@ -93,7 +90,8 @@
           <tr id="acknowledgment-receipt" style="display:none;">
             <td class="label">{$form.is_acknowledge.label}</td>
             <td>
-              {$form.is_acknowledge.html} <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email an acknowledgment of this pledge to %1?{/ts}</span>
+              {$form.is_acknowledge.html}
+              <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email an acknowledgment of this pledge to %1?{/ts}</span>
             </td>
           </tr>
         {/if}
@@ -104,26 +102,22 @@
           <tr id="acknowledgeDate">
             <td class="label" class="crm-pledge-form-block-acknowledge_date">{$form.acknowledge_date.label}</td>
             <td>
-              {$form.acknowledge_date.html}<br />
-              <span class="description">{ts}Date when an acknowledgment of the pledge was sent.{/ts}</span>
+              {$form.acknowledge_date.html}
             </td>
           </tr>
           <tr class="crm-pledge-form-block-financial_type_id">
-            <td class="label">{$form.financial_type_id.label}</td>
-            <td>{$form.financial_type_id.html}<br />
-              <span class="description">{ts}Sets the default financial type for payments against this pledge.{/ts}</span>
-            </td>
+            <td class="label">{$form.financial_type_id.label} {help id='id-financial_type_id'}
+</td>
+            <td>{$form.financial_type_id.html}</td>
           </tr>
 
       {* CRM-7362 --add campaign *}
       {include file="CRM/Campaign/Form/addCampaignToComponent.tpl"
       campaignTrClass="crm-pledge-form-block-campaign_id"}
 
           <tr class="crm-pledge-form-block-contribution_page_id">
-            <td class="label">{$form.contribution_page_id.label}</td>
-            <td>{$form.contribution_page_id.html}<br />
-              <span class="description">{ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts}</span>
-            </td>
+            <td class="label">{$form.contribution_page_id.label} {help id='id-contribution_page_id'}</td>
+            <td>{$form.contribution_page_id.html}</td>
           </tr>
 
           <tr class="crm-pledge-form-block-status">