From ad3979c12c37a677c53d59640ca3f79a068417e9 Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Wed, 24 May 2023 22:15:18 -0600 Subject: [PATCH] Remove unneeded text on Campaign, Pledge, Tell a Friend, Survey and Attachment Forms --- CRM/Campaign/Form/Petition.php | 4 +-- .../templates/CRM/Grant/Form/Grant.tpl | 10 ++----- templates/CRM/Campaign/Form/Petition.tpl | 21 +++---------- templates/CRM/Campaign/Form/Survey/Main.tpl | 17 ++++------- templates/CRM/Form/attachment.tpl | 2 +- templates/CRM/Friend/Form/Friend.tpl | 10 ++----- templates/CRM/Pledge/Form/Pledge.hlp | 22 ++++++++++++++ templates/CRM/Pledge/Form/Pledge.tpl | 30 ++++++++----------- 8 files changed, 52 insertions(+), 64 deletions(-) create mode 100644 templates/CRM/Pledge/Form/Pledge.hlp diff --git a/CRM/Campaign/Form/Petition.php b/CRM/Campaign/Form/Petition.php index d52c50e1f5..1cbd72d69b 100644 --- a/CRM/Campaign/Form/Petition.php +++ b/CRM/Campaign/Form/Petition.php @@ -206,10 +206,10 @@ class CRM_Campaign_Form_Petition extends CRM_Core_Form { $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 index 6fa4d9f9ac..22d7865e5c 100644 --- a/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl +++ b/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl @@ -37,7 +37,7 @@ {$form.amount_requested.label} - {$form.amount_requested.html}
{ts}Amount requested for grant in original currency (if different).{/ts} + {$form.amount_requested.html} {$form.amount_granted.label} @@ -50,16 +50,12 @@ {$form.decision_date.label} - {$form.decision_date.html}
- {ts}Date on which the grant decision was finalized.{/ts} - + {$form.decision_date.html} {$form.money_transfer_date.label} - {$form.money_transfer_date.html}
- {ts}Date on which the grant money was transferred.{/ts} - + {$form.money_transfer_date.html} {$form.grant_due_date.label} diff --git a/templates/CRM/Campaign/Form/Petition.tpl b/templates/CRM/Campaign/Form/Petition.tpl index 100cf4ef7a..1d43edbb54 100644 --- a/templates/CRM/Campaign/Form/Petition.tpl +++ b/templates/CRM/Campaign/Form/Petition.tpl @@ -46,14 +46,12 @@ {$form.contact_profile_id.label} {$form.contact_profile_id.html}  -
{ts}Fields about the contact you want to collect.{/ts}
{$form.profile_id.label} {$form.profile_id.html}  -
{ts}Fields about the petition.{/ts}
{$form.thankyou_title.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='thankyou_title' id=$surveyId}{/if} - {$form.thankyou_title.html}
- -
{ts}This title will be displayed at the top of the thank-you page.{/ts}
- + {$form.thankyou_title.html} {$form.thankyou_text.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='thankyou_text' id=$surveyId}{/if} - {$form.thankyou_text.html}
- -
{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}
- + {$form.thankyou_text.html} {$form.bypass_confirm.label} @@ -90,15 +81,11 @@ {$form.is_active.label} - {$form.is_active.html} -
{ts}Is this petition active?{/ts}
- + {$form.is_active.html} {$form.is_default.label} - {$form.is_default.html} -
{ts}Is this the default petition?{/ts}
- + {$form.is_default.html} diff --git a/templates/CRM/Campaign/Form/Survey/Main.tpl b/templates/CRM/Campaign/Form/Survey/Main.tpl index 6d16494f81..e1601b1f8b 100644 --- a/templates/CRM/Campaign/Form/Survey/Main.tpl +++ b/templates/CRM/Campaign/Form/Survey/Main.tpl @@ -18,19 +18,16 @@ - + - - + @@ -49,17 +46,15 @@ +
{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"}
- + - + {if $form.tag_1} diff --git a/templates/CRM/Friend/Form/Friend.tpl b/templates/CRM/Friend/Form/Friend.tpl index c67198fb0b..31ff89aded 100644 --- 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} - + @@ -80,10 +77,7 @@ {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_tell_friend' field='thankyou_text' id=$friendId} {/if} - +
{$form.title.label}{$form.title.html} -
{ts}Title of the survey.{/ts}
{$form.title.html}
{$form.campaign_id.label}{$form.campaign_id.html} -
{ts}Select the campaign for which survey is created.{/ts}
+ 		{$form.campaign_id.html}
{$form.activity_type_id.label}{$form.activity_type_id.html} -
{ts}Select the Activity Type.{/ts}
{$form.activity_type_id.html}
{$form.instructions.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_survey' field='instructions' id=$surveyId}{/if}
{$form.release_frequency.label} {$form.release_frequency.html} -
{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"}
{$form.is_active.label}{$form.is_active.html} -
{ts}Is this survey active?{/ts}
{$form.is_active.html}
{$form.is_default.label}{$form.is_default.html} -
{ts}Is this the default survey?{/ts}
{$form.is_default.html}
diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl index 152ea3fcfb..0c7ef9f998 100644 --- a/templates/CRM/Form/attachment.tpl +++ b/templates/CRM/Form/attachment.tpl @@ -46,7 +46,7 @@
{$form.attachFile_1.label} {$form.attachFile_1.html} {$form.attachDesc_1.html} -
{ts}Browse to the file 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}
+
{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}
{$form.suggested_message.html}
- {ts 1=$enduser}Provides the %1 with suggested text for their personalized message to their friends.{/ts} - - 		{$form.suggested_message.html}
{$form.general_link.label}{$form.tf_thankyou_text.html}
- {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} - - 		{$form.tf_thankyou_text.html}
diff --git a/templates/CRM/Pledge/Form/Pledge.hlp b/templates/CRM/Pledge/Form/Pledge.hlp new file mode 100644 index 0000000000..ea9d237e30 --- /dev/null +++ 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 index b14178a710..df3640751c 100644 --- a/templates/CRM/Pledge/Form/Pledge.tpl +++ b/templates/CRM/Pledge/Form/Pledge.tpl @@ -60,23 +60,20 @@ {$form.frequency_day.label} - {$form.frequency_day.html} {ts}day of the period{/ts}
- {ts}This applies to weekly, monthly and yearly payments.{/ts} + {$form.frequency_day.html} {ts}day of the period{/ts} {$form.create_date.label} - {$form.create_date.html}
- {ts}Date when pledge was made by the contributor.{/ts} + {$form.create_date.html} {$form.start_date.label} - {$form.start_date.html}
- {ts}Date of first pledge payment.{/ts} + {$form.start_date.html} @@ -84,7 +81,7 @@ {if !empty($form.is_acknowledge)} {$form.is_acknowledge.label} - {$form.is_acknowledge.html}
+ {$form.is_acknowledge.html} {ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts} @@ -93,7 +90,8 @@ {$form.is_acknowledge.label} - {$form.is_acknowledge.html} {ts 1=''}Automatically email an acknowledgment of this pledge to %1?{/ts} + {$form.is_acknowledge.html} + {ts 1=''}Automatically email an acknowledgment of this pledge to %1?{/ts} {/if} @@ -104,15 +102,13 @@ {$form.acknowledge_date.label} - {$form.acknowledge_date.html}
- {ts}Date when an acknowledgment of the pledge was sent.{/ts} + {$form.acknowledge_date.html} - {$form.financial_type_id.label} - {$form.financial_type_id.html}
- {ts}Sets the default financial type for payments against this pledge.{/ts} - + {$form.financial_type_id.label} {help id='id-financial_type_id'} + + {$form.financial_type_id.html} {* CRM-7362 --add campaign *} @@ -120,10 +116,8 @@ campaignTrClass="crm-pledge-form-block-campaign_id"} - {$form.contribution_page_id.label} - {$form.contribution_page_id.html}
- {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} - + {$form.contribution_page_id.label} {help id='id-contribution_page_id'} + {$form.contribution_page_id.html} -- 2.25.1