From: mathieu <mathieu.boye28@gmail.com>
Date: Wed, 13 Apr 2016 10:39:51 +0000 (+0200)
Subject: Ajout tri recherche simple et avancee
X-Git-Tag: 1.6.2^2~15^2~10^2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=30c6f6c64b24880141af6b2847098723e450c141;p=telemeta.git

Ajout tri recherche simple et avancee


Former-commit-id: fc7321864fa1f8f23f64574dd6df06901226c912
---

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index 258481ba..dcc86f36 100644
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -10,6 +10,7 @@
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/search.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/lists_sorttable.css" media="print, projection, screen"/>
 {% endblock %}
 {% block content %}
     <form method="get" action=".">
@@ -237,6 +238,7 @@
 {% block extra_javascript %}
     <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
     <script>
         $(function(){
             $("#results-per-page").selectmenu({
@@ -269,6 +271,11 @@ $(function(){
         }
     });
     });
+    
+    $.tablesorter.defaults.sortList = [[1,0]];
+    
+    $("#searchtable").tablesorter({headers: {0:{sorter:false}, 2:{sorter:false}}} );
+    
 });
     </script>
 {% endblock %}
diff --git a/telemeta/templates/search/mediacollection_listhaystack.html b/telemeta/templates/search/mediacollection_listhaystack.html
index 621fac94..307a4f54 100644
--- a/telemeta/templates/search/mediacollection_listhaystack.html
+++ b/telemeta/templates/search/mediacollection_listhaystack.html
@@ -3,7 +3,8 @@
 
 {% if page.object_list %}
 
-<table class="listing">
+<table class="listing" id="searchtable">
+<thead>
 <tr>
     {% if user.is_authenticated %}
         <th class="highlight"><input id="selectAll" type="checkbox"/> select all </th>
@@ -17,7 +18,9 @@
     <th>{% trans "Recording period" %}</th>
     <th>{% trans "Code" %}</th>
 </tr>
+</thead>
 {% if user.is_authenticated %}
+<tbody>
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
         <td class="highlight"><input type="checkbox" class="check1" name="selected_items_list" value="{{ result.object.id }}"/></td>
@@ -45,6 +48,7 @@
         </td>
     </tr>
     {% endfor %}
+    </tbody>
 {% else %}
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html
index 47bf9da0..2fd5306b 100644
--- a/telemeta/templates/search/mediaitem_listhaystack.html
+++ b/telemeta/templates/search/mediaitem_listhaystack.html
@@ -3,7 +3,8 @@
 
 {% if page.object_list %}
 
-<table class="listing">
+<table class="listing" id="searchtable">
+<thead>
 <tr>
     {% if user.is_authenticated %}
         <th class="highlight"><input id="selectAll" type="checkbox"/> select all </th>
@@ -21,7 +22,9 @@
     <th>{% trans "Year of recording" %}</th>
     <th>{% trans "Code" %}</th>
 </tr>
+</thead>
 {% if user.is_authenticated %}
+<tbody>
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
         <td class="highlight"><input type="checkbox" class="check1" name="selected_items_list" value="{{ result.object.id }}"/></td>
@@ -50,6 +53,7 @@
         </td>
     </tr>
     {% endfor %}
+    </tbody>
 {% else %}
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
diff --git a/telemeta/templates/search/mediaresource_listhaystack.html b/telemeta/templates/search/mediaresource_listhaystack.html
index 533c32f0..e9caad86 100644
--- a/telemeta/templates/search/mediaresource_listhaystack.html
+++ b/telemeta/templates/search/mediaresource_listhaystack.html
@@ -3,7 +3,8 @@
 
 {% if page.object_list %}
 
-<table class="listing">
+<table class="listing" id="searchtable">
+<thead>
 <tr>
     {% if user.is_authenticated %}
         <th class="highlight"><input id="selectAll" type="checkbox"/> select all </th>
@@ -15,7 +16,9 @@
     <th>{% trans "Description" %}</th>
     <th>{% trans "Code" %}</th>
 </tr>
+</thead>
 {% if user.is_authenticated %}
+<tbody>
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
         <td class="highlight"><input type="checkbox" class="check1" name="selected_items_list" value="{{ result.object.id }}"/></td>
@@ -34,6 +37,7 @@
         </td>
     </tr>
     {% endfor %}
+    </tbody>
 {% else %}
     {% for result in page.object_list %}
     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index 4cca777e..4b2945ab 100644
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -7,6 +7,7 @@
 {% endblock %}
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
+        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/lists_sorttable.css" media="print, projection, screen"/>
 {% endblock %}
 {% block content %}
         {% if query %}
@@ -109,6 +110,7 @@
 {% block extra_javascript %}
     <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}telemeta/js/search.js" type="text/javascript"></script>
+        <script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
     <script>
 
 
@@ -119,6 +121,11 @@
                     window.location = '?q={{ query }}&amp;page=1&amp;selected_facets={{selected_facets_url|join:'&selected_facets='}}&results_page='+$(this).val();
                 }
             }).selectmenu("menuWidget").addClass("overflow");
+            
+             $.tablesorter.defaults.sortList = [[1,0]];
+    
+    		$("#searchtable").tablesorter({headers: {0:{sorter:false}, 2:{sorter:false}}} );
+
 
         });
     </script>