From 48b9822a3fece5987c72a68545b8dba299525e56 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Tue, 4 Oct 2011 01:00:02 +0530
Subject: [PATCH 1/4] add dummy search view

---
 trubox/deals/views.py      | 5 +++++
 trubox/static/js/home.js   | 0
 trubox/templates/home.html | 2 +-
 trubox/urls.py             | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 trubox/static/js/home.js

diff --git a/trubox/deals/views.py b/trubox/deals/views.py
index b7d42d6..5f8f625 100644
--- a/trubox/deals/views.py
+++ b/trubox/deals/views.py
@@ -1,5 +1,10 @@
 # Create your views here.
 from django.shortcuts import render_to_response
+from ox.django.shortcuts import render_to_json_response
 
 def index(request):
     return render_to_response("home.html", {})
+
+def search(request):
+    d = {}
+    return render_to_json_response(d)
diff --git a/trubox/static/js/home.js b/trubox/static/js/home.js
new file mode 100644
index 0000000..e69de29
diff --git a/trubox/templates/home.html b/trubox/templates/home.html
index ba99d09..53761c6 100644
--- a/trubox/templates/home.html
+++ b/trubox/templates/home.html
@@ -5,7 +5,7 @@
 {% block extra_head %}
 <link rel="stylesheet" href="/static/css/slider.css" type="text/css" />
 <script type="text/javascript" src="/static/js/jquery.tinycarousel.min.js"></script>
-
+<script type="text/javascript" src="/static/js/home.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
 				
diff --git a/trubox/urls.py b/trubox/urls.py
index 0c746f4..3f1c787 100644
--- a/trubox/urls.py
+++ b/trubox/urls.py
@@ -12,6 +12,7 @@ urlpatterns = patterns('',
     # Example:
     # (r'^trubox/', include('trubox.foo.urls')),
     (r'^$', 'deals.views.index'),
+    (r'^search/', 'deals.views.search'),
     # Uncomment the admin/doc line below to enable admin documentation:
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 

From 3abb611fdb4295cca3d38cbc805d29d4cbfc9724 Mon Sep 17 00:00:00 2001
From: Girts Graudins <ggraudins@gmail.com>
Date: Mon, 3 Oct 2011 12:35:54 -0700
Subject: [PATCH 2/4] added dollar

---
 trubox/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trubox/urls.py b/trubox/urls.py
index 3f1c787..840b8bb 100644
--- a/trubox/urls.py
+++ b/trubox/urls.py
@@ -12,7 +12,7 @@ urlpatterns = patterns('',
     # Example:
     # (r'^trubox/', include('trubox.foo.urls')),
     (r'^$', 'deals.views.index'),
-    (r'^search/', 'deals.views.search'),
+    (r'^search/$', 'deals.views.search'),
     # Uncomment the admin/doc line below to enable admin documentation:
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 

From f9a430dfb613a45bde80cbe4ce366c9216cb16f5 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Tue, 4 Oct 2011 01:18:53 +0530
Subject: [PATCH 3/4] requirements, js

---
 requirements.txt           | 1 +
 trubox/static/js/home.js   | 9 +++++++++
 trubox/templates/base.html | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8cab98c..883b1d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@
 -e bzr+http://code.0xdb.org/python-ox/#egg=python-ox
 django_extensions
 South
+pYsearch
diff --git a/trubox/static/js/home.js b/trubox/static/js/home.js
index e69de29..00b7fa8 100644
--- a/trubox/static/js/home.js
+++ b/trubox/static/js/home.js
@@ -0,0 +1,9 @@
+$(function() {
+    $('#searchForm').submit(function(e) {
+        e.preventDefault();
+        var q = $('#search').val();
+        $.getJSON("/search/", {'q': q}, function(data) {
+            console.log(data);    
+        }); 
+    });
+});
diff --git a/trubox/templates/base.html b/trubox/templates/base.html
index bb011ec..3ea9de1 100644
--- a/trubox/templates/base.html
+++ b/trubox/templates/base.html
@@ -22,7 +22,7 @@
   <div class="header">
     <a href="#">
     	<img src="/static/images/truboxx-logo.png" alt="trubox-logo" width="280" height="78" id="logo"></a>
-    <form action="" method="get">
+    <form action="" id="searchForm" method="get">
    	  <input type="text" placeholder="search for a gadget" name="field" id="search"/>
   	</form>
     

From eb18c680503c677fed75dbea40bc3d20a22e7166 Mon Sep 17 00:00:00 2001
From: Girts Graudins <ggraudins@gmail.com>
Date: Mon, 3 Oct 2011 13:05:29 -0700
Subject: [PATCH 4/4] new yahoo id for image search

---
 trubox/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/trubox/settings.py b/trubox/settings.py
index f820f0e..1c1933c 100644
--- a/trubox/settings.py
+++ b/trubox/settings.py
@@ -103,6 +103,8 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
 )
 
+YAHOO_APP_ID = 'kLiikCPV34F1hM9x12wGnAzgjAFYXHzb89Tf4_kIirXZDPRa3WwfRGkZsA3TfG3ohw--'
+
 try:
   from local_settings import *
 except: