opensearch for firefox

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index a6f394f..7f1de6d 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -491,13 +491,14 @@ def json_tags_starting_with(request, callback=None):
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []

-    result = ""   

     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:
     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:

-            result += "\n" + tag.name

             tags_list.append(tag.name)
             tags_list.append(tag.name)

-    dict_result = {"matches": tags_list}
-    return JSONResponse(dict_result, callback)
+    if request.GET.get('mozhint', ''):
+        result = [prefix, tags_list]
+    else:
+        result = {"matches": tags_list}
+    return JSONResponse(result, callback)

 
 # ====================
 # = Shelf management =
 
 # ====================
 # = Shelf management =

diff --git a/wolnelektury/static/img/favicon.ico b/wolnelektury/static/img/favicon.ico
new file mode 100644 (file)
index 0000000..3f2aacc
Binary files /dev/null and b/wolnelektury/static/img/favicon.ico differ

diff --git a/wolnelektury/static/img/favicon.png b/wolnelektury/static/img/favicon.png
index 6cffce8..9794f35 100644 (file)
Binary files a/wolnelektury/static/img/favicon.png and b/wolnelektury/static/img/favicon.png differ

diff --git a/wolnelektury/static/img/wl_icon_64.png b/wolnelektury/static/img/wl_icon_64.png
new file mode 100644 (file)
index 0000000..a9dded3
Binary files /dev/null and b/wolnelektury/static/img/wl_icon_64.png differ

diff --git a/wolnelektury/static/opensearch.xml b/wolnelektury/static/opensearch.xml
index 7a319f1..9cc0565 100644 (file)
--- a/wolnelektury/static/opensearch.xml
+++ b/wolnelektury/static/opensearch.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+        xmlns:moz="http://www.mozilla.org/2006/browser/search/">

     <ShortName>Wolne Lektury</ShortName>
     <Description>WolneLektury.pl, szkolna biblioteka internetowa.</Description>
     <ShortName>Wolne Lektury</ShortName>
     <Description>WolneLektury.pl, szkolna biblioteka internetowa.</Description>

+    <InputEncoding>UTF-8</InputEncoding>

     <Tags>lektury</Tags>
     <Developer>Fundacja Nowoczesna Polska</Developer>
     <Language>pl</Language>
     <Contact>fundacja@nowoczesnapolska.org.pl</Contact>
     <Tags>lektury</Tags>
     <Developer>Fundacja Nowoczesna Polska</Developer>
     <Language>pl</Language>
     <Contact>fundacja@nowoczesnapolska.org.pl</Contact>

+    <Image height="16" width="16" type="image/x-icon">http://www.wolnelektury.pl/static/img/favicon.ico</Image>
+    <Image height="64" width="64" type="image/png">http://www.wolnelektury.pl/static/img/wl_icon_64.png</Image>

     <Url type="application/atom+xml;profile=opds-catalog"
         template="http://www.wolnelektury.pl/opds/search/?q={searchTerms}" />
     <Url type="application/atom+xml;profile=opds-catalog"
         template="http://www.wolnelektury.pl/opds/search/?q={searchTerms}" />

+    <Url type="text/html" method="GET" template="http://www.wolnelektury.pl/katalog/szukaj?q={searchTerms}" />
+    <Url type="application/x-suggestions+json" method="GET" template="http://www.wolnelektury.pl/katalog/jtags?mozhint=1&amp;q={searchTerms}" />
+    <moz:SearchForm>http://www.wolnelektury.pl/katalog/</moz:SearchForm>

     <Query role="example" searchTerms="słowa" />
 </OpenSearchDescription>
     <Query role="example" searchTerms="słowa" />
 </OpenSearchDescription>

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 3e2678d..8aaabf1 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -6,7 +6,8 @@
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta http-equiv="Content-Style-Type" content="text/css">
         <title>{% block title %}WolneLektury.pl{% endblock %}</title>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta http-equiv="Content-Style-Type" content="text/css">
         <title>{% block title %}WolneLektury.pl{% endblock %}</title>

-        <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/x-icon" />
+        <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
+        <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{{ STATIC_URL }}opensearch.xml">

         {% compressed_css "all" %}
         <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";</script>
         {% compressed_js "jquery" %}
         {% compressed_css "all" %}
         <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";</script>
         {% compressed_js "jquery" %}