From: Seamus Lee Date: Sat, 1 Dec 2018 20:32:53 +0000 (+0000) Subject: Remove Defunct Templates from CiviMail X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7f94d9c27a4f731c2a72cfa4ac2ffc0f92daec05;p=civicrm-core.git Remove Defunct Templates from CiviMail --- diff --git a/templates/CRM/Mailing/Form/Group.hlp b/templates/CRM/Mailing/Form/Group.hlp deleted file mode 100644 index 640c2d012c..0000000000 --- a/templates/CRM/Mailing/Form/Group.hlp +++ /dev/null @@ -1,97 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{htxt id="mailing-name-title"} - {ts}Name{/ts} -{/htxt} -{htxt id="mailing-name"} -{ts}Assign a unique name to each of your mailings. Select a naming convention that will help keep your mailings organized and easy to find when you want to review and compare mailing results. For example, if you do a monthly general-interest newsletter - you might use the following naming convention:{/ts} -
-{ts}General Monthly Newsletter: 200709{/ts} -
-

-{/htxt} - -{htxt id="base-group-title"} - {ts}Group{/ts} -{/htxt} -{htxt id="base-group"} -

{ts}Search-based mailings require an "unsubscribe tracking" group.{/ts}

-

{ts}Because this mailing is using the results of a search to provide the recipient list, you need to specify a group to track people who unsubscribe in response to this mailing.{/ts}

-

{ts}If a recipient unsubscribes from this mailing, they will be excluded from future mailings which use the same "Unsubscription Group". This is achieved through actually marking the contact as "unsubscribed from the group". If a contact in your search results has already been marked as unsubscribed from that group, they will be excluded from this mailing.{/ts}

-

{ts}If a recipient clicks the unsubscribe link they will see the "Unsubscription Group" title on the unsubscribe page. The selected group should have a title that corresponds to the content / type of mailing being sent.{/ts}

-

{ts}NOTE: Contacts who are in the "Unsubscription Group" but do not match your search critera will not be included in the mailing regardless of their status in that group. This is a change from previous versions which used the term "Base Group".{/ts}

-{/htxt} - -{htxt id="dedupe-email-title"} - {ts}Dedupe{/ts} -{/htxt} -{htxt id="dedupe-email"} -

{ts}CiviCRM will always dedupe your mailing based on unique contact records. For example, if a contact is in three of the groups you are including in your mailing, they will only be sent one copy of the email.{/ts}

-

{ts}However, if the same email is used by multiple contacts, that email address will receive multiple copies of the email -- one for each contact using that address.{/ts}

-

{ts}Selecting this option will ensure only one email is sent to each address. Note that when using this option and including contact tokens in your email content, the email with it's respective tokens will only be created for one of the matching contacts.{/ts}

-{/htxt} - -{htxt id="email-selection-title"} - {ts}Email selection{/ts} -{/htxt} -{htxt id="email-selection"} -

{ts}Some of your contacts may have more than one email address. By selecting a location and a selection method, you can tell CiviCRM which email address to use for this mailing.{/ts}

-

{ts}Automatic: If you choose automatic for both the location and the selection method, CiviCRM will choose the best option for each user: If an email is marked "Bulk" then it will be used; otherwise, the email marked "Primary" will be used.{/ts}

-

{ts}If "Only send to email addresses assigned to the specified location" is selected, then the recipients will be restricted to only include contacts that have an email address assigned to the given location. This option may limit the number of recipients in your mailing.{/ts}

-

{ts}If "Prefer email addresses assigned to the specified location" is selected, then recipients that have an email address assigned to the given location will have that email used. Other recipients will have their email selected using the automatic method.{/ts}

-

{ts}If "Exclude email addresses assigned to the specified location" is chosen, then recipients who only have an email address assigned to the given location will be excluded. Everyone else will have their email chosen from the list of emails that are not assigned to the given location, using the automatic method.{/ts}

-{/htxt} - -{htxt id="include-groups-title"} - {ts}Include Groups{/ts} -{/htxt} -{htxt id="include-groups"} -

{ts}Determine the contacts in your database who should receive this mailing by first selecting one or more Included Groups. (Groups must be assigned the Mailing List type to be available on this screen - you can update this for an existing group from Manage Groups » Settings.){/ts}

-

{ts}You also have the option to Exclude some contacts from your included groups by selecting one or more Excluded Groups. Contacts who are in both groups will NOT receive the mailing (they are 'excluded').{/ts}

-

{ts}If you have sent other mailings - you can additionally Include (or Exclude) contacts who received those mailings. CiviCRM will eliminate any duplications so that contacts who are in an Included Group AND were recipients of an Included Mailing will only be sent one copy of this mailing.{/ts}

-

{ts}After you click Next - the total number of selected recipients will be displayed on the next screen. Use this as a 'reality-check' to help you confirm that you've targeted (and excluded) the desired recipients.{/ts}

-{/htxt} - -{htxt id="exclude-groups-title"} - {ts}Exclude Groups{/ts} -{/htxt} -{htxt id="exclude-groups"} -

{ts}You also have the option to Exclude some contacts in your included groups by selecting one or more Excluded Groups. Contacts who are in both groups will NOT receive the mailing (they are 'excluded').{/ts}

-{/htxt} - -{htxt id="include-mailings-title"} - {ts}Include Mailings{/ts} -{/htxt} -{htxt id="include-mailings"} -

{ts}If you have sent other mailings - you can additionally Include (or Exclude) contacts who received those mailings. CiviCRM will eliminate any duplications so that contacts who are in an Included Group AND were recipients of an Included Mailing will only be sent one copy of this mailing.{/ts}

-{/htxt} - -{htxt id="exclude-mailings-title"} - {ts}Exclude Mailings{/ts} -{/htxt} -{htxt id="exclude-mailings"} -

{ts}If you have sent other mailings - you can additionally Include (or Exclude) contacts who received those mailings. CiviCRM will eliminate any duplications so that contacts who are in an Included Group AND were recipients of an Included Mailing will only be sent one copy of this mailing.{/ts}

-{/htxt} diff --git a/templates/CRM/Mailing/Form/Group.tpl b/templates/CRM/Mailing/Form/Group.tpl deleted file mode 100644 index 198de5444c..0000000000 --- a/templates/CRM/Mailing/Form/Group.tpl +++ /dev/null @@ -1,89 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} - -
-{include file="CRM/common/WizardHeader.tpl"} - - - - {* CRM-7362 --add campaign *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" - campaignTrClass="crm-mailing-group-form-block-campaign_id"} - - {if $context EQ 'search'} - - - - - {/if} - - - - - - - - - - - - - - -
{$form.name.label}{$form.name.html} {help id="mailing-name"}
{$form.baseGroup.label}{$form.baseGroup.html} {help id="base-group"}
{$form.dedupe_email.label}{$form.dedupe_email.html} {help id="dedupe-email"}
{$form.location_type_id.label}{$form.location_type_id.html}
{$form.email_selection_method.label}{$form.email_selection_method.html} {help id="email-selection"}
- -{if ($groupCount > 0|| $mailingCount > 0)} -
-
-
- {if $context EQ 'search'}{ts}Additional Mailing Recipients{/ts}{else}{ts}Mailing Recipients{/ts}{/if} -
-
- {strip} - - - {if $groupCount > 0} - - - - - {/if} - {if $mailingCount > 0} - - - - - {/if} -
{$form.includeGroups.label} {help id="include-groups"}
{$form.includeGroups.html}
{$form.excludeGroups.label} {help id="exclude-groups"}
{$form.excludeGroups.html}
{$form.includeMailings.label} {help id="include-mailings"}
{$form.includeMailings.html}
{$form.excludeMailings.label} {help id="exclude-mailings"}
{$form.excludeMailings.html}
- - {/strip} -
-
-{/if} -
{include file="CRM/common/formButtons.tpl"}
-
-
- diff --git a/templates/CRM/Mailing/Form/Schedule.hlp b/templates/CRM/Mailing/Form/Schedule.hlp deleted file mode 100644 index 014b911fb4..0000000000 --- a/templates/CRM/Mailing/Form/Schedule.hlp +++ /dev/null @@ -1,42 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{htxt id="sending-title"} - {ts}Scheduling and Sending Mailings{/ts} -{/htxt} -{htxt id="sending"} -

- {ts}You can schedule mailings to be sent starting at a specific date and time, OR you can request that they be sent as soon as possible by checking "Send Immediately".{/ts} -

-

- {ts}Click Submit Mailing to add this mailing to the mailing queue. An automated task which runs periodically on your server processes mailings in the queue, and starts actually sending out your mail.{/ts} -

-

- {ts}Click Continue Later if you're not ready to schedule or send this mailing. Click the Continue link from Unscheduled and Draft Mailings when you are ready to schedule or send it.{/ts} -

-

- {ts}Trouble-shooting Tip - If you find that your mailings are not being sent, ask the system administrator or technical support contact for your site to verify that the automated task ("cron job") is running - and how frequently.{/ts} {docURL page="user/advanced-configuration/email-system-configuration"} -

-{/htxt} diff --git a/templates/CRM/Mailing/Form/Schedule.tpl b/templates/CRM/Mailing/Form/Schedule.tpl deleted file mode 100644 index cb57a01912..0000000000 --- a/templates/CRM/Mailing/Form/Schedule.tpl +++ /dev/null @@ -1,88 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -
-{include file="CRM/common/WizardHeader.tpl"} -
- {ts}You can schedule this mailing to be sent starting at a specific date and time, OR you can request that it be sent as soon as possible by checking "Send Immediately".{/ts} {help id="sending"} -
-{include file="CRM/Mailing/Form/Count.tpl"} - - - - - - - - - - - - - - - - -
{$form.now.label}{$form.now.html}
{ts}OR{/ts} 
{$form.start_date.label}{include file="CRM/common/jcalendar.tpl" elementName=start_date} -
{ts}Set a date and time when you want CiviMail to start sending this mailing.{/ts}
-
-
{include file="CRM/common/formButtons.tpl"}
- -{if $preview} - -{/if} -
- - diff --git a/templates/CRM/Mailing/Form/Settings.tpl b/templates/CRM/Mailing/Form/Settings.tpl deleted file mode 100644 index c9435a1012..0000000000 --- a/templates/CRM/Mailing/Form/Settings.tpl +++ /dev/null @@ -1,118 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} - - - -
-{include file="CRM/common/WizardHeader.tpl"} -
- {ts}These settings control tracking and responses to recipient actions. The number of recipients selected to receive this mailing is shown in the box to the right. If this count doesn't match your expectations, click Previous to review your selection(s).{/ts} -
-{include file="CRM/Mailing/Form/Count.tpl"} -
-
{ts}Tracking{/ts} - - - - - -
{$form.url_tracking.label}{$form.url_tracking.html} - - {ts}Track the number of times recipients click each link in this mailing.{/ts} - {ts}NOTE: When this feature is enabled, all links in the message body will be automatically re-written to route through your CiviCRM server prior to redirecting to the target page.{/ts} - -
{$form.open_tracking.label}{$form.open_tracking.html} - {ts}Track the number of times recipients open this mailing in their email software.{/ts} -
-
-
{ts}Responding{/ts} - - - - - - - - - - - - - - - - - - - -
{$form.override_verp.label}{$form.override_verp.html} - {ts}Recipients' replies are sent to a CiviMail specific address instead of the sender's address so they can be stored within CiviCRM.{/ts} -
{$form.forward_replies.label}{$form.forward_replies.html} - {ts}If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.{/ts} -
{$form.auto_responder.label}{$form.auto_responder.html}   {$form.reply_id.html} - {ts}If a recipient replies to this mailing, send an automated reply using the selected message.{/ts} -
{$form.unsubscribe_id.label}{$form.unsubscribe_id.html} - {ts}Select the automated message to be sent when a recipient unsubscribes from this mailing.{/ts} -
{$form.resubscribe_id.label}{$form.resubscribe_id.html} - {ts}Select the automated message to be sent when a recipient resubscribes to this mailing.{/ts} -
{$form.optout_id.label}{$form.optout_id.html} - {ts}Select the automated message to be sent when a recipient opts out of all mailings from your site.{/ts} -
-
-
Online Publication - - - - -
{$form.visibility.label}{$form.visibility.html} {help id="mailing-visibility"} -
-
-
{include file="CRM/common/formButtons.tpl"}
-
-
- diff --git a/templates/CRM/Mailing/Form/Test.hlp b/templates/CRM/Mailing/Form/Test.hlp deleted file mode 100644 index c87226acba..0000000000 --- a/templates/CRM/Mailing/Form/Test.hlp +++ /dev/null @@ -1,38 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{htxt id="test-intro-title"} - {ts}Test Message{/ts} -{/htxt} -{htxt id="test-intro"} -

{ts}It's a good idea to test your mailing by sending it to yourself and/or a selected group of people in your organization. You can also view your content in the preview panel below.{/ts}

-

{ts}Enter a single email address or select an existing group and click "Send a Test Mailing." Once you receive the test mailing:{/ts}

- -

{ts}If you need to make changes, you can click Previous to return to the content step, make your changes, and send another test.{/ts}

-{/htxt} diff --git a/templates/CRM/Mailing/Form/Test.tpl b/templates/CRM/Mailing/Form/Test.tpl deleted file mode 100644 index 953ab080c8..0000000000 --- a/templates/CRM/Mailing/Form/Test.tpl +++ /dev/null @@ -1,66 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -
-{include file="CRM/common/WizardHeader.tpl"} -
- {ts}It's a good idea to test your mailing by sending it to yourself and/or a selected group of people in your organization. You can also view your content by clicking (+) Preview Mailing.{/ts} {help id="test-intro"} -
- -{include file="CRM/Mailing/Form/Count.tpl"} - -
- Test Mailing - - - - -
{$form.test_email.label}{$form.test_email.html} {ts}(filled with your contact's token values){/ts}
{$form.test_group.label}{$form.test_group.html}
{$form.sendtest.html}
-
- - - -
{include file="CRM/common/formButtons.tpl"}
- -
diff --git a/templates/CRM/Mailing/Form/Upload.hlp b/templates/CRM/Mailing/Form/Upload.hlp deleted file mode 100644 index 7b6c1281ed..0000000000 --- a/templates/CRM/Mailing/Form/Upload.hlp +++ /dev/null @@ -1,63 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{htxt id ="id-from_email-title"} - {ts}From Address{/ts} -{/htxt} -{htxt id ="id-from_email"} -

{ts}Select the "FROM" Email Address for this mailing from the dropdown list. Available email addresses are configurable by users with Administer CiviCRM permission. EXAMPLE: "Client Services" <clientservices@example.org>{/ts}

-{if $params.isAdmin} - {capture assign="fromConfig"}{crmURL p="civicrm/admin/options/from_email_address" q="reset=1"}{/capture} -

{ts 1=$fromConfig}Go to Administer CiviCRM » Communications » FROM Email Addresses to add or edit email addresses. Make sure these email addresses are valid email accounts with your email service provider.{/ts}

-{else} - {ts}Contact your site administrator if you need to use a "FROM" Email Address which is not in the dropdown list.{/ts} -{/if} -{/htxt} - -{htxt id="content-intro-title"} - {ts}Message Formats{/ts} -{/htxt} -{htxt id="content-intro"} -

{ts}You can choose to send BOTH an HTML and a plain TEXT version of your mailing, OR you can send a TEXT version only.{/ts}

-

{ts}If you create only an HTML version, CiviMail will automatically create a TEXT version for your recipients who have chosen NOT to receive HTML email.{/ts}

-

{ts}Required Elements{/ts}

-

{ts}CiviMail email messages must include an opt-out link ("Opt out via web page"), and the postal address of your organization. These elements help reduce the chances of your email being categorized as SPAM. They can be included in the main message body OR in a re-usable message footer. Refer to the online documentation for details on how to include required links and contact information as well as sample messages.{/ts} {docURL page="Sample CiviMail Messages" resource="wiki"}

-{/htxt} - -{htxt id="upload-compose-title"} - {ts}Upload or Compose On-screen{/ts} -{/htxt} -{htxt id="upload-compose"} -

{ts}You can use your favorite editor to create content on your local computer and then Upload the files. OR you can Compose content directly on the screen.{/ts}

-

{ts}If you choose to compose on the screen, a basic WYSIWYG (what-you-see-is-what-you-get) editor is provided which you can use create simple HTML messages. However, if you are planning on creating HTML messages with complex layouts - it is best to use an HTML editor on your local computer. Then locate and upload the saved file(s) by clicking the Browse button.{/ts}

-{/htxt} - -{htxt id="id-message-text-title"} - {ts}Text Message{/ts} -{/htxt} -{htxt id="id-message-text"} -

{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication - and some recipients may prefer not to receive HTML formatted messages.{/ts}

-

{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently - so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}

-{/htxt} diff --git a/templates/CRM/Mailing/Form/Upload.tpl b/templates/CRM/Mailing/Form/Upload.tpl deleted file mode 100644 index 953afd48da..0000000000 --- a/templates/CRM/Mailing/Form/Upload.tpl +++ /dev/null @@ -1,127 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 5 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -
-{include file="CRM/common/WizardHeader.tpl"} - -
- {ts}You can either upload the mailing content from your computer OR compose the content on this screen.{/ts} {help id="content-intro"} -
- -{include file="CRM/Mailing/Form/Count.tpl"} - - - - - - {if $trackReplies} - - - - - {else} - - - - - {/if} - - - - - - - - -
{$form.from_email_address.label}{$form.from_email_address.html} {help id ="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}
{ts}Reply-To{/ts}*{ts}Auto-Generated{/ts}
{$form.reply_to_address.label}{$form.reply_to_address.html}
{$form.template.label}{$form.template.html}
{$form.subject.label} - {$form.subject.html|crmAddClass:huge}  - - {help id="id-token-subject" tplFile=$tplFile isAdmin=$isAdmin file="CRM/Contact/Form/Task/Email.hlp"} -
{$form.upload_type.label} {$form.upload_type.html} {help id="upload-compose"}
- -
{ts}Compose On-screen{/ts} -{include file="CRM/Contact/Form/Task/EmailCommon.tpl" upload=1 noAttach=1} -
- - {capture assign=docLink}{docURL page="Sample CiviMail Messages" text="More information and sample messages..." resource="wiki"}{/capture} -
{ts}Upload Content{/ts} - - - - - - - - - -
{$form.textFile.label}{$form.textFile.html}
- {ts}Browse to the TEXT message file you have prepared for this mailing.{/ts}
{$docLink} -
{$form.htmlFile.label}{$form.htmlFile.html}
- {ts}Browse to the HTML message file you have prepared for this mailing.{/ts}
{$docLink} -
-
- - {include file="CRM/Form/attachment.tpl"} - -
{ts}Header / Footer{/ts} - - - - - - - - - -
{$form.header_id.label}{$form.header_id.html}
- {ts}You may choose to include a pre-configured Header block above your message.{/ts} -
{$form.footer_id.label}{$form.footer_id.html}
- {ts}You may choose to include a pre-configured Footer block below your message. This is a good place to include the required unsubscribe, opt-out and postal address tokens.{/ts} -
-
- -
{include file="CRM/common/formButtons.tpl"}
-
- -{* -- Javascript for showing/hiding the upload/compose options -- *} -{include file="CRM/common/showHide.tpl"} -{literal} - -{/literal}