Index: openacs-4/packages/acs-subsite/www/admin/applications/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.adp,v
diff -u -N -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-subsite/www/admin/applications/index.adp	27 Apr 2017 15:55:19 -0000	1.7.2.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.adp	28 Apr 2017 17:47:23 -0000	1.7.2.2
@@ -1,18 +1,10 @@
 <master>
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
+  <property name="focus">filter.search</property>
 
-  <table>
-    <tr>
-      <td class="list-filter-pane">
-        <formtemplate id="filter" style="filter"></formtemplate>
-	<listfilters name="applications"></listfilters>
-      </td>
-      <td class="list-list-pane">
-	<listtemplate name="applications"></listtemplate>
-      </td>
-    </tr>
-  </table>
+  <formtemplate id="filter" style="filter"></formtemplate>
+  <listtemplate name="applications"></listtemplate>
 
 
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.tcl,v
diff -u -N -r1.11.2.4 -r1.11.2.5
--- openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	27 Apr 2017 15:55:19 -0000	1.11.2.4
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	28 Apr 2017 17:47:23 -0000	1.11.2.5
@@ -6,9 +6,7 @@
     @cvs-id $Id$
 } {
     page:naturalnum,optional
-    {search_name ""}
-    {search_url ""}
-    {search_application ""}
+    {search ""}
 }
 
 set page_title [_ acs-subsite.Applications]
@@ -21,22 +19,14 @@
 ad_form \
     -name filter \
     -edit_buttons [list [list "Go" go]] \
+    -has_submit 1 \
+    -html { style "float:right;" } \
     -form {
-	{search_name:text,optional
-	    {label "#acs-subsite.Name#"}
-	    {html {length 20} }
-	    {value $search_name}
+	{search:text,optional
+            {label ""}
+	    {html {length 20 placeholder "Search"} }
+	    {value $search}
 	}
-	{search_url:text,optional
-	    {label "#acs-subsite.URL#"}
-	    {html {length 20} }
-	    {value $search_url}
-	}
-	{search_application:text,optional
-	    {label "#acs-subsite.Application#"}
-	    {html {length 20} }
-	    {value $search_application}
-	}
     } -on_submit {}
 
 list::create \
@@ -92,18 +82,10 @@
             link_html { title "#acs-subsite.Delete_this_application#" }
         }
     } -filters {
-	search_name {
+	search {
 	    hide_p 1
-            where_clause {(:search_name is null or upper(coalesce(coalesce(m.message, md.message), p.instance_name)) like '%' || upper(:search_name) || '%')}
-	}
-	search_url {
-	    hide_p 1
-            where_clause {(:search_url is null or upper(n.name) like '%' || upper(:search_url) || '%')}
-	}
-	search_application {
-	    hide_p 1
-            where_clause {(:search_application is null or upper(pt.pretty_name) like '%' || upper(:search_application) || '%')}
-	}
+            where_clause {(:search is null or upper(coalesce(coalesce(m.message, md.message), p.instance_name) || n.name || pt.pretty_name) like '%' || upper(:search) || '%')}
+        }
     }