Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x

tripal/includes/TripalFields/TripalFieldFormatter.inc

@@ -179,6 +179,7 @@ class TripalFieldFormatter {
     $pager = preg_replace('/href="' . $tmp_base_path . 'bio_data\/ajax\/field_attach\/' . $field_id . '\?page=(.+?)"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', $1)"', $pager);
     $pager = preg_replace('/href="' . $tmp_base_path . 'bio_data\/ajax\/field_attach\/' . $field_id . '"/', 'href="javascript:void(0)" onclick="tripal_navigate_field_pager(\'' . $field_id . '\', 0)"', $pager);
 
+    $pager = '<img src="/' . drupal_get_path('module', 'tripal') . '/theme/images/ajax-loader.gif" id="' . $field_id . '-spinner" class="tripal-field-ajax-spinner">' . $pager;
     return $pager;
   }
 

tripal/theme/css/tripal.css

@@ -72,9 +72,7 @@ div.messages.tripal-site-admin-only{
 /******************************************************************************
  * Spinner for paginated elements
  *****************************************************************************/
- #spinner {
-   position: absolute;
+ .tripal-field-ajax-spinner {
    display: none;
-   left: 24%;
-   bottom: 7%;
+   float: left;
  }

tripal/theme/js/tripal.js

@@ -25,9 +25,9 @@
 
 function tripal_navigate_field_pager(id, page) {
     jQuery(document).ajaxStart(function () {
-        jQuery('#spinner').show();
+      jQuery('#' + id + '-spinner').show();
     }).ajaxComplete(function () {
-        jQuery('#spinner').hide();
+      jQuery('#' + id + '-spinner').hide();
     });
 
     jQuery.ajax({
@@ -38,4 +38,4 @@ function tripal_navigate_field_pager(id, page) {
       jQuery("#" + id + ' .field-items').replaceWith(response['content']);
     }
   });
-}
+}

tripal_chado/includes/TripalFields/sbo__relationship/sbo__relationship_formatter.inc

@@ -113,10 +113,10 @@ class sbo__relationship_formatter extends ChadoFieldFormatter {
       'quantity' => $total_pages,
     ));
     $pager = $this->ajaxifyPager($pager, $entity);
+    $page_items = array_chunk($rows, $items_per_page);
 
-    $page_items = array_chunk ($rows, $items_per_page);
-
-    $table = theme_table(array(
+    $content = 'There are ' . count($items) . ' relationships';
+    $content .= theme_table(array(
       'header' => $headers,
       'rows' => $page_items[$current_page],
       'attributes' => array(
@@ -133,8 +133,7 @@ class sbo__relationship_formatter extends ChadoFieldFormatter {
     if (count($items) > 0) {
       $element[0] = array(
         '#type' => 'markup',
-        '#markup' => $table,
-        '#suffix' => '<img src=\'/sites/all/modules/tripal-7.x-3.x/tripal/theme/images/ajax-loader.gif\' id=\'spinner\'/>' . $pager,
+        '#markup' => $content . $pager,
       );
     }
   }