From a601be62b3a10454227f82af394ec57fe88cdb32 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 15 Dec 2010 10:57:39 -0500 Subject: [PATCH] initial run-through of copying changes in. needs mucho testing --- Open-ILS/web/opac/skin/kcls/js/advanced.js | 9 +++++ Open-ILS/web/opac/skin/kcls/js/holds.js | 8 +++-- Open-ILS/web/opac/skin/kcls/js/myopac.js | 3 ++ Open-ILS/web/opac/skin/kcls/js/result_common.js | 30 +++++++++++++++- .../skin/kcls/xml/advanced/advanced_global.xml | 13 ------- Open-ILS/web/opac/skin/kcls/xml/common/fonts.xml | 16 ++++----- Open-ILS/web/opac/skin/kcls/xml/common/holds.xml | 1 - Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml | 23 +++++++------ .../opac/skin/kcls/xml/myopac/myopac_bookbags.xml | 1 - .../web/opac/skin/kcls/xml/myopac/myopac_holds.xml | 1 - Open-ILS/web/opac/skin/kcls/xml/page_cnbrowse.xml | 1 - Open-ILS/web/opac/skin/kcls/xml/page_mresult.xml | 5 --- Open-ILS/web/opac/skin/kcls/xml/page_myopac.xml | 1 - Open-ILS/web/opac/skin/kcls/xml/page_rdetail.xml | 14 -------- Open-ILS/web/opac/skin/kcls/xml/page_rresult.xml | 7 ---- .../skin/kcls/xml/rdetail/rdetail_altcanvas.xml | 28 --------------- .../skin/kcls/xml/rdetail/rdetail_cn_details.xml | 2 -- .../skin/kcls/xml/rdetail/rdetail_copyinfo.xml | 13 ------- .../opac/skin/kcls/xml/rdetail/rdetail_extras.xml | 10 ------ .../opac/skin/kcls/xml/rdetail/rdetail_summary.xml | 40 ---------------------- .../web/opac/skin/kcls/xml/result/result_table.xml | 18 ---------- 21 files changed, 66 insertions(+), 178 deletions(-) delete mode 100644 Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_altcanvas.xml diff --git a/Open-ILS/web/opac/skin/kcls/js/advanced.js b/Open-ILS/web/opac/skin/kcls/js/advanced.js index ebedf8741f..ebdbfce14d 100644 --- a/Open-ILS/web/opac/skin/kcls/js/advanced.js +++ b/Open-ILS/web/opac/skin/kcls/js/advanced.js @@ -19,6 +19,15 @@ function advInit() { //hideMe($('adv_global_search')); } +function __setsortsel() { + var sel = $('adv_global_sort_by'); + if (sel.selectedIndex == 0) { + $("adv_global_sort_dir").disabled = true; + $("adv_global_sort_dir").selectedIndex = 0; + } else $("adv_global_sort_dir").disabled = false; +} +setTimeout(__setsortsel, 100); + function advAddMARC() { var newt = $('adv_sdbar_table').cloneNode(true); newt.id = ""; diff --git a/Open-ILS/web/opac/skin/kcls/js/holds.js b/Open-ILS/web/opac/skin/kcls/js/holds.js index 3afe810d60..1d6f16c21b 100644 --- a/Open-ILS/web/opac/skin/kcls/js/holds.js +++ b/Open-ILS/web/opac/skin/kcls/js/holds.js @@ -54,8 +54,12 @@ function holdsHandleStaff() { }; } -$('holds_frozen_thaw_input').onchange = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');} -$('holds_frozen_thaw_input').onkeyup = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');} +setTimeout( + function() { + $('holds_frozen_thaw_input').onchange = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');} + $('holds_frozen_thaw_input').onkeyup = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');} + }, 100); + function _holdsHandleStaffMe() { holdArgs.recipient = G.user; diff --git a/Open-ILS/web/opac/skin/kcls/js/myopac.js b/Open-ILS/web/opac/skin/kcls/js/myopac.js index a5736160d9..f2db1eb47c 100644 --- a/Open-ILS/web/opac/skin/kcls/js/myopac.js +++ b/Open-ILS/web/opac/skin/kcls/js/myopac.js @@ -67,6 +67,9 @@ var addrRowTemplate; var notesTemplate; function myOPACInit() { + + $('myopac_holds_actions_none').selected = true; + if(!(G.user && G.user.session)) { initLogin(); } else { diff --git a/Open-ILS/web/opac/skin/kcls/js/result_common.js b/Open-ILS/web/opac/skin/kcls/js/result_common.js index 5907e11bec..413cac8b5a 100644 --- a/Open-ILS/web/opac/skin/kcls/js/result_common.js +++ b/Open-ILS/web/opac/skin/kcls/js/result_common.js @@ -9,6 +9,34 @@ buildOrgSel($('holdsCacheSel'), globalOrgTree, 0); var resultFetchAllRecords = false; var resultCompiledSearch = null; +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' + /* set up the event handlers */ if( findCurrentPage() == MRESULT || findCurrentPage() == RRESULT ) { G.evt.result.hitCountReceived.push(resultSetHitInfo); @@ -801,7 +829,7 @@ function showDetailedInfo(bool) { function fetchChiliFreshReviews() { if (chilifresh && chilifresh != '(none)') { - try { chili_init(); } catch(E) { dump(E + '\n'); } + try { chili_init(); } catch(E) { console.log(E + '\n'); } } } diff --git a/Open-ILS/web/opac/skin/kcls/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/kcls/xml/advanced/advanced_global.xml index b91cee3e89..e16f6da38f 100644 --- a/Open-ILS/web/opac/skin/kcls/xml/advanced/advanced_global.xml +++ b/Open-ILS/web/opac/skin/kcls/xml/advanced/advanced_global.xml @@ -8,8 +8,6 @@ .adv_adv_link { font-size: 8pt; color: red; } - - @@ -257,16 +255,6 @@ - - @@ -169,11 +135,5 @@ value="" /> - -var sslSwitch = (("https:" == document.location.protocol) ? "https://secure." : "http://"); -document.write(unescape("%3Cscript src='" + sslSwitch + "chilifresh.com/on-site/js/evergreen.js' type='text/javascript'%3E%3C/script%3E")); - -]]> ]]> diff --git a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml index c1c47f3c85..3c26d367b1 100644 --- a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml +++ b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml @@ -168,18 +168,7 @@ - - - - @@ -187,13 +176,6 @@ value="" /> - - -var sslSwitch = (("https:" == document.location.protocol) ? "https://secure." : "http://"); -document.write(unescape("%3Cscript src='" + sslSwitch + "chilifresh.com/on-site/js/evergreen.js' type='text/javascript'%3E%3C/script%3E")); - -]]> ]]> -- 2.11.0