From 8414b4acd942747b51163e6dc1194ecc6a880c58 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 2 Jan 2006 16:34:10 +0000 Subject: [PATCH] moved cn browse to be a sibling of reviews, marc record, etc on the record detail page gave cn browse cells a fixed height of 190px so the page won't shift when browsing... git-svn-id: svn://svn.open-ils.org/ILS/trunk@2586 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/default/css/layout.css | 8 +++++++- Open-ILS/web/opac/skin/default/js/cn_browse.js | 13 +++++++++++-- Open-ILS/web/opac/skin/default/js/rdetail.js | 15 ++++++++++++++- .../opac/skin/default/xml/common/altcanvas.xml | 4 ++-- .../opac/skin/default/xml/common/cn_browse.xml | 11 +++++++++-- .../skin/default/xml/rdetail/rdetail_copyinfo.xml | 2 +- .../skin/default/xml/rdetail/rdetail_extras.xml | 8 ++++++++ 7 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index 8a9acce877..9339a5321c 100644 --- a/Open-ILS/web/opac/skin/default/css/layout.css +++ b/Open-ILS/web/opac/skin/default/css/layout.css @@ -168,14 +168,20 @@ table { border-collapse: collapse; } .rdetail_extras_td { padding-right: 15px; padding-left: 15px; border-right: 1px solid #888; } -.cn_browse_item { } +.cn_browse_item { height: 190px; } .cn_browse_info { padding: 4px; border-bottom: 1px dashed #E0E0E0;} .bookshelf { /*background-image: url(http://10.4.0.10/woodgrain.jpeg);*/ + /* background-image: url(http://dev.gapines.org/opac/images/woodgrain.jpg); background-repeat: repeat; + */ border-bottom: 1px solid black; } +.cn_browse_loading { width: 95%; padding: 15px; text-align: center; background: #E0F0E0; } + +.cn_browse_home_cn { border: 2px solid #E0F0E0; background: green; font-weight: 700;} + diff --git a/Open-ILS/web/opac/skin/default/js/cn_browse.js b/Open-ILS/web/opac/skin/default/js/cn_browse.js index ddb0846645..856a92d48f 100644 --- a/Open-ILS/web/opac/skin/default/js/cn_browse.js +++ b/Open-ILS/web/opac/skin/default/js/cn_browse.js @@ -7,6 +7,7 @@ var MAX_CN = 9; function cnBrowseGo(cn) { cnBrowseCurrent = cn; + //unHideMe($('cn_browse_loading')); var req = new Request( FETCH_CNBROWSE_TARGET, 'org_unit', getLocation(), 'depth', getDepth(), @@ -17,6 +18,7 @@ function cnBrowseGo(cn) { } function cnBrowseNext() { + //unHideMe($('cn_browse_loading')); var req = new Request( FETCH_CNBROWSE_NEXT, 'org_unit', getLocation(), 'depth', getDepth(), @@ -28,6 +30,7 @@ function cnBrowseNext() { } function cnBrowsePrev() { + //unHideMe($('cn_browse_loading')); var req = new Request( FETCH_CNBROWSE_PREV, 'org_unit', getLocation(), 'depth', getDepth(), @@ -44,7 +47,6 @@ var cnRowT; var cnTdT; function cnBrowseDraw( r ) { - swapCanvas($('cn_browse')); var list = r.getResultObject(); if(!cnTbody) { @@ -71,13 +73,20 @@ function cnBrowseDraw( r ) { var record = list[idx][2]; var id = list[idx][3]; + /* + if( label != cnBrowseCurrent ) { + removeCSSClass( td, 'cn_browse_home_cn' ); + } + */ if( idx == 0 ) { cnBrowseTopCn = label; cnBrowseTopId = id; - } else if( idx == MAX_CN - 1 ) { + //alert('top cn: ' + cnBrowseTopCn + ' : top id : ' + cnBrowseTopId ); + } else { cnBrowseBottomCn = label; cnBrowseBottomId = id; + //alert('bottom cn: ' + cnBrowseBottomCn + ' : bottom id : ' + cnBrowseBottomId ); } var cn_td = $n(currentTd, 'cn_browse_cn'); diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index 2e5f92b96c..9a49d895d9 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -113,6 +113,8 @@ function rdetailShowExtra(type) { hideMe($('rdetail_reviews_div')); hideMe($('rdetail_toc_div')); hideMe($('rdetail_marc_div')); + hideMe($('cn_browse')); + hideMe($('rdetail_viewcn_link')); var req; switch(type) { @@ -152,6 +154,16 @@ function rdetailShowExtra(type) { } } +function rdetailShowCNBrowse( cn ) { + hideMe($('rdetail_copy_info_div')); + hideMe($('rdetail_reviews_div')); + hideMe($('rdetail_toc_div')); + hideMe($('rdetail_marc_div')); + unHideMe($('rdetail_viewcn_link')); + unHideMe($('cn_browse')); + cnBrowseGo(cn); +} + function rdetailHandleAddedContent(r) { var resp = r.getResultObject(); if( resp.Review == 'true' ) unHideMe($('rdetail_reviews_link')); @@ -257,7 +269,8 @@ function _rdetailBuildInfoRows(r) { } else rowNode.setAttribute("used", "1"); - var a = elem("a", {href:'javascript:cnBrowseGo("' + arr[1] + '");' }, arr[1]); + //var a = elem("a", {href:'javascript:cnBrowseGo("' + arr[1] + '");' }, arr[1]); + var a = elem("a", {href:'javascript:rdetailShowCNBrowse("' + arr[1] + '");' }, arr[1]); addCSSClass(a, 'classic_link'); findNodeByName( rowNode, config.names.rdetail.cn_cell ).appendChild(a); diff --git a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml index 61cf2a0177..0f4fb02965 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml @@ -19,12 +19,12 @@ config.ids.altcanvas.holds = 'holds_box'; config.ids.altcanvas.xulholds = 'xulholds_box'; config.ids.altcanvas.loading = 'loading_alt'; - config.ids.altcanvas.cnbrowse = 'cn_browse'; + //config.ids.altcanvas.cnbrowse = 'cn_browse'; - +
diff --git a/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml b/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml index 7ecc4d678d..7d339e8dd9 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml @@ -1,4 +1,10 @@ -
+ +
+
Loading Callnumber Page...
@@ -13,7 +19,8 @@ - + diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml index 3ecdc8ece5..bb7451fb39 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml @@ -32,6 +32,12 @@ MARC Record + + +
- +
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 c78659bb84..48d031d9c8 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 @@ -28,7 +28,7 @@
@@ -54,5 +60,7 @@
+ +
-- 2.43.2