From 1112e42c821d380abcaef1704785f18bc96a0da0 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 14 Oct 2005 16:07:36 +0000 Subject: [PATCH] more fixes for myopac and record details git-svn-id: svn://svn.open-ils.org/ILS/trunk@1913 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/opac_utils.js | 6 ----- Open-ILS/web/opac/common/js/utils.js | 5 +++- Open-ILS/web/opac/locale/en-US/lang.dtd | 2 +- Open-ILS/web/opac/skin/default/css/layout.css | 4 ++-- Open-ILS/web/opac/skin/default/js/mresult.js | 1 + Open-ILS/web/opac/skin/default/js/rdetail.js | 10 +++++++- .../web/opac/skin/default/js/search_bar.js | 24 +++++++++---------- Open-ILS/web/opac/skin/default/js/sidebar.js | 19 +-------------- Open-ILS/web/opac/skin/default/xml/myopac.xml | 4 ++-- .../web/opac/skin/default/xml/sidebar.xml | 16 +------------ 10 files changed, 33 insertions(+), 58 deletions(-) diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index 837d9b8dab..07779ee235 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -404,12 +404,6 @@ function doLogout() { args.page = "home"; goTo(buildOPACLink(args)); - - /* - hideMe(G.ui.sidebar.logoutbox); - unHideMe(G.ui.sidebar.loginbox); - hideMe(G.ui.sidebar.logged_in_as); - */ } diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js index 43398f530e..f173ee439b 100644 --- a/Open-ILS/web/opac/common/js/utils.js +++ b/Open-ILS/web/opac/common/js/utils.js @@ -65,7 +65,10 @@ function userPressedEnter(evt) { } -function goTo(url) {location.href = url;} +function goTo(url) { + /* setTimeout because ie sux */ + setTimeout( function(){ location.href = url; }, 0 ); +} function removeChildren(dom) { diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index e67ed423bf..f92473239b 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -45,6 +45,6 @@ - + diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index 22df586ece..b5d3ad62b1 100644 --- a/Open-ILS/web/opac/skin/default/css/layout.css +++ b/Open-ILS/web/opac/skin/default/css/layout.css @@ -28,7 +28,7 @@ table { border-collapse: collapse; } #not_the_canvas {} #canvas_main { min-height: 300px; border-left: 3px solid #A7EA9D; border-bottom: 3px solid #A7EA9D; - border-top: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px;} + border-top: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px; padding-bottom: 10px; } .non_canvas { min-height: 300px; border-left: 3px solid #A7EA9D; border-top: 3px solid #A7EA9D; border-bottom: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px;} @@ -125,7 +125,7 @@ border-left: 1px solid #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1p .myopac_link { width: 25%; margin: 3px; padding: 3px; text-align: center; vertical-align: middle; } -.myopac_table thead { padding: 2px; font-weight: 600;} +.myopac_table thead tr td { padding: 2px; font-weight: 600; border: 1px solid #808080;} .myopac_table td { padding: 3px; }; diff --git a/Open-ILS/web/opac/skin/default/js/mresult.js b/Open-ILS/web/opac/skin/default/js/mresult.js index d56fb82adf..8d18919129 100644 --- a/Open-ILS/web/opac/skin/default/js/mresult.js +++ b/Open-ILS/web/opac/skin/default/js/mresult.js @@ -81,6 +81,7 @@ function mresultHandleMRIds(r) { } function mresultSetRecords(idstruct) { + if(!idstruct) return; var o = getOffset(); for( var x = o; x < idstruct.length + o; x++ ) { if(idstruct[x-o] == null) break; diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index d6ee3ce07a..962a4cb9c3 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -23,6 +23,11 @@ function rdetailDraw() { G.ui.rdetail.cp_info_all.onclick = rdetailShowAllCopies; G.ui.rdetail.view_marc.onclick = rdetailViewMarc; G.ui.rdetail.hide_marc.onclick = showCanvas; + + + if(getLocation() == globalOrgTree.id()) + hideMe(G.ui.rdetail.cp_info_all); + var req = new Request(FETCH_RMODS, getRid()); req.callback(_rdetailDraw); req.send(); @@ -140,6 +145,7 @@ function _rdetailBuildInfoRows(r) { G.ui.rdetail.cp_info_loading.parentNode.removeChild( G.ui.rdetail.cp_info_loading); + var found = false; for( var i = 0; i < summary.length; i++ ) { var arr = summary[i]; @@ -166,11 +172,13 @@ function _rdetailBuildInfoRows(r) { rdetailApplyStatuses(rowNode, cpc_temp, arr[2]); var isLocal = false; - if( orgIsMine( findOrgUnit(getLocation()), thisOrg ) ) isLocal = true; + if( orgIsMine( findOrgUnit(getLocation()), thisOrg ) ) { found = true; isLocal = true; } rdetailSetPath( thisOrg, isLocal ); } + if(!found) unHideMe(G.ui.rdetail.cp_info_none); + } /* sets the path to org as 'active' and displays the diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js index 9a0a383df4..139573da5c 100644 --- a/Open-ILS/web/opac/skin/default/js/search_bar.js +++ b/Open-ILS/web/opac/skin/default/js/search_bar.js @@ -21,8 +21,9 @@ function searchBarInit() { _fs = G.ui.searchbar.form_selector; G.ui.searchbar.text.focus(); - G.ui.searchbar.text.onkeypress = - function(evt) {if(userPressedEnter(evt)) searchBarSubmit();}; + //G.ui.searchbar.text.onkeypress = + G.ui.searchbar.text.onkeydown = + function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } }; G.ui.searchbar.submit.onclick = searchBarSubmit; @@ -57,12 +58,14 @@ function depthSelectorChanged() { _opacHandleLocationTagClick(); } else { - if(!isFrontPage) + if(!isFrontPage && (findCurrentPage() != MYOPAC)) { searchBarSubmit(); + } } } +var chooseAnotherNode; function buildLocationSelector(newLoc) { var loc; @@ -72,7 +75,9 @@ function buildLocationSelector(newLoc) { if( loc == globalOrgTree.id() ) return; var selector = G.ui.searchbar.depth_selector - var node = selector.removeChild(selector.getElementsByTagName("option")[0]); + if(!chooseAnotherNode) + chooseAnotherNode = selector.removeChild(selector.getElementsByTagName("option")[0]); + var node = chooseAnotherNode; removeChildren(selector); var location = findOrgUnit(loc); @@ -113,15 +118,10 @@ function updateLoc(location, depth) { newSearchDepth = depth; } - if(!isFrontPage && (findCurrentPage() != MYOPAC)) + if(!isFrontPage && (findCurrentPage() != MYOPAC) + && (newSearchLocation != getLocation()) ) { searchBarSubmit(); - - alert(findCurrentPage()); - /* - alert(MYOPAC); - alert(findCurrentPage() == MYOPAC); - */ - + } } diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js index 39e221909d..dcb99aa7a9 100644 --- a/Open-ILS/web/opac/skin/default/js/sidebar.js +++ b/Open-ILS/web/opac/skin/default/js/sidebar.js @@ -25,9 +25,6 @@ function initSideBar() { } unHideMe(G.ui.sidebar[page]); - - //addCSSClass(G.ui.sidebar[page], config.css.color_2); - //addCSSClass(G.ui.sidebar[page], config.css.encircled); addCSSClass(G.ui.sidebar[page], "sidebar_item_active"); /* if we're logged in, show it and replace the Login link with the Logout link */ @@ -45,7 +42,6 @@ function initSideBar() { /* sets up the login ui components */ var loginBoxVisible = false; -/* function loginDance() { if(doLogin()) { showCanvas(); @@ -53,25 +49,12 @@ function loginDance() { unHideMe(G.ui.sidebar.logoutbox); unHideMe(G.ui.sidebar.logged_in_as); hideMe(G.ui.sidebar.loginbox); - return true; + runEvt("common", "loggedIn"); } - return false; } -*/ function initLogin() { - var loginDance = function() { - if(doLogin()) { - showCanvas(); - G.ui.sidebar.username_dest.appendChild(text(G.user.usrname())); - unHideMe(G.ui.sidebar.logoutbox); - unHideMe(G.ui.sidebar.logged_in_as); - hideMe(G.ui.sidebar.loginbox); - runEvt("common", "loggedIn"); - } - } - G.ui.login.button.onclick = loginDance; G.ui.login.username.onkeydown = function(evt) {if(userPressedEnter(evt)) loginDance();}; diff --git a/Open-ILS/web/opac/skin/default/xml/myopac.xml b/Open-ILS/web/opac/skin/default/xml/myopac.xml index 5d8780eb0f..40b39ad98c 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac.xml @@ -25,11 +25,11 @@ - -
+ +
diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml index a7a01e65d1..8babb11fa5 100644 --- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml +++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml @@ -33,19 +33,12 @@
- - -