From 2638b214b958efe26c8a0712e72098d4da251e8c Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 12 Nov 2008 15:16:22 +0000 Subject: [PATCH] fix phantom links and status display git-svn-id: svn://svn.open-ils.org/ILS/trunk@11152 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/default/js/rdetail.js | 18 +++++++++++------- .../opac/skin/default/xml/rdetail/rdetail_copyinfo.xml | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index 89ea569202..f379b0723e 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -609,6 +609,9 @@ var localCNFound = false; var ctr = 0; function _rdetailBuildInfoRows(r) { + if (rdetailShowCopyLocation) + unHideMe( $n( $('rdetail_copy_info_table'), 'rdetail_copylocation_header' ) ); + removeChildren(copyRowParent); _rdetailRows(); @@ -625,9 +628,6 @@ function _rdetailBuildInfoRows(r) { var rowNode = $("cp_info_" + thisOrg.id()); if(!rowNode) continue; - if (rdetailShowCopyLocation) - unHideMe( $n( rowNode, 'rdetail_copylocation_header' ) ); - if(rowNode.getAttribute("used")) { if( rowNode.nextSibling ) { @@ -658,7 +658,12 @@ function _rdetailBuildInfoRows(r) { findNodeByName(rowNode, config.names.rdetail.cp_count_cell)); var statuses = arr[2]; - if (rdetailShowCopyLocation) statuses = arr[3]; + var cl = ''; + if (rdetailShowCopyLocation) { + cl = arr[2]; + statuses = arr[3]; + } + rdetailApplyStatuses(rowNode, cpc_temp, statuses); @@ -675,9 +680,6 @@ function _rdetailBuildInfoRows(r) { //if(isLocal) unHideMe(rowNode); unHideMe(rowNode); - var cl = ''; - if (rdetailShowCopyLocation) cl = arr[2]; - rdetailSetPath( thisOrg, isLocal ); rdetailBuildBrowseInfo( rowNode, arr[1], isLocal, thisOrg, cl ); @@ -714,7 +716,9 @@ function rdetailBuildBrowseInfo(row, cn, local, orgNode, cl) { var bHref = 'javascript:rdetailShowCNBrowse("' + cn + '", '+orgNode.id()+', "'+depth+'");'; + unHideMe( $n(row, 'details') ) $n(row, 'details').setAttribute('href', dHref); + unHideMe( $n(row, 'browse') ) $n(row, 'browse').setAttribute('href', bHref); if(isXUL()) { diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml index c2f5341b52..24f4af2756 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml @@ -43,11 +43,11 @@
&rdetail.copyInfo.details; + name='details' class='hide_me classic_link'>&rdetail.copyInfo.details;
&rdetail.copyInfo.browse; + class='hide_me classic_link'>&rdetail.copyInfo.browse;