Index: openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	15 Feb 2010 20:09:21 -0000	1.13
+++ openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	9 Apr 2010 20:42:50 -0000	1.14
@@ -138,9 +138,9 @@
   <msg key="Name_in_shortcut_URL">Name in shortcut URL</msg>
   <msg key="Need_Info">Need_Info</msg>
   <msg key="New">New</msg>
-  <msg key="New_Workflow">New Workflow</msg>
   <msg key="New_1">New %Bug_name%</msg>
   <msg key="New_2">Patch</msg>
+  <msg key="New_Workflow">New Workflow</msg>
   <msg key="No_Bugs">No %bugs_name%</msg>
   <msg key="No_categories_of_this_type">No categories of this type.</msg>
   <msg key="No_components">No components</msg>
@@ -220,7 +220,7 @@
   <msg key="Resolver">Resolver</msg>
   <msg key="resolver">resolver</msg>
   <msg key="Return">Return</msg>
-  <msg key="Search">Search...</msg>
+  <msg key="Search">Search</msg>
   <msg key="Select_one_or_more_of">Select one or more of the following %pretty_names.bugs% for patch &quot;%patch_summary%&quot; (you may select more %pretty_names.bugs% later):</msg>
   <msg key="send_email_error">Error on %bug_pretty_s% ID %one_bug_id%:</msg>
   <msg key="send_email_success_inform">#%bug_info.bug_number%: %bug_info.summary%</msg>
Index: openacs-4/packages/bug-tracker/lib/nav-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/nav-bar.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/lib/nav-bar.adp	11 May 2004 09:27:16 -0000	1.4
+++ openacs-4/packages/bug-tracker/lib/nav-bar.adp	9 Apr 2010 20:42:50 -0000	1.5
@@ -3,7 +3,16 @@
   <multiple name="links"><a href="@links.url@" class="bt_navbar">@links.name@</a>&nbsp;|&nbsp;</multiple>
   <form style="display: inline" action="@form_action_url@" method="get" name="navbar_form_@bt_nav_bar_count@">
     <input name="bug_number" type="text" size="5" class="bt_navbar" value="@pretty_names.Bug@ #" 
-      onFocus="javascript:document.navbar_form_@bt_nav_bar_count@.bug_number.value='';">
+      onFocus="javascript:this.value='';">
       <input type="submit" value="Go" class="bt_navbar">
   </form>
+  <if @search_mounted_p@>
+      <form style="display: inline" action="@form_search_url@" method="get" name="search">
+        <input name="q" type="text" size="15" class="bt_navbar" value="#bug-tracker.Search#" 
+          onFocus="javascript:this.value='';">
+        <input name="search_package_id" type="hidden" value="@package_id@">
+          <input type="submit" value="#bug-tracker.Search#" class="bt_navbar">
+      </form>
+  </if>
+
 </div>
Index: openacs-4/packages/bug-tracker/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/nav-bar.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/bug-tracker/lib/nav-bar.tcl	29 Mar 2004 15:07:33 -0000	1.12
+++ openacs-4/packages/bug-tracker/lib/nav-bar.tcl	9 Apr 2010 20:42:50 -0000	1.13
@@ -88,4 +88,10 @@
 
 set form_action_url "[ad_conn package_url]bug"
 
+set search_mounted_p [bug_tracker::search_mounted_p]
+
+if {$search_mounted_p} {
+    set form_search_url "[site_node::get_package_url -package_key search]search"
+}
+
 ad_return_template
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-init.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-init.tcl	9 Apr 2010 20:42:50 -0000	1.1
@@ -0,0 +1,32 @@
+# /packages/bug-tracker/tcl/bug-tracker-init.tcl
+
+
+ad_library {
+    
+    Generic init procs for bug tracker 
+    
+    @author Ryan Gallimore (rgallimore@viscousmedia.com)
+    @creation-date 2010-04-07
+    @cvs-id $Id: bug-tracker-init.tcl,v 1.1 2010/04/09 20:42:50 ryang Exp $
+}
+
+# Is search mounted and associated driver installed?
+set search_mounted_p 1
+set search_driver [parameter::get -package_id [apm_package_id_from_key search] \
+                                  -parameter FtsEngineDriver]
+
+if { [site_node::get_package_url -package_key search] eq "" } { 
+    ns_log Warning Bug Tracker: Search package is not mounted.
+    set search_mounted_p 0
+} elseif { $search_driver eq ""} {
+    ns_log Warning Bug Tracker: FtsEngineDriver parameter in package search is empty.
+    set search_mounted_p 0
+} elseif { [apm_package_id_from_key $search_driver] == 0} { 
+    ns_log Warning Bug Tracker: Search driver $search_driver is not installed.
+    set search_mounted_p 0
+}
+
+eval "ad_proc -public bug_tracker::search_mounted_p {} {} {
+    return $search_mounted_p
+}"
+