Refactored searches into separate module

2 files changed, 20 insertions, 23 deletions

diff --git a/servo/templates/search/results/gsx_results.html b/servo/templates/search/results/gsx_results.html
index dc7fff5..0e4c890 100755
--- a/servo/templates/search/results/gsx_results.html
+++ b/servo/templates/search/results/gsx_results.html
@@ -1,4 +1,4 @@
-<div id="gsx-container" data-source="{% url 'search-search_gsx' what=what arg=arg value=value %}">
+<div id="gsx-container" data-source="{% url 'search-get_gsx_search_results' what=what arg=arg value=value %}">
   <div class="progress active">
     <div class="bar" style="width:1%;" data-progress="0"></div>
   </div>
diff --git a/servo/templates/search/spotlight.html b/servo/templates/search/spotlight.html
index 3b3715c..f18eb43 100755
--- a/servo/templates/search/spotlight.html
+++ b/servo/templates/search/spotlight.html
@@ -3,35 +3,32 @@
 {% load i18n %}
 
 {% block toolbar %}
-    <a href="{% url 'customers-create_customer' group='all' %}?name={{ query }}" class="btn btn-inverse"><i class="icon-plus icon-white"></i> {% trans "New Customer" %}</a>
 {% endblock toolbar %}
 
 {% block first_column %}
-<ul class="nav nav-list">
-    <li class="nav-header">{% trans "Results" %}</li>
-    <li class="{% active request 'search/customers' %}">
-        <a href="/search/customers/?q={{ query }}">{% trans "Customers" %}</a>
-    </li>
-    <li class="{% active request 'search/devices' %}">
-        <a href="/search/devices/?q={{ query }}">{% trans "Devices" %}</a>
-    </li>
-    <li class="{% active request 'search/gsx' %}">
-        <a href="/search/gsx/{{ what }}?q={{ query }}">{% trans "GSX" %}</a>
-    </li>
-    <li class="{% active request 'search/orders' %}">
-        <a href="/search/orders/?q={{ query }}">{% trans "Orders" %}</a>
-    </li>
-    <li class="{% active request 'search/products' %}">
-        <a href="/search/products/?q={{ query }}">{% trans "Products and Parts" %}</a>
-    </li>
-    <li class="{% active request 'search/notes' %}"><a href="/search/notes/?q={{ query }}">{% trans "Notes" %}</a></li>
-    <li class="{% active request 'search/articles' %}"><a href="/search/articles/?q={{ query }}">{% trans "Articles" %}</a></li>
-</ul>
 {% endblock first_column %}
 
 {% block second_column %}
+<ul class="nav nav-tabs">
+  <li class="active">
+    <a href="{% url 'search-customers' %}?q={{ query }}">{% trans "Customers" %}</a>
+  </li>
+  <li class="{% active request 'search/devices' %}">
+    <a href="{% url 'search-devices' %}?q={{ query }}">{% trans "Devices" %}</a>
+  </li>
+  <li class="{% active request 'search/gsx' %}">
+    <a href="/search/gsx/{{ what }}?q={{ query }}">{% trans "GSX" %}</a>
+  </li>
+  <li class="{% active request 'search/orders' %}">
+    <a href="{% url 'search-orders' %}?q={{ query }}">{% trans "Orders" %}</a>
+  </li>
+  <li class="{% active request 'search/products' %}">
+    <a href="{% url 'search-products' %}?q={{ query }}">{% trans "Products and Parts" %}</a>
+  </li>
+  <li class="{% active request 'search/notes' %}"><a href="/search/notes/?q={{ query }}">{% trans "Notes" %}</a></li>
+</ul>
 {% endblock second_column %}
 
 {% block footer %}
-    <li><i class="icon-home"></i> <a href="{% url 'accounts-list_orders'  %}">{% trans "Home" %}</a> <span class="divider">/</span></li><li class="active">{{ title }}</li>
+  <li><i class="icon-home"></i> <a href="{% url 'accounts-list_orders'  %}">{% trans "Home" %}</a> <span class="divider">/</span></li><li class="active">{{ title }}</li>
 {% endblock footer %}