[open-ils-commits] r17212 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/chrome/content/util (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-08-13 10:48:15 -0400 (Fri, 13 Aug 2010)
New Revision: 17212

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
   trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
   trunk/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
Log:
go ahead and expose the Find in Page functionality, but hide it under the Debug label for now.  Other than being incomplete (no Find Next, etc.), the main problem I see are our dynamic dojo interfaces where the text one might be tempted to search for won't actually be rendered yet on the screen (say in a scrolling list)


Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2010-08-13 14:48:01 UTC (rev 17211)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2010-08-13 14:48:15 UTC (rev 17212)
@@ -64,6 +64,10 @@
 <!ENTITY common.browser.print.accesskey "P">
 <!ENTITY common.browser.help.label "Help">
 <!ENTITY common.browser.help.accesskey "H">
+<!ENTITY common.browser.find.label "Find in Page">
+<!ENTITY common.browser.find.accesskey "i">
+<!ENTITY common.browser.set_url.label "Modify URL">
+<!ENTITY common.browser.set_url.accesskey "U">
 
 <!ENTITY common.textbox.cut "Cut">
 <!ENTITY common.textbox.copy "Copy">

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js	2010-08-13 14:48:01 UTC (rev 17211)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js	2010-08-13 14:48:15 UTC (rev 17212)
@@ -200,7 +200,7 @@
                 endPt.setStart(body, count);
                 endPt.setEnd(body, count);
             var retRange = finder.Find(text, searchRange, startPt, endPt);
-            alert('retRange = ' + retRange );
+            dump('retRange = ' + retRange + '\n');
             setSelection(retRange);
         } catch(E) {
             alert('Error in browser.js, find(): ' + E);

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.xul	2010-08-13 14:48:01 UTC (rev 17211)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.xul	2010-08-13 14:48:15 UTC (rev 17212)
@@ -112,13 +112,20 @@
         <command id="cmd_forward" label="&common.browser.forward.label;" accesskey="&common.browser.forward.accesskey;" />
     </commandset>
 
+    <popupset>
+        <popup id="debug_popup">
+            <menuitem label="&common.browser.set_url.label;" accesskey="&common.browser.set_url.accesskey;" command="cmd_debug" />
+            <menuitem label="&common.browser.find.label;" accesskey="&common.browser.find.accesskey;" command="cmd_find" />
+        </popup>
+    </popupset>
+
     <vbox flex="1">
         <hbox>
             <button id="back" command="cmd_back" disabled="true" hidden="true"/>
             <button id="reload" command="cmd_reload" disabled="false" hidden="false"/>
             <button id="forward" command="cmd_forward" disabled="true" hidden="true"/>
             <spacer flex="1"/>
-            <label id="debug" value="Debug" disabled="true" command="cmd_debug" onclick="this.doCommand();" />
+            <label id="debug" value="Debug" disabled="true" popup="debug_popup" />
             <button id="browser_print" command="cmd_print" hidden="true"/>
             <button id="browser_find" label="Find in Page" command="cmd_find" hidden="false"/>
         </hbox>

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul	2010-08-13 14:48:01 UTC (rev 17211)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul	2010-08-13 14:48:15 UTC (rev 17212)
@@ -115,13 +115,20 @@
         <command id="cmd_forward" label="&common.browser.forward.label;" accesskey="&common.browser.forward.accesskey;" />
     </commandset>
 
+    <popupset>
+        <popup id="debug_popup">
+            <menuitem label="&common.browser.set_url.label;" accesskey="&common.browser.set_url.accesskey;" command="cmd_debug" />
+            <menuitem label="&common.browser.find.label;" accesskey="&common.browser.find.accesskey;" command="cmd_find" />
+        </popup>
+    </popupset>
+
     <vbox flex="1">
         <hbox>
             <button id="back" command="cmd_back" disabled="true" hidden="true"/>
             <button id="reload" command="cmd_reload" disabled="false" hidden="false"/>
             <button id="forward" command="cmd_forward" disabled="true" hidden="true"/>
             <spacer flex="1"/>
-            <label id="debug" value="Debug" disabled="true" command="cmd_debug" onclick="this.doCommand();" />
+            <label id="debug" value="Debug" disabled="true" popup="debug_popup" />
             <button id="browser_print" command="cmd_print" hidden="true"/>
             <button id="browser_find" label="Find in Page" command="cmd_find" hidden="false"/>
         </hbox>