From 1c98c5c5a18138b1bd03ec3bed1a60cac01705ea Mon Sep 17 00:00:00 2001
From: Jake Dahn <admin@jakedahn.com>
Date: Wed, 20 Jul 2011 11:18:20 -0700
Subject: [PATCH] readding object filter form

---
 .../dashboard/templates/_object_filter.html        | 11 ++++-------
 .../dashboard/templates/dash_objects.html          | 14 ++++++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/openstack-dashboard/dashboard/templates/_object_filter.html b/openstack-dashboard/dashboard/templates/_object_filter.html
index 42047f4b2..196ee4ae1 100644
--- a/openstack-dashboard/dashboard/templates/_object_filter.html
+++ b/openstack-dashboard/dashboard/templates/_object_filter.html
@@ -1,10 +1,7 @@
 <form id="form_filter_{{ container_name }}" class="form-filter" method="post">
   {% csrf_token %}
-  {% for hidden in form.hidden_fields %}
-    {{hidden}}
-  {% endfor %}
-  {% for field in form.visible_fields %}
-    {{field}}
-  {% endfor %}
-  <input id="filter_{{ container_name }}" class="filter" type="submit" value="Filter" />
+  {% for hidden in form.hidden_fields %}{{hidden}}{% endfor %}
+  {% for field in form.visible_fields %}{{field}}{% endfor %}
+  <label for="table_search">Search</label>
+  <input id="table_search" class="filter" type="submit" value="Filter" style="font-size:11px;"/>
 </form>
diff --git a/openstack-dashboard/dashboard/templates/dash_objects.html b/openstack-dashboard/dashboard/templates/dash_objects.html
index 5a61901da..7026daeea 100644
--- a/openstack-dashboard/dashboard/templates/dash_objects.html
+++ b/openstack-dashboard/dashboard/templates/dash_objects.html
@@ -7,10 +7,16 @@
 {% endblock %}
 
 {% block page_header %}
-  {% url dash_objects tenant_id container_name as refresh_link %}
-  {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Objects" refresh_link=refresh_link searchable="true" %}
-{% endblock page_header %}
+  <div id='page_header'>
+    <h2>Objects</h2>
+    <div class="right">
+      <div class='search'>
+        {% include '_object_filter.html' with form=filter_form %}
+      </div>
+      <a class="refresh" title="Refresh" href="{% url dash_objects request.user.tenant container_name %}">Refresh List</a>
+    </div>
+  </div>
+{% endblock %}
 
 {% block dash_main %}
   <h3 class="container_name"><span>Container:</span> {{ container_name }}</h3>