From fb99c7e060c5058efe5885bc24b3b5a4a402cc3e Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 18 Sep 2017 12:00:15 +0200
Subject: [PATCH] Re-move search templates

---
 .../{telemeta => }/search/addplaylist.html     |  0
 .../search/confirmation_add_playslist.html     |  0
 .../{telemeta => }/search/filters.html         |  0
 .../search/mediacollection_listhaystack.html   |  0
 .../search/mediaitem_listhaystack.html         |  0
 .../search/mediaresource_listhaystack.html     |  0
 .../{telemeta => }/search/search.html          | 18 +++++++++---------
 .../{telemeta => }/search/search_advanced.html | 16 ++++++++--------
 .../{telemeta => }/search/search_criteria.html |  0
 .../{telemeta => }/search/search_results.html  |  0
 telemeta/urls.py                               |  4 ++--
 telemeta/views/new_playlist.py                 |  4 ++--
 telemeta/views/search.py                       |  5 +++--
 13 files changed, 24 insertions(+), 23 deletions(-)
 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/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/{telemeta => }/search/search_advanced.html (96%)
 rename telemeta/templates/{telemeta => }/search/search_criteria.html (100%)
 rename telemeta/templates/{telemeta => }/search/search_results.html (100%)

diff --git a/telemeta/templates/telemeta/search/addplaylist.html b/telemeta/templates/search/addplaylist.html
similarity index 100%
rename from telemeta/templates/telemeta/search/addplaylist.html
rename to telemeta/templates/search/addplaylist.html
diff --git a/telemeta/templates/telemeta/search/confirmation_add_playslist.html b/telemeta/templates/search/confirmation_add_playslist.html
similarity index 100%
rename from telemeta/templates/telemeta/search/confirmation_add_playslist.html
rename to telemeta/templates/search/confirmation_add_playslist.html
diff --git a/telemeta/templates/telemeta/search/filters.html b/telemeta/templates/search/filters.html
similarity index 100%
rename from telemeta/templates/telemeta/search/filters.html
rename to telemeta/templates/search/filters.html
diff --git a/telemeta/templates/telemeta/search/mediacollection_listhaystack.html b/telemeta/templates/search/mediacollection_listhaystack.html
similarity index 100%
rename from telemeta/templates/telemeta/search/mediacollection_listhaystack.html
rename to telemeta/templates/search/mediacollection_listhaystack.html
diff --git a/telemeta/templates/telemeta/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html
similarity index 100%
rename from telemeta/templates/telemeta/search/mediaitem_listhaystack.html
rename to telemeta/templates/search/mediaitem_listhaystack.html
diff --git a/telemeta/templates/telemeta/search/mediaresource_listhaystack.html b/telemeta/templates/search/mediaresource_listhaystack.html
similarity index 100%
rename from telemeta/templates/telemeta/search/mediaresource_listhaystack.html
rename to telemeta/templates/search/mediaresource_listhaystack.html
diff --git a/telemeta/templates/telemeta/search/search.html b/telemeta/templates/search/search.html
similarity index 89%
rename from telemeta/templates/telemeta/search/search.html
rename to telemeta/templates/search/search.html
index a55c0a90..ec9b8ee0 100644
--- a/telemeta/templates/telemeta/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -55,22 +55,22 @@
                     </div>
                  </div>
              </div>
-             {% include "telemeta/search/filters.html" %}
+             {% include "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 "telemeta/search/mediaitem_listhaystack.html" %}
+                        {% include "search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'collection' %}
-                            {% include "telemeta/search/mediacollection_listhaystack.html" %}
+                            {% include "search/mediacollection_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                {% include "search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                    {% include "search/mediaresource_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
@@ -79,16 +79,16 @@
                 <noscript>
                     <div class="fullpage">
                     {% ifequal type 'item' %}
-                        {% include "telemeta/search/mediaitem_listhaystack.html" %}
+                        {% include "search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'collection' %}
-                            {% include "telemeta/search/mediacollection_listhaystack.html" %}
+                            {% include "search/mediacollection_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                {% include "search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                    {% include "search/mediaresource_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
diff --git a/telemeta/templates/telemeta/search/search_advanced.html b/telemeta/templates/search/search_advanced.html
similarity index 96%
rename from telemeta/templates/telemeta/search/search_advanced.html
rename to telemeta/templates/search/search_advanced.html
index 01bf47f6..22b43b37 100644
--- a/telemeta/templates/telemeta/search/search_advanced.html
+++ b/telemeta/templates/search/search_advanced.html
@@ -207,16 +207,16 @@
              {% with object_list as items %}
                 <div class="fullpage" style="display:none">
                     {% ifequal type 'item' %}
-                        {% include "telemeta/search/mediaitem_listhaystack.html" %}
+                        {% include "search/mediaitem_listhaystack.html" %}
                     {% else %}
                         {% ifequal type 'corpus' %}
-                            {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                            {% include "search/mediaresource_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'fonds' %}
-                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                {% include "search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'collection' %}
-                                    {% include "telemeta/search/mediacollection_listhaystack.html" %}
+                                    {% include "search/mediacollection_listhaystack.html" %}
                                 {%endifequal%}
                             {%endifequal%}
                         {%endifequal%}
@@ -225,16 +225,16 @@
                 <noscript>
                     <div class="fullpage">
                         {% ifequal type 'item' %}
-                            {% include "telemeta/search/mediaitem_listhaystack.html" %}
+                            {% include "search/mediaitem_listhaystack.html" %}
                         {% else %}
                             {% ifequal type 'corpus' %}
-                                {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                {% include "search/mediaresource_listhaystack.html" %}
                             {% else %}
                                 {% ifequal type 'fonds' %}
-                                    {% include "telemeta/search/mediaresource_listhaystack.html" %}
+                                    {% include "search/mediaresource_listhaystack.html" %}
                                 {% else %}
                                     {% ifequal type 'collection' %}
-                                        {% include "telemeta/search/mediacollection_listhaystack.html" %}
+                                        {% include "search/mediacollection_listhaystack.html" %}
                                     {%endifequal%}
                                 {%endifequal%}
                             {%endifequal%}
diff --git a/telemeta/templates/telemeta/search/search_criteria.html b/telemeta/templates/search/search_criteria.html
similarity index 100%
rename from telemeta/templates/telemeta/search/search_criteria.html
rename to telemeta/templates/search/search_criteria.html
diff --git a/telemeta/templates/telemeta/search/search_results.html b/telemeta/templates/search/search_results.html
similarity index 100%
rename from telemeta/templates/telemeta/search/search_results.html
rename to telemeta/templates/search/search_results.html
diff --git a/telemeta/urls.py b/telemeta/urls.py
index d047f972..26b17236 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -133,8 +133,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='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/advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/search_advanced.html'), name='haystack_advance_search'),
+    url(r'^search/advance/(?P<type>[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='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 648df732..b629d12f 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('telemeta/search/addplaylist.html')
+        template_name = loader.get_template('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('telemeta/search/confirmation_add_playslist.html')
+        template_name = loader.get_template('search/confirmation_add_playslist.html')
 
         idlist = request.POST.getlist('item_id')
         selected_playlist_id = request.POST.get('playlist_id')
diff --git a/telemeta/views/search.py b/telemeta/views/search.py
index 2bef482a..dbcd44ca 100644
--- a/telemeta/views/search.py
+++ b/telemeta/views/search.py
@@ -29,8 +29,9 @@ from django.http import HttpResponse
 
 
 class HaystackSearch(FacetedSearchView, SavedSearchView):
-    search_key = 'quick'
 
+    search_key = 'quick'
+    
     def __call__(self, request, type=None):
         self.type = type
         self.form_class = HaySearchForm
@@ -204,4 +205,4 @@ def autocomplete(request):
     return HttpResponse(the_data, content_type='application/json')
 
 def escape_accent_and_lower(chaine):
-    return unicodedata.normalize('NFD', chaine).encode('ascii', 'ignore').lower()
\ No newline at end of file
+    return unicodedata.normalize('NFD', chaine).encode('ascii', 'ignore').lower()
-- 
2.39.5