From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 2 Jan 2014 22:13:45 +0000 (-0800)
Subject: CRM-13863 - Contact summary popup fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2c407361fc51b6e76d2b5c9bae6be7ab27d289d5;p=civicrm-core.git

CRM-13863 - Contact summary popup fixes
---

diff --git a/templates/CRM/Contact/Page/View/Email.tpl b/templates/CRM/Contact/Page/View/Email.tpl
index 75f379155b..7f6effd5c2 100644
--- a/templates/CRM/Contact/Page/View/Email.tpl
+++ b/templates/CRM/Contact/Page/View/Email.tpl
@@ -32,7 +32,7 @@
 <dt>{ts}To{/ts}</dt><dd>{$toName|escape}</dd>
 <dt>{ts}Subject{/ts}</dt><dd>{$subject}</dd>
 <dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
-<dt>&nbsp;</dt><dd><input type="button" name="Done" value="Done" onclick="location.href='{crmURL p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}';"></dd>
+<dt>&nbsp;</dt><dd><a class="button cancel form-submit" href="{crmURL p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}</a></dd>
 </dl>
 </fieldset>
 </div>
diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index 298483656f..673bf3e86a 100644
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -51,7 +51,7 @@
             <tr><td class="label">{ts}Auto Renew?{/ts}</td><td>{if $recur.auto_renew}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}</td></tr>
             {if $recur.payment_processor}<tr><td class="label">{ts}Payment Processor{/ts}</td><td>{$recur.payment_processor}</td></tr>{/if}
           </table>
-          <div class="crm-submit-buttons"><input type="button" name='cancel' value="{ts}Done{/ts}" onclick="location.href='{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=contribute'}';"/></div>
+          <div class="crm-submit-buttons"><a class="button cancel form-submit" href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=contribute'}">{ts}Done{/ts}</a></div>
         </div>
     {/if}
 {/if}
diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl
index 96f8392ea9..27c32d46da 100644
--- a/templates/CRM/Contribute/Page/Tab.tpl
+++ b/templates/CRM/Contribute/Page/Tab.tpl
@@ -31,11 +31,13 @@
     <div class="view-content">
         <div id="help">
             {if $permission EQ 'edit'}
-                {capture assign=newContribURL}{crmURL p="civicrm/contact/view/contribution" q="reset=1&action=add&cid=`$contactId`&context=contribution"}{/capture}
-                {ts 1=$newContribURL}Click <a href='%1'>Record Contribution (Check, Cash, EFT ...)</a> to record a new contribution received from this contact.{/ts}
+              {capture assign=newContribURL}{crmURL p="civicrm/contact/view/contribution" q="reset=1&action=add&cid=`$contactId`&context=contribution"}{/capture}
+              {capture assign=link}class="action-item action-item-first" href="{$newContribURL}"{/capture}
+              {ts 1=$link}Click <a %1>Record Contribution</a> to record a new contribution received from this contact.{/ts}
                 {if $newCredit}
-                    {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/contribution" q="reset=1&action=add&cid=`$contactId`&context=contribution&mode=live"}{/capture}
-                    {ts 1=$newCreditURL}Click <a href='%1'>Submit Credit Card Contribution</a> to process a new contribution on behalf of the contributor using their credit card.{/ts}
+                  {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/contribution" q="reset=1&action=add&cid=`$contactId`&context=contribution&mode=live"}{/capture}
+                  {capture assign=link}class="action-item action-item-first" href="{$newCreditURL}"{/capture}
+                  {ts 1=$link}Click <a %1>Submit Credit Card Contribution</a> to process a new contribution on behalf of the contributor using their credit card.{/ts}
                 {/if}
             {else}
                 {ts 1=$displayName}Contributions received from %1 since inception.{/ts}
diff --git a/templates/CRM/Event/Page/Tab.tpl b/templates/CRM/Event/Page/Tab.tpl
index 100e32c859..9d6d8a0214 100644
--- a/templates/CRM/Event/Page/Tab.tpl
+++ b/templates/CRM/Event/Page/Tab.tpl
@@ -33,10 +33,12 @@
 
     <div id="help">
         <p>{ts 1=$displayName}This page lists all event registrations for %1 since inception.{/ts}
-        {if $permission EQ 'edit'}{ts 1=$newEventURL}Click <a accesskey="N" href='%1'>Add Event Registration</a> to register this contact for an event.{/ts}{/if}
+        {capture assign="link"}class="action-item action-item-first" href="{$newEventURL}"{/capture}
+        {if $permission EQ 'edit'}{ts 1=$link}Click <a %1>Add Event Registration</a> to register this contact for an event.{/ts}{/if}
         {if $accessContribution and $newCredit}
             {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/participant" q="reset=1&action=add&cid=`$contactId`&context=participant&mode=live"}{/capture}
-            {ts 1=$newCreditURL}Click <a href='%1'>Submit Credit Card Event Registration</a> to process a new New Registration on behalf of the participant using their credit card.{/ts}
+            {capture assign="link"}class="action-item action-item-first" href="{$newCreditURL}"{/capture}
+            {ts 1=$link}Click <a %1>Submit Credit Card Event Registration</a> to process a new New Registration on behalf of the participant using their credit card.{/ts}
         {/if}
         </p>
     </div>
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 61cf3eadfd..fd73e63bd7 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -336,7 +336,50 @@
 
     {literal}
     <script type="text/javascript">
-    cj( function( ) {
+
+      function setPaymentBlock(mode, checkboxEvent) {
+        var memType = parseInt(cj('#membership_type_id_1').val( ));
+        var isPriceSet = 0;
+
+        if ( cj('#price_set_id').length > 0 && cj('#price_set_id').val() ) {
+          isPriceSet = 1;
+        }
+
+        if ( !memType || isPriceSet ) {
+          return;
+        }
+
+        var allMemberships = {/literal}{$allMembershipInfo}{literal};
+        if ( !mode ) {
+          //check the record_contribution checkbox if membership is a paid one
+          {/literal}{if $action eq 1}{literal}
+          if (!checkboxEvent) {
+            if (allMemberships[memType]['total_amount_numeric'] > 0) {
+              cj('#record_contribution').prop('checked','checked');
+              cj('#recordContribution').show();
+            }
+            else {
+              cj('#record_contribution').prop('checked', false);
+              cj('#recordContribution').hide();
+            }
+          }
+          {/literal}{/if}{literal}
+        }
+
+        // skip this for test and live modes because financial type is set automatically
+        cj("#financial_type_id").val(allMemberships[memType]['financial_type_id']);
+        var term = cj('#num_terms').val();
+        if ( term ) {
+          var feeTotal = allMemberships[memType]['total_amount_numeric'] * term;
+          cj("#total_amount").val( feeTotal.toFixed(2) );
+        }
+        else {
+          cj("#total_amount").val( allMemberships[memType]['total_amount'] );
+        }
+      }
+
+
+      cj( function( ) {
       var mode   = {/literal}'{$membershipMode}'{literal};
       if ( !mode ) {
         // Offline form (mode = false) has the record_contribution checkbox
@@ -414,49 +457,6 @@
     }
     {/literal}{/if}
 
-    {literal}
-    function setPaymentBlock(mode, checkboxEvent) {
-      var memType = parseInt(cj('#membership_type_id_1').val( ));
-      var isPriceSet = 0;
-
-      if ( cj('#price_set_id').length > 0 && cj('#price_set_id').val() ) {
-        isPriceSet = 1;
-      }
-
-      if ( !memType || isPriceSet ) {
-        return;
-      }
-
-      var allMemberships = {/literal}{$allMembershipInfo}{literal};
-      if ( !mode ) {
-        //check the record_contribution checkbox if membership is a paid one
-        {/literal}{if $action eq 1}{literal}
-          if (!checkboxEvent) {
-            if (allMemberships[memType]['total_amount_numeric'] > 0) {
-              cj('#record_contribution').prop('checked','checked');
-              cj('#recordContribution').show();
-            }
-            else {
-              cj('#record_contribution').prop('checked', false);
-              cj('#recordContribution').hide();
-            }
-          }
-        {/literal}{/if}{literal}
-      }
-
-      // skip this for test and live modes because financial type is set automatically
-      cj("#financial_type_id").val(allMemberships[memType]['financial_type_id']);
-      var term = cj('#num_terms').val();
-      if ( term ) {
-        var feeTotal = allMemberships[memType]['total_amount_numeric'] * term;
-        cj("#total_amount").val( feeTotal.toFixed(2) );
-      }
-      else {
-        cj("#total_amount").val( allMemberships[memType]['total_amount'] );
-      }
-    }
-
-    {/literal}
     {if $context eq 'standalone' and $outBound_option != 2 }
     {literal}
     cj( function( ) {
diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl
index e43974ac52..2b6bdd7d0a 100644
--- a/templates/CRM/Member/Page/Tab.tpl
+++ b/templates/CRM/Member/Page/Tab.tpl
@@ -31,15 +31,18 @@
 {elseif $action eq 32768}  {* renew *}
     {include file="CRM/Member/Form/MembershipRenewal.tpl"}
 {elseif $action eq 16} {* Browse memberships for a contact *}
-    {if $permission EQ 'edit'}{capture assign=newURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership"}{/capture}{/if}
+    {if $permission EQ 'edit'}
+      {capture assign=newURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership"}{/capture}{/if}
 
     {if $action ne 1 and $action ne 2 and $permission EQ 'edit'}
         <div id="help">
             {if $permission EQ 'edit'}
-                {ts 1=$newURL}Click <a href='%1'>Add Membership</a> to record a new membership.{/ts}
+              {capture assign="link"}class="action-item action-item-first" href="{$newURL}"{/capture}
+              {ts 1=$link}Click <a %1>Add Membership</a> to record a new membership.{/ts}
               {if $newCredit}
-                    {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership&mode=live"}{/capture}
-                    {ts 1=$newCreditURL}Click <a href='%1'>Submit Credit Card Membership</a> to process a Membership on behalf of the member using their credit card.{/ts}
+                {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership&mode=live"}{/capture}
+                {capture assign="link"}class="action-item action-item-first" href="{$newCreditURL}"{/capture}
+                {ts 1=$link}Click <a %1>Submit Credit Card Membership</a> to process a Membership on behalf of the member using their credit card.{/ts}
                 {/if}
             {else}
                 {ts 1=$displayName}Current and inactive memberships for %1 are listed below.{/ts}
diff --git a/templates/CRM/Pledge/Page/Tab.tpl b/templates/CRM/Pledge/Page/Tab.tpl
index a684466999..7eb58b6767 100644
--- a/templates/CRM/Pledge/Page/Tab.tpl
+++ b/templates/CRM/Pledge/Page/Tab.tpl
@@ -32,8 +32,9 @@
 <div id="help">
     {ts 1=$displayName}Pledges received from %1 since inception.{/ts}
     {if $permission EQ 'edit'}
-     {capture assign=newContribURL}class="action-item action-item-first" href="{crmURL p="civicrm/contact/view/pledge" q="reset=1&action=add&cid=`$contactId`&context=pledge"}"{/capture}
-     {ts 1=$newContribURL}Click <a %1>Add Pledge</a> to record a new pledge received from this contact.{/ts}
+     {capture assign=newContribURL}{crmURL p="civicrm/contact/view/pledge" q="reset=1&action=add&cid=`$contactId`&context=pledge"}{/capture}
+     {capture assign=link}class="action-item action-item-first" href="{$newContribURL}"{/capture}
+     {ts 1=$link}Click <a %1>Add Pledge</a> to record a new pledge received from this contact.{/ts}
     {/if}
 </div>
 
diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index 61c6e21631..f574be3c61 100644
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -43,7 +43,7 @@
         <p>{ts}Click 'Upgrade Now' if you are ready to proceed. Otherwise click 'Cancel' to return to the CiviCRM home page.{/ts}</p>
         <input type="hidden" name="action" value="begin" />
         <input type="submit" value="{ts}Upgrade Now{/ts}" name="upgrade" onclick="return confirm('{ts escape="js"}Are you sure you are ready to upgrade now?{/ts}');" /> &nbsp;&nbsp;
-        <input type="button" value="{ts}Cancel{/ts}" onclick="window.location='{$cancelURL}';" />
+        <a class="button cancel form-submit" value="{ts}Cancel{/ts}" href="{$cancelURL}">{ts}Cancel{/ts}</a>
     </form>
   </div>