From 267bc56c70b53e0ea298afc71fdcb2718769c894 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:42:20 +0530
Subject: [PATCH 01/11] gallery

---
 itf/static/js/insidepage.js                           | 7 +++++++
 itf/templates/modules/bestpractices/bestpractice.html | 2 +-
 itf/templates/noel/insidepage.html                    | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index a1232e8..4aa2680 100644
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -29,6 +29,13 @@ $('#listLeft ul li a').live("click", function() {
 });
 
 
+$('.thumbsDetails').live("click", function(e) {
+//    alert($(this).attr("data-bigimage")); 
+    var bigImge = $(this).attr("data-bigimage");
+    var $img = $('<img />').attr("src", bigImage);
+    $('#lightboxContent').empty().append($img);    
+});
+
 $('.toggleNext').live("click", function(e) {
     e.preventDefault();
     var $next = $(this).next();
diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index 4e20b6c..9463c14 100644
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -22,7 +22,7 @@
   <div class="thumbsGallery">
     {% for img in images %}
         {% thumbnail img.image "100x100" crop="center" as im %}
-            <img class="itfInfoImg" src="{{ im.url }}" class="thumbsDetails" />
+            <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="/static/{{ img.url }}"/>
         {% endthumbnail %}
     {% endfor %}
   </div>
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html
index 1efb8ab..588ed84 100644
--- a/itf/templates/noel/insidepage.html
+++ b/itf/templates/noel/insidepage.html
@@ -15,6 +15,11 @@
 
 
 {% block content %}
+<div id="lightBox">
+    <div id="lightBoxContent">
+
+    </div>
+</div>
 <div id="centerInner">
 	<div id="woodPng">
 	</div>  

From 21647a0044a854fdbe8dcff8d63df81eb518804e Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:48:42 +0530
Subject: [PATCH 02/11] default lightbox code

---
 itf/static/css/noel/inner.css      | 32 ++++++++++++++++++++++++++++++
 itf/static/js/insidepage.js        |  7 ++++++-
 itf/templates/noel/insidepage.html |  6 +++---
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css
index b27c579..a5464ed 100644
--- a/itf/static/css/noel/inner.css
+++ b/itf/static/css/noel/inner.css
@@ -374,3 +374,35 @@ border-radius:3px;
 
 #clearBoth
 {clear:both;}
+
+
+/* Begin LightBox CSS */
+
+#lightbox
+{display:none; 
+background-color:#000; 
+opacity:0.9; 
+filter:alpha(opacity=90); 
+position:fixed; 
+top:0px; 
+left:0px; 
+bottom:0px;
+right:0px;
+width:100%; 
+height:100%; 
+z-index:1000;} /*everything except the lightbox panel should be below this z-index*/
+ 
+#lightboxPanel { 
+display:none; 
+position:fixed; 
+top:200px; 
+left:0;
+right:0;
+margin:0 auto;
+width:400px; 
+background-color:#FFF; 
+padding:15px;
+z-index:1001;} /*must have the highest z-index, just more than the lightbox*/
+
+
+/* End LightBox CSS */
diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 4aa2680..621862d 100644
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -33,9 +33,11 @@ $('.thumbsDetails').live("click", function(e) {
 //    alert($(this).attr("data-bigimage")); 
     var bigImge = $(this).attr("data-bigimage");
     var $img = $('<img />').attr("src", bigImage);
-    $('#lightboxContent').empty().append($img);    
+    $('#lightbox, #lightBoxPanel').fadeIn(400);
+    $('#lightBoxPanel').empty().append($img);    
 });
 
+
 $('.toggleNext').live("click", function(e) {
     e.preventDefault();
     var $next = $(this).next();
@@ -68,6 +70,9 @@ function getLi(item) {
 }
 
 $(function() {
+    $('#lightbox').click(function() {
+        $('#lightbox, #lightBoxPanel').fadeOut(400);
+    });
 
     /* search button toggle */
     $('.searchInnerField').hide();
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html
index 588ed84..8177747 100644
--- a/itf/templates/noel/insidepage.html
+++ b/itf/templates/noel/insidepage.html
@@ -15,11 +15,11 @@
 
 
 {% block content %}
-<div id="lightBox">
-    <div id="lightBoxContent">
+<div id="lightBoxPanel">
 
-    </div>
 </div>
+<div id="lightbox"></div>
+
 <div id="centerInner">
 	<div id="woodPng">
 	</div>  

From 587b59b2738ceb853a997c2ece90c5a71589a154 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:51:22 +0530
Subject: [PATCH 03/11] image sizes

---
 itf/templates/modules/bestpractices/bestpractice.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index 9463c14..db6d4b5 100644
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -3,7 +3,7 @@
   {% for s in stories %}
   <span class="orange">Story: </span><span class="ifInfoInfo">{{ s.text }}</span>
     {% if s.image %}
-        {% thumbnail s.image "100x100" crop="center" as im %}
+        {% thumbnail s.image "164x114" crop="center" as im %}
             <img class="itfInfoImg" src="{{ im.url }}" />
         {% endthumbnail %}
     {% endif %}
@@ -11,7 +11,7 @@
   {% endfor %}
   <span class="orange">Law: </span><span class="itfInfoInfo">{{ law }}</span>
   {% if law_image %}
-  {% thumbnail law_image "100x100" crop="center" as im %}
+  {% thumbnail law_image "164x114" crop="center" as im %}
     <img class="itfInfoImg" src="{{ im.url }}" />
   {% endthumbnail %}
   {% endif %}
@@ -21,7 +21,7 @@
 
   <div class="thumbsGallery">
     {% for img in images %}
-        {% thumbnail img.image "100x100" crop="center" as im %}
+        {% thumbnail img.image "164x114" crop="center" as im %}
             <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="/static/{{ img.url }}"/>
         {% endthumbnail %}
     {% endfor %}

From 4f4a090c1b4de62696c1de01fee4a2b2376459bb Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:53:31 +0530
Subject: [PATCH 04/11] oops, typo

---
 itf/static/js/insidepage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 621862d..491331d 100644
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -31,7 +31,7 @@ $('#listLeft ul li a').live("click", function() {
 
 $('.thumbsDetails').live("click", function(e) {
 //    alert($(this).attr("data-bigimage")); 
-    var bigImge = $(this).attr("data-bigimage");
+    var bigImage = $(this).attr("data-bigimage");
     var $img = $('<img />').attr("src", bigImage);
     $('#lightbox, #lightBoxPanel').fadeIn(400);
     $('#lightBoxPanel').empty().append($img);    

From 916a03936b477ddd5492ca45abeef61e5ef21887 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:54:49 +0530
Subject: [PATCH 05/11] big image path

---
 itf/templates/modules/bestpractices/bestpractice.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index db6d4b5..2bc352b 100644
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -22,7 +22,7 @@
   <div class="thumbsGallery">
     {% for img in images %}
         {% thumbnail img.image "164x114" crop="center" as im %}
-            <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="/static/{{ img.url }}"/>
+            <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="/static/{{ img.image.url }}"/>
         {% endthumbnail %}
     {% endfor %}
   </div>

From 48e7c498737539ee60338a0c3dd9dab55de1e7c3 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:56:04 +0530
Subject: [PATCH 06/11] image url

---
 itf/templates/modules/bestpractices/bestpractice.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index 2bc352b..21baa11 100644
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -22,7 +22,7 @@
   <div class="thumbsGallery">
     {% for img in images %}
         {% thumbnail img.image "164x114" crop="center" as im %}
-            <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="/static/{{ img.image.url }}"/>
+            <img src="{{ im.url }}" class="thumbsDetails" data-bigimage="{{ img.image.url }}"/>
         {% endthumbnail %}
     {% endfor %}
   </div>

From cd00416ef3aa2ef591a22e94e2bc0abe6282e290 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:57:43 +0530
Subject: [PATCH 07/11] lightboxPanel

---
 itf/static/js/insidepage.js        | 4 ++--
 itf/templates/noel/insidepage.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 491331d..77770f7 100644
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -33,8 +33,8 @@ $('.thumbsDetails').live("click", function(e) {
 //    alert($(this).attr("data-bigimage")); 
     var bigImage = $(this).attr("data-bigimage");
     var $img = $('<img />').attr("src", bigImage);
-    $('#lightbox, #lightBoxPanel').fadeIn(400);
-    $('#lightBoxPanel').empty().append($img);    
+    $('#lightbox, #lightboxPanel').fadeIn(400);
+    $('#lightboxPanel').empty().append($img);    
 });
 
 
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html
index 8177747..c087194 100644
--- a/itf/templates/noel/insidepage.html
+++ b/itf/templates/noel/insidepage.html
@@ -15,7 +15,7 @@
 
 
 {% block content %}
-<div id="lightBoxPanel">
+<div id="lightboxPanel">
 
 </div>
 <div id="lightbox"></div>

From 543c1fff2c108ab2e4ed520a0bda88f55dca47a7 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 16:59:00 +0530
Subject: [PATCH 08/11] oops

---
 itf/static/js/insidepage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 77770f7..b51ebc2 100644
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -71,7 +71,7 @@ function getLi(item) {
 
 $(function() {
     $('#lightbox').click(function() {
-        $('#lightbox, #lightBoxPanel').fadeOut(400);
+        $('#lightbox, #lightboxPanel').fadeOut(400);
     });
 
     /* search button toggle */

From e67df25d70ba4f6f606e35e12795065b746fc3da Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Thu, 6 Oct 2011 17:03:38 +0530
Subject: [PATCH 09/11] handle stories with 0 images

---
 itf/bestpractices/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/itf/bestpractices/models.py b/itf/bestpractices/models.py
index f589a0c..467c530 100644
--- a/itf/bestpractices/models.py
+++ b/itf/bestpractices/models.py
@@ -47,7 +47,11 @@ class BestPractice(ItfModel):
     }
 
   def main_image(self):
-    return self.get_images()[0]
+    imgs = self.get_images()
+    if len(imgs) > 0:
+        return imgs[0]
+    else:
+        return None
 
   def list_dict(self):
     return {

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 10/11] 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'),

From 20e31819b970fe8095fb0db5abfe7dcfe334f7bc Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sat, 8 Oct 2011 06:29:07 +0530
Subject: [PATCH 11/11] add search form to go to /search/

---
 itf/templates/noel/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/itf/templates/noel/base.html b/itf/templates/noel/base.html
index 885b099..d59a1ca 100644
--- a/itf/templates/noel/base.html
+++ b/itf/templates/noel/base.html
@@ -16,8 +16,8 @@
 		INDIA<br>
 		<span>THEATRE <span>FORUM</span></span>
 		</div>
-		<form>
-			<input type="text" placeholder="search" name="field" id="search"/>
+		<form id="searchForm" action="/search/" method="GET">
+			<input type="text" placeholder="search" name="q" id="search"/>
 		</form>      
 		<a href=""><img src="/static/images/noel/home.png" width="16" height="17" alt="home" id="homeIcon"></a>