From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Thu, 4 Jun 2015 10:09:12 +0000 (+0100)
Subject: CRM-16624: Remove unused and outdated reqMark variable from templates
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2d579f4283db8bd1e750235919e4a0d31b3283da;p=civicrm-core.git

CRM-16624: Remove unused and outdated reqMark variable from templates
---

diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index ba70f9bb0c..181b23af12 100644
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -67,7 +67,6 @@
 
   {include file="CRM/common/TrackingFields.tpl"}
 
-  {capture assign='reqMark'}<span class="marker" title="{ts}This field is required.{/ts}">*</span>{/capture}
   <div class="crm-contribution-page-id-{$contributionPageID} crm-block crm-contribution-main-form-block">
 
   {if $contact_id}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
index 980162ec11..46c343b1b1 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
@@ -23,7 +23,6 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
 <div class="crm-block crm-form-block crm-contribution-contributionpage-thankyou-form-block">
 <div id="help">
     <p>{ts}Use this form to configure the thank-you message and receipting options.{/ts} {help id="id_thank"}</p>
@@ -57,7 +56,7 @@
   </td>
     </tr>
     <tr class="crm-contribution-contributionpage-thankyou-form-block-receipt_from_email">
-      <td class="label">{$form.receipt_from_email.label}{$reqMark} {help id="id_receipt-from-email"}</td>
+      <td class="label">{$form.receipt_from_email.label} <span class="crm-marker" title="{ts}This field is required.{/ts}">*</span> {help id="id_receipt-from-email"}</td>
       <td class="html-adjust">{$form.receipt_from_email.html}</td>
     </tr>
     <tr class="crm-contribution-contributionpage-thankyou-form-block-receipt_text">
diff --git a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
index 37a016e446..6069f6a1b2 100644
--- a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
@@ -1,7 +1,5 @@
 {include file="CRM/common/TrackingFields.tpl"}
 
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
-
 <h3>{ts 1=$mer_participant->display_name 2=$mer_participant->email}Choose Events For %1 (%2){/ts}</h3>
 
 {foreach from=$slot_fields key=slot_name item=field_name}
diff --git a/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl b/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl
index abc90210fa..22d053a2b0 100644
--- a/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl
@@ -1,7 +1,5 @@
 {include file="CRM/common/TrackingFields.tpl"}
 
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
-
 {if $contact}
 <div class="messages status no-popup">
     {ts 1=$contact.display_name}Welcome %1{/ts}. (<a href="{crmURL p='civicrm/event/cart_checkout' q="&cid=0&reset=1"}" title="{ts}Click here to register a different person for this event.{/ts}">{ts 1=$contact.display_name}Not %1, or want to register a different person{/ts}</a>?)</div>
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index 1fb4412c99..3444d7f7db 100644
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -32,8 +32,6 @@
 
 {include file="CRM/common/TrackingFields.tpl"}
 
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
-
 {*CRM-4320*}
 {if $statusMessage}
     <div class="messages status no-popup">
diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl
index e7b4894a17..1233e4a662 100644
--- a/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/templates/CRM/Event/Form/Registration/Register.tpl
@@ -30,7 +30,7 @@
   {/if}
 
   {include file="CRM/common/TrackingFields.tpl"}
-  {capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
+
   <div class="crm-event-id-{$event.id} crm-block crm-event-register-form-block">
 
     {* moved to tpl since need to show only for primary participant page *}
diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl
index 3afa67feb8..b6696bca3c 100644
--- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl
+++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl
@@ -1,7 +1,7 @@
 {if $action & 1024}
     {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"}
 {/if}
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
+
 <div class="form-item">
 {if $event.intro_text}
     <div id="intro_text">
diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl
index 3afa67feb8..b6696bca3c 100644
--- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl
+++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl
@@ -1,7 +1,7 @@
 {if $action & 1024}
     {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"}
 {/if}
-{capture assign='reqMark'}<span class="marker"  title="{ts}This field is required.{/ts}">*</span>{/capture}
+
 <div class="form-item">
 {if $event.intro_text}
     <div id="intro_text">