From 0d86a40ecf0625f4e03d795dfdf76a652776d9ab Mon Sep 17 00:00:00 2001
From: Kaltar5679 <killian.mary@outlook.fr>
Date: Thu, 25 Jun 2015 13:54:35 +0200
Subject: [PATCH] organization of haystack function

---
 src/django-haystack                           |   1 +
 src/pip-delete-this-directory.txt             |   5 +
 telemeta/forms/haystack_form.py               |   6 +-
 .../static/telemeta/css/advanceSearch.css     |  43 +++++
 telemeta/static/telemeta/css/search.js        |  69 ++++++++
 telemeta/static/telemeta/js/advanceSearch.js  | 106 ++++++++++++
 telemeta/static/telemeta/js/search.js         |  69 ++++++++
 .../{js => lib/jquery}/jquery-ui.min.js       |   0
 .../telemeta/{js => lib/jquery}/jquery.js     |   0
 .../{js => lib/tablesorter}/jquery-latest.js  |   0
 .../tablesorter}/jquery.tablesorter.min.js    |   0
 telemeta/templates/search/addplaylist.html    |  49 +-----
 telemeta/templates/search/advanceSearch.html  | 158 +-----------------
 .../search/mediacollection_listhaystack.html  |   4 +-
 .../search/mediaitem_listhaystack.html        |   4 +-
 telemeta/templates/search/search.html         | 121 +-------------
 telemeta/templates/telemeta/lists.html        |   6 +-
 17 files changed, 314 insertions(+), 327 deletions(-)
 create mode 160000 src/django-haystack
 create mode 100644 src/pip-delete-this-directory.txt
 create mode 100644 telemeta/static/telemeta/css/advanceSearch.css
 create mode 100644 telemeta/static/telemeta/css/search.js
 create mode 100644 telemeta/static/telemeta/js/advanceSearch.js
 create mode 100644 telemeta/static/telemeta/js/search.js
 rename telemeta/static/telemeta/{js => lib/jquery}/jquery-ui.min.js (100%)
 rename telemeta/static/telemeta/{js => lib/jquery}/jquery.js (100%)
 rename telemeta/static/telemeta/{js => lib/tablesorter}/jquery-latest.js (100%)
 rename telemeta/static/telemeta/{js => lib/tablesorter}/jquery.tablesorter.min.js (100%)

diff --git a/src/django-haystack b/src/django-haystack
new file mode 160000
index 00000000..ebf1a5c9
--- /dev/null
+++ b/src/django-haystack
@@ -0,0 +1 @@
+Subproject commit ebf1a5c94a7e8af1329084cf0056de0014821723
diff --git a/src/pip-delete-this-directory.txt b/src/pip-delete-this-directory.txt
new file mode 100644
index 00000000..c8883ea9
--- /dev/null
+++ b/src/pip-delete-this-directory.txt
@@ -0,0 +1,5 @@
+This file is placed here by pip to indicate the source was put
+here by pip.
+
+Once this package is successfully installed this source code will be
+deleted (unless you remove this file).
diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index 4288d5c1..cee89cb4 100644
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -35,7 +35,7 @@ class HayAdvanceForm(SearchForm):
 #begin create field
 
     #to replace de basic search form field
-    q = forms.CharField(required=False, label=('Title'), widget=forms.TextInput(attrs={'class': 'form-control', 'type': 'search'}))
+    q = forms.CharField(required=False, label=('title'), widget=forms.TextInput(attrs={'class': 'form-control', 'type': 'search'}))
 
     location = forms.CharField(required=False, label=('Location'), widget=forms.TextInput(attrs={'class': 'form-control', 'type': 'search'}))
 
@@ -189,9 +189,9 @@ class HayAdvanceForm(SearchForm):
 
         if self.cleaned_data['item_status']:
             if self.cleaned_data.get('item_status') == 'pub':
-                sqs = sqs = sqs.filter(item_status='Published')
+                sqs = sqs.filter(item_status='Published')
             if self.cleaned_data.get('item_status') == 'unpub':
-                sqs = sqs = sqs.filter(item_status='Unpublished')
+                sqs = sqs.filter(item_status='Unpublished')
 
         if self.cleaned_data['media_type']:
             if self.cleaned_data.get('media_type') != '1':
diff --git a/telemeta/static/telemeta/css/advanceSearch.css b/telemeta/static/telemeta/css/advanceSearch.css
new file mode 100644
index 00000000..2c69cdaa
--- /dev/null
+++ b/telemeta/static/telemeta/css/advanceSearch.css
@@ -0,0 +1,43 @@
+.overflow{
+	max-height:200px;
+}
+
+.module ul, li {
+	border-radius: 0px 0px 0px 0px;
+}
+
+.ui-selectmenu-button.ui-widget.ui-state-default{
+	background-image:none;
+	background-color:#6a0307;
+	border-color:#6a0307;
+	color:white;
+}
+
+.ui-selectmenu-button.ui-widget.ui-state-hover{
+	background-image:none;
+	background-color:#6a0307;
+	border-color:#6a0307;
+	color:white;
+}
+
+.ui-selectmenu-button.ui-widget.ui-state-focus{
+	background-image:none;
+	background-color:#6a0307;
+	border-color:#6a0307;
+	color:white;
+}
+
+.ui-selectmenu-button.ui-widget.ui-state-default .ui-icon{
+	background-image:url("images/ui-icons_ffffff_256x240.png");
+}
+
+.ui-menu-item{
+	background-color:white;
+}
+
+.ui-menu-item.ui-state-focus{
+	background-image:none;
+	background-color:#6a0307;
+	border-color:#6a0307;
+	color:white;
+}
diff --git a/telemeta/static/telemeta/css/search.js b/telemeta/static/telemeta/css/search.js
new file mode 100644
index 00000000..8b2a5066
--- /dev/null
+++ b/telemeta/static/telemeta/css/search.js
@@ -0,0 +1,69 @@
+$(function() {
+
+            function getPrevUrlParameter(sParam){
+                var sPageURL = document.referrer.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            function getCurrUrlParameter(sParam){
+                var sPageURL = window.location.search.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            var prev = getPrevUrlParameter("page");
+            var curr = getCurrUrlParameter("page");
+            if(prev<curr){
+                $(".fullpage").show( "slide", {direction:"right"} );
+            }
+            else if(!curr){
+                $(".fullpage").fadeIn(500);
+            }
+            else if(!prev){
+                $(".fullpage").show( "slide", {direction:"right"} );
+            }
+            else{
+                $(".fullpage").show( "slide", {direction:"left"} );
+            };
+
+            //alert("prev = "+ prev +" curr = "+ curr);
+
+            var nouvellesIcones = {
+                header : 'ui-icon-carat-1-e',
+                activeHeader : 'ui-icon-carat-1-s',
+
+
+            };
+
+            $("#accordeon").accordion({
+                collapsible : true,
+                icons : nouvellesIcones,
+            });
+            $("#selectAll").click(function(){
+                if(this.checked){
+                    $(".check1").each(function(){
+                        this.checked=true;
+                    });
+                }
+                else{
+                    $(".check1").each(function(){
+                        this.checked=false;
+                    });
+                }
+            });
+	});
diff --git a/telemeta/static/telemeta/js/advanceSearch.js b/telemeta/static/telemeta/js/advanceSearch.js
new file mode 100644
index 00000000..70f13f58
--- /dev/null
+++ b/telemeta/static/telemeta/js/advanceSearch.js
@@ -0,0 +1,106 @@
+$(document).ready(function() {
+            var nouvellesIcones = {
+                header : 'ui-icon-carat-1-e',
+                activeHeader : 'ui-icon-carat-1-s',
+
+
+            };
+
+            function getPrevUrlParameter(sParam){
+                var sPageURL = document.referrer.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            function getCurrUrlParameter(sParam){
+                var sPageURL = window.location.search.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            function scrollToElement(ele) {
+                $(document).scrollTop(ele.offset().top).scrollLeft(ele.offset().left);
+            };
+
+
+            var prev = getPrevUrlParameter("page");
+            var curr = getCurrUrlParameter("page");
+            var prespage = getPrevUrlParameter("results_page");
+            var crespage = getCurrUrlParameter("results_page");
+            if(prev<curr){
+                $(".fullpage").show( "slide", {direction:"right"} );
+                if($("#anchor")){
+                    scrollToElement($("#anchor"));
+                }
+
+            }
+            else if(!curr || (prespage!=crespage)){
+                $(".fullpage").fadeIn(500);
+                if($("#anchor")){
+                    scrollToElement($("#anchor"));
+                }
+            }
+            else if(!prev){
+                $(".fullpage").show( "slide", {direction:"right"} );
+                if($("#anchor")){
+                    scrollToElement($("#anchor"));
+                }
+            }
+            else{
+                $(".fullpage").show( "slide", {direction:"left"} );
+                if($("#anchor")){
+                    scrollToElement($("#anchor"));
+                }
+            };
+
+            $("#id_media_type").buttonset();
+            $("#id_viewable").buttonset();
+            $("#id_item_status").buttonset();
+            $("#id_ethnic_group").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_year_published_from").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_year_published_to").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_recorded_from_date").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_recorded_to_date").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_recording_context").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#id_physical_format").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"}
+            }).selectmenu("menuWidget").addClass("overflow");
+            $("#selectAll").click(function(){
+                if(this.checked){
+                    $(".check1").each(function(){
+                        this.checked=true;
+                    });
+                }
+                else{
+                    $(".check1").each(function(){
+                        this.checked=false;
+                    });
+                }
+            });
+	});
diff --git a/telemeta/static/telemeta/js/search.js b/telemeta/static/telemeta/js/search.js
new file mode 100644
index 00000000..8b2a5066
--- /dev/null
+++ b/telemeta/static/telemeta/js/search.js
@@ -0,0 +1,69 @@
+$(function() {
+
+            function getPrevUrlParameter(sParam){
+                var sPageURL = document.referrer.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            function getCurrUrlParameter(sParam){
+                var sPageURL = window.location.search.substring(1);
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++)
+                {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam)
+                    {
+                        return sParameterName[1];
+                    }
+                }
+            };
+
+            var prev = getPrevUrlParameter("page");
+            var curr = getCurrUrlParameter("page");
+            if(prev<curr){
+                $(".fullpage").show( "slide", {direction:"right"} );
+            }
+            else if(!curr){
+                $(".fullpage").fadeIn(500);
+            }
+            else if(!prev){
+                $(".fullpage").show( "slide", {direction:"right"} );
+            }
+            else{
+                $(".fullpage").show( "slide", {direction:"left"} );
+            };
+
+            //alert("prev = "+ prev +" curr = "+ curr);
+
+            var nouvellesIcones = {
+                header : 'ui-icon-carat-1-e',
+                activeHeader : 'ui-icon-carat-1-s',
+
+
+            };
+
+            $("#accordeon").accordion({
+                collapsible : true,
+                icons : nouvellesIcones,
+            });
+            $("#selectAll").click(function(){
+                if(this.checked){
+                    $(".check1").each(function(){
+                        this.checked=true;
+                    });
+                }
+                else{
+                    $(".check1").each(function(){
+                        this.checked=false;
+                    });
+                }
+            });
+	});
diff --git a/telemeta/static/telemeta/js/jquery-ui.min.js b/telemeta/static/telemeta/lib/jquery/jquery-ui.min.js
similarity index 100%
rename from telemeta/static/telemeta/js/jquery-ui.min.js
rename to telemeta/static/telemeta/lib/jquery/jquery-ui.min.js
diff --git a/telemeta/static/telemeta/js/jquery.js b/telemeta/static/telemeta/lib/jquery/jquery.js
similarity index 100%
rename from telemeta/static/telemeta/js/jquery.js
rename to telemeta/static/telemeta/lib/jquery/jquery.js
diff --git a/telemeta/static/telemeta/js/jquery-latest.js b/telemeta/static/telemeta/lib/tablesorter/jquery-latest.js
similarity index 100%
rename from telemeta/static/telemeta/js/jquery-latest.js
rename to telemeta/static/telemeta/lib/tablesorter/jquery-latest.js
diff --git a/telemeta/static/telemeta/js/jquery.tablesorter.min.js b/telemeta/static/telemeta/lib/tablesorter/jquery.tablesorter.min.js
similarity index 100%
rename from telemeta/static/telemeta/js/jquery.tablesorter.min.js
rename to telemeta/static/telemeta/lib/tablesorter/jquery.tablesorter.min.js
diff --git a/telemeta/templates/search/addplaylist.html b/telemeta/templates/search/addplaylist.html
index 3e3c7b70..b08ad8db 100644
--- a/telemeta/templates/search/addplaylist.html
+++ b/telemeta/templates/search/addplaylist.html
@@ -7,51 +7,6 @@
 {% endblock %}
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
-    <style>
-        .overflow{
-            max-height:200px;
-        }
-
-        .module ul, li {
-            border-radius: 0px 0px 0px 0px;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-        .ui-selectmenu-button.ui-widget.ui-state-hover{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default .ui-icon{
-            background-image:url("{{ STATIC_URL }}telemeta/css/images/ui-icons_ffffff_256x240.png");
-        }
-
-        .ui-menu-item{
-            background-color:white;
-        }
-
-        .ui-menu-item.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-    </style>
 {% endblock %}
 {% block content %}
 
@@ -104,8 +59,8 @@
   </form>
 {% endblock %}
 {% block extra_javascript %}
-    <script src="{{ STATIC_URL }}telemeta/js/jquery.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}telemeta/js/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery-ui.min.js" type="text/javascript"></script>
     <script>
         $(document).ready(function() {
             $("#selection").selectmenu({
diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index e640ab65..89741445 100644
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -9,51 +9,6 @@
 {% endblock %}
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
-    <style>
-        .overflow{
-            max-height:200px;
-        }
-
-        .module ul, li {
-            border-radius: 0px 0px 0px 0px;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-        .ui-selectmenu-button.ui-widget.ui-state-hover{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default .ui-icon{
-            background-image:url("{{ STATIC_URL }}telemeta/css/images/ui-icons_ffffff_256x240.png");
-        }
-
-        .ui-menu-item{
-            background-color:white;
-        }
-
-        .ui-menu-item.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-    </style>
 {% endblock %}
 {% block content %}
     <form method="get" action=".">
@@ -207,7 +162,6 @@
                         <div style="display:inline-block;vertical-align:middle">
                             <select id="results-per-page" name="results_page">
                                 <option {% ifequal results_page 20 %}selected{% endifequal %} value="20">20</option>
-                                <option {% ifequal results_page 1 %}selected{% endifequal %} value="1">1</option>
                                 <option {% ifequal results_page 50 %}selected{% endifequal %} value="50">50</option>
                                 <option {% ifequal results_page 100 %}selected{% endifequal %} value="100">100</option>
                                 <option {% ifequal results_page 250 %}selected{% endifequal %} value="250">250</option>
@@ -255,115 +209,11 @@
 
 {% endblock %}
 {% block extra_javascript %}
-    <script src="{{ STATIC_URL }}telemeta/js/jquery.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}telemeta/js/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
     <script>
-
-        $(document).ready(function() {
-            var nouvellesIcones = {
-                header : 'ui-icon-carat-1-e',
-                activeHeader : 'ui-icon-carat-1-s',
-
-
-            };
-
-            function getPrevUrlParameter(sParam){
-                var sPageURL = document.referrer.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
-
-            function getCurrUrlParameter(sParam){
-                var sPageURL = window.location.search.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
-
-            function scrollToElement(ele) {
-                $(document).scrollTop(ele.offset().top).scrollLeft(ele.offset().left);
-            };
-
-
-            var prev = getPrevUrlParameter("page");
-            var curr = getCurrUrlParameter("page");
-            var prespage = getPrevUrlParameter("results_page");
-            var crespage = getCurrUrlParameter("results_page");
-            if(prev<curr){
-                $(".fullpage").show( "slide", {direction:"right"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-
-            }
-            else if(!curr || (prespage!=crespage)){
-                $(".fullpage").fadeIn(500);
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-            }
-            else if(!prev){
-                $(".fullpage").show( "slide", {direction:"right"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-            }
-            else{
-                $(".fullpage").show( "slide", {direction:"left"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-            };
-
-            $("#id_media_type").buttonset();
-            $("#id_viewable").buttonset();
-            $("#id_item_status").buttonset();
-            $("#id_ethnic_group").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_year_published_from").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_year_published_to").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recorded_from_date").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recorded_to_date").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recording_context").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_physical_format").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#selectAll").click(function(){
-                if(this.checked){
-                    $(".check1").each(function(){
-                        this.checked=true;
-                    });
-                }
-                else{
-                    $(".check1").each(function(){
-                        this.checked=false;
-                    });
-                }
-            });
+        $(function(){
             $("#results-per-page").selectmenu({
                 icons : {button: "ui-icon-carat-2-n-s"},
                 change : function(){
diff --git a/telemeta/templates/search/mediacollection_listhaystack.html b/telemeta/templates/search/mediacollection_listhaystack.html
index 2c5df32b..b29527de 100644
--- a/telemeta/templates/search/mediacollection_listhaystack.html
+++ b/telemeta/templates/search/mediacollection_listhaystack.html
@@ -7,9 +7,9 @@
 <tr>
     {% if user.is_authenticated %}
         <th class="highlight"><input id="selectAll" type="checkbox"/> select all </th>
-        <th>{% trans "Title" %}</th>
+        <th>{% trans "title" %}</th>
     {% else %}
-        <th class="highlight">{% trans "Title" %}</th>
+        <th class="highlight">{% trans "title" %}</th>
     {% endif %}
     <th>{% trans "Digitized" %}</th>
     <th>{% field_label "MediaCollection" "creator" %}</th>
diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html
index 22a2d157..b9cce21e 100644
--- a/telemeta/templates/search/mediaitem_listhaystack.html
+++ b/telemeta/templates/search/mediaitem_listhaystack.html
@@ -10,9 +10,9 @@
 <tr>
     {% if user.is_authenticated %}
         <th class="highlight"><input id="selectAll" type="checkbox"/> select all </th>
-        <th>{% trans "Title" %}</th>
+        <th>{% trans "title" %}</th>
     {% else %}
-        <th class="highlight">{% trans "Title" %}</th>
+        <th class="highlight">{% trans "title" %}</th>
     {% endif %}
     <th>{% trans "Digitized" %}</th>
     <th>{% trans "Recordist" %}</th>
diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index 81af8a82..d327bf5f 100644
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -7,51 +7,6 @@
 {% endblock %}
 {% block extra_stylesheets %}
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
-    <style>
-        .overflow{
-            max-height:200px;
-        }
-
-        .module ul, li {
-            border-radius: 0px 0px 0px 0px;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-        .ui-selectmenu-button.ui-widget.ui-state-hover{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-        .ui-selectmenu-button.ui-widget.ui-state-default .ui-icon{
-            background-image:url("{{ STATIC_URL }}telemeta/css/images/ui-icons_ffffff_256x240.png");
-        }
-
-        .ui-menu-item{
-            background-color:white;
-        }
-
-        .ui-menu-item.ui-state-focus{
-            background-image:none;
-            background-color:#6a0307;
-            border-color:#6a0307;
-            color:white;
-        }
-
-    </style>
 {% endblock %}
 {% block content %}
         {% if query %}
@@ -84,7 +39,6 @@
                         <div style="display:inline-block;vertical-align:middle">
                             <select id="results-per-page" name="results_page">
                                 <option {% ifequal results_page 20 %}selected{% endifequal %} value="20">20</option>
-                                <option {% ifequal results_page 1 %}selected{% endifequal %} value="1">1</option>
                                 <option {% ifequal results_page 50 %}selected{% endifequal %} value="50">50</option>
                                 <option {% ifequal results_page 100 %}selected{% endifequal %} value="100">100</option>
                                 <option {% ifequal results_page 250 %}selected{% endifequal %} value="250">250</option>
@@ -133,79 +87,14 @@
     </form>
 {% endblock %}
 {% block extra_javascript %}
-    <script src="{{ STATIC_URL }}telemeta/js/jquery.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}telemeta/js/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/js/search.js" type="text/javascript"></script>
     <script>
-        $(function() {
-
-            function getPrevUrlParameter(sParam){
-                var sPageURL = document.referrer.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
 
-            function getCurrUrlParameter(sParam){
-                var sPageURL = window.location.search.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
-
-            var prev = getPrevUrlParameter("page");
-            var curr = getCurrUrlParameter("page");
-            if(prev<curr){
-                $(".fullpage").show( "slide", {direction:"right"} );
-            }
-            else if(!curr){
-                $(".fullpage").fadeIn(500);
-            }
-            else if(!prev){
-                $(".fullpage").show( "slide", {direction:"right"} );
-            }
-            else{
-                $(".fullpage").show( "slide", {direction:"left"} );
-            };
-
-            //alert("prev = "+ prev +" curr = "+ curr);
-
-            var nouvellesIcones = {
-                header : 'ui-icon-carat-1-e',
-                activeHeader : 'ui-icon-carat-1-s',
-
-
-            };
-
-            $("#accordeon").accordion({
-                collapsible : true,
-                icons : nouvellesIcones,
-            });
-            $("#selectAll").click(function(){
-                if(this.checked){
-                    $(".check1").each(function(){
-                        this.checked=true;
-                    });
-                }
-                else{
-                    $(".check1").each(function(){
-                        this.checked=false;
-                    });
-                }
-            });
 
-            $("#results-per-page").selectmenu({
+            $(function(){
+                $("#results-per-page").selectmenu({
                 icons : {button: "ui-icon-carat-2-n-s"},
                 change : function(){
                     window.location = '?q={{ query }}&amp;page=1&amp;selected_facets={{selected_facets_url|join:'&selected_facets='}}&results_page='+$(this).val();
diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index 96d83060..1637a3b1 100644
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@ -12,9 +12,9 @@
 {% block extra_javascript %}
 <script src="{{ STATIC_URL }}telemeta/js/popupdiv.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}telemeta/js/jquery-latest.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}telemeta/js/jquery.tablesorter.min.js"></script>
-<script src="{{ STATIC_URL }}telemeta/js/jquery-ui.min.js" type="text/javascript"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}telemeta/lib/tablesorter/jquery-latest.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}telemeta/lib/tablesorter/jquery.tablesorter.min.js"></script>
+<script src="{{ STATIC_URL }}telemeta/lib/jquery/jquery-ui.min.js" type="text/javascript"></script>
 <script>
     jQuery(window).ready(function(){
         var p = playlistUtils;
-- 
2.39.5