From d65e1c56a995db0c60c434e9a015dc3a288afa15 Mon Sep 17 00:00:00 2001 From: Sean Madsen Date: Thu, 26 Oct 2017 10:31:48 -0400 Subject: [PATCH] CRM-21358 - Remove `current` from docs URLs --- templates/CRM/ACL/Page/ACL.tpl | 2 +- templates/CRM/ACL/Page/ACLBasic.tpl | 2 +- templates/CRM/ACL/Page/EntityRole.tpl | 2 +- templates/CRM/Admin/Page/Access.tpl | 2 +- templates/CRM/Admin/Page/MessageTemplates.hlp | 2 +- templates/CRM/Admin/Page/Options.tpl | 2 +- templates/CRM/Admin/Page/ScheduleReminders.tpl | 2 +- templates/CRM/Contact/Form/Search/Advanced.hlp | 2 +- templates/CRM/Contact/Form/Task/SaveSearch.tpl | 2 +- templates/CRM/Event/Form/Task/SaveSearch.tpl | 2 +- templates/CRM/Group/Page/Group.hlp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl index 8cb7759250..53cdb9eafd 100644 --- a/templates/CRM/ACL/Page/ACL.tpl +++ b/templates/CRM/ACL/Page/ACL.tpl @@ -25,7 +25,7 @@ *} {capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} {capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} +{capture assign=docLink}{docURL page='user/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} {if $action eq 1 or $action eq 2 or $action eq 8} diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl index 3cf4473d9e..0c9cd6d1d5 100644 --- a/templates/CRM/ACL/Page/ACLBasic.tpl +++ b/templates/CRM/ACL/Page/ACLBasic.tpl @@ -25,7 +25,7 @@ *} {capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} {capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} +{capture assign=docLink}{docURL page='user/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture}

{ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts, a profile or a set of custom fields), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl index 9a499b8e52..8760ebeb4b 100644 --- a/templates/CRM/ACL/Page/EntityRole.tpl +++ b/templates/CRM/ACL/Page/EntityRole.tpl @@ -25,7 +25,7 @@ *} {capture assign=aclURL}{crmURL p='civicrm/acl' q='reset=1'}{/capture} {capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} +{capture assign=docLink}{docURL page='user/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture}

{ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

diff --git a/templates/CRM/Admin/Page/Access.tpl b/templates/CRM/Admin/Page/Access.tpl index f5dd5a3c60..a765753e3e 100644 --- a/templates/CRM/Admin/Page/Access.tpl +++ b/templates/CRM/Admin/Page/Access.tpl @@ -23,7 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=docLink}{docURL page="user/current/initial-set-up/permissions-and-access-control/" text="Access Control Documentation"}{/capture} +{capture assign=docLink}{docURL page="user/initial-set-up/permissions-and-access-control/" text="Access Control Documentation"}{/capture}

{ts 1=$docLink}ACLs (Access Control Lists) allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of Data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts} {if $config->userSystem->is_drupal EQ '1'}{ts}Note that a CiviCRM ACL Role is not related to the Drupal Role.{/ts}{/if}

diff --git a/templates/CRM/Admin/Page/MessageTemplates.hlp b/templates/CRM/Admin/Page/MessageTemplates.hlp index 1cddaf679d..85947c4bb7 100644 --- a/templates/CRM/Admin/Page/MessageTemplates.hlp +++ b/templates/CRM/Admin/Page/MessageTemplates.hlp @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *} {capture assign=tokenDocLink}{docURL page="user/common-workflows/tokens-and-mail-merge"}{/capture} -{capture assign=schedRemindersDocLink}{docURL page="user/current/email/scheduled-reminders/"}{/capture} +{capture assign=schedRemindersDocLink}{docURL page="user/email/scheduled-reminders/"}{/capture} {capture assign=schedRemURL}{crmURL p='civicrm/admin/scheduleReminders' q="reset=1"}{/capture} {capture assign=upgradeTemplatesDocLink}{docURL page="Updating System Workflow Message Templates after Upgrades - method 1 - kdiff" resource="wiki"}{/capture} {htxt id="id-intro-title"} diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index 9708ec8c32..e4061d72b0 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -50,7 +50,7 @@ {ts}The following credit card options will be offered to contributors using Online Contribution pages. You will need to verify which cards are accepted by your chosen Payment Processor and update these entries accordingly.{/ts}

{ts}IMPORTANT: This page does NOT control credit card/payment method choices for sites and/or contributors using the PayPal Express service (e.g. where billing information is collected on the Payment Processor's website).{/ts} {elseif $gName eq "acl_role"} - {capture assign=docLink}{docURL page="user/current/initial-set-up/permissions-and-access-control/" text="Access Control Documentation"}{/capture} + {capture assign=docLink}{docURL page="user/initial-set-up/permissions-and-access-control/" text="Access Control Documentation"}{/capture} {capture assign=aclURL}{crmURL p='civicrm/acl' q='reset=1'}{/capture} {capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} {ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl index 953e0a04d0..95e787fe2f 100644 --- a/templates/CRM/Admin/Page/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Page/ScheduleReminders.tpl @@ -35,7 +35,7 @@ {* include wysiwyg related files*} {include file="CRM/common/wysiwyg.tpl" includeWysiwygEditor=true} {if !$component} - {capture assign=schedRemindersDocLink}{docURL page="user/current/email/scheduled-reminders/"}{/capture} + {capture assign=schedRemindersDocLink}{docURL page="user/email/scheduled-reminders/"}{/capture}
{ts}Scheduled reminders allow you to automatically send messages to contacts regarding their memberships, participation in events, or other activities.{/ts} {$schedRemindersDocLink}
diff --git a/templates/CRM/Contact/Form/Search/Advanced.hlp b/templates/CRM/Contact/Form/Search/Advanced.hlp index 522e58e0f0..39a5a3a013 100644 --- a/templates/CRM/Contact/Form/Search/Advanced.hlp +++ b/templates/CRM/Contact/Form/Search/Advanced.hlp @@ -64,7 +64,7 @@ {ts}Search Views{/ts} {/htxt} {htxt id="id-search-views"} -

{ts}You can modify the columns displayed in your search results by creating a Profile containing a different set of contact fields and then selecting that Profile here. For example you may want to include columns for Gender and Date of Birth, while eliminating Country.{/ts} {docURL page="user/current/organising-your-data/profiles"}

+

{ts}You can modify the columns displayed in your search results by creating a Profile containing a different set of contact fields and then selecting that Profile here. For example you may want to include columns for Gender and Date of Birth, while eliminating Country.{/ts} {docURL page="user/organising-your-data/profiles"}

{/htxt} {htxt id="id-search-operator-title"} diff --git a/templates/CRM/Contact/Form/Task/SaveSearch.tpl b/templates/CRM/Contact/Form/Task/SaveSearch.tpl index 27a9886f36..a355a26991 100644 --- a/templates/CRM/Contact/Form/Task/SaveSearch.tpl +++ b/templates/CRM/Contact/Form/Task/SaveSearch.tpl @@ -39,7 +39,7 @@
{/if} -

{docURL page='user/current/organising-your-data/smart-groups/'}

+

{docURL page='user/organising-your-data/smart-groups/'}

diff --git a/templates/CRM/Event/Form/Task/SaveSearch.tpl b/templates/CRM/Event/Form/Task/SaveSearch.tpl index 8d09cf8771..2cc398c753 100644 --- a/templates/CRM/Event/Form/Task/SaveSearch.tpl +++ b/templates/CRM/Event/Form/Task/SaveSearch.tpl @@ -41,7 +41,7 @@ {/if} -

{docURL page='user/current/organising-your-data/smart-groups/'}

+

{docURL page='user/organising-your-data/smart-groups/'}

diff --git a/templates/CRM/Group/Page/Group.hlp b/templates/CRM/Group/Page/Group.hlp index ed962ea381..a6d26f7e70 100644 --- a/templates/CRM/Group/Page/Group.hlp +++ b/templates/CRM/Group/Page/Group.hlp @@ -37,7 +37,7 @@ {ts}Group Type{/ts} {/htxt} {htxt id="id-group-type"} -{capture assign=docLinkAccess}{docURL page="user/current/initial-set-up/permissions-and-access-control/"}{/capture} +{capture assign=docLinkAccess}{docURL page="user/initial-set-up/permissions-and-access-control/"}{/capture} {capture assign=docLinkMail}{docURL page="user/email/what-is-civimail" text="CiviMail component"}{/capture}

{if $config->userFramework neq 'Joomla'}{ts 1=$docLinkAccess}Check 'Access Control' if you want to use this group to assign access permissions to a set of contacts. %1{/ts}{/if} {ts 1=$docLinkMail}Check 'Mailing List' if you are using this group as a mailing list in the %1.{/ts}

{/htxt} -- 2.25.1