From 1056ce23a34dc1346a1222576b84faee1b8051a0 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 9 Mar 2006 15:10:17 +0000 Subject: [PATCH] added some confirmation alerts made some minor style changes added ability for users to login via barcode or username git-svn-id: svn://svn.open-ils.org/ILS/trunk@3288 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/config.js | 4 ++ Open-ILS/web/opac/common/js/opac_utils.js | 12 +++++- .../web/opac/locale/en-US/opac_common.dtd | 2 +- Open-ILS/web/opac/skin/default/js/myopac.js | 4 ++ Open-ILS/web/opac/skin/default/js/rdetail.js | 2 +- .../default/xml/advanced/advanced_refined.xml | 2 +- .../opac/skin/default/xml/common/login.xml | 25 ++++++----- .../default/xml/myopac/myopac_bookbags.xml | 41 +++++++++++-------- .../default/xml/myopac/myopac_checked.xml | 2 + .../skin/default/xml/myopac/myopac_prefs.xml | 10 +++-- 10 files changed, 65 insertions(+), 39 deletions(-) diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index 07561f4c43..812aac7ecc 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -114,6 +114,10 @@ G.user = null; /* global user object */ G.ui = {} /* cache of UI components */ +/* regexes */ +var REGEX_BARCODE = /^\d+/; /* starts with a number */ + + /* call me after page init and I will load references to all of the ui object id's defined below They will be stored in G.ui.. diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index 33e498d3c4..60c3e529ca 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -3,6 +3,7 @@ /* define it again here for pages that don't load RemoteRequest */ function isXUL() { try { if(IAMXUL) return true;}catch(e){return false;}; } + var cookieManager = new HTTP.Cookies(); var __ilsEvent; /* the last event the occurred */ @@ -464,9 +465,16 @@ function doLogin() { return null; } - var auth_request = new Request( LOGIN_COMPLETE, - uname, hex_md5(seed + hex_md5(passwd)), "opac", getOrigLocation()); + var args = { + password : hex_md5(seed + hex_md5(passwd)), + type : "opac", + org : getOrigLocation() + }; + + if( uname.match(REGEX_BARCODE) ) args.barcode = uname; /* make this better */ + else args.username = uname; + var auth_request = new Request( LOGIN_COMPLETE, args ); auth_request.send(true); var auth_result = auth_request.result(); diff --git a/Open-ILS/web/opac/locale/en-US/opac_common.dtd b/Open-ILS/web/opac/locale/en-US/opac_common.dtd index 66d2bf3f03..a21b7ac5b6 100644 --- a/Open-ILS/web/opac/locale/en-US/opac_common.dtd +++ b/Open-ILS/web/opac/locale/en-US/opac_common.dtd @@ -66,4 +66,4 @@ - + diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js index f6dea2397c..87fc3908e8 100644 --- a/Open-ILS/web/opac/skin/default/js/myopac.js +++ b/Open-ILS/web/opac/skin/default/js/myopac.js @@ -197,6 +197,8 @@ function myOPACRenewCirc(circid) { if(circsCache[i].id() == circid) circ = circsCache[i]; + if(!confirm($('myopac_renew_confirm').innerHTML)) return; + var req = new Request(RENEW_CIRC, G.user.session, { patron : G.user.id(), copyid : circ.target_copy() } ); req.send(true); @@ -485,6 +487,7 @@ function _myOPACSummaryShowUer(r) { var user = r.getResultObject(); fleshedUser = user; + if(!user) return; appendClear($('myopac_summary_first'),text(user.first_given_name())); appendClear($('myopac_summary_middle'),text(user.second_given_name())); @@ -725,6 +728,7 @@ function myOPACExpandBookbag( id, name ) { } function myOPACRemoveBBItem( id, containerid, container_name ) { + if(!confirm($('myopac_remove_bb_item_confirm').innerHTML)) return; containerRemoveItem( id ); myOPACFetchBBItems( containerid, $('myopac_bookbag_row_' + containerid), true); myOPACExpandBookbag( containerid, container_name ); diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index 8f3779566d..656b051764 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -58,7 +58,7 @@ function rdetailViewMarc(r,id) { var d = new Date(); - var div = elem('div', { class : 'hide_me' }); + var div = elem('div', { "class" : 'hide_me' }); var span = div.appendChild( elem('span') ); buildunAPISpan( span, 'biblio-record_entry', record.doc_id() ); diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml index a7d2d7154d..4404762e55 100644 --- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml +++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml @@ -1,6 +1,6 @@ - + diff --git a/Open-ILS/web/opac/skin/default/xml/common/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml index 37c5190e4c..a1e47734c8 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/login.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml @@ -12,16 +12,18 @@ config.ids.altcanvas.login = config.ids.login.box; -
&opac.advanced.refined.title;
&opac.advanced.refined.title;
+
- + - - - + + -

-

+ - -
- diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml index 06d04da13b..65caeff958 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml @@ -68,25 +68,24 @@ +
+
+ +
The selected bookbag contains no items...
-
-
- -
The selected bookbag contains no items...
- - - - - - - - - - - - -
Title Authors Remove this item?
remove
+ + + + + + + + + + + +
Title Authors Remove this item?
remove
@@ -94,5 +93,11 @@ To see the public view of a published Bookbag, click the "View" link in the "Published" column of the Bookbag list at the top of this page. + + + Are you sure you wish to remove this bookbag item? + + + diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml index f2c74666e0..15ef4a40f5 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml @@ -46,6 +46,8 @@
Item successfully renewed
+ Are you sure you wish to renew this item? + diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml index 319a235779..248e4a89ca 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml @@ -1,7 +1,7 @@
- +

@@ -29,16 +29,20 @@ + + - +

+ + id='myopac_prefs_submit'>Save Preference Changes
-- 2.43.2