From df23a079377cbdf05a6e184b652028310b0c70f7 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 13 Oct 2005 14:47:44 +0000 Subject: [PATCH] added first part of myopac, minor changes git-svn-id: svn://svn.open-ils.org/ILS/trunk@1910 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/RemoteRequest.js | 7 ++- Open-ILS/web/opac/common/js/config.js | 3 + Open-ILS/web/opac/common/js/opac_utils.js | 36 ++++++++--- Open-ILS/web/opac/skin/default/css/layout.css | 13 ++++ Open-ILS/web/opac/skin/default/js/mresult.js | 8 ++- .../web/opac/skin/default/js/search_bar.js | 10 ++- Open-ILS/web/opac/skin/default/js/sidebar.js | 18 +++++- Open-ILS/web/opac/skin/default/xml/index.xml | 4 +- .../web/opac/skin/default/xml/mresult.xml | 3 +- Open-ILS/web/opac/skin/default/xml/myopac.xml | 63 +++++++++++++++++-- .../web/opac/theme/default/css/colors.css | 6 ++ 11 files changed, 150 insertions(+), 21 deletions(-) diff --git a/Open-ILS/web/opac/common/js/RemoteRequest.js b/Open-ILS/web/opac/common/js/RemoteRequest.js index fd331112b6..c01adcf5f1 100644 --- a/Open-ILS/web/opac/common/js/RemoteRequest.js +++ b/Open-ILS/web/opac/common/js/RemoteRequest.js @@ -102,6 +102,9 @@ function _remoteRequestCallback(id) { to XML_HTTP_MAX_TRIES attempts */ if( E && E.classname == "EXCommunication" ) { + //try { dump('Communication Error: ' + E ); } catch(e){} + alert('Debug: Communication Error: ' + E ); + if(object.sendCount >= XML_HTTP_MAX_TRIES ) { if(isXUL()) throw object; else alert("Arrrgghh, Matey! Error communicating:\n" + E + "\n" + object.param_string); @@ -169,7 +172,8 @@ RemoteRequest.prototype.send = function(blocking) { 'application/x-www-form-urlencoded'); } - this.xmlhttp.send( data ); + try{ this.xmlhttp.send( data ); } catch(e){} + this.sendCount += 1; return this; } @@ -187,6 +191,7 @@ RemoteRequest.prototype.isReady = function() { /* returns the JSON->js result object */ RemoteRequest.prototype.getResultObject = function() { if(this.cancelled) return null; + if(!this.xmlhttp) return null; var text = this.xmlhttp.responseText; var obj = JSON2js(text); diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index f6b47c2c5f..701b062411 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -189,6 +189,7 @@ var UPDATE_USER_PREFS = "open-ils.actor:open-ils.actor.patron.settings.update" var FETCH_COPY_STATUSES = "open-ils.search:open-ils.search.config.copy_status.retrieve.all"; var FETCH_COPY_COUNTS_SUMMARY = "open-ils.search:open-ils.search.biblio.copy_counts.summary.retrieve"; var FETCH_MARC_HTML = "open-ils.search:open-ils.search.biblio.record.html"; +var FETCH_CHECKED_OUT = "open-ils.circ:open-ils.circ.actor.user.checked_out"; /* ---------------------------------------------------------------------------- */ @@ -235,6 +236,8 @@ createEvt("result", "allRecordsReceived"); /* f(mvrsArray) : add other page stuf createEvt("rdetail", "recordDrawn"); /* f() : the record has been drawn */ +createEvt("common", "loggedIn"); /* f() : user has just logged in */ + diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index 42e46948ee..837d9b8dab 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -295,12 +295,14 @@ function grabFleshedUser() { var skinCookie = new cookieObject("skin", 1, "/", COOKIE_SKIN); function checkUserSkin(new_skin) { + return; /* XXX do some debugging with this... */ + var user_skin = getSkin(); var cur_skin = grabSkinFromURL(); if(new_skin) user_skin = new_skin; - if(isNull(user_skin)) { + if(!user_skin) { if(grabUser()) { if(grabUserPrefs()) { @@ -311,7 +313,7 @@ function checkUserSkin(new_skin) { } } - if(isNull(user_skin)) return; + if(!user_skin) return; if( cur_skin != user_skin ) { var url = buildOPACLink(); @@ -364,13 +366,17 @@ function doLogin() { var auth_request = new Request( LOGIN_COMPLETE, uname, hex_md5(seed + hex_md5(passwd)), "opac"); + auth_request.send(true); var auth_result = auth_request.result(); - if(auth_result == '0' || auth_result == null || auth_result.length == 0) { return false; } + if(auth_result == '0' || auth_result == null || auth_result.length == 0) { + alert("Login failed"); + return false; + } var u = grabUser(auth_result, true); - if(u) updateLoc(u.home_ou(), findOrgDepth(u.home_ou())); + if(u) runEvt( "common", "locationChanged", u.home_ou(), findOrgDepth(u.home_ou()) ); checkUserSkin(); @@ -388,13 +394,22 @@ function doLogout() { G.user = null; cookie.remove(COOKIE_SES); + skinCookie.remove(COOKIE_SKIN); + checkUserSkin("default"); + + var args = {}; + args[PARAM_TERM] = ""; + args[PARAM_LOCATION] = globalOrgTree.id(); + args[PARAM_DEPTH] = findOrgDepth(globalOrgTree); + args.page = "home"; + goTo(buildOPACLink(args)); + + /* hideMe(G.ui.sidebar.logoutbox); unHideMe(G.ui.sidebar.loginbox); hideMe(G.ui.sidebar.logged_in_as); - skinCookie.remove(COOKIE_SKIN); - - checkUserSkin("default"); + */ } @@ -520,5 +535,12 @@ function setResourcePic( img, resource ) { +function msg( text ) { + try { + alert( text ); + } catch(e) {} +} + + diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index b6be3739cc..22df586ece 100644 --- a/Open-ILS/web/opac/skin/default/css/layout.css +++ b/Open-ILS/web/opac/skin/default/css/layout.css @@ -10,6 +10,8 @@ table { border-collapse: collapse; } .encircled { border: 1px solid black; } +.light_border { border: 1px solid #E0E0E0; } + #main_table { border-collapse: collapse; width: 100%; height: 100%; } #main_left_cell { height: 100%; width: 20%; vertical-align: top;margin: 0px; padding: 0px;} #main_right_cell { height: 100%; width: 80%; vertical-align: top; margin: 0px; padding:0px;} @@ -48,7 +50,12 @@ table { border-collapse: collapse; } .sidebar_extra_item { padding: 0px; margin-right: 8px;} .side_bar_item { padding-left: 8px; padding-right: 8px; padding-top: 4px; padding-bottom: 4px; margin-right: 8px; } + .sidebar_item_active { background: #A7EA9D; margin-right: 0px; } + +/* +.sidebar_item_active { background: #035E47; margin-right: 0px; } +*/ .sidebar_chunk { width: 100%; } /* @@ -114,5 +121,11 @@ border-left: 1px solid #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1p .dim2 { filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5; text-decoration: none; } .dim { filter:alpha(opacity=10); -moz-opacity:0.1; opacity: 0.1; text-decoration: none; } +/* ---------------------------------------------------------------------- */ + +.myopac_link { width: 25%; margin: 3px; padding: 3px; text-align: center; vertical-align: middle; } + +.myopac_table thead { padding: 2px; font-weight: 600;} +.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 378090391a..d56fb82adf 100644 --- a/Open-ILS/web/opac/skin/default/js/mresult.js +++ b/Open-ILS/web/opac/skin/default/js/mresult.js @@ -23,7 +23,7 @@ function mresultDoSearch() { // mresultGetCount(); mresultCollectIds(FETCH_MRIDS_FULL); } else { - runEvt('result', 'hitCountReceived'); + //runEvt('result', 'hitCountReceived'); mresultCollectIds(FETCH_MRIDS); } } @@ -57,13 +57,14 @@ function mresultCollectIds(method) { if( getOffset() != 0 && records[getOffset()] != null && records[resultFinalPageIndex()] != null) { + runEvt('result', 'hitCountReceived'); mresultCollectRecords(); } else { var form = (getForm() == "all") ? null : getForm(); var req = new Request(method, getStype(), getTerm(), - getLocation(), getDepth(), getDisplayCount() * 5, getOffset(), form ); + getLocation(), getDepth(), 100, getOffset(), form ); req.callback(mresultHandleMRIds); req.send(); } @@ -73,7 +74,7 @@ function mresultHandleMRIds(r) { var res = r.getResultObject(); if(res.count != null) { - HITCOUNT = res.count; + if( getOffset() == 0 ) HITCOUNT = res.count; runEvt('result', 'hitCountReceived'); } runEvt('result', 'idsReceived', res.ids); @@ -97,6 +98,7 @@ function mresultCollectRecords() { var i = 0; for( var x = getOffset(); x!= getDisplayCount() + getOffset(); x++ ) { if(isNull(records[x])) break; + if(isNaN(records[x])) continue; var req = new Request(FETCH_MRMODS, records[x]); req.request.userdata = i++; req.callback(mresultHandleMods); 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 062572f10c..9a0a383df4 100644 --- a/Open-ILS/web/opac/skin/default/js/search_bar.js +++ b/Open-ILS/web/opac/skin/default/js/search_bar.js @@ -112,8 +112,16 @@ function updateLoc(location, depth) { setSelector(G.ui.searchbar.depth_selector, depth); newSearchDepth = depth; } - if(!isFrontPage) + + if(!isFrontPage && (findCurrentPage() != MYOPAC)) 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 2ca5168a1c..39e221909d 100644 --- a/Open-ILS/web/opac/skin/default/js/sidebar.js +++ b/Open-ILS/web/opac/skin/default/js/sidebar.js @@ -44,6 +44,21 @@ function initSideBar() { /* sets up the login ui components */ var loginBoxVisible = false; + +/* +function loginDance() { + 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); + return true; + } + return false; +} +*/ + function initLogin() { var loginDance = function() { @@ -53,6 +68,7 @@ function initLogin() { unHideMe(G.ui.sidebar.logoutbox); unHideMe(G.ui.sidebar.logged_in_as); hideMe(G.ui.sidebar.loginbox); + runEvt("common", "loggedIn"); } } @@ -66,7 +82,7 @@ function initLogin() { showCanvas(); } else { swapCanvas(G.ui.login.box); - G.ui.login.username.focus(); + try{G.ui.login.username.focus();}catch(e){} } loginBoxVisible = !loginBoxVisible; diff --git a/Open-ILS/web/opac/skin/default/xml/index.xml b/Open-ILS/web/opac/skin/default/xml/index.xml index ce4b3b03f1..4bbd6c7998 100644 --- a/Open-ILS/web/opac/skin/default/xml/index.xml +++ b/Open-ILS/web/opac/skin/default/xml/index.xml @@ -22,7 +22,9 @@ - + diff --git a/Open-ILS/web/opac/skin/default/xml/mresult.xml b/Open-ILS/web/opac/skin/default/xml/mresult.xml index 5b0538597c..766fc4a120 100644 --- a/Open-ILS/web/opac/skin/default/xml/mresult.xml +++ b/Open-ILS/web/opac/skin/default/xml/mresult.xml @@ -1,8 +1,7 @@ %ent; ]> - +Evergreen: Title Groups diff --git a/Open-ILS/web/opac/skin/default/xml/myopac.xml b/Open-ILS/web/opac/skin/default/xml/myopac.xml index 8eeb799b7b..5d8780eb0f 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac.xml @@ -7,6 +7,18 @@ Evergreen: My OPAC + + + + + + + + @@ -18,12 +30,53 @@ diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css index 6a37fa0d74..77a66a083a 100644 --- a/Open-ILS/web/opac/theme/default/css/colors.css +++ b/Open-ILS/web/opac/theme/default/css/colors.css @@ -6,6 +6,12 @@ body a:hover { color: red; text-decoration: underline;} .color_2 { background: #64EA4F; color: #000000; } .color_3 { background: #CCFFFF; color: #000000; } +/* +.color_1 { background: #4D8444; color: #000000; } +.color_2 { background: #168405; color: #000000; } +.color_3 { background: #035E47; color: #000000; } +*/ + /* ---------------------------------------------------------------------- */ .sidebar_chunk {} .sidebar_extra_link { text-decoration: none; } -- 2.43.2
+
- - - -
My OPAC Goes Here
-
+ + + +
+ + + + + + + + + + + + + + + +
+ +

+ +
+ + + + +
+ +
+ +