Index: openacs-4/packages/acs-api-browser/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/lib/search.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-api-browser/lib/search.adp	10 Sep 2003 12:11:54 -0000	1.1
@@ -0,0 +1,67 @@
+<table border="0" cellspacing="12" cellpadding="4"> 
+ <tr bgcolor="#DDDDDD">
+  <td>
+   <table>
+
+    <form action="@openacs_search_url@" method="get">
+     <tr>
+      <td valign="top">
+       <h4>OpenACS Tcl API Search</h4>
+       <input type="text" name="query_string" value="@query_string@"/><br />
+       <input type="submit" value="All matches" name="search_type" />
+       <input type="submit" value="Only best match" name="search_type" />
+       <p><a href="@openacs_browse_url@">Browse OpenACS Tcl API</a></p>
+      </td>
+      <td>       
+       <table cellspacing="0" cellpadding="0">
+         <tr><td align="right">Name contains:</td>
+           <td><input type="radio" name="name_weight" value="5" checked="checked" /> </td></tr>
+         <tr><td align="right">Exact name:</td>
+           <td><input type="radio" name="name_weight" value="exact" /></td></tr>
+         <tr><td align="right">&nbsp;</td><td>&nbsp;</td></tr>
+         <tr><td align="right">Parameters:</td>
+           <td><input type="checkbox" name="param_weight" value="3" checked="checked" /></td></tr>
+         <tr><td align="right">Documentation:</td>
+           <td><input type="checkbox" name="doc_weight" value="2" checked="checked" /></td></tr>
+         <tr><td align="right">Source:</td>
+           <td><input type="checkbox" name="source_weight" value="1" /></td></tr>
+       </table>
+      </td>
+     </tr>
+    </form>
+   </table>
+  </td>
+ </tr>
+ 
+ <tr bgcolor="#DDDDDD">
+  <td colspan="2">
+   <h4>OpenACS PL/SQL API Search</h4>
+   <p><a href="@openacs_plsql_browse_url@">Browse OpenACS PL/SQL API</a></p>
+  </td>
+ </tr>
+
+ <form action="@aolserver_search_url@" method="get">
+  <tr bgcolor="#DDDDDD">
+   <td colspan="2">
+    <h4>AOLserver Tcl API Search</h4>
+    <input type="text" name="tcl_proc" />
+    <input type="submit" value="Go" /><br />
+    (enter <em>exact</em> procedure name)<br />
+    <a href="@aolserver_tcl_api_root@">Browse AOLserver Tcl API</a>
+   </td>
+  </tr>
+ </form>
+
+ <form action="@tcl_search_url@" method="get">
+  <tr bgcolor="#DDDDDD">
+   <td colspan="2">
+    <h4>Tcl Documentation Search</h4>
+    <input type="text" name="tcl_proc" />
+    <input type="submit" value="Go" /><br />
+    (enter <em>exact</em> procedure name)<br />
+    <a href="@tcl_docs_root@">Browse the Tcl documentation</a>
+   </td>
+  </tr>
+ </form>
+
+</table>
Index: openacs-4/packages/acs-api-browser/lib/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/lib/search.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-api-browser/lib/search.tcl	10 Sep 2003 12:11:55 -0000	1.1
@@ -0,0 +1,27 @@
+#
+# API Browser search widget
+#
+# @cvs-id $Id: search.tcl,v 1.1 2003/09/10 12:11:55 lars Exp $
+#
+# Expects: query_string:optional
+#
+
+if { ![info exists query_string] } {
+    set query_string {}
+}
+
+set aolserver_tcl_api_root "http://www.aolserver.com/docs/devel/tcl/api/"
+
+set tcl_docs_root "http://dev.scriptics.com/man/tcl[info tclversion]/TclCmd/contents.htm"
+
+set package_url [apm_package_url_from_key "acs-api-browser"]
+
+set openacs_search_url "${package_url}proc-search"
+
+set openacs_browse_url "${package_url}proc-browse"
+
+set openacs_plsql_browse_url "${package_url}plsql-subprograms-all"
+
+set aolserver_search_url "${package_url}tcl-proc-view"
+
+set tcl_search_url "${package_url}tcl-doc-search"
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-api-browser/www/index.adp	20 Jun 2003 11:43:52 -0000	1.15
+++ openacs-4/packages/acs-api-browser/www/index.adp	10 Sep 2003 12:11:55 -0000	1.16
@@ -2,75 +2,10 @@
 <property name=title>@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<table align="right" border="0" cellspacing="12" cellpadding="4"> 
- <tr bgcolor="#DDDDDD">
-  <td>
-   <table>
+<div style="float: right;">
+  <include src="/packages/acs-api-browser/lib/search">
+</div>
 
-    <form action="proc-search" method="get">
-     <tr>
-      <td valign="top">
-       <h4>OpenACS Tcl API Search</h4>
-       <input type="text" name="query_string" /><br />
-       <input type="submit" value="All matches" name="search_type" />
-       <input type="submit" value="Only best match" name="search_type" />
-       <p><a href="proc-browse">Browse OpenACS Tcl API</a></p>
-      </td>
-      <td>       
-       <table cellspacing="0" cellpadding="0">
-         <tr><td align="right">Name contains:</td>
-           <td><input type="radio" name="name_weight" value="5" checked="checked" /> </td></tr>
-         <tr><td align="right">Exact name:</td>
-           <td><input type="radio" name="name_weight" value="exact" /></td></tr>
-         <tr><td align="right">&nbsp;</td><td>&nbsp;</td></tr>
-         <tr><td align="right">Parameters:</td>
-           <td><input type="checkbox" name="param_weight" value="3" checked="checked" /></td></tr>
-         <tr><td align="right">Documentation:</td>
-           <td><input type="checkbox" name="doc_weight" value="2" checked="checked" /></td></tr>
-         <tr><td align="right">Source:</td>
-           <td><input type="checkbox" name="source_weight" value="1" /></td></tr>
-       </table>
-      </td>
-     </tr>
-    </form>
-   </table>
-  </td>
- </tr>
- 
- <tr bgcolor="#DDDDDD">
-  <td colspan="2">
-   <h4>OpenACS PL/SQL API Search</h4>
-   <p><a href="plsql-subprograms-all">Browse OpenACS PL/SQL API</a></p>
-  </td>
- </tr>
-
- <form action="tcl-proc-view" method="get">
-  <tr bgcolor="#DDDDDD">
-   <td colspan="2">
-    <h4>AOLserver Tcl API Search</h4>
-    <input type="text" name="tcl_proc" />
-    <input type="submit" value="Go" /><br />
-    (enter <em>exact</em> procedure name)<br />
-    <a href="@aolserver_tcl_api_root@">Browse AOLserver Tcl API</a>
-   </td>
-  </tr>
- </form>
-
- <form action="tcl-doc-search" method="get">
-  <tr bgcolor="#DDDDDD">
-   <td colspan="2">
-    <h4>Tcl Documentation Search</h4>
-    <input type="text" name="tcl_proc" />
-    <input type="submit" value="Go" /><br />
-    (enter <em>exact</em> procedure name)<br />
-    <a href="@tcl_docs_root@">Browse the Tcl documentation</a>
-   </td>
-  </tr>
- </form>
-
-</table>
-
-
 <h3>Installed Enabled Packages</h3>
 <ul>
   
Index: openacs-4/packages/acs-api-browser/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/index.tcl	6 Sep 2002 21:49:54 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/index.tcl	10 Sep 2003 12:11:55 -0000	1.4
@@ -17,10 +17,6 @@
 set title "API Browser"
 set context [list]
 
-set aolserver_tcl_api_root "http://www.aolserver.com/docs/devel/tcl/api/"
-
-set tcl_docs_root "http://dev.scriptics.com/man/tcl[info tclversion]/TclCmd/contents.htm"
-
 db_multirow installed_packages installed_packages_select {
     select version_id, pretty_name, version_name
       from apm_package_version_info
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	22 May 2003 14:01:20 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	10 Sep 2003 12:11:55 -0000	1.7
@@ -2,6 +2,10 @@
 <property name=title>@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
+<div style="float: right;">
+  <include src="/packages/acs-api-browser/lib/search" query_string="@query_string@">
+</div>
+
 <h3>Procedure Matches:</h3>
 <ul>
   <multiple name="results">
@@ -13,56 +17,3 @@
 <if @results:rowcount@ eq 0>
 No results found
 </if>
-
-<form action=proc-search method=get>
-<table bgcolor=#DDDDDD cellpadding=15 border=0 cellspacing=0>
-  <tr><td valign=top>
-   <b>ACS API Search:</b><br>
-   <input type=text name=query_string value="@query_string@"><br>
-   <input type=submit value=Search name=search_type>
-   <input type=submit value="Feeling Lucky" name=search_type>
-   </td>
-  <td><table cellspacing=0 cellpadding=0>
-    <font size=-1>
-    <tr>
-      <td align=right>Name:</td>
-       <if @name_weight@ eq 0>
-      <td><input type=checkbox name=name_weight value=5> </td>
-       </if>
-       <else>
-      <td><input type=checkbox name=name_weight value=5 checked> </td>
-       </else>
-    </tr>
-    <tr>
-      <td align=right>Parameters:</td>
-       <if @param_weight@ eq 0>
-      <td><input type=checkbox name=param_weight value=5> </td>
-       </if>
-       <else>
-      <td><input type=checkbox name=param_weight value=5 checked> </td>
-       </else>
-    </tr>
-    <tr>
-      <td align=right>Documentation:</td>
-       <if @doc_weight@ eq 0>
-      <td><input type=checkbox name=doc_weight value=5> </td>
-       </if>
-       <else>
-      <td><input type=checkbox name=doc_weight value=5 checked> </td>
-       </else>
-    </tr>
-    <tr>
-      <td align=right>Source:</td>
-       <if @source_weight@ eq 0>
-      <td><input type=checkbox name=source_weight value=5> </td>
-       </if>
-       <else>
-      <td><input type=checkbox name=source_weight value=5 checked> </td>
-       </else>
-    </tr>
-    </font>
- </table>
- </td>
-</tr>
-</form>
-</table>