fix first item index

diff --git a/telemeta/models/search_indexes.py b/telemeta/models/search_indexes.py
deleted file mode 100644 (file)
index cbd4bb2..0000000
--- a/telemeta/models/search_indexes.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from haystack import indexes
-from telemeta.models import *
-
-
-class MediaItemIndex(indexes.SearchIndex, indexes.Indexable):
-
-    title = indexes.CharField(use_template=True, document=True)
-
-    def get_model(self):
-        return MediaItem

diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py
new file mode 100644 (file)
index 0000000..ff34d4a
--- /dev/null
+++ b/telemeta/search_indexes.py
@@ -0,0 +1,12 @@
+from haystack import indexes
+from telemeta.models import *
+
+
+class MediaItemIndex(indexes.SearchIndex, indexes.Indexable):
+
+    text = indexes.CharField(document=True)
+
+    def get_model(self):
+        return MediaItem
+
+

diff --git a/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
new file mode 100644 (file)
index 0000000..4665cb5
--- /dev/null
+++ b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
@@ -0,0 +1,2 @@
+{{ object.title }}
+{{ object.body }}

diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
new file mode 100644 (file)
index 0000000..4665cb5
--- /dev/null
+++ b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
@@ -0,0 +1,2 @@
+{{ object.title }}
+{{ object.body }}

diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index e3f6dd4dd1241c2c5f981b55c67bb5903721b9f0..64cbb4768bd080ced53be46abb7aa0b710001104 100644 (file)
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -1,7 +1,13 @@
 {% extends 'telemeta/base.html' %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+
+{% block title %}
+{% trans "Search" %}
+{% endblock %}
 
 {% block content %}
-    <h2>Search</h2>
 
     <form method="get" action=".">
         <table>
@@ -9,7 +15,7 @@
             <tr>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="submit" value="Search">
+                    <input type="submit" value="{% trans "Search" %}">
                 </td>
             </tr>
         </table>

diff --git a/telemeta/urls.py b/telemeta/urls.py
index cac3461a288a41e13472c80e08211e35acfe8737..1be5f40433a084d2f503782bebb1cde625d7df47 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -142,7 +142,7 @@ urlpatterns = patterns('',
     url(r'^search/(?P<type>[A-Za-z0-9._-]+)/$', SearchView.as_view(), name="telemeta-search-type"),
     url(r'^search_criteria/$', home_view.edit_search, name="telemeta-search-criteria"),
     url(r'^complete_location/$', home_view.complete_location, name="telemeta-complete-location"),
-    url(r'^search_haystack/', include('haystack.urls')),
+    url(r'^haystack/', include('haystack.urls')),
 
     # administration
     url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"),