Make template structure proper

diff --git a/templates/CRM/Campaign/Form/Survey/Results.tpl b/templates/CRM/Campaign/Form/Survey/Results.tpl
index 2093e7d6d340ad9b7dd40c9fd17894486769b123..95424e10f4f828977234825481c8ec052de11fad 100644 (file)
--- a/templates/CRM/Campaign/Form/Survey/Results.tpl
+++ b/templates/CRM/Campaign/Form/Survey/Results.tpl
@@ -46,11 +46,11 @@
            <div class="crm-accordion-body">
            <table class="form-layout-compressed">
              <tr>
-                <td class="description label">{$form.create_report.label}</td>
+                <td class="label">{$form.create_report.label}</td>
                 <td>{$form.create_report.html}</td>
              </tr>
              <tr>
-                <td class="description label">{$form.report_title.label}</td>
+                <td class="label">{$form.report_title.label}</td>
                 <td>{$form.report_title.html|crmAddClass:big}</td>
              </tr>
             </table>

diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index f81f1070fba1a1d5b37e831e3865dc5e0482f30d..57fe8ad98e0a1febbf2cd6b447d9ae6bbd8370cf 100644 (file)
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -30,7 +30,7 @@
 {if !$email and $action neq 8 and $context neq 'standalone'}
 <div class="messages status no-popup">
   <div class="icon inform-icon"></div>
-        <p>{ts}You will not be able to send an acknowledgment for this pledge because there is no email address recorded for this contact. If you want a acknowledgment to be sent when this pledge is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the pledge.{/ts}</p>
+  <p>{ts}You will not be able to send an acknowledgment for this pledge because there is no email address recorded for this contact. If you want a acknowledgment to be sent when this pledge is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the pledge.{/ts}</p>
 </div>
 {/if}
 {if $action EQ 2}
@@ -45,9 +45,9 @@
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    {if $action eq 8}
     <div class="messages status no-popup">
-        <div class="icon inform-icon"></div>&nbsp;
-        <span class="font-red bold">{ts}WARNING: Deleting this pledge will also delete any related pledge payments.{/ts} {ts}This action cannot be undone.{/ts}</span>
-        <p>{ts}Consider cancelling the pledge instead if you want to maintain an audit trail and avoid losing payment data. To set the pledge status to Cancelled and cancel any not-yet-paid pledge payments, first click Cancel on this form. Then click the more &gt; link from the pledge listing, and select the Cancel action.{/ts}</p>
+    <div class="icon inform-icon"></div>&nbsp;
+    <span class="font-red bold">{ts}WARNING: Deleting this pledge will also delete any related pledge payments.{/ts} {ts}This action cannot be undone.{/ts}</span>
+    <p>{ts}Consider cancelling the pledge instead if you want to maintain an audit trail and avoid losing payment data. To set the pledge status to Cancelled and cancel any not-yet-paid pledge payments, first click Cancel on this form. Then click the more &gt; link from the pledge listing, and select the Cancel action.{/ts}</p>
     </div>
    {else}
       <table class="form-layout-compressed">
@@ -58,93 +58,118 @@
           </tr>
         {else}
           <tr class="crm-pledge-form-block-displayName">
-              <td class="font-size12pt right"><strong>{ts}Pledge by{/ts}</strong></td>
-              <td class="font-size12pt"><strong>{$displayName}</strong></td>
+            <td class="font-size12pt right"><strong>{ts}Pledge by{/ts}</strong></td>
+            <td class="font-size12pt"><strong>{$displayName}</strong></td>
           </tr>
         {/if}
-  <tr class="crm-pledge-form-block-amount">
-       <td class="label">{$form.amount.label}</td>
-          <td><span>{$form.currency.html|crmAddClass:eight}&nbsp;{$form.amount.html|crmAddClass:eight}</span>
-          {if $originalPledgeAmount}<div class="messages status no-popup"><div class="icon inform-icon"></div>&nbsp;{ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}</div>{/if}
-      </td>
-  </tr>
-        <tr class="crm-pledge-form-block-installments">
-      <td class="label">{$form.installments.label}</td>
-      <td>{$form.installments.html} {ts}installments of{/ts}
-        <span class='currency-symbol'>
-          {if $action eq 1 or $isPending}
-            {$form.eachPaymentAmount.html|crmMoney:$currency}
-          {elseif $action eq 2 and !$isPending}
-            {$eachPaymentAmount|crmMoney:$currency}
-          {/if}
-        </span>&nbsp;{ts}every{/ts}&nbsp;{$form.frequency_interval.html}&nbsp;{$form.frequency_unit.html}</td></tr>
-        <tr class="crm-pledge-form-block-frequency_day">
-      <td class="label nowrap">{$form.frequency_day.label}</td>
-      <td>{$form.frequency_day.html} {ts}day of the period{/ts}<br />
-            <span class="description">{ts}This applies to weekly, monthly and yearly payments.{/ts}</td></tr>
+          <tr class="crm-pledge-form-block-amount">
+            <td class="label">{$form.amount.label}</td>
+            <td>
+              <span>{$form.currency.html|crmAddClass:eight}&nbsp;{$form.amount.html|crmAddClass:eight}</span>
+              {if $originalPledgeAmount}<div class="messages status no-popup"><div class="icon inform-icon"></div>&nbsp;{ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}</div>{/if}
+            </td>
+          </tr>
+          <tr class="crm-pledge-form-block-installments">
+            <td class="label">{$form.installments.label}</td>
+            <td>{$form.installments.html} {ts}installments of{/ts}
+              <span class='currency-symbol'>
+                {if $action eq 1 or $isPending}
+                  {$form.eachPaymentAmount.html|crmMoney:$currency}
+                {elseif $action eq 2 and !$isPending}
+                  {$eachPaymentAmount|crmMoney:$currency}
+                {/if}
+              </span>&nbsp;{ts}every{/ts}&nbsp;{$form.frequency_interval.html}&nbsp;{$form.frequency_unit.html}
+            </td>
+          </tr>
+          <tr class="crm-pledge-form-block-frequency_day">
+            <td class="label nowrap">{$form.frequency_day.label}</td>
+            <td>{$form.frequency_day.html} {ts}day of the period{/ts}<br />
+              <span class="description">{ts}This applies to weekly, monthly and yearly payments.{/ts}</span>
+            </td>
+          </tr>
         {if $form.create_date}
-        <tr class="crm-pledge-form-block-create_date">
+          <tr class="crm-pledge-form-block-create_date">
             <td class="label">{$form.create_date.label}</td>
             <td>{include file="CRM/common/jcalendar.tpl" elementName=create_date}<br />
         {/if}
         {if $create_date}
-            <tr class="crm-pledge-form-block-create_date">
-        <td class="label">{ts}Pledge Made{/ts}</td>
-    <td class="view-value">{$create_date|truncate:10:''|crmDate}
+          <tr class="crm-pledge-form-block-create_date">
+            <td class="label">{ts}Pledge Made{/ts}</td>
+            <td class="view-value">{$create_date|truncate:10:''|crmDate}
         {/if}<br />
-            <span class="description">{ts}Date when pledge was made by the contributor.{/ts}</span></td></tr>
+            <span class="description">{ts}Date when pledge was made by the contributor.{/ts}</span>
+            </td>
+          </tr>
 
         {if $form.start_date}
-            <tr class="crm-pledge-form-block-start_date">
-                <td class="label">{$form.start_date.label}</td>
-                <td>{include file="CRM/common/jcalendar.tpl" elementName=start_date}<br />
+          <tr class="crm-pledge-form-block-start_date">
+            <td class="label">{$form.start_date.label}</td>
+            <td>{include file="CRM/common/jcalendar.tpl" elementName=start_date}<br />
         {/if}
         {if $start_date}
-            <tr class="crm-pledge-form-block-start_date">
-        <td class="label">{ts}Payments Start{/ts}</td>
-    <td class="view-value">{$start_date|truncate:10:''|crmDate}
-        {/if}<br />
-            <span class="description">{ts}Date of first pledge payment.{/ts}</span></td></tr>
+          <tr class="crm-pledge-form-block-start_date">
+            <td class="label">{ts}Payments Start{/ts}</td>
+            <td class="view-value">{$start_date|truncate:10:''|crmDate}
+        {/if}
+              <br />
+              <span class="description">{ts}Date of first pledge payment.{/ts}</span>
+            </td>
+          </tr>
 
         {if $email and $outBound_option != 2}
             {if $form.is_acknowledge }
-                <tr class="crm-pledge-form-block-is_acknowledge">
-        <td class="label">{$form.is_acknowledge.label}</td>
-        <td>{$form.is_acknowledge.html}<br />
-                <span class="description">{ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts}</span></td></tr>
+          <tr class="crm-pledge-form-block-is_acknowledge">
+            <td class="label">{$form.is_acknowledge.label}</td>
+            <td>{$form.is_acknowledge.html}<br />
+              <span class="description">{ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts}</span>
+            </td>
+          </tr>
             {/if}
-      {elseif $context eq 'standalone' and $outBound_option != 2 }
-                <tr id="acknowledgment-receipt" style="display:none;"><td class="label">{$form.is_acknowledge.label}</td><td>{$form.is_acknowledge.html} <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email an acknowledgment of this pledge to %1?{/ts}</span></td></tr>
+        {elseif $context eq 'standalone' and $outBound_option != 2 }
+          <tr id="acknowledgment-receipt" style="display:none;">
+            <td class="label">{$form.is_acknowledge.label}</td>
+            <td>
+              {$form.is_acknowledge.html} <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email an acknowledgment of this pledge to %1?{/ts}</span>
+            </td>
+          </tr>
         {/if}
-        <tr id="fromEmail" style="display:none;">
+          <tr id="fromEmail" style="display:none;">
             <td class="label">{$form.from_email_address.label}</td>
             <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
-        </tr>
-        <tr id="acknowledgeDate">
-      <td class="label" class="crm-pledge-form-block-acknowledge_date">{$form.acknowledge_date.label}</td>
+          </tr>
+          <tr id="acknowledgeDate">
+            <td class="label" class="crm-pledge-form-block-acknowledge_date">{$form.acknowledge_date.label}</td>
             <td>{include file="CRM/common/jcalendar.tpl" elementName=acknowledge_date}<br />
-            <span class="description">{ts}Date when an acknowledgment of the pledge was sent.{/ts}</span></td>
-  </tr>
-        <tr class="crm-pledge-form-block-financial_type_id">
-      <td class="label">{$form.financial_type_id.label}</td>
-      <td>{$form.financial_type_id.html}<br />
-            <span class="description">{ts}Sets the default financial type for payments against this pledge.{/ts}</span></td></tr>
+              <span class="description">{ts}Date when an acknowledgment of the pledge was sent.{/ts}</span>
+            </td>
+          </tr>
+          <tr class="crm-pledge-form-block-financial_type_id">
+            <td class="label">{$form.financial_type_id.label}</td>
+            <td>{$form.financial_type_id.html}<br />
+              <span class="description">{ts}Sets the default financial type for payments against this pledge.{/ts}</span>
+            </td>
+          </tr>
 
       {* CRM-7362 --add campaign *}
       {include file="CRM/Campaign/Form/addCampaignToComponent.tpl"
       campaignTrClass="crm-pledge-form-block-campaign_id"}
 
-      <tr class="crm-pledge-form-block-contribution_page_id">
-        <td class="label">{$form.contribution_page_id.label}</td>
-    <td>{$form.contribution_page_id.html}<br />
-            <span class="description">{ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts}</span></td>
-      </tr>
+          <tr class="crm-pledge-form-block-contribution_page_id">
+            <td class="label">{$form.contribution_page_id.label}</td>
+            <td>{$form.contribution_page_id.html}<br />
+              <span class="description">{ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts}</span>
+            </td>
+          </tr>
 
-      <tr class="crm-pledge-form-block-status">
-        <td class="label">{ts}Pledge Status{/ts}</td>
-    <td class="view-value">{$status}<br />
-            <span class="description">{ts}Pledges are "Pending" until the first payment is received. Once a payment is received, status is "In Progress" until all scheduled payments are completed. Overdue pledges are ones with payment(s) past due.{/ts}</span></td></tr>
-      <tr><td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td></tr>
+          <tr class="crm-pledge-form-block-status">
+            <td class="label"><label>{ts}Pledge Status{/ts}</label></td>
+            <td class="view-value">{$status}<br />
+              <span class="description">{ts}Pledges are "Pending" until the first payment is received. Once a payment is received, status is "In Progress" until all scheduled payments are completed. Overdue pledges are ones with payment(s) past due.{/ts}</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
+          </tr>
        </table>
 {literal}
 <script type="text/javascript">