From 7e8bc0263c08d82898496f9389f7a5e9259a9e34 Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Wed, 29 May 2013 11:24:10 -0700 Subject: [PATCH] CRM-12721 Change a=true to a=1. Add fe=1 if missing. Add conditional to display URLs for WordPress sites where missing. ---------------------------------------- * CRM-12721: Correct crmURL parameters and add option for WordPress link display http://issues.civicrm.org/jira/browse/CRM-12721 --- .../Campaign/Page/Petition/SocialNetwork.tpl | 2 +- templates/CRM/Case/Audit/Report.tpl | 2 +- .../Contribute/Form/Contribution/ThankYou.tpl | 2 +- .../Form/ContributionPage/Settings.tpl | 4 ++-- .../Contribute/Form/ContributionPage/Tab.hlp | 2 +- .../CRM/Event/Form/ManageEvent/EventInfo.hlp | 20 +++++++++---------- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 4 ++-- templates/CRM/Event/Form/ManageEvent/Tab.hlp | 6 +++--- .../CRM/Event/Form/Registration/ThankYou.tpl | 2 +- templates/CRM/Event/Page/EventInfo.tpl | 2 +- templates/CRM/Friend/Form.tpl | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/templates/CRM/Campaign/Page/Petition/SocialNetwork.tpl b/templates/CRM/Campaign/Page/Petition/SocialNetwork.tpl index 6173f45a0c..d2f5e1bf55 100644 --- a/templates/CRM/Campaign/Page/Petition/SocialNetwork.tpl +++ b/templates/CRM/Campaign/Page/Petition/SocialNetwork.tpl @@ -3,5 +3,5 @@ Default Thank-you page for verified signers. You might have a specific page that displays more information that the form. Check SocialNetwork.drupal as an example *} -{capture assign=petitionURL}{crmURL p='civicrm/petition/sign' q="sid=`$petition_id`" a=true fe=1 h=1}{/capture} +{capture assign=petitionURL}{crmURL p='civicrm/petition/sign' q="sid=`$petition_id`" a=1 fe=1 h=1}{/capture} {include file="CRM/common/SocialNetwork.tpl" url=$petitionURL title=$petitionTitle pageURL=$petitionURL} diff --git a/templates/CRM/Case/Audit/Report.tpl b/templates/CRM/Case/Audit/Report.tpl index 1665071bfd..69a7234ff9 100644 --- a/templates/CRM/Case/Audit/Report.tpl +++ b/templates/CRM/Case/Audit/Report.tpl @@ -27,7 +27,7 @@ {$pageTitle} - + diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index f5acd08755..a04849e346 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -292,7 +292,7 @@

{if $isShare} - {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="$qParams" a=true fe=1 h=1}{/capture} + {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="$qParams" a=1 fe=1 h=1}{/capture} {include file="CRM/common/SocialNetwork.tpl" url=$contributionUrl title=$title pageURL=$contributionUrl} {/if} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index a801e1502b..e818a74e7f 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -129,9 +129,9 @@                              {$form.is_active.html} {$form.is_active.label}
{if $contributionPageID} - {if $config->userSystem->is_drupal EQ '1'} + {if $config->userSystem->is_drupal || $config->userFramework EQ 'WordPress'} {ts}When your page is active, you can link people to the page by copying and pasting the following URL:{/ts}
- {crmURL a=true p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageID`"} + {crmURL a=1 fe=1 p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageID`"} {elseif $config->userFramework EQ 'Joomla'} {ts 1=$title}When your page is active, create front-end links to the contribution page using the Menu Manager. Select Administer CiviCRM » CiviContribute » Manage Contribution Pages and select %1 for the contribution page.{/ts} {/if} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp index e032a051fd..2d0509dfe2 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp @@ -73,7 +73,7 @@ You can use existing CiviCRM Profiles on your page - OR create profile(s) specif » {ts}Online Contribution{/ts}
({ts}Live{/ts}) {ts}Review your customized LIVE online contribution page here. Use the following URL in links and buttons on any website to send visitors to this live page{/ts}:
- {crmURL a=true p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"} + {crmURL a=1 fe=1 p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"} {/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp index c7024346dc..03372481d6 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp @@ -55,17 +55,17 @@ {htxt id="id-listing"} {ts}To allow users to see a listing of participants, set this field to 'Name' (list names only), 'Name and Email', or 'Name, Status and Register Date'.{/ts} {if !$params.isTemplate} - {if $config->userSystem->is_drupal} - {ts}You will need to set Drupal Access Control permissions to include 'view event participants' for any Roles you want to access this listing.{/ts} - {if $params.action eq 2 AND $params.entityId} - {ts}Create links to the listing page by copying the following URL, and adding it to the Event Description below and / or as a menu item or links elsewhere on your site:{/ts}
- {crmURL a=true p='civicrm/event/participant' q="reset=1&id=`$params.entityId`"} - {else} {* Creating new event *} - {ts}After adding your event, create links to the listing page by copying the URL provided in the 'Participant Listing' section of the Configure Event page.{/ts} - {/if} - {elseif $config->userFramework EQ 'Joomla'} - {ts 1=$params.entityId}Then create front-end links to the Participant Listing page using the Menu Manager. Select Participant Listing Page and enter %1 for the Event ID.{/ts} + {ts}You will need to set Access Control permissions to include 'view event participants' for any Roles you want to access this listing.{/ts} + {if $config->userSystem->is_drupal || $config->userFramework EQ 'WordPress'} + {if $params.action eq 2 AND $params.entityId} + {ts}Create links to the listing page by copying the following URL, and adding it to the Event Description below and / or as a menu item or links elsewhere on your site:{/ts}
+ {crmURL a=1 p='civicrm/event/participant' q="reset=1&id=`$params.entityId`"} + {else} {* Creating new event *} + {ts}After adding your event, create links to the listing page by copying the URL provided in the 'Participant Listing' section of the Configure Event page.{/ts} {/if} + {elseif $config->userFramework EQ 'Joomla'} + {ts 1=$params.entityId}Then create front-end links to the Participant Listing page using the Menu Manager. Select Participant Listing Page and enter %1 for the Event ID.{/ts} + {/if} {/if} {/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl index 0bd39cd021..802321e8ae 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl @@ -130,9 +130,9 @@   - {if $config->userSystem->is_drupal} + {if $config->userSystem->is_drupal || $config->userFramework EQ 'WordPress'} {ts}When this Event is active, create links to the Event Information page by copying and pasting the following URL:{/ts}
- {crmURL a=true p='civicrm/event/info' q="reset=1&id=`$eventID`"} + {crmURL a=1 fe=1 p='civicrm/event/info' q="reset=1&id=`$eventID`"} {elseif $config->userFramework EQ 'Joomla'} {ts 1=$eventID}When this Event is active, create front-end links to the Event Information page using the Menu Manager. Select Event Info Page and enter %1 for the Event ID.{/ts} {/if} diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.hlp b/templates/CRM/Event/Form/ManageEvent/Tab.hlp index 5c71677979..fa7763d98d 100644 --- a/templates/CRM/Event/Form/ManageEvent/Tab.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Tab.hlp @@ -71,14 +71,14 @@ {if $params.isOnlineRegistration} - » {ts}Registration{/ts}
({ts}test-drive{/ts}) + » {ts}Registration{/ts}
({ts}test-drive{/ts}) {ts}Test-drive the entire online registration process - including custom fields, confirmation, thank-you page, and receipting. Fee payment transactions will be directed to your payment processor's test server. No live financial transactions will be submitted. However, a contact record will be created or updated and participant and contribution records will be saved to the database. Use obvious test contact names so you can review and delete these records as needed.{/ts} - » {ts}Registration{/ts}
({ts}live{/ts}) + » {ts}Registration{/ts}
({ts}live{/ts}) {ts}Review your customized LIVE online event registration page here. Use the following URL in links and buttons on any website to send visitors to this live page{/ts}:
- {crmURL a=true p='civicrm/event/register' q="reset=1&id=`$params.eventId`"} + {crmURL a=1 fe=1 p='civicrm/event/register' q="reset=1&id=`$params.eventId`"} {/if} diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index e1efe5a6dc..b4b31f0cc0 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -213,7 +213,7 @@ {include file="CRM/Event/Page/iCalLinks.tpl"} {/if} {if $event.is_share} - {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} + {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=1 fe=1 h=1}{/capture} {include file="CRM/common/SocialNetwork.tpl" url=$eventUrl title=$event.title pageURL=$eventUrl} {/if} diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index 8ce21095a5..6bbaaed9ca 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -219,7 +219,7 @@ {/if} {if $event.is_share } - {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} + {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=1 fe=1 h=1}{/capture} {include file="CRM/common/SocialNetwork.tpl" url=$eventUrl title=$event.title pageURL=$eventUrl} {/if} diff --git a/templates/CRM/Friend/Form.tpl b/templates/CRM/Friend/Form.tpl index 858f95e77c..2ab7c7ed80 100644 --- a/templates/CRM/Friend/Form.tpl +++ b/templates/CRM/Friend/Form.tpl @@ -93,9 +93,9 @@ {if $isShare} {if $context EQ 'event'} - {capture assign=pageURL}{crmURL p='civicrm/event/info' q="id=`$entityID`&reset=1" a=true fe=1 h=1}{/capture} + {capture assign=pageURL}{crmURL p='civicrm/event/info' q="id=`$entityID`&reset=1" a=1 fe=1 h=1}{/capture} {else} - {capture assign=pageURL}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$entityID`" a=true fe=1 h=1}{/capture} + {capture assign=pageURL}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$entityID`" a=1 fe=1 h=1}{/capture} {/if} {include file="CRM/common/SocialNetwork.tpl" url=$pageURL title=$title pageURL=$pageURL} {/if} -- 2.25.1