diff --git a/targets/solr_site/js/solr_site_results.js b/targets/solr_site/js/solr_site_results.js index f70c0ad..213c2ab 100644 --- a/targets/solr_site/js/solr_site_results.js +++ b/targets/solr_site/js/solr_site_results.js @@ -1,7 +1,9 @@ Drupal.behaviors.roblib_search_solr_site_results = { attach: function(context, settings) { - $url = settings.roblib_search_solr_site_results.search_url; - jQuery.getJSON($url, function(data) { + url = settings.roblib_search_solr_site_results.search_url; + query = settings.roblib_search_solr_site_results.search_query; + baseUrl = settings.roblib_search_solr_site_results.base_url; + jQuery.getJSON(url, function(data) { var items = []; var numberOfDocs = 0; try { @@ -31,6 +33,10 @@ Drupal.behaviors.roblib_search_solr_site_results = { qtipify(divs, content, 'Summary'); } + if (numberOfDocs > 0) + { + jQuery('#' + 'roblib-search-solr-site-results-more').empty().append('see all results'); + } }); } diff --git a/targets/solr_site/theme/theme.inc b/targets/solr_site/theme/theme.inc index e96f5b8..99dd79b 100755 --- a/targets/solr_site/theme/theme.inc +++ b/targets/solr_site/theme/theme.inc @@ -52,8 +52,10 @@ function roblib_search_solr_site_preprocessor(&$variables, $type) { $spinner_path = $base_url . '/' . drupal_get_path('module', 'roblib_search') . '/img/' . 'spinner.gif'; $variables['spinner_path'] = $spinner_path; $variables['type'] = $type; - $search_url = $base_url . '/roblib_search/solr_site/' . $type . '/' . urlencode($query); + $query = urlencode($query); + $search_url = $base_url . '/roblib_search/solr_site/' . $type . '/' . $query; drupal_add_js(drupal_get_path('module', 'roblib_search_solr_site') . '/js/solr_site_' . $type . '.js'); $key = 'roblib_search_solr_site_' . $type; - drupal_add_js(array($key => array('search_url' => $search_url)), array('type' => 'setting')); + drupal_add_js(array($key => array('search_url' => $search_url, 'search_query' => $query, + 'base_url' => $base_url)), array('type' => 'setting')); }