diff --git a/targets/eds/css/roblib_search_eds.css b/targets/eds/css/roblib_search_eds.css index 0df0197..d76c3eb 100644 --- a/targets/eds/css/roblib_search_eds.css +++ b/targets/eds/css/roblib_search_eds.css @@ -1,4 +1,4 @@ -/* +/* Document : roblib_search_evergreen Created on : Apr 11, 2013, 2:27:50 PM Author : ppound @@ -15,3 +15,8 @@ .eds-label { font-weight: bolder; } + +.roblib-eds-more-button { + text-align: center; + background-color: lightblue; +} diff --git a/targets/eds/js/eds_results.js b/targets/eds/js/eds_results.js index ab1bcf7..1ce2744 100644 --- a/targets/eds/js/eds_results.js +++ b/targets/eds/js/eds_results.js @@ -45,16 +45,6 @@ Drupal.behaviors.roblib_search_eds = { items.push(roblib_authors); items.push(''); - /*if (typeof val.Items.Src !== 'undefined') { - jQuery.each(val.Items.Src, function (key4, source) { - items.push('
' + source.Data + '
'); - }) - } - if (typeof val.Items.PubIrInfo !== 'undefined') { - jQuery.each(val.Items.PubIrInfo, function (key5, pubinfo) { - items.push('
' + pubinfo.Data + '
'); - }) - }*/ var url; !val.Items.URL ? url = " " : url = val.Items.URL[0].Data; if(url) { @@ -86,6 +76,7 @@ Drupal.behaviors.roblib_search_eds = { //var get = "/edsapi/rest/Search?query=history&searchmode=all&resultsperpage=20&pagenumber=1&sort=relevance&highlight=y&includefacets=y&facetfilter=1%2cSourceType%3aMagazines%2cSourceType%3aNews%2cSourceType%3aAcademic+Journals%2cSourceType%3aConference+Materials&view=detailed"; var href_str = 'http://search.ebscohost.com/login.aspx?direct=true&site=ehost-live&scope=site&type=1&custid=uprince&groupid=main&profid=' + profile + '&mode=bool&lang=en&bquery='; jQuery('#roblib-search-eds-more').empty().append('See all results (' + data.recordCount + ')'); + jQuery('#roblib-eds-books-more-results').empty().append('See all results (' + data.recordCount + ')'); }); } diff --git a/targets/eds/js/eds_results_article.js b/targets/eds/js/eds_results_article.js index 967ce97..83add91 100644 --- a/targets/eds/js/eds_results_article.js +++ b/targets/eds/js/eds_results_article.js @@ -59,6 +59,7 @@ Drupal.behaviors.roblib_search_eds_articles = { if (typeof val.PLink !== 'undefined' && typeof val.HTML !== 'undefined' && val.HTML == '1') { items.push(''); } + items.push(''); } }); @@ -72,6 +73,7 @@ Drupal.behaviors.roblib_search_eds_articles = { var query_str = data.queries[0].query; var href_str = 'http://search.ebscohost.com/login.aspx?direct=true&site=ehost-live&scope=site&type=1&custid=uprince&groupid=main&profid=' + profile + '&mode=bool&lang=en&bquery='; jQuery('#roblib-search-eds-article-more').empty().append('See all results (' + data.recordCount + ')'); + jQuery('#roblib-eds-articles-more-results').empty().append('See all results (' + data.recordCount + ')'); }); } diff --git a/targets/eds/theme/roblib-search-eds-articles.tpl.php b/targets/eds/theme/roblib-search-eds-articles.tpl.php index 5936337..6b09c1c 100644 --- a/targets/eds/theme/roblib-search-eds-articles.tpl.php +++ b/targets/eds/theme/roblib-search-eds-articles.tpl.php @@ -12,9 +12,11 @@ ?>
- - + +
+ +
-
- - +
+ +
+
diff --git a/targets/solr_site/css/roblib_search_solr_site.css b/targets/solr_site/css/roblib_search_solr_site.css index 7bb9c72..9be64af 100755 --- a/targets/solr_site/css/roblib_search_solr_site.css +++ b/targets/solr_site/css/roblib_search_solr_site.css @@ -14,7 +14,7 @@ color: gray; } -.roblib-solr-more-results { +#roblib-solr-more-results-results { text-align: center; background-color: lightblue; } diff --git a/targets/solr_site/js/solr_site_bestbet.js b/targets/solr_site/js/solr_site_bestbet.js index 30a4f66..121ad31 100755 --- a/targets/solr_site/js/solr_site_bestbet.js +++ b/targets/solr_site/js/solr_site_bestbet.js @@ -1,6 +1,7 @@ Drupal.behaviors.roblib_search_solr_site_bestbet = { attach: function(context, settings) { url = settings.roblib_search_solr_site_bestbet.search_url; + default_site_type = settings.roblib_search_solr_site_results.default_site_type jQuery.getJSON(url, function(data) { var items = []; var numberOfDocs = 0; @@ -28,7 +29,6 @@ Drupal.behaviors.roblib_search_solr_site_bestbet = { }); jQuery('#' + 'roblib-search-content-solr-site-bestbet').empty().append(items.join('')); - //qtipify(divs, content, 'Best Bet'); } }); } diff --git a/targets/solr_site/js/solr_site_results.js b/targets/solr_site/js/solr_site_results.js index 40e52a7..eef3da9 100644 --- a/targets/solr_site/js/solr_site_results.js +++ b/targets/solr_site/js/solr_site_results.js @@ -1,10 +1,10 @@ Drupal.behaviors.roblib_search_solr_site_results = { - attach: function(context, settings) { + attach: function (context, settings) { 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; default_site_type = settings.roblib_search_solr_site_results.default_site_type + '/'; - jQuery.getJSON(url, function(data) { + jQuery.getJSON(url, function (data) { var items = []; total_found = data.response.numFound; var numberOfDocs = 0; @@ -21,26 +21,23 @@ Drupal.behaviors.roblib_search_solr_site_results = { var counter = 0; var divs = new Array(); var content = new Array(); - jQuery.each(data.response.docs, function(key, val) { + jQuery.each(data.response.docs, function (key, val) { id = 'roblib_search_solr_results_' + counter; content[counter] = val.teaser; divs[counter++] = id; - items.push('
\n\ + items.push('
\n\ \n\ ' + val.label + '' + '\n\(' + val.bundle_name + ') ' + val.teaser + '
'); }); jQuery('#' + 'roblib-search-content-solr-site-results').empty().append(items.join('')); } - if (numberOfDocs > 0) - { - jQuery('#' + 'roblib-search-solr-site-results-more').empty().append('see all results (' - + total_found + ') '); - jQuery('.' + 'roblib-solr-more-results').empty().append('see all results (' - + total_found + ') '); - - roblib-solr-more-results - } + if (numberOfDocs > 0) { + results_url = 'see all results (' + + total_found + ') '; + jQuery('#' + 'roblib-search-solr-site-results-more').empty().append(results_url); + jQuery('#' + 'roblib-solr-more-results-results').empty().append(results_url); + } }); } diff --git a/targets/solr_site/roblib_search_solr_site.module b/targets/solr_site/roblib_search_solr_site.module index a03516f..0cf8870 100755 --- a/targets/solr_site/roblib_search_solr_site.module +++ b/targets/solr_site/roblib_search_solr_site.module @@ -253,7 +253,7 @@ function roblib_search_solr_site_block_view($delta = '') { * The solr search string. */ function roblib_search_solr_site_results($query) { - print roblib_search_solr_site_get_results($query, ''); + print roblib_search_solr_site_get_results($query, '-bundle:bestbet'); exit(); } diff --git a/targets/solr_site/theme/roblib-search-solr-site-results.tpl.php b/targets/solr_site/theme/roblib-search-solr-site-results.tpl.php index 5ff9269..d6b30b3 100644 --- a/targets/solr_site/theme/roblib-search-solr-site-results.tpl.php +++ b/targets/solr_site/theme/roblib-search-solr-site-results.tpl.php @@ -20,4 +20,4 @@ if (!isset($type)){
-
+