[open-ils-commits] r14218 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-09-30 10:20:34 -0400 (Wed, 30 Sep 2009)
New Revision: 14218

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
   trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
Log:
Consolidate some checkboxes into a Checkin Modifiers menu button, since we'll be adding more and are running out of screen real estate.

Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2009-09-30 14:09:11 UTC (rev 14217)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2009-09-30 14:20:34 UTC (rev 14218)
@@ -1795,6 +1795,8 @@
 <!ENTITY staff.circ.checkin_overlay.do_not_alert_on_precat.label "Ignore Pre-cataloged Items">
 <!ENTITY staff.circ.checkin_overlay.checkin_auto.label "Auto-Print Hold and Transit Slips">
 <!ENTITY staff.circ.checkin_overlay.checkin_auto.accesskey "P">
+<!ENTITY staff.circ.checkin_overlay.checkin_modifiers_btn.label "Checkin Modifiers">
+<!ENTITY staff.circ.checkin_overlay.checkin_modifiers_btn.accesskey "M">
 <!ENTITY staff.circ.renew_overlay.background_text "Renew Item">
 <!ENTITY staff.circ.renew_overlay.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.circ.renew_overlay.sel_clip.accesskey "C">

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2009-09-30 14:09:11 UTC (rev 14217)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2009-09-30 14:20:34 UTC (rev 14218)
@@ -313,7 +313,7 @@
 			}
 			var backdate = obj.controller.view.checkin_effective_datepicker.value;
 			var auto_print = document.getElementById('checkin_auto');
-			if (auto_print) auto_print = auto_print.checked;
+			if (auto_print) auto_print = auto_print.getAttribute('checked') == 'true';
 			JSAN.use('circ.util');
 			circ.util.checkin_via_barcode(
 				ses(), 

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2009-09-30 14:09:11 UTC (rev 14217)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2009-09-30 14:20:34 UTC (rev 14218)
@@ -124,9 +124,16 @@
 		accesskey="&staff.checkin.print_receipt.accesskey;"/>
 	<checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
 	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-	<checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
 	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
+    <button id="checkin_modifiers" oncommand="this.firstChild.showPopup();"
+        label="&staff.circ.checkin_overlay.checkin_modifiers_btn.label;"
+        accesskey="&staff.circ.checkin_overlay.checkin_modifiers_btn.accesskey;"
+        type="menu" allowevents="true">
+        <menupopup id="checkin_modifiers_popup">
+            <menuitem type="checkbox" id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
+            <menuitem type="checkbox" id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
+        </menupopup>
+    </button>
 </hbox>
 
 </overlay>

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-09-30 14:09:11 UTC (rev 14217)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-09-30 14:20:34 UTC (rev 14218)
@@ -2493,7 +2493,7 @@
                     print_data.route_to;
 					if (document.getElementById('do_not_alert_on_precat')) {
 						var x = document.getElementById('do_not_alert_on_precat');
-						if (! x.checked) {
+						if (x.getAttribute('checked') != 'true') {
 							print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
                             msg += print_data.route_to_msg;
 						}