From: artunit Date: Sun, 19 Sep 2010 17:03:02 +0000 (+0000) Subject: fixed up nav links to be consistent, sfx status now on results page attached to appro... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=64f9b3ec6a921820cca605891e5e2d4c012fb124;p=contrib%2FConifer.git fixed up nav links to be consistent, sfx status now on results page attached to appropriate title git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_1@999 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/web/opac/skin/uwin/css/layout.css b/web/opac/skin/uwin/css/layout.css index 5523aa7b20..99a39d21aa 100644 --- a/web/opac/skin/uwin/css/layout.css +++ b/web/opac/skin/uwin/css/layout.css @@ -6,6 +6,7 @@ body { background-color: white; } .vert_space { padding-top: 82px; width: 100%;} .right { position:absolute; right: 0px; } .hide_me { display:none; visibility: hidden; } +.recid { position:relative; left: 0px; color: #EBEBEB; } table { border-collapse: collapse; } @@ -109,11 +110,15 @@ table { border-collapse: collapse; } .result_table_row { text-align: left; width: 100%; } .result_table_subtable { width: 100%; border-collapse: collapse; vertical-align: top;} +/* .result_table_subtable { width: 100%; border-width: 0px; vertical-align: top;} */ .result_table_subtbody { height: 100%; width: 100%; } /* make title slightly larger */ .result_table_title_cell { font-weight: bold; text-align: left; } -.result_table_sfx_cell { background: #EBEBEB; font-weight: bold; text-align: left; } +.result_table_sfx_cell { background: #EBEBEB; color: #000000; font-weight: bold; text-align: left; } .result_table_format_cell { font-size: medium; text-align: left;} +.sfx_image {background: #EBEBEB; padding-right: 10px;} +.sfx_display {background: #EBEBEB;} +.sfx_right {width: 25%;} /* style dan's supercool live status stuff */ /* windsor's colours are #005595 #B2BB1E */ @@ -135,12 +140,14 @@ table { border-collapse: collapse; } #rdetail_details_table { padding-top: 10px; width: 100%; padding: 30px; border-collapse: collapse;} .rdetail_header { padding: 3px; padding-left: 10px;} .rdetail_desc { padding: 2px; padding-left: 2px; padding-right: 2px;} -.rdetail_item { width: 75%; padding-left: 10px; } +.rdetail_item { padding-left: 10px; } #rdetail_image { padding-right: 10px; } #rdetail_copy_info_table { padding: 4px; width: 100%; border-collapse: collapse; } .rdetail_copy_info_header_cell { padding: 2px; } .rdetail_copy_count_cell { text-align: center; } +.resolver_item { background: #EBEBEB; } + .tor_pic { width: 17px; height: 17px; border: none;} diff --git a/web/opac/skin/uwin/js/result_common.js b/web/opac/skin/uwin/js/result_common.js index 083a8c9b7c..3cc5a09171 100644 --- a/web/opac/skin/uwin/js/result_common.js +++ b/web/opac/skin/uwin/js/result_common.js @@ -36,6 +36,7 @@ function cleanISBN(isbn) { return isbn; } + /* an array of the extra services to which we want to direct people, in order of priority: Properties: url: will be proxied via localProxyPrefix @@ -582,13 +583,6 @@ function resultDisplayRecord(rec, pos, is_mr) { var title_link = $n(r, config.names.result.item_title); var author_link = $n(r, config.names.result.item_author); - if (currentISSN.length > 0) { - var issn_link = $n(r, "result_table_issn_cell"); - issn_link.appendChild(text(currentISSN)); - }//if - - //alert(issn_link + " - " + cleanISBN(rec.isbn())); - if( is_mr ) { var onlyrec = onlyrecord[ getOffset() + pos ]; if(onlyrec) { @@ -672,6 +666,7 @@ function resultDisplayRecord(rec, pos, is_mr) { if(! is_mr ) { + $n(r, "result_table_recid_span").appendChild( text( rec.doc_id()) ); if(!isNull(rec.edition())) { unHideMe( $n(r, "result_table_extra_span")); $n(r, "result_table_edition_span").appendChild( text( rec.edition()) ); @@ -693,7 +688,6 @@ function resultDisplayRecord(rec, pos, is_mr) { //$n(r, "result_table_phys_span").appendChild( text(t.replace(/:.*/g,''))); $n(r, "result_table_phys_span").appendChild( text(t)); } - } resultBuildFormatIcons( r, rec, is_mr ); diff --git a/web/opac/skin/uwin/js/tips.js b/web/opac/skin/uwin/js/tips.js index b24985b326..ddfdf79f3f 100644 --- a/web/opac/skin/uwin/js/tips.js +++ b/web/opac/skin/uwin/js/tips.js @@ -8,6 +8,7 @@ var user_tips = [ */ function insertTip () { + try { var tip_div = document.getElementById('tips'); if (tip_div) { var tips = tip_div.getElementsByTagName('div')[0].getElementsByTagName('span'); @@ -15,5 +16,6 @@ function insertTip () { tip_div.appendChild( tips[index] ); removeCSSClass(tip_div, 'hide_me'); } + } catch (er) {} } diff --git a/web/opac/skin/uwin/xml/footer.xml b/web/opac/skin/uwin/xml/footer.xml index 598f6d8e8f..12de58eb82 100644 --- a/web/opac/skin/uwin/xml/footer.xml +++ b/web/opac/skin/uwin/xml/footer.xml @@ -34,6 +34,8 @@ &footer.copyright; diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml index 397b97e175..462f852303 100644 --- a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml +++ b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml @@ -367,10 +367,14 @@ - SFX + +
+ +
+ SFX E-Journals - + diff --git a/web/opac/skin/uwin/xml/result/result_info.xml b/web/opac/skin/uwin/xml/result/result_info.xml index c65480e20a..9f102f2438 100644 --- a/web/opac/skin/uwin/xml/result/result_info.xml +++ b/web/opac/skin/uwin/xml/result/result_info.xml @@ -7,14 +7,20 @@ &common.results; - - - - - &common.ofAtLeast; + + + - + - + - + + - + &common.ofAtLeast; (page - - &common.of; + + - + &common.of; + - diff --git a/web/opac/skin/uwin/xml/result/result_table.xml b/web/opac/skin/uwin/xml/result/result_table.xml index 8d31f29aef..5f2336dc0f 100644 --- a/web/opac/skin/uwin/xml/result/result_table.xml +++ b/web/opac/skin/uwin/xml/result/result_table.xml @@ -29,15 +29,15 @@ - + - - + + + + + - - - - - - - + - + return output.innerHTML; + ]]> + + + + + + + + + + + -
+ + @@ -67,253 +67,262 @@
+ + + SFX E-Journals + + + +
-
&result.localCallNumbers; - - - 0) { - var ses = new OpenSRF.ClientSession('open-ils.resolver'); - var req = ses.request('open-ils.resolver.resolve_holdings.raw', 'issn', issn, 'http://sfx.scholarsportal.info/windsor'); - req.oncomplete = function(r) { - - dojo.forEach(r.recv().content(), function(entry) { - var resolverInfo = entry.public_name + "_" + entry.target_coverage; - if (url_list.indexOf(resolverInfo) == -1) { - url_list += resolverInfo; - try { - /* - dojo.place('
' - + ' ' + entry.public_name + ' - ' - + entry.target_coverage - + (entry.target_embargo ? (' / ' + entry.target_embargo) : '') - + '
', 'rdetail_online'); - */ - /* - dojo.create('div',{ innerHTML: ' ' + entry.public_name + ' - ' - + entry.target_coverage - + (entry.target_embargo ? (' / ' + entry.target_embargo) : '') - },'rdetail_online',"replace"); - */ - var output = dojo.create('div',null,'rdetail_online',"first"); - var link = dojo.create('a', {"class":"search_link", "href": entry.target_url}); - var link_text = dojo.doc.createTextNode(entry.public_name); - link.appendChild(link_text); - output.appendChild(link); - var coverage_text = dojo.doc.createTextNode(' - ' + entry.target_coverage - + (entry.target_embargo ? (' / ' + entry.target_embargo) : '')); - output.appendChild(coverage_text); - - - /* - },'rdetail_online',"first"); - dojo.query('#rdetail_online_row').removeClass('hide_me'); - */ - dojo.query('#rdetail_online_row').removeClass('hide_me'); - } catch (e) { - alert("-> " + e); - } - - } - }); - } - req.send(); - } - } - return ' ' + issn + '
'; - ]]> - - - - = max_items) { - return output.innerHTML; - } - dojo.query('copy', vol).forEach(function (cp) { - if (cp.getAttribute('deleted') == 't') { - return; - } - var loc_id; - var vol_appended = false; - dojo.query('location', cp).forEach(function (location) { - loc_id = parseInt(location.getAttribute('ident')); - if (loc_id != 8 && loc_id != 20) { - if (!vol_appended) { - dojo.create('span',{ className: 'live_location_cell', - innerHTML: vol.getAttribute('label')}, - output); - vol_appended = true; +
&result.localCallNumbers; + + + + + + + 0) { + try { + var ses = new OpenSRF.ClientSession('open-ils.resolver'); + var req = ses.request('open-ils.resolver.resolve_holdings.raw', + 'issn', issn, 'http://sfx.scholarsportal.info/windsor'); + req.oncomplete = function(r) { + var resolverInfo = ""; + dojo.forEach(r.recv().content(), function(entry) { + resolverInfo = entry.public_name + "_" + entry.target_coverage; + if (url_list.indexOf(resolverInfo) == -1) { + var resolverNode = null; + dojo.query('.recid').forEach(function(recinfo) { + if (parseFloat(dojo.trim(dojox.data.dom.textContent(recinfo))) == + parseFloat(this_title_id)) + { + resolverNode = recinfo; + } + }); + url_list += resolverInfo; + var output = null; + if (resolverNode != null) { + var parent = resolverNode.parentNode; + if (parent) + parent = parent.parentNode; + if (parent) + dojo.removeClass(parent,'hide_me'); + output = dojo.create('span',null,resolverNode,"last"); + dojo.addClass(output,"result_table_sfx_cell"); + dojo.create('br', null, output); + var title_text = dojo.doc.createTextNode("   "); + output.appendChild(title_text); + title_list += this_title_id; + var link = dojo.create('a', {"class":"search_link", "href": entry.target_url}); + var link_text = dojo.doc.createTextNode( entry.public_name); + link.appendChild(link_text); + output.appendChild(link); + var coverage_text = dojo.doc.createTextNode(' - ' + entry.target_coverage + + (entry.target_embargo ? (' / ' + entry.target_embargo) : '')); + output.appendChild(coverage_text); + } + } + }); + }; + req.send(); + } catch (err) {} } - dojo.create('span', { className: 'live_separator_cell', - "innerHTML": ' - '}, - output); - dojo.create('span', { className: 'live_location_cell', - "innerHTML": dojox.xml.parser.textContent(location)}, - output); } + return ' ' + issn + '
'; + ]]> + + + + = max_items) { + return output.innerHTML; + } + dojo.query('copy', vol).forEach(function (cp) { + if (cp.getAttribute('deleted') == 't') { + return; + } + var loc_id; + var vol_appended = false; + dojo.query('location', cp).forEach(function (location) { + loc_id = parseInt(location.getAttribute('ident')); + if (loc_id != 8 && loc_id != 20) { + if (!vol_appended) { + dojo.create('span',{ className: 'live_location_cell', + innerHTML: vol.getAttribute('label')}, + output); + vol_appended = true; + } + dojo.create('span', { className: 'live_separator_cell', + "innerHTML": ' - '}, + output); + dojo.create('span', { className: 'live_location_cell', + "innerHTML": dojox.xml.parser.textContent(location)}, + output); + } + }); + if (loc_id == 8 || loc_id == 20) { + return; + } + dojo.query('status', cp).forEach(function (status) { + var pfx = dojo.doc.createTextNode(' ('); + output.appendChild(pfx); + dojo.create('span', { className: 'live_status_cell', + "innerHTML": dojox.xml.parser.textContent(status) }, output); + var sfx = dojo.doc.createTextNode(')'); + output.appendChild(sfx); + }); + dojo.create('br', null, output); + + item_cnt++; + if (item_cnt >= max_items) { + output.appendChild(dojo.doc.createTextNode('... more print items listed in full record')); + dojo.create('br', null, output); + } + }); }); - if (loc_id == 8 || loc_id == 20) { - return; - } - dojo.query('status', cp).forEach(function (status) { - var pfx = dojo.doc.createTextNode(' ('); - output.appendChild(pfx); - dojo.create('span', { className: 'live_status_cell', - "innerHTML": dojox.xml.parser.textContent(status) }, output); - var sfx = dojo.doc.createTextNode(')'); - output.appendChild(sfx); - }); - dojo.create('br', null, output); - - item_cnt++; - if (item_cnt >= max_items) { - output.appendChild(dojo.doc.createTextNode('... more items in full record')); - } - }); - }); - - //if (issn.length == 0) - return output.innerHTML; - ]]> - - - - - - - -
- - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - &common.relevancy; - + + + - - &opac.holds.placeHold; - + + + &common.relevancy; + - - - - + + &opac.holds.placeHold; + - - - &result.googleBooks.browse; - + + + + + + + &result.googleBooks.browse; +
@@ -321,67 +330,67 @@ - - - - - - - - + + +
- - - &common.results; - - - - - &common.ofAtLeast; - - (page - - &common.of; - - - - - &rdetail.start;&common.cn.previous; + + + + + + + &common.cn.next; + + + - - - -
+ + &common.results; + + + - + - + - + + - + &common.ofAtLeast; + + (page + + - + &common.of; + - + + + + &rdetail.start;&common.cn.previous; - - &common.cn.next; - - - - - -
- - + 		+ +
+ + - -