Merge branch 'master' into lucene_memory

[wolnelektury.git] / wolnelektury / static / opensearch.xml

diff --git a/wolnelektury/static/opensearch.xml b/wolnelektury/static/opensearch.xml
index cf904d0..8ccdd26 100644 (file)
--- a/wolnelektury/static/opensearch.xml
+++ b/wolnelektury/static/opensearch.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"

-        xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+                      xmlns:atom="http://www.w3.org/2005/Atom"
+                      xmlns:moz="http://www.mozilla.org/2006/browser/search/">

     <ShortName>Wolne Lektury</ShortName>
     <Description>WolneLektury.pl, szkolna biblioteka internetowa.</Description>
     <InputEncoding>UTF-8</InputEncoding>
     <ShortName>Wolne Lektury</ShortName>
     <Description>WolneLektury.pl, szkolna biblioteka internetowa.</Description>
     <InputEncoding>UTF-8</InputEncoding>


@@ -8,12 +9,12 @@
     <Developer>Fundacja Nowoczesna Polska</Developer>
     <Language>pl</Language>
     <Contact>fundacja@nowoczesnapolska.org.pl</Contact>
     <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>
+    <Image height="16" width="16" type="image/x-icon">http://static.wolnelektury.pl/static/img/favicon.ico</Image>
+    <Image height="64" width="64" type="image/png">http://static.wolnelektury.pl/static/img/wl_icon_64.png</Image>

     <Url type="application/atom+xml;profile=opds-catalog"
     <Url type="application/atom+xml;profile=opds-catalog"

-        template="http://www.wolnelektury.pl/opds/search/?q={searchTerms}&amp;author={atom:author}&amp;translator={atom:contributor}&amp;title={atom:title}" />
-    <Url type="text/html" method="GET" template="http://www.wolnelektury.pl/katalog/szukaj?q={searchTerms}" />
+        template="http://wolnelektury.pl/opds/search/?q={searchTerms}&amp;author={atom:author}&amp;translator={atom:contributor}&amp;title={atom:title}" />
+    <Url type="text/html" method="GET" template="http://wolnelektury.pl/szukaj?q={searchTerms}" />

     <Url type="application/x-suggestions+json" method="GET" template="http://www.wolnelektury.pl/katalog/jtags?mozhint=1&amp;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>
+    <moz:SearchForm>http://wolnelektury.pl/</moz:SearchForm>

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