[open-ils-commits] r11715 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/patron
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Dec 30 16:34:52 EST 2008
Author: phasefx
Date: 2008-12-30 16:34:48 -0500 (Tue, 30 Dec 2008)
New Revision: 11715
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/server/patron/display.js
trunk/Open-ILS/xul/staff_client/server/patron/display.xul
trunk/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
trunk/Open-ILS/xul/staff_client/server/patron/summary.js
trunk/Open-ILS/xul/staff_client/server/patron/summary.xul
trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
Log:
move the Test Password button from the summary sidebar to a more expandible Actions for this Patron menulist
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2008-12-30 21:34:48 UTC (rev 11715)
@@ -1167,6 +1167,8 @@
<!ENTITY staff.patron_navbar.refresh.accesskey ''>
<!ENTITY staff.patron_navbar.retrieve 'Retrieve Patron'>
<!ENTITY staff.patron_navbar.retrieve.accesskey 'R'>
+<!ENTITY staff.patron_navbar.actions.menu.label 'Actions for this Patron'>
+<!ENTITY staff.patron_navbar.actions.menu.accesskey 'A'>
<!ENTITY staff.patron_register_interface_label "New Patron">
<!ENTITY staff.patron_search_form.caption 'Search for Patron'>
<!ENTITY staff.patron_search_form.city.accesskey ''>
Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.js 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.js 2008-12-30 21:34:48 UTC (rev 11715)
@@ -340,7 +340,20 @@
function(e) {
return function() {}
}
- ]
+ ],
+ 'cmd_verify_credentials' : [
+ ['command'],
+ function() {
+ var vframe = obj.right_deck.reset_iframe(
+ urls.XUL_VERIFY_CREDENTIALS,
+ {},
+ {
+ 'barcode' : obj.patron.card().barcode(),
+ 'usrname' : obj.patron.usrname()
+ }
+ );
+ }
+ ]
}
}
);
@@ -373,16 +386,6 @@
{
'barcode' : obj.barcode,
'id' : obj.id,
- 'verify_credentials' : function(patron) {
- var vframe = obj.right_deck.reset_iframe(
- urls.XUL_VERIFY_CREDENTIALS,
- {},
- {
- 'barcode' : patron.card().barcode(),
- 'usrname' : patron.usrname()
- }
- );
- },
'on_finished' : function(patron) {
obj.patron = patron; obj.controller.render();
Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.xul 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.xul 2008-12-30 21:34:48 UTC (rev 11715)
@@ -99,6 +99,7 @@
<command id="cmd_patron_exit" />
<command id="cmd_patron_retrieve" />
<command id="cmd_search_form" />
+ <command id="cmd_verify_credentials" />
</commandset>
<box id="patron_display_main" class="my_overflow" />
Modified: trunk/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display_overlay.xul 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display_overlay.xul 2008-12-30 21:34:48 UTC (rev 11715)
@@ -54,33 +54,52 @@
<hbox id="PatronNavBar1" flex="1"/>
</deck>
-<hbox id="PatronNavBar1">
- <spacer flex="1"/>
- <arrowscrollbox id="PatronNavBarScrollbox" orient="horizontal" flex="1">
- <spacer flex="1"/>
- <button id="PatronNavBar_refresh" command="cmd_patron_refresh" class="nav"
- label="&staff.patron_navbar.refresh;" accesskey="&staff.patron_navbar.refresh.accesskey;"/>
- <button id="PatronNavBar_checkout" command="cmd_patron_checkout" class="nav"
- label="&staff.patron_navbar.checkout;" accesskey="&staff.patron_navbar.checkout.accesskey;"/>
- <button id="PatronNavBar_items" command="cmd_patron_items" class="nav"
- label="&staff.patron_navbar.items;" accesskey="&staff.patron_navbar.items.accesskey;"/>
- <button id="PatronNavBar_holds" command="cmd_patron_holds" class="nav"
- label="&staff.patron_navbar.holds;" accesskey="&staff.patron_navbar.holds.accesskey;"/>
- <button id="PatronNavBar_bills" command="cmd_patron_bills" class="nav"
- label="&staff.patron_navbar.bills;" accesskey="&staff.patron_navbar.bills.accesskey;"/>
- <button id="PatronNavBar_edit" command="cmd_patron_edit" class="nav"
- label="&staff.patron_navbar.edit;" accesskey="&staff.patron_navbar.edit.accesskey;"/>
- <button id="PatronNavBar_info" command="cmd_patron_info" class="nav"
- label="&staff.patron_navbar.info;" accesskey="&staff.patron_navbar.info.accesskey;"/>
- <button id="PatronNavBar_exit" command="cmd_patron_exit" class="nav"
- label="&staff.patron.display_overlay.exit.label;" accesskey="&staff.patron.display_overlay.exit.accesskey;"/>
- </arrowscrollbox>
+<hbox id="PatronNavBar1" flex="1">
+ <vbox flex="1">
+ <hbox flex="1">
+ <spacer flex="1"/>
+ <arrowscrollbox id="PatronNavBarScrollbox" orient="horizontal" flex="1">
+ <spacer flex="1"/>
+ <button id="PatronNavBar_refresh" command="cmd_patron_refresh" class="nav"
+ label="&staff.patron_navbar.refresh;" accesskey="&staff.patron_navbar.refresh.accesskey;"/>
+ <button id="PatronNavBar_checkout" command="cmd_patron_checkout" class="nav"
+ label="&staff.patron_navbar.checkout;" accesskey="&staff.patron_navbar.checkout.accesskey;"/>
+ <button id="PatronNavBar_items" command="cmd_patron_items" class="nav"
+ label="&staff.patron_navbar.items;" accesskey="&staff.patron_navbar.items.accesskey;"/>
+ <button id="PatronNavBar_holds" command="cmd_patron_holds" class="nav"
+ label="&staff.patron_navbar.holds;" accesskey="&staff.patron_navbar.holds.accesskey;"/>
+ <button id="PatronNavBar_bills" command="cmd_patron_bills" class="nav"
+ label="&staff.patron_navbar.bills;" accesskey="&staff.patron_navbar.bills.accesskey;"/>
+ <button id="PatronNavBar_edit" command="cmd_patron_edit" class="nav"
+ label="&staff.patron_navbar.edit;" accesskey="&staff.patron_navbar.edit.accesskey;"/>
+ <button id="PatronNavBar_info" command="cmd_patron_info" class="nav"
+ label="&staff.patron_navbar.info;" accesskey="&staff.patron_navbar.info.accesskey;"/>
+ <button id="PatronNavBar_exit" command="cmd_patron_exit" class="nav"
+ label="&staff.patron.display_overlay.exit.label;" accesskey="&staff.patron.display_overlay.exit.accesskey;"/>
+ </arrowscrollbox>
+ </hbox>
+ <hbox>
+ <spacer flex="1"/>
+ <menubar>
+ <menu label="&staff.patron_navbar.actions.menu.label;" accesskey="&staff.patron_navbar.actions.menu.accesskey;">
+ <menupopup>
+ <menuitem label="&staff.patron_display.verify_password.label;" accesskey="&staff.patron_display.verify_password.accesskey;" command="cmd_verify_credentials"/>
+ </menupopup>
+ </menu>
+ </menubar>
+ </hbox>
+ </vbox>
</hbox>
-<hbox id="PatronNavBar0">
- <spacer flex="1"/>
- <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
- <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+<hbox id="PatronNavBar0" flex="1">
+ <vbox flex="1">
+ <hbox flex="1">
+ <spacer flex="1"/>
+ <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
+ <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+ </hbox>
+ <label value=" "/>
+ </vbox>
</hbox>
</overlay>
Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary.js 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary.js 2008-12-30 21:34:48 UTC (rev 11715)
@@ -35,12 +35,6 @@
['command'],
function() { alert($("commonStrings").getString('common.unimplemented')); }
],
- 'cmd_verify_credentials' : [
- ['command'],
- function() {
- xulG.verify_credentials(obj.patron);
- }
- ],
'patron_alert' : [
['render'],
function(e) {
Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary.xul 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary.xul 2008-12-30 21:34:48 UTC (rev 11715)
@@ -69,7 +69,6 @@
<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
<commandset id="patron_summary_cmds">
- <command id="cmd_verify_credentials"/>
</commandset>
<box id="patron_summary_main" />
Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul 2008-12-30 20:20:25 UTC (rev 11714)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul 2008-12-30 21:34:48 UTC (rev 11715)
@@ -139,12 +139,6 @@
value="&staff.patron_display.library_card.label;"/>
<label id="patron_card" class="card value click_link" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
</row>
- <row id="pdsgr0a">
- <button id="PatronSummary_verify_passwd_label"
- label="&staff.patron_display.verify_password.label;" accesskey="&staff.patron_display.verify_password.accesskey;"
- command="cmd_verify_credentials"/>
- <spacer/>
- </row>
<row id="pdsgr1">
<label id="PatronSummaryContact_ident_label" class="text_left"
value="&staff.patron_display.ident1.label;"/>
More information about the open-ils-commits
mailing list