5 files changed, 79 insertions, 23 deletions
diff --git a/modules/system/admin-rtl.css b/modules/system/admin-rtl.css
index 35d92e956..4331fab4d 100644
--- a/modules/system/admin-rtl.css
+++ b/modules/system/admin-rtl.css
@@ -48,3 +48,20 @@ table.screenshot {
   margin-right: 15px;
 }
 
+/**
+ * Exposed filters
+ */
+.exposed-filters .filters {
+  float: right;
+  margin-left: 1em;
+  margin-right: 0;
+}
+.exposed-filters .form-item label {
+  float: right;
+}
+/* Current filters */
+.exposed-filters .additional-filters {
+  float: right;
+  margin-left: 1em;
+  margin-right: 0;
+}
diff --git a/modules/system/admin.css b/modules/system/admin.css
index 70d415a25..fbd32d427 100644
--- a/modules/system/admin.css
+++ b/modules/system/admin.css
@@ -138,3 +138,36 @@ table.screenshot {
 html.js .custom-container label {
   visibility: hidden;
 }
+
+/**
+ * Exposed filters
+ */
+.exposed-filters .filters {
+  float: left; /* LTR */
+  margin-right: 1em; /* LTR */
+  width: 25em; /* IE6 */
+}
+.exposed-filters .form-item {
+  margin: 0 0 0.1em 0;
+  padding: 0;
+}
+.exposed-filters .form-item label {
+  float: left; /* LTR */
+  font-weight: normal;
+  width: 10em;
+}
+.exposed-filters .form-select {
+  width: 14em;
+}
+/* Current filters */
+.exposed-filters .current-filters {
+  margin-bottom: 1em;
+}
+.exposed-filters .current-filters .placeholder {
+  font-style: normal;
+  font-weight: bold;
+}
+.exposed-filters .additional-filters {
+  float: left; /* LTR */
+  margin-right: 1em; /* LTR */
+}
diff --git a/modules/system/system-behavior.css b/modules/system/system-behavior.css
index 15e65882f..343cff68a 100644
--- a/modules/system/system-behavior.css
+++ b/modules/system/system-behavior.css
@@ -183,28 +183,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 {
diff --git a/modules/system/system.css b/modules/system/system.css
index a5fa7f957..0acff828a 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -82,7 +82,6 @@ thead th {
 .item-list ul li {
   margin: 0 0 0.25em 1.5em; /* LTR */
   padding: 0;
-  list-style: disc;
 }
 .form-item {
   margin-top: 1em;
diff --git a/modules/system/system.module b/modules/system/system.module
index 21b2f79ad..9d0930476 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -3770,6 +3770,35 @@ function theme_system_settings_form($variables) {
 }
 
 /**
+ * Returns HTML for 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 = '';
+
+  if (isset($form['current'])) {
+    $items = array();
+    foreach (element_children($form['current']) as $key) {
+      $items[] = drupal_render($form['current'][$key]);
+    }
+    $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() {