From b1166028a3e403d71701a1b9223365a17f75e2c4 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 25 Oct 2006 19:22:43 +0000 Subject: [PATCH] cleaned up some display issues with my-account and logging in. we hide the default div until after login, so the blank info deck is never visible. git-svn-id: svn://svn.open-ils.org/ILS/trunk@6509 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/default/js/myopac.js | 9 +++++---- Open-ILS/web/opac/skin/default/js/sidebar.js | 10 +++++----- Open-ILS/web/opac/skin/default/xml/page_myopac.xml | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js index fd9012e1bf..a8e6a901d0 100644 --- a/Open-ILS/web/opac/skin/default/js/myopac.js +++ b/Open-ILS/web/opac/skin/default/js/myopac.js @@ -1,7 +1,6 @@ attachEvt("common", "run", myOPACInit ); -attachEvt("common", "loggedIn", myOPACInit ); - +//attachEvt("common", "loggedIn", myOPACInit ); attachEvt('common','locationUpdated', myopacReload ); var fleshedUser = null; @@ -22,16 +21,18 @@ function myOPACInit() { } function myopacReload() { - swapCanvas($('myopac_reloading')); + //swapCanvas($('myopac_reloading')); var a = {}; a[PARAM_LOCATION] = getNewSearchLocation(); a[PARAM_DEPTH] = getNewSearchDepth(); + hideMe($('canvas_main')); goTo(buildOPACLink(a, true)); } function myOPACChangePage( page ) { - + showCanvas(); + var s = $("myopac_summary_td"); var c = $("myopac_checked_td"); var f = $("myopac_fines_td"); diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js index cd6c78976d..7d39671a52 100644 --- a/Open-ILS/web/opac/skin/default/js/sidebar.js +++ b/Open-ILS/web/opac/skin/default/js/sidebar.js @@ -145,14 +145,14 @@ function initLogin() { G.ui.login.password.onkeydown = function(evt) {if(userPressedEnter(evt)) loginDance();}; - if(loginBoxVisible) { - showCanvas(); - } else { +// if(loginBoxVisible) { +// showCanvas(); +// } else { swapCanvas(G.ui.login.box); try{G.ui.login.username.focus();}catch(e){} - } +// } - loginBoxVisible = !loginBoxVisible; +// loginBoxVisible = !loginBoxVisible; G.ui.login.cancel.onclick = showCanvas; if(findCurrentPage() == MYOPAC) G.ui.login.cancel.onclick = goHome; diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml index 353c6e5ba5..8524352bad 100644 --- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml @@ -1,4 +1,4 @@ -
+
-- 2.43.2