backporting r18609 patch from bshum for catalog search in button bar

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

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 6f90ccb..c55d485 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -602,6 +602,8 @@
 <!ENTITY staff.main.button_bar.check_out.accesskey "">
 <!ENTITY staff.main.button_bar.check_in.label "Check In">
 <!ENTITY staff.main.button_bar.check_in.accesskey "">
+<!ENTITY staff.main.button_bar.search_opac.label "Search Catalog">
+<!ENTITY staff.main.button_bar.search_opac.accesskey "">
 <!ENTITY staff.main.button_bar.item_status.label "Item Status">
 <!ENTITY staff.main.button_bar.item_status.accesskey "">
 <!ENTITY staff.main.button_bar.patron_search.label "Patron Search">

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
index 4723b60..c9878f2 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
@@ -90,6 +90,12 @@
             image="chrome://open_ils_staff_client/skin/media/images/center.png" 
             label="&staff.main.button_bar.check_in.label;" 
             accesskey="&staff.main.button_bar.check_in.accesskey;" />
+        <toolbarseparator />
+        <toolbarbutton id="tb_search_opac" 
+            command="cmd_search_opac" 
+            image="chrome://open_ils_staff_client/skin/media/images/Search_Items_32x32.png" 
+            label="&staff.main.button_bar.search_opac.label;" 
+            accesskey="&staff.main.button_bar.search_opac.accesskey;" />
         <toolbarbutton id="tb_item_status" 
             command="cmd_copy_status" 
             image="chrome://open_ils_staff_client/skin/media/images/HILLBLU_libro_32x32.png" 

diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/Search_Items_32x32.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/Search_Items_32x32.png
new file mode 100644 (file)
index 0000000..3b28fec
Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/Search_Items_32x32.png differ

diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt b/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt
index ba77bf8..244c452 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt
+++ b/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt
@@ -25,4 +25,6 @@ Center.png derived from:
 http://commons.wikimedia.org/wiki/File:Center.svg
 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
 
-
+Search_Items_32x32 derived from:
+http://commons.wikimedia.org/wiki/File:HILLBLU_lente.png AND http://commons.wikimedia.org/wiki/File:HILLBLU_libro.png
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".