CRM-13863 - Add ajax paging to contribution tab and dashboard

diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index 5536591305d505238b063784ea038cd1fd8f8483..d9532edd096c48562fe10a76472d047aa8e4ff94 100644 (file)
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -23,9 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{if $context EQ 'Search'}
-    {include file="CRM/common/pager.tpl" location="top"}
-{/if}
+{include file="CRM/common/pager.tpl" location="top"}
 
 {strip}
 <table class="selector row-highlight">
@@ -93,23 +91,7 @@
   </tr>
   {/foreach}
 
-{* Link to "View all contributions" for Contact Summary selector display *}
-{if $limit and $pager->_totalItems GT $limit }
-  {if $context eq 'dashboard' }
-      <tr class="even-row">
-      <td colspan="10"><a href="{crmURL p='civicrm/contribute/search' q='reset=1'}">&raquo; {ts}Find more contributions{/ts}... </a></td>
-      </tr>
-  {elseif $context eq 'contribution' }
-      <tr class="even-row">
-      <td colspan="8"><a href="{crmURL p='civicrm/contribute/search' q="reset=1&force=1&cid=$contactId"}">&raquo; {ts}View all contributions from this contact{/ts}... </a></td>
-      </tr>
-  {/if}
-{/if}
 </table>
 {/strip}
 
-
-
-{if $context EQ 'Search'}
-    {include file="CRM/common/pager.tpl" location="bottom"}
-{/if}
+{include file="CRM/common/pager.tpl" location="bottom"}

diff --git a/templates/CRM/Contribute/Page/DashBoard.js b/templates/CRM/Contribute/Page/DashBoard.js
index b56013ecdf43faa54619e143f0f789dd2ba8185f..653a6ceb0979a19ebdc4bfd8a6a53b68a1984fd4 100644 (file)
--- a/templates/CRM/Contribute/Page/DashBoard.js
+++ b/templates/CRM/Contribute/Page/DashBoard.js
@@ -1,7 +1,7 @@
 // http://civicrm.org/licensing
 /*jslint indent: 2 */
 /*global CRM, cj */
-CRM.$(function($) {
+(function($) {
   'use strict';
 
   var load = {
@@ -21,20 +21,24 @@ CRM.$(function($) {
     }
   };
 
-  $('#chart_view, #table_view').click(function() {
-    if ($(this).hasClass('ui-state-default')) {
-      $('.ui-tabs-selected', '#mainTabContainer').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default');
-      $(this).removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected');
-      load[this.id]();
+  $('#crm-container').on('crmLoad', function (e) {
+    if ($(e.target).is('#crm-main-content-wrapper, #crm-container')) {
+      $('#chart_view, #table_view').click(function () {
+        if ($(this).hasClass('ui-state-default')) {
+          $('.ui-tabs-selected', '#mainTabContainer').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default');
+          $(this).removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected');
+          load[this.id]();
+        }
+      });
+
+      // Initialize chart or table based on url hash
+      if (window.location.hash === '#table_layout') {
+        $('#table_view').click();
+      }
+      else {
+        load.chart_view();
+      }
     }
   });
-
-  // Initialize chart or table based on url hash
-  if (window.location.hash === '#table_layout') {
-    $('#table_view').click();
-  }
-  else {
-    load.chart_view();
-  }
-});
+})(CRM.$);
 

diff --git a/templates/CRM/Contribute/Page/DashBoard.tpl b/templates/CRM/Contribute/Page/DashBoard.tpl
index ec124d5ea62375252be0b320e7285676c868f9ab..0c856353e853909ae2f47729b14db811ac29968d 100644 (file)
--- a/templates/CRM/Contribute/Page/DashBoard.tpl
+++ b/templates/CRM/Contribute/Page/DashBoard.tpl
@@ -66,15 +66,14 @@
 
 <div class="float-right">
 <table class="form-layout-compressed">
-<tr>
+  <tr>
     <td>
-     <a href="{$configPagesURL}" class="button"><span>{ts}Manage Contribution Pages{/ts}
-       </span></a>
+      <a href="{$configPagesURL}" class="button no-popup"><span>{ts}Manage Contribution Pages{/ts}</span></a>
     </td>
-    <td><a href="{$newPageURL}" class="button"><span><div class="icon add-icon"></div>{ts}Add Contribution Page{/ts}
-        </span></a>
+    <td>
+      <a href="{$newPageURL}" class="button no-popup"><span><div class="icon add-icon"></div>{ts}Add Contribution Page{/ts}</span></a>
     </td>
-</tr>
+  </tr>
 </table>
 </div>
 {/if}