From 39e257b875422a1e4d98ee821913e0cb9643d908 Mon Sep 17 00:00:00 2001 From: Mark Hanna Date: Sat, 21 Oct 2017 14:52:10 -0500 Subject: [PATCH] CRM-21006 4.6 backports --- templates/CRM/Activity/Form/ActivityLinks.tpl | 4 +-- templates/CRM/Admin/Page/Admin.tpl | 2 +- templates/CRM/Admin/Page/ConfigTaskList.tpl | 34 +++++++++---------- templates/CRM/Contact/Page/Inline/Actions.tpl | 2 +- templates/CRM/Contact/Page/View/Summary.tpl | 2 +- .../Form/Contribution/PremiumBlock.tpl | 4 +-- .../Contribute/Form/Contribution/ThankYou.tpl | 4 +-- templates/CRM/Dashlet/Page/Blog.tpl | 2 +- .../CRM/Event/Form/Registration/ThankYou.tpl | 4 +-- templates/CRM/Event/Page/DashBoard.tpl | 4 +-- templates/CRM/Event/Page/EventInfo.tpl | 4 +-- templates/CRM/Friend/Form.tpl | 2 +- templates/CRM/PCP/Page/PCPInfo.tpl | 2 +- templates/CRM/Report/Form/Contact/Detail.tpl | 4 +-- templates/CRM/Report/Form/Fields.tpl | 2 +- templates/CRM/Report/Form/Layout/Overlay.tpl | 2 +- templates/CRM/Report/Form/Layout/Table.tpl | 2 +- templates/CRM/common/TabHeader.tpl | 2 +- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/templates/CRM/Activity/Form/ActivityLinks.tpl b/templates/CRM/Activity/Form/ActivityLinks.tpl index 28fa38cfb4..f4af7f276e 100644 --- a/templates/CRM/Activity/Form/ActivityLinks.tpl +++ b/templates/CRM/Activity/Form/ActivityLinks.tpl @@ -64,9 +64,9 @@ {if $hookLinks} {foreach from=$hookLinks item=link}
  • - + {if $link.img} - {$link.title}  + {$link.title|escape}  {/if} {$link.name} diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl index ace006bf06..c925375add 100644 --- a/templates/CRM/Admin/Page/Admin.tpl +++ b/templates/CRM/Admin/Page/Admin.tpl @@ -72,7 +72,7 @@ {foreach from=$group.fields item=panelItem key=panelName name=groupLoop} - {$panelItem.title} + {$panelItem.title|escape} {$panelItem.title} diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl index 7a00d4e1a3..961822b1a7 100644 --- a/templates/CRM/Admin/Page/ConfigTaskList.tpl +++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl @@ -35,15 +35,15 @@ {ts}Site Configuration and Registration{/ts} - {ts}Localization{/ts} + {ts}Localization{/ts} {ts}Localization settings include user language, default currency and available countries for address input.{/ts} - {ts}Organization Address and Contact Info{/ts} + {ts}Organization Address and Contact Info{/ts} {ts}Organization name, email address for system-generated emails, organization address{/ts} - {ts}Enable components{/ts} + {ts}Enable components{/ts} {ts}Enable the required CiviCRM components.(CiviContribute, CiviEvent etc.){/ts} @@ -55,27 +55,27 @@ {ts}Viewing and Editing Contacts{/ts} - {ts}Display Preferences{/ts} + {ts}Display Preferences{/ts} {ts}Configure screen and form elements for Viewing Contacts, Editing Contacts, Advanced Search, Contact Dashboard and WYSIWYG Editor.{/ts} - {ts}Address Settings{/ts} + {ts}Address Settings{/ts} {ts}Format addresses in mailing labels, input forms and screen display.{/ts} - {ts}Mapping and Geocoding{/ts} + {ts}Mapping and Geocoding{/ts} {ts}Configure a mapping provider (e.g. Google or Yahoo) to display maps for contact addresses and event locations.{/ts} - {ts}Search Settings{/ts} + {ts}Search Settings{/ts} {ts}Adjust search behaviors including wildcards, and data to include in quick search results. Adjusting search settings can improve performance for larger datasets.{/ts} - {ts}Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.){/ts} + {ts}Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.){/ts} {ts}Version reporting and alerts, reCAPTCHA configuration and attachments.{/ts} - {ts}Contact Types{/ts} + {ts}Contact Types{/ts} {ts}You can modify the names of the built-in contact types (Individual, Household, Organizations), and you can create or modify "contact subtypes" for more specific uses (e.g. Student, Parent, Team, etc.).{/ts} @@ -83,11 +83,11 @@ {ts}Sending Emails (includes contribution receipts and event confirmations){/ts} - {ts}Outbound Email{/ts} + {ts}Outbound Email{/ts} {ts}Settings for outbound email - either SMTP server, port and authentication or Sendmail path and argument.{/ts} - {ts}From Email Addresses{/ts} + {ts}From Email Addresses{/ts} {ts}Define general email address(es) that can be used as the FROM address when sending email to contacts from within CiviCRM (e.g. info@example.org){/ts} @@ -95,7 +95,7 @@ {ts}Online Contributions / Online Membership Signup / Online Event Registration{/ts} - {ts}Payment Processors{/ts} + {ts}Payment Processors{/ts} {ts}Select and configure one or more payment processing services for online contributions, events and / or membership fees.{/ts} {if $config->userSystem->is_drupal EQ '1'} @@ -109,7 +109,7 @@ {/if} - {ts}System Workflow Templates{/ts} + {ts}System Workflow Templates{/ts} {ts}Review and modify the templates used for system-generated emails, including contribution receipts and event registration confirmations.{/ts} @@ -125,11 +125,11 @@ {ts}Organize your contacts{/ts} - {ts}Tags (Categories){/ts} + {ts}Tags (Categories){/ts} {ts}Tags can be assigned to any contact record, and are a convenient way to find contacts. You can create as many tags as needed to organize and segment your records.{/ts} - {ts}Manage Groups{/ts} + {ts}Manage Groups{/ts} {ts}Use Groups to organize contacts (e.g. these contacts are part of our 'Steering Committee').{/ts} @@ -137,11 +137,11 @@ {ts}Customize Data, Forms and Screens{/ts} - {ts}Custom Fields{/ts} + {ts}Custom Fields{/ts} {ts}Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.{/ts} - {ts}Profiles{/ts} + {ts}Profiles{/ts} {ts}Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.{/ts} diff --git a/templates/CRM/Contact/Page/Inline/Actions.tpl b/templates/CRM/Contact/Page/Inline/Actions.tpl index b22c2fbbdc..d443c42cdf 100644 --- a/templates/CRM/Contact/Page/Inline/Actions.tpl +++ b/templates/CRM/Contact/Page/Inline/Actions.tpl @@ -72,7 +72,7 @@ {foreach from=$actionsMenuList.moreActions item='row'} {if !empty($row.href) or !empty($row.tab)}
  • - {$row.title} + {$row.title}
    • {/if} {/foreach} diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 2c82fa2573..c5a1606d7b 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -138,7 +138,7 @@ {foreach from=$allTabs key=tabName item=tabValue}
  • - + {$tabValue.title} {if empty($tabValue.hideCount)}{$tabValue.count}{/if} diff --git a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl index 98f60d3935..dc448b2da3 100644 --- a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl +++ b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl @@ -67,13 +67,13 @@ {foreach from=$products item=row}
    - {if $row.thumbnail}
    {$row.name}
    {/if} + {if $row.thumbnail}
    {$row.name|escape}
    {/if}
    {$row.name}
    -
    {if $row.image}{$row.name}{/if}
    +
    {if $row.image}{$row.name|escape}{/if}
    {$row.name}
    diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index 3ba22ea541..e40c7e57fe 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -39,13 +39,13 @@ {* Show link to Tell a Friend (CRM-2153) *} {if $friendText} {if !$linkText}

    {/if} {/if} {* Add button for donor to create their own Personal Campaign page *} {if $linkText}
    - » {$linkText} + » {$linkText}


    {/if} diff --git a/templates/CRM/Dashlet/Page/Blog.tpl b/templates/CRM/Dashlet/Page/Blog.tpl index dbb888fdbb..a65e926e50 100644 --- a/templates/CRM/Dashlet/Page/Blog.tpl +++ b/templates/CRM/Dashlet/Page/Blog.tpl @@ -29,7 +29,7 @@
    {$article.title}
    {$article.description}
    - +
    diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index 5e0c0b31cc..98da6337bc 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -42,14 +42,14 @@ {* Show link to Tell a Friend (CRM-2153) *} {if $friendText}

    {/if} {* Add button for donor to create their own Personal Campaign page *} {if $pcpLink}
    - » {$pcpLinkText} + » {$pcpLinkText}


    {/if} diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl index 2f02cfcaf3..806388438d 100644 --- a/templates/CRM/Event/Page/DashBoard.tpl +++ b/templates/CRM/Event/Page/DashBoard.tpl @@ -121,10 +121,10 @@ {if NOT $values.$fld}{assign var="status" value="disabled"}{else}{assign var="status" value="enabled"}{/if} {* Schedule Reminders requires a different query string. *} {if $v.url EQ 'civicrm/event/manage/reminder'} -
  • {$v.title}
    • {else} -
  • {$v.title}
    • {/if} {/foreach} diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index f5c4a91564..d76bcde676 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -96,7 +96,7 @@ {crmRegion name="event-page-eventinfo-actionlinks-top"} {if $allowRegistration}
    - {$registerText} + {$registerText}
    {/if} {/crmRegion} @@ -227,7 +227,7 @@ {crmRegion name="event-page-eventinfo-actionlinks-bottom"} {if $allowRegistration}
    - {$registerText} + {$registerText}
    {/if} {/crmRegion} diff --git a/templates/CRM/Friend/Form.tpl b/templates/CRM/Friend/Form.tpl index e677b7ba44..fb25e9939f 100644 --- a/templates/CRM/Friend/Form.tpl +++ b/templates/CRM/Friend/Form.tpl @@ -32,7 +32,7 @@ {* Add button for donor to create their own Personal Campaign page *} {if $linkText}
    - » {$linkText} + » {$linkText}


    {/if} diff --git a/templates/CRM/PCP/Page/PCPInfo.tpl b/templates/CRM/PCP/Page/PCPInfo.tpl index 973c89eac5..763916e8fa 100644 --- a/templates/CRM/PCP/Page/PCPInfo.tpl +++ b/templates/CRM/PCP/Page/PCPInfo.tpl @@ -41,7 +41,7 @@ {foreach from = $links key = k item = v} - » {$v.name} + » {$v.name}  {$hints.$k} diff --git a/templates/CRM/Report/Form/Contact/Detail.tpl b/templates/CRM/Report/Form/Contact/Detail.tpl index 978b821ceb..854ec0cee4 100644 --- a/templates/CRM/Report/Form/Contact/Detail.tpl +++ b/templates/CRM/Report/Form/Contact/Detail.tpl @@ -96,7 +96,7 @@ {assign var=fieldLink value=$field|cat:"_link"} {assign var=fieldHover value=$field|cat:"_hover"} - {if $row.$fieldLink}{/if} + {if $row.$fieldLink}{/if} {if $row.$field eq 'Subtotal'} {$row.$field} @@ -142,7 +142,7 @@ {assign var=fieldHover value=$field|cat:"_hover"} {if $row.$fieldLink} - + {/if} {if $row.$field eq 'Sub Total'} diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl index f1a2f2c508..5ee9a2113e 100644 --- a/templates/CRM/Report/Form/Fields.tpl +++ b/templates/CRM/Report/Form/Fields.tpl @@ -31,7 +31,7 @@