From e685ed1a9632fe1e380f19217202987c363b2457 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sat, 8 Oct 2011 06:09:33 +0530
Subject: [PATCH] search + minor things

---
 itf/bestpractices/models.py                   |  3 +-
 itf/bestpractices/search_indexes.py           | 24 ++++++++++++
 .../modules/bestpractices/bestpractice.html   | 26 ++++++++-----
 itf/templates/noel/insidepage.html            |  6 +--
 .../bestpractices/bestpractice_text.txt       |  9 +++++
 itf/templates/search/search.html              | 39 +++++++++++++++++++
 itf/urls.py                                   |  3 +-
 7 files changed, 95 insertions(+), 15 deletions(-)
 create mode 100644 itf/bestpractices/search_indexes.py
 create mode 100644 itf/templates/search/indexes/bestpractices/bestpractice_text.txt
 create mode 100644 itf/templates/search/search.html

diff --git a/itf/bestpractices/models.py b/itf/bestpractices/models.py
index 467c530..6262cfe 100644
--- a/itf/bestpractices/models.py
+++ b/itf/bestpractices/models.py
@@ -43,7 +43,8 @@ class BestPractice(ItfModel):
       'quick_howto': self.quick_howto,
       'category': self.category.name,
       'category_id': self.category.id,
-      'images': self.get_images()
+      'images': self.get_images(),
+      'links': BestPracticeLink.objects.filter(bestpractice=self)
     }
 
   def main_image(self):
diff --git a/itf/bestpractices/search_indexes.py b/itf/bestpractices/search_indexes.py
new file mode 100644
index 0000000..f371314
--- /dev/null
+++ b/itf/bestpractices/search_indexes.py
@@ -0,0 +1,24 @@
+from haystack.indexes import *
+from haystack import site
+from models import *
+
+
+class BestPracticeIndex(SearchIndex):
+    text = CharField(document=True, use_template=True)
+    title = CharField(model_attr='title')
+    story = CharField(model_attr='story')
+    guideline = CharField(model_attr='guideline')
+    law = CharField(model_attr='law')
+    theatre = CharField(model_attr='theatre')
+    quick_howto = CharField(model_attr='quick_howto')    
+#    pub_date = DateTimeField(model_attr='pub_date')
+    category = CharField(model_attr='category')
+#    added = DateTimeField(model_attr='added')
+
+    '''
+    def index_queryset(self):
+        """Used when the entire index for model is updated."""
+        return Note.objects.filter(pub_date__lte=datetime.datetime.now())
+    '''
+
+site.register(BestPractice, BestPracticeIndex)
diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index 21baa11..2389510 100644
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -9,16 +9,6 @@
     {% endif %}
   <br /><br />
   {% endfor %}
-  <span class="orange">Law: </span><span class="itfInfoInfo">{{ law }}</span>
-  {% if law_image %}
-  {% thumbnail law_image "164x114" crop="center" as im %}
-    <img class="itfInfoImg" src="{{ im.url }}" />
-  {% endthumbnail %}
-  {% endif %}
-  <br /><br />
-  <span class="orange">Relevance to Theatre: </span><span class="itfInfoInfo">{{ theatre|linebreaksbr }}</span> <br /><br />
-  <span class="orange">Quick Howto: </span><span class="itfInfoInfo">{{ quick_howto|linebreaksbr }}</span><br /><br />
-
   <div class="thumbsGallery">
     {% for img in images %}
         {% thumbnail img.image "164x114" crop="center" as im %}
@@ -27,6 +17,22 @@
     {% endfor %}
   </div>
 
+
+  <span class="orange">Law: </span><span class="itfInfoInfo">{{ law }}</span>
+  {% if law_image %}
+  {% thumbnail law_image "164x114" crop="center" as im %}
+    <img class="itfInfoImg" src="{{ im.url }}" />
+  {% endthumbnail %}
+  {% endif %}
+  <br /><br />
+  {% if theatre %}
+  <span class="orange">Spotlight on Theatre: </span><span class="itfInfoInfo">{{ theatre|linebreaksbr }}</span> <br /><br />
+  {% endif %}
+  {% if quick_howto %}
+  <span class="orange">Quick Howto: </span><span class="itfInfoInfo">{{ quick_howto|linebreaksbr }}</span><br /><br />
+  {% endif %}
+
+  
 </div>
 
 
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html
index c087194..90d7cca 100644
--- a/itf/templates/noel/insidepage.html
+++ b/itf/templates/noel/insidepage.html
@@ -29,9 +29,9 @@
    	</div>
     
     <div id="leftColumn">
-    	
-        <h3 id="topText">{{ title }}</h3>
-        
+        {% load itftags %}    	
+        <h3 id="topText">{{ title|format_title|safe }}</h3>
+          
         <div id="searchInnerDiv">
             <img src="/static/images/noel/search-inner.png" width="22" height="18" alt="search" class="searchInner">
             <!--
diff --git a/itf/templates/search/indexes/bestpractices/bestpractice_text.txt b/itf/templates/search/indexes/bestpractices/bestpractice_text.txt
new file mode 100644
index 0000000..f03548e
--- /dev/null
+++ b/itf/templates/search/indexes/bestpractices/bestpractice_text.txt
@@ -0,0 +1,9 @@
+{{ object.title }}
+{{ object.story }}
+{{ object.guideline }}
+{{ object.law }}
+{{ object.theatre }}
+{{ object.quick_howto }}
+
+
+
diff --git a/itf/templates/search/search.html b/itf/templates/search/search.html
new file mode 100644
index 0000000..ab3e996
--- /dev/null
+++ b/itf/templates/search/search.html
@@ -0,0 +1,39 @@
+{% extends 'noel/base.html' %}
+
+{% block content %}
+    <h2>Search</h2>
+
+    <form method="get" action=".">
+        <table>
+            {{ form.as_table }}
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="Search">
+                </td>
+            </tr>
+        </table>
+
+        {% if query %}
+            <h3>Results</h3>
+
+            {% for result in page.object_list %}
+                <p>
+                    <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+                </p>
+            {% empty %}
+                <p>No results found.</p>
+            {% endfor %}
+
+            {% if page.has_previous or page.has_next %}
+                <div>
+                    {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
+                    |
+                    {% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
+                </div>
+            {% endif %}
+        {% else %}
+            {# Show some example queries to run, maybe query syntax, something else? #}
+        {% endif %}
+    </form>
+{% endblock %}
diff --git a/itf/urls.py b/itf/urls.py
index 0e1ef45..794a299 100644
--- a/itf/urls.py
+++ b/itf/urls.py
@@ -36,7 +36,8 @@ urlpatterns = patterns('',
 #    (r'profile', 'itfcore.views.edit_profile'),
     (r'i/', include('itfcore.urls')),
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    
+    (r'^search/', include('haystack.urls')),    
+
 #    (r'^mockup/', 'itfcore.views.mockup'),
 #    (r'x0news/', 'itfcore.views.allnews'),
 #    (r'x0disc/', 'itfcore.views.disc'),