From 3052768c780718461f579d809c687321e74cdd46 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 10 Mar 2006 15:05:19 +0000 Subject: [PATCH] style updates on the copyright block hiding copyright on mresult and rresult pages until the page is rendered to keep the copyright block from bouncing around git-svn-id: svn://svn.open-ils.org/ILS/trunk@3319 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/default/js/mresult.js | 7 +++- Open-ILS/web/opac/skin/default/js/rresult.js | 6 +++- Open-ILS/web/opac/skin/default/xml/footer.xml | 35 ++++++++++++------- .../opac/skin/default/xml/home/index_body.xml | 2 +- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/Open-ILS/web/opac/skin/default/js/mresult.js b/Open-ILS/web/opac/skin/default/js/mresult.js index 76cbdce928..7a6a729020 100644 --- a/Open-ILS/web/opac/skin/default/js/mresult.js +++ b/Open-ILS/web/opac/skin/default/js/mresult.js @@ -13,8 +13,11 @@ attachEvt("result", "idsReceived", mresultCollectRecords); function mresultUnload() { removeChildren(table); table = null;} +hideMe($('copyright_block')); + function mresultDoSearch() { + if(getOffset() == 0) { swapCanvas($('loading_alt')); searchTimer = new Timer('searchTimer',$('loading_alt_span')); @@ -182,8 +185,10 @@ function mresultHandleMods(r) { var pagePosition = r.userdata; runEvt('result', 'recordReceived', rec, pagePosition, true); resultCollectCopyCounts(rec, pagePosition, FETCH_MR_COPY_COUNTS); - if(resultPageIsDone()) + if(resultPageIsDone()) { runEvt('result', 'allRecordsReceived', recordsCache); + unHideMe($('copyright_block')); /* *** */ + } } diff --git a/Open-ILS/web/opac/skin/default/js/rresult.js b/Open-ILS/web/opac/skin/default/js/rresult.js index 95b9c49810..e609c37fbd 100644 --- a/Open-ILS/web/opac/skin/default/js/rresult.js +++ b/Open-ILS/web/opac/skin/default/js/rresult.js @@ -10,6 +10,8 @@ attachEvt("common", "run", rresultDoSearch); attachEvt("result", "idsReceived", rresultCollectRecords); attachEvt("result", "recordDrawn", rresultLaunchDrawn); +hideMe($('copyright_block')); + function rresultDoSearch() { table = G.ui.result.main_table; hideMe(G.ui.result.row_template); @@ -80,8 +82,10 @@ function rresultHandleMods(r) { var rec = r.getResultObject(); runEvt('result', 'recordReceived', rec, r.userdata, false); resultCollectCopyCounts(rec, r.userdata, FETCH_R_COPY_COUNTS); - if(resultPageIsDone()) + if(resultPageIsDone()) { runEvt('result', 'allRecordsReceived', recordsCache); + unHideMe($('copyright_block')); + } } diff --git a/Open-ILS/web/opac/skin/default/xml/footer.xml b/Open-ILS/web/opac/skin/default/xml/footer.xml index 7402cb0ac3..88ac1c0f9e 100644 --- a/Open-ILS/web/opac/skin/default/xml/footer.xml +++ b/Open-ILS/web/opac/skin/default/xml/footer.xml @@ -1,18 +1,29 @@ -
-
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml index 98eee5b805..ed16e34c88 100644 --- a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml +++ b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml @@ -1,5 +1,5 @@ - +
-- 2.43.2