[open-ils-commits] r9536 - in branches/acq-experiment: .
Open-ILS/web/js/dojo/openils Open-ILS/web/opac/locale/en-US
Open-ILS/xul/staff_client/server/cat
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu May 8 13:13:09 EDT 2008
Author: erickson
Date: 2008-05-08 13:13:02 -0400 (Thu, 08 May 2008)
New Revision: 9536
Modified:
branches/acq-experiment/
branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
branches/acq-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd
branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/opac.xul
Log:
Merged revisions 9534-9535 via svnmerge from
svn://svn.open-ils.org/ILS/trunk
........
r9534 | dbs | 2008-05-08 12:16:48 -0400 (Thu, 08 May 2008) | 2 lines
Patch from Craig Ricciuto to care of XML i18n business in opac.xul
........
r9535 | erickson | 2008-05-08 13:12:40 -0400 (Thu, 08 May 2008) | 1 line
created a fully synchronous version of the login method
........
Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-9532
+ /trunk:1-9535
Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js 2008-05-08 17:12:40 UTC (rev 9535)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js 2008-05-08 17:13:02 UTC (rev 9536)
@@ -86,7 +86,7 @@
/**
* Logs in, sets the authtoken/authtime vars, and fetches the logged in user
*/
- login : function(args, onComplete) {
+ login_async : function(args, onComplete) {
var _u = this;
if (!args) args = {};
@@ -101,6 +101,7 @@
var seed = r.recv().content();
alert(seed);
var loginInfo = {
+ username : args.username,
password : hex_md5(seed + hex_md5(args.passwd)),
type : args.type,
org : args.location,
@@ -120,6 +121,38 @@
initReq.send();
},
+
+ login : function(args) {
+ var _u = this;
+ if (!args) args = {};
+ if (!args.username) args.username = _u.username;
+ if (!args.passwd) args.passwd = _u.passwd;
+ if (!args.type) args.type = _u.login_type;
+ if (!args.location) args.location = _u.location;
+
+ var seed = fieldmapper.standardRequest(
+ ['open-ils.auth', 'open-ils.auth.authenticate.init'],
+ [args.username]
+ );
+
+ var loginInfo = {
+ username : args.username,
+ password : hex_md5(seed + hex_md5(args.passwd)),
+ type : args.type,
+ org : args.location,
+ };
+
+ var data = fieldmapper.standardRequest(
+ ['open-ils.auth', 'open-ils.auth.authenticate.complete'],
+ [loginInfo]
+ );
+
+ _u.authtoken = data.payload.authtoken;
+ if (!openils.User.authtoken) openils.User.authtoken = _u.authtoken;
+ _u.authtime = data.payload.authtime;
+ if (!openils.User.authtime) openils.User.authtime = _u.authtime;
+ },
+
/**
* Returns a list of the "highest" org units where the user
Modified: branches/acq-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-05-08 17:12:40 UTC (rev 9535)
+++ branches/acq-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-05-08 17:13:02 UTC (rev 9536)
@@ -1896,3 +1896,20 @@
<!ENTITY staff.cat.marc_new.load.label "Load">
<!ENTITY staff.cat.marc_new.load.accesskey "L">
<!ENTITY staff.cat.marc_view.title "MARC View">
+<!ENTITY staff.cat.opac.menu.label "Actions for this Record">
+<!ENTITY staff.cat.opac.menu.accesskey "A">
+<!ENTITY staff.cat.opac.menuitem.opacview.label "OPAC View">
+<!ENTITY staff.cat.opac.menuitem.opacview.accesskey "O">
+<!ENTITY staff.cat.opac.menuitem.marcview.label "MARC View">
+<!ENTITY staff.cat.opac.menuitem.marcview.accesskey "V">
+<!ENTITY staff.cat.opac.menuitem.marcedit.label "MARC Edit">
+<!ENTITY staff.cat.opac.menuitem.marcedit.accesskey "E">
+<!ENTITY staff.cat.opac.menuitem.holding.label "Holdings Maintenance">
+<!ENTITY staff.cat.opac.menuitem.holding.accesskey "H">
+<!ENTITY staff.cat.opac.menuitem.viewholds.label "View Holds">
+<!ENTITY staff.cat.opac.menuitem.viewholds.accesskey "s">
+<!ENTITY staff.cat.opac.menuitem.addtobucket.label "Add to Bucket">
+<!ENTITY staff.cat.opac.menuitem.addtobucket.accesskey "B">
+<!ENTITY staff.cat.opac.menuitem.refreshinterfaces.label "Refresh All Interfaces">
+<!ENTITY staff.cat.opac.menuitem.dupnewtab.label "Duplicate in New Tab">
+<!ENTITY staff.cat.opac.menuitem.removeframe.label "Remove this Frame">
Modified: branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/opac.xul
===================================================================
--- branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/opac.xul 2008-05-08 17:12:40 UTC (rev 9535)
+++ branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/opac.xul 2008-05-08 17:13:02 UTC (rev 9536)
@@ -10,7 +10,7 @@
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<!-- LOCALIZATION -->
<!DOCTYPE window PUBLIC "" ""[
- <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
]>
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -331,19 +331,19 @@
<deck id="top_pane"/>
<splitter><grippy/></splitter>
<menubar id="nav" hidden="true">
- <menu label="Actions for this Record" accesskey="A">
+ <menu label="&staff.cat.opac.menu.label;" accesskey="&staff.cat.opac.menu.accesskey;">
<menupopup>
- <menuitem label="OPAC View" accesskey="O" id="opac_view" oncommand="set_opac();"/>
- <menuitem label="MARC View" accesskey="V" id="marc_view" oncommand="set_marc_view();"/>
- <menuitem label="MARC Edit" accesskey="E" id="marc_edit" oncommand="set_marc_edit();"/>
- <menuitem label="Holdings Maintenance" accesskey="H" id="copy_browse" oncommand="set_copy_browser();"/>
- <menuitem label="View Holds" accesskey="s" id="view_holds" oncommand="set_hold_browser();"/>
+ <menuitem label="&staff.cat.opac.menuitem.opacview.label;" accesskey="&staff.cat.opac.menuitem.opacview.accesskey;" id="opac_view" oncommand="set_opac();"/>
+ <menuitem label="&staff.cat.opac.menuitem.marcview.label;" accesskey="&staff.cat.opac.menuitem.marcview.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
+ <menuitem label="&staff.cat.opac.menuitem.marcedit.label;" accesskey="&staff.cat.opac.menuitem.marcedit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
+ <menuitem label="&staff.cat.opac.menuitem.holding.label;" accesskey="&staff.cat.opac.menuitem.holding.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
+ <menuitem label="&staff.cat.opac.menuitem.viewholds.label;" accesskey="&staff.cat.opac.menuitem.viewholds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
<menuseparator/>
- <menuitem label="Add to Bucket" accesskey="B" id="add_bucket" oncommand="add_to_bucket();"/>
+ <menuitem label="&staff.cat.opac.menuitem.addtobucket.label;" accesskey="&staff.cat.opac.menuitem.addtobucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
<menuseparator/>
- <menuitem label="Refresh All Interfaces" id="refresh" oncommand="refresh();"/>
- <menuitem label="Duplicate in New Tab" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
- <menuitem label="Remove this Frame" id="remove_me" oncommand="remove_me();"/>
+ <menuitem label="&staff.cat.opac.menuitem.refreshinterfaces.label;" id="refresh" oncommand="refresh();"/>
+ <menuitem label="&staff.cat.opac.menuitem.dupnewtab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
+ <menuitem label="&staff.cat.opac.menuitem.removeframe.label;" id="remove_me" oncommand="remove_me();"/>
</menupopup>
</menu>
</menubar>
More information about the open-ils-commits
mailing list