--- a/src/hdalab/templates/renkan_list.html	Mon Sep 29 12:43:40 2014 +0200
+++ b/src/hdalab/templates/renkan_list.html	Tue Sep 30 12:31:48 2014 +0200
@@ -3,7 +3,7 @@
 {% load static %}
 {% load thumbnail %}
 
-{% block title %}{{block.super}} > Liste des Renkans publiques{% endblock %}
+{% block title %}{{block.super}} > {% trans 'Public Renkans list' %}{% endblock %}
 
 {% block css_import %}
 {{block.super}}
@@ -14,16 +14,38 @@
 
 {% block renkans_actif %}actif{% endblock %}
 
+{% block js_import %}
+{{block.super}}
+<script src="{% static 'hdalab/lib/jquery-ui-1.10.4.min.js' %}"></script>
+<script type="text/javascript">
+    $(document).ready(function() {
+        $("#toggle-search").click(function(){
+            $("#advanced-form").toggle();
+        });
+        $(".date").datepicker({ dateFormat: 'yy-mm-dd' });
+    });
+</script>
+{% endblock %}
+
 {% block main_content %}
-    <h2>Liste des renkans publics</h2>
+    <h2>{% trans 'Public Renkans list' %}</h2>
     <p class="inline">{% if page.has_previous %}<a href="?page={{ page.previous_page_number }}&sort={{ sort_param }}&order={{ order_param }}{{ filters }}" >{% trans 'Previous' %}</a>{% endif %}
        {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}<a href="?page={{ page.next_page_number }}&sort={{ sort_param }}&order={{ order_param }}{{ filters }}">{% trans 'Next' %}</a>{% endif %}</p>
-    <form class="inline"><p>{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : <input type="text" name="title" value="{{ title }}"/></p></form>
+    <form class="inline"><p>{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : <input type="text" name="title" value="{{ title }}"/> - <span class="hand_cursor" id="toggle-search">{% trans 'Advanced search' %}</span></p></p></form>
+    <form id="advanced-form" style="display: {% if startdate != '' or enddate != '' or username != '' or state != '' %}block{% else %}none{% endif %};">
+      <p>{% trans 'Title' %} : <input type="text" name="title" value="{{ title }}"/></p>
+      <p>{% trans 'Modification date' %} : {% trans 'begin' %} <input type="text" name="startdate" value="{{ startdate }}" class="date" /> -
+                                           {% trans 'end' %} : <input type="text" name="enddate" value="{{ enddate }}" class="date" /></p>
+      <p>{% trans 'Username' %} : <input type="text" name="username" value="{{ username }}"/></p>
+      <p><input type="submit" value="{% trans 'Search' %}"/></p>
+    </form>
     <table id="rk-table">
       <thead>
         <tr class="border_bottom">
           <th><a class="" href="?sort=title&order={% if sort_param == 'title' %}{{ opposite }}{% else %}asc{% endif %}{{ filters }}">{% trans 'Title' %}</a>
               {% if sort_param == 'title' %}<span class="ui-icon {% if opposite == 'asc' %}ui-icon-triangle-1-s{% else %}ui-icon-triangle-1-n{% endif %}"></span>{% endif %}</th>
+          <th><a href="?sort=user&order={% if sort_param == 'user' %}{{ opposite }}{% else %}desc{% endif %}{{ filters }}">{% trans 'User' %}</a>
+              {% if sort_param == 'user' %}<span class="ui-icon {% if opposite == 'asc' %}ui-icon-triangle-1-s{% else %}ui-icon-triangle-1-n{% endif %}"></span>{% endif %}</th>
           <th><a href="?sort=date&order={% if sort_param == 'date' %}{{ opposite }}{% else %}desc{% endif %}{{ filters }}">{% trans 'Modification date' %}</a>
               {% if sort_param == 'date' %}<span class="ui-icon {% if opposite == 'asc' %}ui-icon-triangle-1-s{% else %}ui-icon-triangle-1-n{% endif %}"></span>{% endif %}</th>
           <th>Preview</th><th>Actions</th></tr>
@@ -32,7 +54,8 @@
       {% for hr in page.object_list %}
        {% with hr.renkan as r %}
         <tr class="border_bottom">
-            <td>{{ r.title }}</td>
+            <td><a title="View renkan" href="{% url 'renkan_view' %}?rk_id={{ r.rk_id }}">{{ r.title }}</a></td>
+            <td>{{ r.owner.username }}</td>
             <td>{{ r.modification_date|date:"Y-m-d H:i" }}</td>
             <td>{% thumbnail r.image 100x100 as thumb %}<img src="{{ thumb.url }}" width="{{ thumb.width }}" height="{{ thumb.height }}" /></td>
             <td>