Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

diff --cc Open-ILS/web/opac/skin/default/js/myopac.js
Simple merge

diff --cc Open-ILS/web/opac/skin/default/js/result_common.js
index c13ca27,39dc238..11aa24e
--- 1/Open-ILS/web/opac/skin/default/js/result_common.js
--- 2/Open-ILS/web/opac/skin/default/js/result_common.js
+++ b/Open-ILS/web/opac/skin/default/js/result_common.js
@@@ -1,34 -1,7 +1,36 @@@
  dojo.require('openils.BibTemplate');
+ dojo.requireLocalization("openils.opac", "opac");
+ var opac_strings = dojo.i18n.getLocalization("openils.opac", "opac");
  
 +config.ids.result = {};
 +config.css.result = {};
 +config.names.result = {};
 +config.ids.result.offset_start        = "offset_start";
 +config.ids.result.offset_end          = "offset_end";
 +config.ids.result.result_count        = "result_count";
 +config.ids.result.next_link           = 'next_link';
 +config.ids.result.prev_link           = 'prev_link';
 +config.ids.result.home_link           = 'search_home_link';
 +config.ids.result.end_link                    = 'end_link';
 +config.ids.result.main_table          = 'result_table';
 +config.ids.result.row_template        = 'result_table_template';
 +config.ids.result.num_pages           = 'num_pages';
 +config.ids.result.current_page        = 'current_page';
 +config.css.result.nav_active          = "nav_link_active";
 +config.ids.result.top_div                     = "result_table_div";
 +config.ids.result.nav_links           = "search_nav_links";
 +config.ids.result.info                                = "result_info_div";
 +config.css.result.cc_cell_even        = "copy_count_cell_even";
 +config.names.result.item_jacket       = "item_jacket";
 +config.names.result.item_title        = "item_title";
 +config.names.result.item_author       = "item_author";
 +config.names.result.counts_row        = "counts_row";
 +config.names.result.count_cell        = "copy_count_cell";
 +config.names.result.format_cell = 'result_table_format_cell';
 +config.names.result.format_link = 'resource_link'
 +config.names.result.format_pic = 'format_pic'
 +
 +
  var recordsHandled = 0;
  var recordsCache = [];
  var lowHitCount = 4;

diff --cc Open-ILS/web/opac/skin/default/xml/result/result_table.xml
Simple merge