comment fixes only

[civicrm-core.git] / templates / CRM / Contribute / Form / Contribution.tpl

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 65f818c0fd58e9a0943fc85c6dc38efadab148ac..721a156e00a7fa611eb2d60aeac3b5cbcfdb73b2 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -68,7 +68,7 @@
       {else}
         {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&context=standalone&mode=live"}{/capture}
       {/if}
-     <a class="open-inline crm-hover-button action-item" href="{$ccModeLink}">&raquo; {ts}submit credit card contribution{/ts}</a>
+     <a class="open-inline-noreturn action-item crm-hover-button" href="{$ccModeLink}">&raquo; {ts}submit credit card contribution{/ts}</a>
     </div>
     {/if}
   <div class="crm-submit-buttons">
@@ -112,8 +112,8 @@
 
         {if $ppID}{ts}<a href='#' onclick='adjustPayment();'>adjust payment amount</a>{/ts}{help id="adjust-payment-amount"}{/if}
         <div id="totalAmountBlock">
-          <br /><span class="description">{ts}Total amount of this contribution.{/ts}{if $hasPriceSets} {ts}Alternatively, you can use a price set.{/ts}{/if}</span>
-          <br /><span id="totalTaxAmount" class="label"></span>
+          {if $hasPriceSets}<span class="description">{ts}Alternatively, you can use a price set.{/ts}</span>{/if}
+          <div id="totalTaxAmount" class="label"></div>
         </div>
       </td>
     </tr>
@@ -247,8 +247,7 @@
               <td class="label">{$form.pcp_made_through_id.label}</td>
               <td>
                 {$form.pcp_made_through_id.html} &nbsp;
-                <span class="description">{ts}Search for the Personal Campaign Page by the fund-raiser's last name or
-                 email address.{/ts}</span>
+                <span class="description">{ts}Search for the Personal Campaign Page by the fund-raiser's last name or email address.{/ts}</span>
 
                 <div class="spacer"></div>
                  <div class="crm-contribution-form-block-pcp_details">
@@ -260,8 +259,7 @@
                     <tr id="nickID" class="crm-contribution-form-block-pcp_roll_nickname">
                       <td class="label">{$form.pcp_roll_nickname.label}</td>
                       <td>{$form.pcp_roll_nickname.html|crmAddClass:big}<br/>
-                        <span class="description">{ts}Name or nickname contributor wants to be displayed in the Honor
-                      Roll. Enter "Anonymous" for anonymous contributions.{/ts}</span>
+                        <span class="description">{ts}Name or nickname contributor wants to be displayed in the Honor Roll. Enter "Anonymous" for anonymous contributions.{/ts}</span>
                       </td>
                     </tr>
                     <tr id="personalNoteID" class="crm-contribution-form-block-pcp_personal_note">
@@ -632,23 +630,26 @@ CRM.$(function($) {
         for(m = re.exec(currencySymbol); m; m = re.exec(currencySymbol)){
           currencySymbol = m[1];
         }
-        var taxRate = taxRates[financialType]; 
+        var taxRate = taxRates[financialType];
         if (!taxRate) {
           taxRate = 0;
-        }  
+          cj("#totalTaxAmount").hide( );
+        } else {
+          cj("#totalTaxAmount").show( );
+        }
         var totalAmount = $('#total_amount').val();
         var thousandMarker = '{/literal}{$config->monetaryThousandSeparator}{literal}';
         var seperator = '{/literal}{$config->monetaryDecimalPoint}{literal}';
         // replace all thousandMarker and change the seperator to a dot
-       totalAmount = totalAmount.replace(thousandMarker,'').replace(seperator,'.');
+  totalAmount = totalAmount.replace(thousandMarker,'').replace(seperator,'.');
 
-       var totalTaxAmount = '{/literal}{$totalTaxAmount}{literal}';
-       var taxAmount = (taxRate/100)*totalAmount;
-       taxAmount = isNaN (taxAmount) ? 0:taxAmount;
-       var totalTaxAmount = taxAmount + Number(totalAmount);
-       totalTaxAmount = formatMoney( totalTaxAmount, 2, seperator, thousandMarker );
+        var totalTaxAmount = '{/literal}{$totalTaxAmount}{literal}';
+        var taxAmount = (taxRate/100)*totalAmount;
+        taxAmount = isNaN (taxAmount) ? 0:taxAmount;
+        var totalTaxAmount = taxAmount + Number(totalAmount);
+        totalTaxAmount = formatMoney( totalTaxAmount, 2, seperator, thousandMarker );
 
-       $("#totalTaxAmount" ).html('Amount with tax : <span id="currencySymbolShow">' + currencySymbol + '</span> '+ totalTaxAmount);
+        $("#totalTaxAmount" ).html('Amount with tax : <span id="currencySymbolShow">' + currencySymbol + '</span> '+ totalTaxAmount);
       }
       event.handled = true;
     }
@@ -661,7 +662,7 @@ CRM.$(function($) {
 
 CRM.$(function($) {
   $('#price_set_id').click(function() {
-    if( $('#price_set_id').val() ) { 
+    if( $('#price_set_id').val() ) {
       $('#totalAmountBlock').hide();
     }
     else {