From 118417c6c055b2dcf98c0b64729160e85ea44e6c Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 4 Aug 2017 16:00:52 +0200
Subject: [PATCH] Fix advanced search page using jquery-ui 1.11, mv search
 template directory

---
 app/settings.py                               |  3 +-
 docker-compose.yml                            |  7 ++-
 telemeta/templates/telemeta/inc/tabs.html     | 56 ++++++++++++++++++
 .../{ => telemeta}/search/addplaylist.html    |  0
 .../search/confirmation_add_playslist.html    |  0
 .../{ => telemeta}/search/filters.html        |  0
 .../indexes/telemeta/instrument_text.txt      |  0
 .../indexes/telemeta/instrumentalias_text.txt |  0
 .../search/indexes/telemeta/location_text.txt |  0
 .../indexes/telemeta/locationalias_text.txt   |  0
 .../indexes/telemeta/mediacollection_text.txt |  0
 .../indexes/telemeta/mediacorpus_text.txt     |  0
 .../indexes/telemeta/mediafonds_text.txt      |  0
 .../indexes/telemeta/mediaitem_text.txt       |  0
 .../search/mediacollection_listhaystack.html  |  0
 .../search/mediaitem_listhaystack.html        |  0
 .../search/mediaresource_listhaystack.html    |  0
 .../{ => telemeta}/search/search.html         | 20 +++----
 .../search/search_advanced.html}              | 58 +++++++++----------
 .../{ => search}/search_criteria.html         |  0
 .../telemeta/{ => search}/search_results.html |  0
 telemeta/urls.py                              |  6 +-
 telemeta/views/new_playlist.py                |  6 +-
 23 files changed, 105 insertions(+), 51 deletions(-)
 create mode 100644 telemeta/templates/telemeta/inc/tabs.html
 rename telemeta/templates/{ => telemeta}/search/addplaylist.html (100%)
 rename telemeta/templates/{ => telemeta}/search/confirmation_add_playslist.html (100%)
 rename telemeta/templates/{ => telemeta}/search/filters.html (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/instrument_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/instrumentalias_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/location_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/locationalias_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/mediacollection_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/mediacorpus_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/mediafonds_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/indexes/telemeta/mediaitem_text.txt (100%)
 rename telemeta/templates/{ => telemeta}/search/mediacollection_listhaystack.html (100%)
 rename telemeta/templates/{ => telemeta}/search/mediaitem_listhaystack.html (100%)
 rename telemeta/templates/{ => telemeta}/search/mediaresource_listhaystack.html (100%)
 rename telemeta/templates/{ => telemeta}/search/search.html (89%)
 rename telemeta/templates/{search/advanceSearch.html => telemeta/search/search_advanced.html} (95%)
 rename telemeta/templates/telemeta/{ => search}/search_criteria.html (100%)
 rename telemeta/templates/telemeta/{ => search}/search_results.html (100%)

diff --git a/app/settings.py b/app/settings.py
index d7f30355..22875ab9 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -351,9 +351,8 @@ BOWER_INSTALLED_APPS = (
     'soundmanager#V2.97a.20150601',
     'https://github.com/Parisson/loaders.git',
     'https://github.com/Parisson/ui.git',
-    'jquery-ui#1.12.1',
+    'jquery-ui#1.11.4',
     'tablesorter',
     'video.js',
     'sass-bootstrap-glyphicons',
-    
 )
diff --git a/docker-compose.yml b/docker-compose.yml
index b064e296..8fbb25cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,9 +52,10 @@ search:
 app:
   build: .
   volumes:
-    - ./app/:/srv/app
-    - ./telemeta/:/srv/src/telemeta/telemeta
-    - ./lib/TimeSide/:/srv/src/timeside
+    - ./app:/srv/app
+    - ./telemeta:/srv/src/telemeta/telemeta
+    # - ./lib/TimeSide:/srv/src/timeside
+    # - ./lib/plugins:/srv/src/plugins
   volumes_from:
     - data
   env_file:
diff --git a/telemeta/templates/telemeta/inc/tabs.html b/telemeta/templates/telemeta/inc/tabs.html
new file mode 100644
index 00000000..096414a6
--- /dev/null
+++ b/telemeta/templates/telemeta/inc/tabs.html
@@ -0,0 +1,56 @@
+{% load i18n %}
+{% load telemeta_tags %}
+{% load bootstrap3 %}
+
+                        {# spaces between li and a elements breaks layout #}
+
+                        <ul id="nav">
+                            {% if user.is_authenticated %}
+                                <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
+                            {% else %}
+                                <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
+                            {% endif %}
+
+                            <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
+                                <ul>
+                                    <li><a href="{% url "telemeta-resource-list" "fonds" %}">{% trans "Fonds" %}</a></li>
+                                    <li><a href="{% url "telemeta-resource-list" "corpus" %}">{% trans "Corpus" %}</a></li>
+                                    <li><a href="{% url "telemeta-collections" %}">{% trans "Collections" %}</a></li>
+                                    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
+                                </ul>
+                            </li>
+
+                            <li><a href="{% url "telemeta-geo-continents" %}"
+                                   class="yellow">{% trans "Geo Navigator" %}</a></li>
+
+                            <li><a href="{% url "haystack_advance_search" %}"
+                                   class="orange">{% trans "Advanced search" %}</a></li>
+
+                            {% if user.is_authenticated and user.is_staff %}
+                                <li><a href="#vocabulary#" class="red">{% trans "Terminology" %}</a>
+                                    {% if perms.telemeta.change_physicalformat %}
+                                        <ul>
+                                            <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
+                                            <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
+                                            <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument (vernaculare)" %}</a></li>
+                                        </ul>
+                                    {% else %}
+                                        <ul>
+                                            <li><a href="{% url "telemeta-instruments" %}">{% trans "Instruments" %}</a>
+                                            <li><a href="{% url "telemeta-instrument-alias" %}">{% trans "Instruments (vernaculare)" %}</a></li>
+                                            {% for enu in menu %}
+                                                <li>
+                                                    <a href="{% url "telemeta-enumeration" enu.id %}">{{ enu.name |capfirst }}</a>
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                    {% endif %}
+                                </li>
+                            {% endif %}
+
+                            {% if user.is_authenticated and user.is_staff %}
+                                <li><a href="{% url "telemeta-home" %}admin/django/" class="violet">{% trans "Admin" %}</a>
+                                </li>
+                            {% endif %}
+
+                        </ul>
diff --git a/telemeta/templates/search/addplaylist.html b/telemeta/templates/telemeta/search/addplaylist.html
similarity index 100%
rename from telemeta/templates/search/addplaylist.html
rename to telemeta/templates/telemeta/search/addplaylist.html
diff --git a/telemeta/templates/search/confirmation_add_playslist.html b/telemeta/templates/telemeta/search/confirmation_add_playslist.html
similarity index 100%
rename from telemeta/templates/search/confirmation_add_playslist.html
rename to telemeta/templates/telemeta/search/confirmation_add_playslist.html
diff --git a/telemeta/templates/search/filters.html b/telemeta/templates/telemeta/search/filters.html
similarity index 100%
rename from telemeta/templates/search/filters.html
rename to telemeta/templates/telemeta/search/filters.html
diff --git a/telemeta/templates/search/indexes/telemeta/instrument_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/instrument_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/instrument_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/instrument_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/instrumentalias_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/instrumentalias_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/location_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/location_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/location_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/location_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/locationalias_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/locationalias_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/locationalias_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/locationalias_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/mediacollection_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/mediacollection_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/mediacorpus_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/mediacorpus_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/mediacorpus_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/mediacorpus_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/mediafonds_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/mediafonds_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/mediafonds_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/mediafonds_text.txt
diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt b/telemeta/templates/telemeta/search/indexes/telemeta/mediaitem_text.txt
similarity index 100%
rename from telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
rename to telemeta/templates/telemeta/search/indexes/telemeta/mediaitem_text.txt
diff --git a/telemeta/templates/search/mediacollection_listhaystack.html b/telemeta/templates/telemeta/search/mediacollection_listhaystack.html
similarity index 100%
rename from telemeta/templates/search/mediacollection_listhaystack.html
rename to telemeta/templates/telemeta/search/mediacollection_listhaystack.html
diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/telemeta/search/mediaitem_listhaystack.html
similarity index 100%
rename from telemeta/templates/search/mediaitem_listhaystack.html
rename to telemeta/templates/telemeta/search/mediaitem_listhaystack.html
diff --git a/telemeta/templates/search/mediaresource_listhaystack.html b/telemeta/templates/telemeta/search/mediaresource_listhaystack.html
similarity index 100%
rename from telemeta/templates/search/mediaresource_listhaystack.html
rename to telemeta/templates/telemeta/search/mediaresource_listhaystack.html
diff --git a/telemeta/templates/search/search.html b/telemeta/templates/telemeta/search/search.html
similarity index 89%
rename from telemeta/templates/search/search.html
rename to telemeta/templates/telemeta/search/search.html
index f2393d93..a55c0a90 100644
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/telemeta/search/search.html
@@ -39,7 +39,7 @@
                     {% endifequal %}
                  </div>
                  <div class="col-md-4 col-md-offset-4" >
-                    <div class="pull-right"">
+                    <div class="pull-right">
                         <label style="display:inline-block;vertical-align:middle">{% trans "results per page"%}:</label>
                         <div style="display:inline-block;vertical-align:middle">
                             <select id="results-per-page" name="results_page">
@@ -55,22 +55,22 @@
                     </div>
                  </div>
              </div>
-             {% include "search/filters.html" %}
+             {% include "telemeta/search/filters.html" %}
 
             <form method="POST" action="{% url "haystack_playlist" type %} ">{% csrf_token %}
              {% with object_list as items %}
                 <div class="fullpage" style="display:none">
                     {% ifequal type 'item' %}
-                        {% include "search/mediaitem_listhaystack.html" %}
+                        {% include "telemeta/search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'collection' %}
-                            {% include "search/mediacollection_listhaystack.html" %}
+                            {% include "telemeta/search/mediacollection_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "search/mediaresource_listhaystack.html" %}
+                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "search/mediaresource_listhaystack.html" %}
+                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
@@ -79,16 +79,16 @@
                 <noscript>
                     <div class="fullpage">
                     {% ifequal type 'item' %}
-                        {% include "search/mediaitem_listhaystack.html" %}
+                        {% include "telemeta/search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'collection' %}
-                            {% include "search/mediacollection_listhaystack.html" %}
+                            {% include "telemeta/search/mediacollection_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "search/mediaresource_listhaystack.html" %}
+                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "search/mediaresource_listhaystack.html" %}
+                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/telemeta/search/search_advanced.html
similarity index 95%
rename from telemeta/templates/search/advanceSearch.html
rename to telemeta/templates/telemeta/search/search_advanced.html
index 7e3d6393..01bf47f6 100644
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/telemeta/search/search_advanced.html
@@ -3,15 +3,33 @@
 {% load i18n %}
 {% load bootstrap_pagination %}
 
-
 {% block title %}
 {% trans "Search" %}
 {% 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/search.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/lists_sorttable.css" media="print, projection, screen"/>
 {% endblock %}
+
+{% block extra_javascript %}
+    <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
+    <script>
+        $(function(){
+            $("#results-per-page").selectmenu({
+                icons : {button: "ui-icon-carat-2-n-s"},
+                change : function(){
+                    window.location = '?q={{request.GET.q}}&location={{request.GET.location}}&ethnic_group={{request.GET.ethnic_group}}&instruments={{request.GET.instruments}}&year_published_from={{request.GET.year_published_from}}&year_published_to={{request.GET.year_published_to}}&media_type={{request.GET.media_type}}&viewable={{request.GET.viewable}}&collectors={{request.GET.collectors}}&recorded_from_date={{request.GET.recorded_from_date}}&recorded_to_date={{request.GET.recorded_to_date}}&item_status={{request.GET.item_status}}&recording_context={{request.GET.recording_context}}&physical_format={{request.GET.physical_format}}&code={{ request.GET.code }}&page=1&results_page='+$(this).val();
+                }
+            }).selectmenu("menuWidget").addClass("overflow");
+
+        });
+    </script>
+{% endblock %}
+
 {% block content %}
     <form method="get" action=".">
         <div class="row">
@@ -168,8 +186,8 @@
                         {% endifequal %}
                     {% endifequal %}
                  </div>
-                 <div class="col-md-4 col-md-offset-4" >
-                    <div class="pull-right"">
+                 <div class="col-md-4 col-md-offset-4">
+                    <div class="pull-right">
                         <label style="display:inline-block;vertical-align:middle">{% trans "results per page"%}:</label>
                         <div style="display:inline-block;vertical-align:middle">
                             <select id="results-per-page" name="results_page">
@@ -189,16 +207,16 @@
              {% with object_list as items %}
                 <div class="fullpage" style="display:none">
                     {% ifequal type 'item' %}
-                        {% include "search/mediaitem_listhaystack.html" %}
+                        {% include "telemeta/search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'corpus' %}
-                            {% include "search/mediaresource_listhaystack.html" %}
+                            {% include "telemeta/search/mediaresource_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'fonds' %}
-                                {% include "search/mediaresource_listhaystack.html" %}
+                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'collection' %}
-                                    {% include "search/mediacollection_listhaystack.html" %}
+                                    {% include "telemeta/search/mediacollection_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
@@ -207,16 +225,16 @@
                 <noscript>
                     <div class="fullpage">
                         {% ifequal type 'item' %}
-                            {% include "search/mediaitem_listhaystack.html" %}
+                            {% include "telemeta/search/mediaitem_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "search/mediaresource_listhaystack.html" %}
+                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "search/mediaresource_listhaystack.html" %}
+                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
                                 {% else %}
                                     {% ifequal type 'collection' %}
-                                        {% include "search/mediacollection_listhaystack.html" %}
+                                        {% include "telemeta/search/mediacollection_listhaystack.html" %}
                                     {%endifequal%}
                                 {%endifequal%}
                             {%endifequal%}
@@ -271,21 +289,3 @@
         {% endcomment %}
 
 {% endblock %}
-{% block extra_javascript %}
-    <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
-
-    <script>
-        $(function(){
-            $("#results-per-page").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"},
-                change : function(){
-                    window.location = '?q={{request.GET.q}}&location={{request.GET.location}}&ethnic_group={{request.GET.ethnic_group}}&instruments={{request.GET.instruments}}&year_published_from={{request.GET.year_published_from}}&year_published_to={{request.GET.year_published_to}}&media_type={{request.GET.media_type}}&viewable={{request.GET.viewable}}&collectors={{request.GET.collectors}}&recorded_from_date={{request.GET.recorded_from_date}}&recorded_to_date={{request.GET.recorded_to_date}}&item_status={{request.GET.item_status}}&recording_context={{request.GET.recording_context}}&physical_format={{request.GET.physical_format}}&code={{ request.GET.code }}&page=1&results_page='+$(this).val();
-                }
-            }).selectmenu("menuWidget").addClass("overflow");
-
-        });
-
-</script>
-{% endblock %}
diff --git a/telemeta/templates/telemeta/search_criteria.html b/telemeta/templates/telemeta/search/search_criteria.html
similarity index 100%
rename from telemeta/templates/telemeta/search_criteria.html
rename to telemeta/templates/telemeta/search/search_criteria.html
diff --git a/telemeta/templates/telemeta/search_results.html b/telemeta/templates/telemeta/search/search_results.html
similarity index 100%
rename from telemeta/templates/telemeta/search_results.html
rename to telemeta/templates/telemeta/search/search_results.html
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 39c94054..aa557347 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -67,7 +67,7 @@ urlpatterns = patterns('',
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/dc/xml/$', item_view.item_detail, {'format': 'dublin_core_xml'}, name="telemeta-item-dublincore-xml"),
     url(r'^archives/items/download/(?P<public_id>[A-Za-z0-9._-]+)\.(?P<extension>' + export_extensions + ')$', item_view.item_export, name="telemeta-item-export"),
     url(r'^archives/items/download/(?P<public_id>[A-Za-z0-9._-]+)\.(?P<extension>' + export_extensions + ')/isAvailable$', item_view.item_export_available, name="telemeta-item-export-available"),
-                       
+
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/visualize/(?P<grapher_id>[0-9a-z_]+)/(?P<width>[0-9A-Z]+)x(?P<height>[0-9A-Z]+)/$', item_view.item_visualize, name="telemeta-item-visualize"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/analyze/xml/$', item_view.item_analyze_xml, name="telemeta-item-analyze-xml"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/item_xspf.xml$', item_view.item_playlist, dict(template="telemeta/mediaitem_xspf.xml", mimetype="application/xspf+xml"), name="telemeta-item-xspf"),
@@ -131,8 +131,8 @@ urlpatterns = patterns('',
     url(r'^search/$', HaystackSearch(), name='haystack_search'),
     url(r'^search/autocomplete/$', autocomplete),
     url(r'^search/quick/(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
-    url(r'^search/advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search'),
-    url(r'^search/advance/(?P<type>[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search_type'),
+    url(r'^search/advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='telemeta/search/search_advanced.html'), name='haystack_advance_search'),
+    url(r'^search/advance/(?P<type>[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='telemeta/search/search_advanced.html'), name='haystack_advance_search_type'),
     #url(r'^search/booleaninstru/$', boolean_view.get_boolean_query),
 
     url(r'^search/playlist_add/(?P<type>[A-Za-z0-9._-]+)/$', NewPlaylistView().display, name='haystack_playlist'),
diff --git a/telemeta/views/new_playlist.py b/telemeta/views/new_playlist.py
index fe8d016d..648df732 100644
--- a/telemeta/views/new_playlist.py
+++ b/telemeta/views/new_playlist.py
@@ -9,7 +9,7 @@ class NewPlaylistView(object):
 
         self.type=type
 
-        template_name = loader.get_template('search/addplaylist.html')
+        template_name = loader.get_template('telemeta/search/addplaylist.html')
 
         idlist = request.POST.getlist('selected_items_list')
         itemlist = []
@@ -31,7 +31,7 @@ class NewPlaylistView(object):
     def addToPlaylist(self, request, type=None):
         self.type=type
 
-        template_name = loader.get_template('search/confirmation_add_playslist.html')
+        template_name = loader.get_template('telemeta/search/confirmation_add_playslist.html')
 
         idlist = request.POST.getlist('item_id')
         selected_playlist_id = request.POST.get('playlist_id')
@@ -58,5 +58,3 @@ class NewPlaylistView(object):
                 'type':self.type,
                 'lastquerypath': request.POST.get('lastquerypath')})
         return HttpResponse(template_name.render(context))
-
-
-- 
2.39.5