Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1138
diff -u -p -F '^f' -r1.1138 common.inc
--- includes/common.inc	28 Mar 2010 10:46:36 -0000	1.1138
+++ includes/common.inc	29 Mar 2010 07:27:26 -0000
@@ -5500,6 +5500,9 @@ function drupal_common_theme() {
     'date' => array(
       'render element' => 'element',
     ),
+    'exposed_filters' => array(
+      'render element' => 'form',
+    ),
     'checkbox' => array(
       'render element' => 'element',
     ),
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.92
diff -u -p -F '^f' -r1.92 node.admin.inc
--- modules/node/node.admin.inc	7 Mar 2010 06:49:10 -0000	1.92
+++ modules/node/node.admin.inc	29 Mar 2010 07:27:27 -0000
@@ -150,7 +150,7 @@ function node_filter_form() {
   $form['filters'] = array(
     '#type' => 'fieldset',
     '#title' => t('Show only items where'),
-    '#theme' => 'node_filters',
+    '#theme' => 'exposed_filters__node',
   );
   foreach ($session as $filter) {
     list($type, $value) = $filter;
@@ -165,11 +165,18 @@ function node_filter_form() {
     else {
       $value = $filters[$type]['options'][$value];
     }
+    $params = $filters[$type]['title'];
     if ($i++) {
-      $form['filters']['current'][] = array('#markup' => t('<em>and</em> where <strong>%type</strong> is <strong>%value</strong>', array('%type' => $filters[$type]['title'], '%value' => $value)));
+      $form['filters']['current'][] = array(
+        '#type' => 'item',
+        '#markup' => t('and where %property is %value', array('%property' => $params, '%value' => $value)),
+      );
     }
     else {
-      $form['filters']['current'][] = array('#markup' => t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => $filters[$type]['title'], '%value' => $value)));
+      $form['filters']['current'][] = array(
+        '#type' => 'item',
+        '#markup' => t('where %property is %value', array('%property' => $params, '%value' => $value)),
+      );
     }
     if (in_array($type, array('type', 'language'))) {
       // Remove the option if it is already being filtered on.
@@ -177,9 +184,17 @@ function node_filter_form() {
     }
   }
 
+  $form['filters']['status'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('clearfix')),
+    '#prefix' => ($i ? '<div class="additional-filters">' . t('and where') . '</div>' : ''),
+  );
+  $form['filters']['status']['filters'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('filters')),
+  );
   foreach ($filters as $key => $filter) {
-    $names[$key] = $filter['title'];
-    $form['filters']['status'][$key] = array(
+    $form['filters']['status']['filters'][$key] = array(
       '#type' => 'select',
       '#options' => $filter['options'],
       '#title' => $filter['title'],
@@ -187,15 +202,14 @@ function node_filter_form() {
     );
   }
 
-  $form['filters']['actions'] = array(
+  $form['filters']['status']['actions'] = array(
     '#type' => 'container',
-    '#id' => 'node-admin-buttons',
     '#attributes' => array('class' => array('form-actions', 'container-inline')),
   );
-  $form['filters']['actions']['submit'] = array('#type' => 'submit', '#value' => (count($session) ? t('Refine') : t('Filter')));
+  $form['filters']['status']['actions']['submit'] = array('#type' => 'submit', '#value' => (count($session) ? t('Refine') : t('Filter')));
   if (count($session)) {
-    $form['filters']['actions']['undo'] = array('#type' => 'submit', '#value' => t('Undo'));
-    $form['filters']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
+    $form['filters']['status']['actions']['undo'] = array('#type' => 'submit', '#value' => t('Undo'));
+    $form['filters']['status']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
   }
 
   drupal_add_js('misc/form.js');
Index: modules/node/node.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.css,v
retrieving revision 1.15
diff -u -p -F '^f' -r1.15 node.css
--- modules/node/node.css	18 Mar 2010 06:50:37 -0000	1.15
+++ modules/node/node.css	29 Mar 2010 07:27:27 -0000
@@ -6,21 +6,6 @@
 .preview .node {
   background-color: #ffffea;
 }
-/* Override the default multiselect layout in system-behavior.css. */
-#node-admin-content dl.multiselect dd, dl.multiselect dd .form-item {
-  width: 20em; /* 6em label + 14em select */
-}
-#node-admin-content dl.multiselect dd .form-item label {
-  display: block;
-  float: left; /* LTR */
-  width: 6em;
-  font-weight: normal;
-}
-#node-admin-buttons {
-  float: left; /* LTR */
-  margin-left: 0.5em; /* LTR */
-  clear: right; /* LTR */
-}
 td.revision-current {
   background: #ffc;
 }
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1252
diff -u -p -F '^f' -r1.1252 node.module
--- modules/node/node.module	28 Mar 2010 11:16:29 -0000	1.1252
+++ modules/node/node.module	29 Mar 2010 07:27:27 -0000
@@ -135,10 +135,6 @@ function node_theme() {
     'node_search_admin' => array(
       'render element' => 'form',
     ),
-    'node_filters' => array(
-      'render element' => 'form',
-      'file' => 'node.admin.inc',
-    ),
     'node_add_list' => array(
       'variables' => array('content' => NULL),
       'file' => 'node.pages.inc',
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.77
diff -u -p -F '^f' -r1.77 node.test
--- modules/node/node.test	28 Mar 2010 11:16:29 -0000	1.77
+++ modules/node/node.test	29 Mar 2010 07:27:27 -0000
@@ -1140,7 +1140,9 @@ class NodeAdminTestCase extends DrupalWe
       'status' => 'status-1',
     );
     $this->drupalPost(NULL, $edit, t('Filter'));
-    $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('status'), '%value' => t('published'))), t('Content list is filtered by status.'));
+
+    $this->assertRaw(t('where %property is %value', array('%property' => t('status'), '%value' => 'published')), t('Content list is filtered by status.'));
+
     $this->assertLinkByHref('node/' . $nodes['published_page']->nid . '/edit');
     $this->assertLinkByHref('node/' . $nodes['published_article']->nid . '/edit');
     $this->assertNoLinkByHref('node/' . $nodes['unpublished_page_1']->nid . '/edit');
@@ -1150,8 +1152,10 @@ class NodeAdminTestCase extends DrupalWe
       'type' => 'page',
     );
     $this->drupalPost(NULL, $edit, t('Refine'));
-    $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('status'), '%value' => t('published'))), t('Content list is filtered by status.'));
-    $this->assertRaw(t('<strong>%type</strong> is <strong>%value</strong>', array('%type' => t('type'), '%value' => 'Basic page')), t('Content list is filtered by content type.'));
+
+    $this->assertRaw(t('where %property is %value', array('%property' => t('status'), '%value' => 'published')), t('Content list is filtered by status.'));
+    $this->assertRaw(t('and where %property is %value', array('%property' => t('type'), '%value' => 'Basic page')), t('Content list is filtered by content type.'));
+
     $this->assertLinkByHref('node/' . $nodes['published_page']->nid . '/edit');
     $this->assertNoLinkByHref('node/' . $nodes['published_article']->nid . '/edit');
 
Index: modules/system/admin-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/admin-rtl.css,v
retrieving revision 1.6
diff -u -p -F '^f' -r1.6 admin-rtl.css
--- modules/system/admin-rtl.css	3 Aug 2009 03:04:33 -0000	1.6
+++ modules/system/admin-rtl.css	29 Mar 2010 07:27:27 -0000
@@ -46,3 +46,22 @@ table.screenshot {
   margin-right: 15px;
 }
 
+/**
+ * Exposed filters
+ */
+.exposed-filters .filters {
+  float: right;
+  margin-left: 1em;
+}
+.exposed-filters .form-item label {
+  float: right;
+}
+
+/* Current Filters */
+.current-filters li {
+  margin-right: 0;
+}
+.exposed-filters .additional-filters {
+  float: right;
+  margin-left: 1em;
+}
Index: modules/system/admin.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/admin.css,v
retrieving revision 1.21
diff -u -p -F '^f' -r1.21 admin.css
--- modules/system/admin.css	3 Aug 2009 03:04:33 -0000	1.21
+++ modules/system/admin.css	29 Mar 2010 07:27:27 -0000
@@ -135,3 +135,52 @@ table.screenshot {
 html.js .custom-container label {
   visibility: hidden;
 }
+
+/**
+ * Exposed filters
+ */
+.exposed-filters .form-actions {
+  margin: 0;
+  padding: 0;
+}
+.exposed-filters .form-item {
+  margin: 0 0 0.1em 0;
+  padding: 0;
+}
+.exposed-filters .filters {
+  float: left; /* LTR */
+  margin-right: 1em; /* LTR */
+  width: 22em;
+}
+.exposed-filters .form-item label {
+  float: left; /* LTR */
+  font-weight: normal;
+  margin: 0;
+  padding: 0;
+  width: 7em;
+}
+.exposed-filters .form-select {
+  width: 14em;
+}
+
+/* Current Filters */
+.exposed-filters .item-list {
+  margin-bottom: 1em;
+}
+.current-filters li {
+  margin-left: 0; /* LTR */
+}
+.current-filters li .form-item,
+.current-filters li .form-item label {
+  display: inline;
+  float: none;
+  font-weight: normal;
+}
+.current-filters .placeholder {
+  font-style: normal;
+  font-weight: bold;
+}
+.additional-filters {
+  float: left; /* LTR */
+  margin-right: 1em; /* LTR */
+}
Index: modules/system/system-behavior.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system-behavior.css,v
retrieving revision 1.6
diff -u -p -F '^f' -r1.6 system-behavior.css
--- modules/system/system-behavior.css	9 Mar 2010 11:45:37 -0000	1.6
+++ modules/system/system-behavior.css	29 Mar 2010 07:27:27 -0000
@@ -182,25 +182,6 @@ tr .ajax-progress .throbber {
 }
 
 /**
- * Multiselect form
- */
-dl.multiselect dd, dl.multiselect dd .form-item, dl.multiselect dd select {
-  font-family: inherit;
-  font-size: inherit;
-  width: 14em;
-}
-dl.multiselect dt, dl.multiselect dd {
-  float: left; /* LTR */
-  line-height: 1.75em;
-  padding: 0;
-  margin: 0 1em 0 0; /* LTR */
-}
-dl.multiselect .form-item {
-  height: 1.75em;
-  margin: 0;
-}
-
-/**
  * Password strength indicator
  */
 #password-strength {
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.73
diff -u -p -F '^f' -r1.73 system.css
--- modules/system/system.css	18 Jan 2010 17:29:28 -0000	1.73
+++ modules/system/system.css	29 Mar 2010 07:27:27 -0000
@@ -113,7 +113,6 @@ div.ok, tr.ok {
 .item-list ul li {
   margin: 0 0 0.25em 1.5em; /* LTR */
   padding: 0;
-  list-style: disc;
 }
 .form-item {
   margin-top: 1em;
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.912
diff -u -p -F '^f' -r1.912 system.module
--- modules/system/system.module	28 Mar 2010 11:54:27 -0000	1.912
+++ modules/system/system.module	29 Mar 2010 07:27:28 -0000
@@ -3657,6 +3657,35 @@ function theme_system_settings_form($var
 }
 
 /**
+ * Theme an exposed filter form.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - form: An associative array containing the structure of the form.
+ *
+ * @return
+ *   A string containing an HTML-formatted form.
+ *
+ * @ingroup themeable
+ */
+function theme_exposed_filters($variables) {
+  $form = $variables['form'];
+  $output = '';
+
+  $items = array();
+  foreach (element_children($form['current']) as $key) {
+    $items[] = drupal_render($form['current'][$key]);
+  }
+  if ($items) {
+    $output .= theme('item_list', array('items' => $items, 'attributes' => array('class' => array('clearfix', 'current-filters'))));
+  }
+
+  $output .= drupal_render_children($form);
+
+  return '<div class="exposed-filters">' . $output . '</div>';
+}
+
+/**
  * Implements hook_admin_paths().
  */
 function system_admin_paths() {
Index: modules/user/user-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-rtl.css,v
retrieving revision 1.7
diff -u -p -F '^f' -r1.7 user-rtl.css
--- modules/user/user-rtl.css	3 Jan 2010 21:01:04 -0000	1.7
+++ modules/user/user-rtl.css	29 Mar 2010 07:27:28 -0000
@@ -4,18 +4,6 @@
   padding-left: 0;
   padding-right: 1.5em;
 }
-
-#user-filter-form dl.multiselect dd .form-item label {
-  float: right;
-}
-
-#user-admin-buttons {
-  float: right;
-  margin-left: 0;
-  margin-right: 0.5em;
-  clear: left;
-}
-
 .profile .user-picture {
   float: left;
   margin: 0 0 1em 1em;
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.105
diff -u -p -F '^f' -r1.105 user.admin.inc
--- modules/user/user.admin.inc	26 Mar 2010 22:24:31 -0000	1.105
+++ modules/user/user.admin.inc	29 Mar 2010 07:27:28 -0000
@@ -40,7 +40,7 @@ function user_filter_form() {
   $form['filters'] = array(
     '#type' => 'fieldset',
     '#title' => t('Show only users where'),
-    '#theme' => 'user_filters',
+    '#theme' => 'exposed_filters__user',
   );
   foreach ($session as $filter) {
     list($type, $value) = $filter;
@@ -53,18 +53,32 @@ function user_filter_form() {
     else {
       $value = $filters[$type]['options'][$value];
     }
-    $params = array('%property' => $filters[$type]['title'] , '%value' => $value);
+    $params = $filters[$type]['title'];
     if ($i++) {
-      $form['filters']['current'][] = array('#markup' => t('<em>and</em> where <strong>%property</strong> is <strong>%value</strong>', $params));
+      $form['filters']['current'][] = array(
+        '#type' => 'item',
+        '#markup' => t('and where %property is %value', array('%property' => $params, '%value' => $value)),
+      );
     }
     else {
-      $form['filters']['current'][] = array('#markup' => t('<strong>%property</strong> is <strong>%value</strong>', $params));
+      $form['filters']['current'][] = array(
+        '#type' => 'item',
+        '#markup' => t('%property is %value', array('%property' => $params, '%value' => $value)),
+      );
     }
   }
 
+  $form['filters']['status'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('clearfix')),
+    '#prefix' => ($i ? '<div class="additional-filters">' . t('and where') . '</div>' : ''),
+  );
+  $form['filters']['status']['filters'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('filters')),
+  );
   foreach ($filters as $key => $filter) {
-    $names[$key] = $filter['title'];
-    $form['filters']['status'][$key] = array(
+    $form['filters']['status']['filters'][$key] = array(
       '#type' => 'select',
       '#options' => $filter['options'],
       '#title' => $filter['title'],
@@ -72,21 +86,20 @@ function user_filter_form() {
     );
   }
 
-  $form['filters']['actions'] = array(
+  $form['filters']['status']['actions'] = array(
     '#type' => 'container',
-    '#id' => 'user-admin-buttons',
     '#attributes' => array('class' => array('form-actions', 'container-inline')),
   );
-  $form['filters']['actions']['submit'] = array(
+  $form['filters']['status']['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => (count($session) ? t('Refine') : t('Filter')),
   );
   if (count($session)) {
-    $form['filters']['actions']['undo'] = array(
+    $form['filters']['status']['actions']['undo'] = array(
       '#type' => 'submit',
       '#value' => t('Undo'),
     );
-    $form['filters']['actions']['reset'] = array(
+    $form['filters']['status']['actions']['reset'] = array(
       '#type' => 'submit',
       '#value' => t('Reset'),
     );
@@ -1005,38 +1018,3 @@ function user_admin_role_delete_confirm_
   drupal_set_message(t('The role has been deleted.'));
   $form_state['redirect'] = 'admin/people/permissions/roles';
 }
-
-/**
- * Theme user administration filter selector.
- *
- * @ingroup themeable
- */
-function theme_user_filters($variables) {
-  $form = $variables['form'];
-
-  $output = '<ul class="clearfix">';
-  if (!empty($form['current'])) {
-    foreach (element_children($form['current']) as $key) {
-      $output .= '<li>' . drupal_render($form['current'][$key]) . '</li>';
-    }
-  }
-  $output .= '</ul>';
-
-  $output .= '<div class="clearfix">';
-
-  $output .= '<dl class="multiselect">' . (!empty($form['current']) ? '<dt><em>' . t('and') . '</em> ' . t('where') . '</dt>' : '');
-
-  $output .= '<dd>';
-
-  foreach (element_children($form['status']) as $key) {
-    $output .= drupal_render($form['status'][$key]);
-  }
-  $output .= '</dd>';
-
-  $output .= '</dl>';
-  $output .= drupal_render($form['actions']);
-
-  $output .= '</div>';
-
-  return $output;
-}
Index: modules/user/user.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.css,v
retrieving revision 1.20
diff -u -p -F '^f' -r1.20 user.css
--- modules/user/user.css	24 Mar 2010 07:34:10 -0000	1.20
+++ modules/user/user.css	29 Mar 2010 07:27:28 -0000
@@ -9,21 +9,6 @@
 #permissions tr.odd .form-item, #permissions tr.even .form-item {
   white-space: normal;
 }
-/* Override the default multiselect layout in system-behavior.css. */
-#user-filter-form dl.multiselect dd, dl.multiselect dd .form-item {
-  width: 20em; /* 6em label + 14em select */
-}
-#user-filter-form dl.multiselect dd .form-item label {
-  display: block;
-  float: left; /* LTR */
-  width: 6em;
-  font-weight: normal;
-}
-#user-admin-buttons {
-  float: left; /* LTR */
-  margin-left: 0.5em; /* LTR */
-  clear: right; /* LTR */
-}
 #user-admin-settings fieldset .fieldset-description {
   font-size: 0.85em;
   padding-bottom: .5em;
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1149
diff -u -p -F '^f' -r1.1149 user.module
--- modules/user/user.module	27 Mar 2010 05:52:50 -0000	1.1149
+++ modules/user/user.module	29 Mar 2010 07:27:28 -0000
@@ -106,10 +106,6 @@ function user_theme() {
       'render element' => 'form',
       'file' => 'user.admin.inc',
     ),
-    'user_filters' => array(
-      'render element' => 'form',
-      'file' => 'user.admin.inc',
-    ),
     'user_permission_description' => array(
       'variables' => array('permission_item' => NULL, 'hide' => NULL),
       'file' => 'user.admin.inc',