From: Dave Greenberg Date: Sat, 4 May 2013 20:09:29 +0000 (-0700) Subject: Adding support for including event id or contribution page id class in the main div... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=569df8ec045eb02faaee71861c4cf8e1da1cc242;p=civicrm-core.git Adding support for including event id or contribution page id class in the main div container. Had to assign contribution page id to template for contribution confirm step in Confirm.php preProcess() --- diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index ca96a812fd..6e3af38f57 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -352,6 +352,9 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $this->_params['campaign_id'] = $this->_params['contribution_campaign_id']; } + // assign contribution page id to the template so we can add css class for it + $this->assign('contributionPageID', $this->_id); + $this->set('params', $this->_params); } diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 1c495358e7..e3fc398db2 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -29,7 +29,7 @@ {include file="CRM/common/TrackingFields.tpl"} -
+

{ts}Please verify the information below carefully. Click Go Back if you need to make changes.{/ts} {if $contributeMode EQ 'notify' and ! $is_pay_later} diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index d1fc7fbfd9..565691e497 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -94,7 +94,7 @@ {include file="CRM/common/TrackingFields.tpl"} {capture assign='reqMark'}*{/capture} -

+
{$intro_text}
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index 0252de3c4b..f5acd08755 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -29,7 +29,7 @@ {include file="CRM/common/TrackingFields.tpl"} -
+
{if $thankyou_text}
{$thankyou_text} diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl index 5b75bd0d1a..1c5487256c 100644 --- a/templates/CRM/Event/Form/Registration/Confirm.tpl +++ b/templates/CRM/Event/Form/Registration/Confirm.tpl @@ -29,7 +29,7 @@ {include file="CRM/common/TrackingFields.tpl"} -
+
{if $isOnWaitlist}
{ts}Please verify the information below. Then click 'Continue' to be added to the WAIT LIST for this event. If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl index 8996e277dc..887b790221 100644 --- a/templates/CRM/Event/Form/Registration/Register.tpl +++ b/templates/CRM/Event/Form/Registration/Register.tpl @@ -46,7 +46,7 @@ {include file="CRM/common/TrackingFields.tpl"} {capture assign='reqMark'}*{/capture} -
+
{* moved to tpl since need to show only for primary participant page *} {if $requireApprovalMsg || $waitlistMsg} diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index 1513c81eff..e1efe5a6dc 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -29,7 +29,7 @@ {include file="CRM/common/TrackingFields.tpl"} -
+
{* Don't use "normal" thank-you message for Waitlist and Approval Required registrations - since it will probably not make sense for those situations. dgg *} {if $event.thankyou_text AND (not $isOnWaitlist AND not $isRequireApproval)}
diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index 867f4243f4..8ce21095a5 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -82,7 +82,7 @@
{/if} -
+
{if $event.summary}