# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1353945707 -3600
# Node ID 4507168941a4f7b02731970540e55d49d5250686
# Parent  07c9aa7de7658c9296d00f6b372babdfab0b9d0b# Parent  9f809996c613ba183b5ec116628ad4ccc7029459
Merge with 9f809996c613ba183b5ec116628ad4ccc7029459

diff -r 9f809996c613 -r 4507168941a4 .hgtags
--- a/.hgtags	Mon Nov 26 12:05:16 2012 +0100
+++ b/.hgtags	Mon Nov 26 17:01:47 2012 +0100
@@ -49,3 +49,4 @@
 97720389d14bf416db1a628243c93e7287a6474f V00.05
 b31ba28871ca7be3c77768e00fac4a84d378323d V00.05
 1b68d4acab0d3be10a9cc496f72dedaac7170647 V00.06
+0fcb603b04eb92bc70203ceaab65a03884bfcb3f V00.07
diff -r 9f809996c613 -r 4507168941a4 sbin/sync/fabfile.py
--- a/sbin/sync/fabfile.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/sbin/sync/fabfile.py	Mon Nov 26 17:01:47 2012 +0100
@@ -195,7 +195,8 @@
     
     sync_install_lib(package_path)
     clean_export_folder(export_path)
-    relaunch_server()
+    relaunch_server('ldt')
+    relaunch_server('hp')
 
 
 @task
diff -r 9f809996c613 -r 4507168941a4 src/hp/__init__.py
--- a/src/hp/__init__.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/src/hp/__init__.py	Mon Nov 26 17:01:47 2012 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 0, "alpha", 0)
+VERSION = (0, 7, 0, "alpha", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 9f809996c613 -r 4507168941a4 src/hp/forms.py
--- a/src/hp/forms.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/src/hp/forms.py	Mon Nov 26 17:01:47 2012 +0100
@@ -21,12 +21,12 @@
     def __init__(self, *args, **kwargs):
         super(VideoKCRelForm, self).__init__(*args, **kwargs)
         
-        url = settings.LDT_API_URL + "contents/?limit=" + str(settings.LDT_MAX_FETCH)
-        contents = get_all_objects(url, 'front_project')
+        url = settings.LDT_API_URL + "contents/"
+        contents = get_all_objects(url, {'limit':settings.LDT_MAX_FETCH}, 'front_project')
         self.fields['iri_id'].widget.choices = [(content['iri_id'], content['title']) for content in contents]
         
-        url = settings.LDT_API_URL + "projects/?state=2&limit=" + str(settings.LDT_MAX_FETCH)
-        projects = get_all_objects(url, None)
+        url = settings.LDT_API_URL + "projects/"
+        projects = get_all_objects(url, {'state': 2, 'limit': settings.LDT_MAX_FETCH}, None)
         logger.debug("projects " + repr(projects))
         values = [(None, "-----")]
         values.extend([(project['ldt_id'], project['title']) for project in projects])
diff -r 9f809996c613 -r 4507168941a4 src/hp/templates/hp/all_videos.html
--- a/src/hp/templates/hp/all_videos.html	Mon Nov 26 12:05:16 2012 +0100
+++ b/src/hp/templates/hp/all_videos.html	Mon Nov 26 17:01:47 2012 +0100
@@ -19,7 +19,7 @@
 <!-- all videos -->
 
 <div class="main row">
-    <h2>{% trans 'All videos' %}</h2>
+    <h2>{% if search %}{% trans 'Results for:' %}&nbsp;{{search}}{% else %}{% trans 'All videos' %}{% endif %}</h2>
     <div class="row">
     {% for content in results %}
         <div class="video">
@@ -45,7 +45,7 @@
     <div class="pagination">
         <span class="step-links">
         {% if results.has_previous %}
-            <a href="{% url hp.views.all_videos %}">&lt;&lt;</a> <a href="{% url hp.views.all_videos %}?page={{ results.previous_page_number }}">&lt;</a>
+            <a href="{% url hp.views.all_videos %}{{search_param_first}}">&lt;&lt;</a> <a href="{% url hp.views.all_videos %}?page={{ results.previous_page_number }}{{search_param}}">&lt;</a>
         {% else %}
             {{"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"|safe}}
         {% endif %}
@@ -53,7 +53,7 @@
             {{ results.number }}/{{ results.paginator.num_pages }}
         </span>
         {% if results.has_next %}
-            <a href="{% url hp.views.all_videos %}?page={{ results.next_page_number }}">&gt;</a> <a href="{% url hp.views.all_videos %}?page=last">&gt;&gt;</a>
+            <a href="{% url hp.views.all_videos %}?page={{ results.next_page_number }}{{search_param}}">&gt;</a> <a href="{% url hp.views.all_videos %}?page=last{{search_param}}">&gt;&gt;</a>
         {% else %}
             {{"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"|safe}}
         {% endif %}
diff -r 9f809996c613 -r 4507168941a4 src/hp/utils.py
--- a/src/hp/utils.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/src/hp/utils.py	Mon Nov 26 17:01:47 2012 +0100
@@ -23,11 +23,11 @@
         return pr.geturl()
     
 
-def get_all_objects(res_url, field_filter):
+def get_all_objects(res_url, request_params, field_filter):
     objects = []
     url = res_url
     while url:        
-        r = requests.get(url)
+        r = requests.get(url, params=request_params)
         if r.status_code != requests.codes.ok: #@UndefinedVariable
             logger.error("Error when requesting objects " + repr(r.status_code) + " : " + repr(r.text))
             break
diff -r 9f809996c613 -r 4507168941a4 src/hp/views.py
--- a/src/hp/views.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/src/hp/views.py	Mon Nov 26 17:01:47 2012 +0100
@@ -20,10 +20,18 @@
 
 def all_videos(request):
     
-    url = settings.LDT_API_URL + "contents/?limit=" + str(settings.LDT_MAX_FETCH)
+    url = "%scontents/" % (settings.LDT_API_URL)
+    
+    request_params = {'limit' : settings.LDT_MAX_FETCH, 'order_by': 'title'}
+    
+    search = request.REQUEST.get("search", None)
+    if search:
+        search = search.strip()
+        request_params['title__icontains'] = search
 
     #pagination TODO : implement a lazy loader     
-    contents = get_all_objects(url, 'front_project')
+    contents = get_all_objects(url, request_params, 'front_project')
+
     for content in contents:
         url_parts = urlparse.urlparse(content.get('image',''))
         if not url_parts.netloc:
@@ -42,8 +50,15 @@
     except EmptyPage:
         # If page is out of range (e.g. 9999), deliver last page of results.
         results = paginator.page(paginator.num_pages)
-        
-    return render_to_response('hp/all_videos.html',{'results':results}, context_instance=RequestContext(request))
+    
+    if search:
+        search_param = "&search=%s" % search
+        search_param_first = "?search=%s" % search
+    else:
+        search_param = ""
+        search_param_first = ""
+    
+    return render_to_response('hp/all_videos.html',{'results':results, 'search': search, 'search_param': search_param, 'search_param_first': search_param_first}, context_instance=RequestContext(request))
     
 
 def show_video_details(request, content_id):
diff -r 9f809996c613 -r 4507168941a4 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Mon Nov 26 12:05:16 2012 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Mon Nov 26 17:01:47 2012 +0100
@@ -49,7 +49,7 @@
     'PYYAML' : {'setup':'pyyaml', 'url':'http://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz', 'local': 'PyYAML-3.10.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'PYTHON-DIGEST' : {'setup':'python-digest', 'url':'http://pypi.python.org/packages/source/p/python-digest/python-digest-1.7.tar.gz', 'local': 'python-digest-1.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'django-tastypie-0.9.11-modified.tar.gz', 'local': 'django-tastypie-0.9.11-modified.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'LDT': {'setup': 'ldt','url': 'ldt-1.31.tar.gz', 'local':"ldt-1.31.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'LDT': {'setup': 'ldt','url': 'ldt-1.33.tar.gz', 'local':"ldt-1.33.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 
 if system_str == 'Windows':
diff -r 9f809996c613 -r 4507168941a4 virtualenv/res/src/ldt-1.31.tar.gz
Binary file virtualenv/res/src/ldt-1.31.tar.gz has changed
diff -r 9f809996c613 -r 4507168941a4 virtualenv/res/src/ldt-1.33.tar.gz
Binary file virtualenv/res/src/ldt-1.33.tar.gz has changed