improved search templates; almost done with this branch !

Author: albanm

djity/search/views.py

@@ -2,6 +2,7 @@
 
 from haystack.views import basic_search
 from haystack.query import SearchQuerySet
+from haystack.forms import SearchForm
 
 from djity.utils.decorators import djity_view
 from djity.utils.context import DjityContext
@@ -12,7 +13,4 @@ def project_search(request,context=None):
     Override haystack basic_view for customization.
     """
     sqs = SearchQuerySet().narrow("project:%s"% context['project'].id).narrow("status:%s" % settings.LOWER_VISIBLE_STATUS[context['role']])
-    #for hidden_status in settings.HIDDEN_STATUSES[context['role']]:
-    #    sqs = sqs.exclude(status=hidden_status)
-    print sqs
-    return basic_search(request, template='djity/search/search.html', searchqueryset=sqs, extra_context=context, context_class=DjityContext)
+    return basic_search(request, template='djity/search/search.html', searchqueryset=sqs, form_class=SearchForm, extra_context=context, context_class=DjityContext)

djity/static/djity/js/djity.js

@@ -163,6 +163,25 @@ function widgetify() {
 				$(this).removeClass("ui-state-hover");
 			}
 	);
+	
+	$('#search_query').keypress(function(e) {
+        if(e.which == 13) {
+            $("#search_button").click();
+        }});
+	
+	$('#search_button')
+	    .addClass("dj-mini-button")
+	    .button({
+            icons: {
+                primary: "ui-icon-search"
+            },
+            text:false,
+            })
+        .click(function(){
+                query = $("#search_query").val();
+                project_url = $("#search_button .ui-button-text").text();
+                window.location.replace(project_url+"/search/?q="+query);
+            });
 
 	$('#messages').notify();
 

djity/templates/djity/base.html

@@ -124,16 +124,15 @@
                     {% endif %}
 				</div>
             </div>
-            
-            <div id="search_form">
-                <form method="get" action="{% djiurl project %}/search/">
-                    <input id="search_query" name='q' type="text"></input>
-                    <input type="submit" id="search_button" value="{% trans "Search" %}" />
-                </form>
-            </div>
 
             <nav id="portal_parameters" class="ui-helper-hidden">
             </nav>
+                 
+
+            <div id="search_form">
+                <input id="search_query" name='q' type="text"></input>
+                <span class="ui-icon ui-icon-search" title="{% trans "Search" %}" id="search_button">{% djiurl project %}</span>
+            </div>
 
 				<nav id="right_tabs" class="ui-helper-hidden" >
 					{% if perm.manage %}

djity/templates/djity/search/search.html

@@ -2,29 +2,17 @@
 
 {% load search_result %}
 
-{% block body %}
-    <h2>Search</h2>
-
-    <form method="get" action=".">
-        <table>
-            {{ form.as_table }}
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <input type="submit" value="Search">
-                </td>
-            </tr>
-        </table>
+{% load i18n %}
 
+{% block body %}
         {% if query %}
-            <h3>Results</h3>
-
+            <h3>{% trans "Search results for query" %} "{{ query }}"</h3>
             {% for result in page.object_list %}
                 <p>
                     {% search_result result %}
                 </p>
             {% empty %}
-                <p>No results found.</p>
+                <p>{% trans "No results found." %}</p>
             {% endfor %}
 
             {% if page.has_previous or page.has_next %}
@@ -35,7 +23,6 @@ <h3>Results</h3>
                 </div>
             {% endif %}
         {% else %}
-            {# Show some example queries to run, maybe query syntax, something else? #}
+            {% trans "Submit a query to get some results !"
         {% endif %}
-    </form>
 {% endblock %}

djity/templates/djity/style/project.css

@@ -217,6 +217,19 @@ html>body #main {
 	float:right;
 }
 
+#search_form {
+	float:right;
+	padding-right:50px;
+}
+
+#search_query {
+}
+
+#search_button {
+    right:32px;
+    border:none;
+    background:none;
+}
 
 #create_tab_button {
 	float:right;