[open-ils-commits] r11021 - in trunk/Open-ILS/xul/staff_client/server: cat locale/en-US

svn at svn.open-ils.org svn at svn.open-ils.org
Sun Nov 2 13:45:47 EST 2008


Author: phasefx
Date: 2008-11-02 13:45:44 -0500 (Sun, 02 Nov 2008)
New Revision: 11021

Modified:
   trunk/Open-ILS/xul/staff_client/server/cat/z3950.js
   trunk/Open-ILS/xul/staff_client/server/cat/z3950.xul
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Log:
grippy for a splitter, and indication of what (if any) record is marked for overlay before spawning the marc editor

Modified: trunk/Open-ILS/xul/staff_client/server/cat/z3950.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/z3950.js	2008-11-02 00:27:06 UTC (rev 11020)
+++ trunk/Open-ILS/xul/staff_client/server/cat/z3950.js	2008-11-02 18:45:44 UTC (rev 11021)
@@ -66,8 +66,13 @@
 							obj.error.sdump('D_TRACE','cat/z3950: selection list = ' + js2JSON(list) );
 							obj.controller.view.marc_import.disabled = false;
 							obj.controller.view.marc_import.setAttribute('retrieve_id',list[0]);
-							obj.controller.view.marc_import_overlay.disabled = false;
-							obj.controller.view.marc_import_overlay.setAttribute('retrieve_id',list[0]);
+		                    obj.data.init({'via':'stash'});
+                    		if (obj.data.marked_record) {
+				    			obj.controller.view.marc_import_overlay.disabled = false;
+                            } else {
+				    			obj.controller.view.marc_import_overlay.disabled = true;
+                            }
+			    			obj.controller.view.marc_import_overlay.setAttribute('retrieve_id',list[0]);
 							obj.controller.view.marc_view_btn.disabled = false;
 							obj.controller.view.marc_view_btn.setAttribute('retrieve_id',list[0]);
 						} catch(E) {
@@ -361,6 +366,24 @@
 
             setTimeout( function() { obj.focus(); }, 0 );
 
+            setInterval( 
+                function() {
+                    obj.data.init({'via':'stash'});
+                    if (obj.data.marked_record) {
+						var sel = obj.list.retrieve_selection();
+                        if (sel.length > 0) { obj.controller.view.marc_import_overlay.disabled = false; }
+                        if ($("overlay_tcn_indicator")) {
+                            $("overlay_tcn_indicator").setAttribute('value',$("catStrings").getFormattedString('staff.cat.z3950.marked_record_for_overlay_indicator.label',[obj.data.marked_record]));
+                        }
+                    } else {
+                        obj.controller.view.marc_import_overlay.disabled = true;
+                        if ($("overlay_tcn_indicator")) {
+                            $("overlay_tcn_indicator").setAttribute('value',$("catStrings").getString('staff.cat.z3950.marked_record_for_overlay_indicator.no_record.label'));
+                        }
+                    }
+                }, 2000
+            );
+
 		} catch(E) {
 			this.error.sdump('D_ERROR','cat.z3950.init: ' + E + '\n');
 		}

Modified: trunk/Open-ILS/xul/staff_client/server/cat/z3950.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/z3950.xul	2008-11-02 00:27:06 UTC (rev 11020)
+++ trunk/Open-ILS/xul/staff_client/server/cat/z3950.xul	2008-11-02 18:45:44 UTC (rev 11021)
@@ -160,11 +160,15 @@
                     </hbox>
                 </groupbox>
             </hbox>
-            <splitter id="z_splitter" collapse="before" persist="state hidden"/>
+            <splitter id="z_splitter" collapse="before" persist="state hidden"><grippy/></splitter>
             <groupbox id="z_splitter2" persist="height" flex="1">
                 <caption label="&staff.cat.z3950.results_caption.label;"/>
-                <hbox id="result_message" />
                 <hbox>
+                    <hbox id="result_message" />
+                    <spacer flex="1"/>
+                    <label id="overlay_tcn_indicator"/>
+                </hbox>
+                <hbox>
                     <button id="page_next" label="&staff.cat.z3950.page_next.label;" accesskey="&staff.cat.z3950.page_next.accesskey;" disabled="true"/>
                     <button id="z3950_list_actions" oncommand="this.firstChild.showPopup();"
                         label="&staff.cat.z3950.list_actions.label;" 

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2008-11-02 00:27:06 UTC (rev 11020)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2008-11-02 18:45:44 UTC (rev 11021)
@@ -377,6 +377,8 @@
 staff.cat.z3950.hide_top_pane.accesskey=T
 staff.cat.z3950.unhide_top_pane.label=Show Top Pane
 staff.cat.z3950.unhide_top_pane.accesskey=T
+staff.cat.z3950.marked_record_for_overlay_indicator.label=Record %1$s marked for overlay.
+staff.cat.z3950.marked_record_for_overlay_indicator.no_record.label=No record marked for overlay.
 staff.cat.z3950.obj_controller_init.marc_view_error=Failure during MARC view.
 staff.cat.z3950.obj_controller_init.marc_import_error=Failure during MARC import.
 staff.cat.z3950.obj_controller_init.marc_import_overlay_error=Failure during MARC import overlay.



More information about the open-ils-commits mailing list