[open-ils-commits] r8925 - in trunk/Open-ILS/xul/staff_client: chrome/content/OpenILS server/locale/en-US server/patron

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-03-08 04:02:30 -0500 (Sat, 08 Mar 2008)
New Revision: 8925

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
   trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
Log:
Hrmm, global_utils.js gets copied and shared between chrome and remote xul, so not sure what's the best thing to do here for the properties files.  Where do we want the redundancy?  Or can we get rid of it?

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js	2008-03-08 08:50:59 UTC (rev 8924)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js	2008-03-08 09:02:30 UTC (rev 8925)
@@ -27,7 +27,8 @@
 			removeCSSClass(document.documentElement,'ALL_FONTS_XX_LARGE');
 			addCSSClass(document.documentElement,data.global_font_adjust);
 		} catch(E) {
-			alert($('offlineStrings').getFormattedString('openils.global_util.font_size.error', [E]));
+            var Strings = $('offlineStrings') || $('commonStrings');
+			alert(Strings.getFormattedString('openils.global_util.font_size.error', [E]));
 		}
 	}
 
@@ -46,14 +47,16 @@
 									 return frame.contentWindow.wrappedJSObject;
 						  }
                 } catch(E) {
-                    alert($('offlineStrings').getFormattedString('openils.global_util.content_window_jsobject.error', [frame, E]));
+                    var Strings = $('offlineStrings') || $('commonStrings');
+                    alert(Strings.getFormattedString('openils.global_util.content_window_jsobject.error', [frame, E]));
                 }
                 return frame.contentWindow;
             } else {
                 return null;
             }
         } catch(E) {
-            alert($('offlineStrings').getFormattedString('openils.global_util.content_window.error', [frame, E]));
+            var Strings = $('offlineStrings') || $('commonStrings');
+            alert(Strings.getFormattedString('openils.global_util.content_window.error', [frame, E]));
         }
 	}
 
@@ -192,9 +195,11 @@
 			const gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
 				.getService(Components.interfaces.nsIClipboardHelper);
 			gClipboardHelper.copyString(text);
-			alert($('offlineStrings').getFormattedString('openils.global_util.clipboard', [text]));
+            var Strings = $('offlineStrings') || $('commonStrings');
+			alert(Strings.getFormattedString('openils.global_util.clipboard', [text]));
 		} catch(E) {
-			alert($('offlineStrings').getFormattedString('openils.global_util.clipboard.error', [E]));	
+            var Strings = $('offlineStrings') || $('commonStrings');
+			alert(Strings.getFormattedString('openils.global_util.clipboard.error', [E]));	
 		}
 	}
 
@@ -206,7 +211,8 @@
 			cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
 			cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
 		} catch(E) {
-			alert($('offlineStrings').getFormattedString('openils.global_util.clear_cache.error', [E]));
+            var Strings = $('offlineStrings') || $('commonStrings');
+			alert(Strings.getFormattedString('openils.global_util.clear_cache.error', [E]));
 		}
 	}
 

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2008-03-08 08:50:59 UTC (rev 8924)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2008-03-08 09:02:30 UTC (rev 8925)
@@ -13,6 +13,12 @@
 common.barcode.status.warning.unknown=with an unknown code: %1$s
 common.date.invalid=Invalid Date
 lang.version=remote v1
+openils.global_util.clear_cache.error=Problem clearing the cache: %1$s
+openils.global_util.clipboard.error=Clipboard action failed: %1$s
+openils.global_util.clipboard=Copied "%1$s" to clipboard.
+openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%1$s) and wrappedJSObject: %2$s
+openils.global_util.content_window.error=Error with get_contentWindow(%1$s): %2$s
+openils.global_util.font_size.error=Error adjusting the font size: %1$s
 staff.acp_label_barcode=Barcode
 staff.acp_label_call_number=Call Number
 staff.acp_label_circ_as_type=Circ As Type

Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul	2008-03-08 08:50:59 UTC (rev 8924)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul	2008-03-08 09:02:30 UTC (rev 8925)
@@ -135,7 +135,7 @@
 		<row id="pdsgr0">
 			<label id="PatronSummaryContact_library_card_label" class="text_left card label"
 				value="&staff.patron_display.library_card.label;"/>
-			<label id="patron_card" class="card value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+			<label id="patron_card" class="card value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
 			<!--<textbox id="patron_card" class="plain" readonly="true" onclick="this.select()"/>-->
 		</row>
 		<row id="pdsgr1">