--- a/src/hdalab/templates/editorial/manage_renkans.html	Fri Sep 26 12:55:35 2014 +0200
+++ b/src/hdalab/templates/editorial/manage_renkans.html	Mon Sep 29 12:43:40 2014 +0200
@@ -13,21 +13,49 @@
     <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/profile.css' %}" />
 {% 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 %}
-    <p class="inline">{% if page.has_previous %}<a href="?page={{ page.previous_page_number }}&sort={{ sort_param }}&order={{ order_param }}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}" >{% 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 }}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'Next' %}</a>{% endif %}</p>
-    <form class="inline"><p>{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : <input type="text" name="filter" value="{{ filter }}"/></p></form>
+    <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 }}"/> - <span class="hand_cursor" id="toggle-search">{% trans 'Advanced search' %}</span></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 class="inline">{% trans 'Start date' %} : <input type="text" name="startdate" value="{{ startdate }}" class="date" /></p>
+      <p class="inline">{% trans 'End date' %} : <input type="text" name="enddate" value="{{ enddate }}" class="date" /></p>
+      <p>{% trans 'Username' %} : <input type="text" name="username" value="{{ username }}"/></p>
+      <p>{% trans 'State' %} : 
+        <select name="state">
+            <option value=""></option>
+            <option value="2"{% if state == '2' %} selected="selected"{% endif %}>{% trans 'Moderated' %}</option>
+            <option value="3"{% if state == '3' %} selected="selected"{% endif %}>{% trans 'Published' %}</option>
+            <option value="4"{% if state == '4' %} selected="selected"{% endif %}>{% trans 'Rejected' %}</option>
+        </select>
+      </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 %}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'Title' %}</a>
+          <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 %}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'User' %}</a>
+          <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 %}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'Modification date' %}</a>
+          <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>{% trans 'Preview' %}</th>
-          <th><a href="?sort=state&order={% if sort_param == 'state' %}{{ opposite }}{% else %}asc{% endif %}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'State' %}</a>
+          <th><a href="?sort=state&order={% if sort_param == 'state' %}{{ opposite }}{% else %}asc{% endif %}{{ filters }}">{% trans 'State' %}</a>
               {% if sort_param == 'state' %}<span class="ui-icon {% if opposite == 'asc' %}ui-icon-triangle-1-s{% else %}ui-icon-triangle-1-n{% endif %}"></span>{% endif %}</th>
           <th>{% trans 'Actions' %}</th>
         </tr>
@@ -52,6 +80,6 @@
       {% endfor %}
       </tbody>
     </table>
-    <p>{% if page.has_previous %}<a href="?page={{ page.previous_page_number }}&sort={{ sort_param }}&order={{ order_param }}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}" >{% 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 }}{% if filter|length > 0 %}&filter={{ filter }}{% endif %}">{% trans 'Next' %}</a>{% endif %}</p>
+    <p>{% 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>
 {% endblock %}
\ No newline at end of file