diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php index 3a97596024e4..2ab55eaafe1d 100644 --- a/CRM/Contact/Form/Task/EmailTrait.php +++ b/CRM/Contact/Form/Task/EmailTrait.php @@ -168,17 +168,20 @@ public function buildQuickForm() { $emailAttributes = [ 'class' => 'huge', + 'title' => ts('Send email to'), ]; $this->add('text', 'to', ts('To'), $emailAttributes, TRUE); $this->addEntityRef('cc_id', ts('CC'), [ 'entity' => 'Email', 'multiple' => TRUE, + 'title' => ts('CC Contacts'), ]); $this->addEntityRef('bcc_id', ts('BCC'), [ 'entity' => 'Email', 'multiple' => TRUE, + 'title' => ts('BCC Contacts'), ]); $setDefaults = TRUE; @@ -239,7 +242,7 @@ public function buildQuickForm() { $this->add('text', 'subject', ts('Subject'), ['size' => 50, 'maxlength' => 254], TRUE); - $this->add('select', 'from_email_address', ts('From'), $this->getFromEmails(), TRUE, ['class' => 'crm-select2 huge']); + $this->add('select', 'from_email_address', ts('From'), $this->getFromEmails(), TRUE, ['class' => 'crm-select2 huge', 'title' => ts('From Email Address')]); CRM_Mailing_BAO_Mailing::commonCompose($this); @@ -260,12 +263,13 @@ public function buildQuickForm() { 'create' => TRUE, 'api' => ['params' => ['is_deceased' => 0]], ], + 'title' => ts('Assigned To'), ], 'followup_activity_type_id' => [ 'type' => 'select', 'label' => ts('Followup Activity'), 'attributes' => ['' => '- ' . ts('select activity') . ' -'] + CRM_Core_PseudoConstant::ActivityType(FALSE), - 'extra' => ['class' => 'crm-select2'], + 'extra' => ['class' => 'crm-select2', 'title' => ts('Followup Activity')], ], 'followup_activity_subject' => [ 'type' => 'text', @@ -273,6 +277,7 @@ public function buildQuickForm() { 'attributes' => CRM_Core_DAO::getAttribute('CRM_Activity_DAO_Activity', 'subject' ), + 'title' => ts('Followup Actvity Subject'), ], ]; diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 024876c5e484..2ff0e155e1ac 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -2188,7 +2188,7 @@ public static function commonCompose(&$form) { $form->add('select', "{$prefix}template", ts('Use Template'), ['' => ts('- select -')] + $templates[$prefix], FALSE, - ['onChange' => "selectValue( this.value, '{$prefix}');", 'class' => 'crm-select2 huge'] + ['onChange' => "selectValue( this.value, '{$prefix}');", 'class' => 'crm-select2 huge', 'title' => ts('Use Template')] ); } if (\CRM_Core_Permission::check('edit message templates')) { diff --git a/templates/CRM/Activity/Form/FollowUp.tpl b/templates/CRM/Activity/Form/FollowUp.tpl index ef4caddcbe5f..43fe706db3ee 100644 --- a/templates/CRM/Activity/Form/FollowUp.tpl +++ b/templates/CRM/Activity/Form/FollowUp.tpl @@ -5,7 +5,7 @@
- + - + @@ -59,7 +59,8 @@ diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/templates/CRM/Contact/Form/Task/EmailCommon.tpl index ce0258ac8cd0..2c9410867847 100644 --- a/templates/CRM/Contact/Form/Task/EmailCommon.tpl +++ b/templates/CRM/Contact/Form/Task/EmailCommon.tpl @@ -16,10 +16,12 @@
- + + {help id="id-token-html" file="CRM/Contact/Form/Task/Email.hlp"}
+ {$form.html_message.label}
{$form.html_message.html}
@@ -32,10 +34,12 @@
- + + {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
+ {$form.text_message.label} {$form.text_message.html}
{ts}Schedule Follow-up Activity{/ts}{ts}Schedule Follow-up Activity{/ts} {$form.followup_activity_type_id.html}   {ts}on{/ts} {$form.followup_date.html} diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl index ad73eef2f59f..8df8b34029ed 100644 --- a/templates/CRM/Contact/Form/Task/Email.tpl +++ b/templates/CRM/Contact/Form/Task/Email.tpl @@ -20,7 +20,7 @@ {$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}
{if $single eq false}{ts}Recipient(s){/ts}{else}{$form.to.label}{/if}{if $single eq false}{else}{$form.to.label}{/if} {$form.to.html} {help id="id-to_email" file="CRM/Contact/Form/Task/Email.hlp"} {$form.subject.label} {$form.subject.html|crmAddClass:huge}  - + + {help id="id-token-subject" tplFile=$tplFile isAdmin=$isAdmin file="CRM/Contact/Form/Task/Email.hlp"}