CIVICRM-2004 CiviCRM Personal Campaign Pages (PCP), incorrectly display "Don't list...

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 3bfd864ea8a84b55a6826002be512c0d4a0da9a3..1beb28c2fe7c731b28288e3de5763ecfc7db37a9 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -182,29 +182,25 @@
     </fieldset>
   {/if}
 
-  {if $pcpBlock}
+  {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
       <div class="header-dark">
         {ts}Contribution Honor Roll{/ts}
       </div>
       <div class="display-block">
-        {if $pcp_display_in_roll}
-          {ts}List my contribution{/ts}
-          {if $pcp_is_anonymous}
-            <strong>{ts}anonymously{/ts}.</strong>
+        {ts}List my contribution{/ts}
+        {if $pcp_is_anonymous}
+          <strong>{ts}anonymously{/ts}.</strong>
+        {else}
+          {ts}under the name{/ts}:
+          <strong>{$pcp_roll_nickname}</strong>
+          <br/>
+          {if $pcp_personal_note}
+            {ts}With the personal note{/ts}:
+            <strong>{$pcp_personal_note}</strong>
           {else}
-            {ts}under the name{/ts}:
-            <strong>{$pcp_roll_nickname}</strong>
-            <br/>
-            {if $pcp_personal_note}
-              {ts}With the personal note{/ts}:
-              <strong>{$pcp_personal_note}</strong>
-            {else}
-              <strong>{ts}With no personal note{/ts}</strong>
-            {/if}
+            <strong>{ts}With no personal note{/ts}</strong>
           {/if}
-        {else}
-          {ts}Don't list my contribution in the honor roll.{/ts}
         {/if}
         <br/>
       </div>

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 3e638d8aacd31689e96944c7b8322422a9fb94ec..c9ac6090e09ae4b0141204478d51b6c03863d7b5 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -215,26 +215,22 @@
     </fieldset>
   {/if}
 
-  {if $pcpBlock}
+  {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
       <div class="header-dark">
         {ts}Contribution Honor Roll{/ts}
       </div>
       <div class="display-block">
-        {if $pcp_display_in_roll}
-          {ts}List my contribution{/ts}
-          {if $pcp_is_anonymous}
-            <strong>{ts}anonymously{/ts}.</strong>
+        {ts}List my contribution{/ts}
+        {if $pcp_is_anonymous}
+          <strong>{ts}anonymously{/ts}.</strong>
+        {else}
+          {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
+          {if $pcp_personal_note}
+            {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
           {else}
-            {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
-            {if $pcp_personal_note}
-              {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
-            {else}
-              <strong>{ts}With no personal note{/ts}</strong>
-            {/if}
+            <strong>{ts}With no personal note{/ts}</strong>
           {/if}
-        {else}
-          {ts}Don't list my contribution in the honor roll.{/ts}
         {/if}
         <br />
       </div>

diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
index 862728aa978c92ebea6071bae8cd01997af6f53a..20fa9774f0be3b886f5bdb9b11e458be057036d3 100644 (file)
--- a/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -55,28 +55,24 @@
         </div>
     </div>
 
-    {if $pcpBlock}
+    {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
         <div class="header-dark">
            {ts}Contribution Honor Roll{/ts}
         </div>
         <div class="display-block">
-            {if $pcp_display_in_roll}
-                {ts}List my contribution{/ts}
-                {if $pcp_is_anonymous}
-                    <strong>{ts}anonymously{/ts}.</strong>
-                {else}
+          {ts}List my contribution{/ts}
+          {if $pcp_is_anonymous}
+              <strong>{ts}anonymously{/ts}.</strong>
+          {else}
             {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
-                    {if $pcp_personal_note}
-                        {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
-                    {else}
-                     <strong>{ts}With no personal note{/ts}</strong>
-                     {/if}
-                {/if}
+            {if $pcp_personal_note}
+                {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
             {else}
-                {ts}Don't list my contribution in the honor roll.{/ts}
-            {/if}
-            <br />
+             <strong>{ts}With no personal note{/ts}</strong>
+             {/if}
+          {/if}
+          <br />
         </div>
     </div>
     {/if}