changing implementation name from remote_stringbundle to messagecatalog and adding...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7654 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
index 3ef3151..d93c4d4 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
+++ b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
@@ -5,7 +5,7 @@
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
-       <binding id="remote_stringbundle">
+       <binding id="messagecatalog">
                <resources>
                </resources>
     
@@ -80,7 +80,6 @@
                                                var current_m = 0;
                                                var cont = false;
                                                do {    
-                                                       var cont = false;
                                                        if (v.indexOf( "{" + current_m + "}" ) >= 0 ) {
                                                                var mes_bund = new RegExp( "\\\{" + current_m + "\\\}", 'g' );
                                                                var sprintf_format = "%" + (current_m + 1) + "$s";
@@ -89,6 +88,8 @@
 
                                                                cont = true;
                                                                current_m++;
+                                                       } else {
+                                                               cont = false;
                                                        }
                                                } while ( cont == true );
 
@@ -153,27 +154,38 @@
                </implementation>
        </binding>
 
-  <binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
-    <resources>
-      <stylesheet src="chrome://global/skin/groupbox.css"/>
-    </resources>
-    
-    <content>
-      <children>
-        <xul:image onclick="var n = document.getAnonymousNodes(parentNode.parentNode)[1]; if (n.hidden) { n.hidden = false; this.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/opentriangle.gif'); } else { n.hidden = true; this.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/triangle.gif');  }" />
-        <xul:image class="caption-icon" xbl:inherits="src=image"/>
-        <xul:label class="caption-text" flex="1" xbl:inherits="default,value=label,crop,accesskey" />
-      </children>
-    </content>
-
-    <implementation>
-       <constructor>
-               <![CDATA[
-               var n = document.getAnonymousNodes(this)[0];
-               n.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/opentriangle.gif');
-               ]]>
-       </constructor>
-    </implementation>
-  </binding>
+       <binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
+               <resources>
+                       <stylesheet src="chrome://global/skin/groupbox.css"/>
+               </resources>
+
+               <content>
+                       <children>
+                               <xul:image
+                                       onclick="
+                                               var n = document.getAnonymousNodes(parentNode.parentNode)[1];
+                                               if (n.hidden) {
+                                                       n.hidden = false;
+                                                       this.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/opentriangle.gif');
+                                               } else {
+                                                       n.hidden = true;
+                                                       this.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/triangle.gif');
+                                               }
+                                       "
+                               />
+                               <xul:image class="caption-icon" xbl:inherits="src=image"/>
+                               <xul:label class="caption-text" flex="1" xbl:inherits="default,value=label,crop,accesskey" />
+                       </children>
+               </content>
+
+               <implementation>
+                       <constructor>
+                               <![CDATA[
+                                       var n = document.getAnonymousNodes(this)[0];
+                                       n.setAttribute('src','chrome://open_ils_staff_client/skin/media/images/opentriangle.gif');
+                               ]]>
+                       </constructor>
+               </implementation>
+       </binding>
 
 </bindings>

diff --git a/Open-ILS/xul/staff_client/chrome/skin/global.css b/Open-ILS/xul/staff_client/chrome/skin/global.css
index 6e084c4..0a94564 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/skin/global.css
+++ b/Open-ILS/xul/staff_client/chrome/skin/global.css
@@ -15,6 +15,7 @@ iframe { background: #CDCED3 url("chrome://browser/skin/icons/box-background.png
 .operator_change { background-color: red; }
 
 .shrinkable_groupbox { font-weight: bold; -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#caption'); }
+messagecatalog { -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#messagecatalog'); }
 
 .my_overflow { overflow: auto; }