Merge branch 'master' of http://github.com/fnp/wolnelektury

diff --git a/.gitignore b/.gitignore
index 1152ea7..d78f78f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ thumbs.db
 .project
 .settings
 .pydevproject
+.tmp_*
+

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 4b600b6..b040ef9 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -18,7 +18,7 @@ class BookImportForm(forms.Form):
 
 
 class SearchForm(forms.Form):
-    q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50})
+    q = JQueryAutoCompleteField('/katalog/tags/', {'minChars': 2, 'selectFirst': True, 'cacheLength': 50, 'matchContains': "word"})
     tags = forms.CharField(widget=forms.HiddenInput, required=False)
     
     def __init__(self, *args, **kwargs):

diff --git a/wolnelektury/static/js/jquery.autocomplete.js b/wolnelektury/static/js/jquery.autocomplete.js
index 9d12a29..7cdb359 100644 (file)
--- a/wolnelektury/static/js/jquery.autocomplete.js
+++ b/wolnelektury/static/js/jquery.autocomplete.js
@@ -10,6 +10,11 @@
  * Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
  */
 
+/*
+ * Modified by Radek Czajka, Fundacja Nowoczesna Polska, 2010-05-10:
+ *   escape regex for word start checking in matchSubset
+ */
+
 ;(function($) {
        
 $.fn.extend({
@@ -442,7 +447,7 @@ $.Autocompleter.Cache = function(options) {
                        s = s.toLowerCase();
                var i = s.indexOf(sub);
                if (options.matchContains == "word"){
-                       i = s.toLowerCase().search("\\b" + sub.toLowerCase());
+                       i = s.toLowerCase().search("\\b" + sub.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1").toLowerCase());
                }
                if (i == -1) return false;
                return i == 0 || options.matchContains;

diff --git a/wolnelektury/static/js/jquery.countdown-pl.js b/wolnelektury/static/js/jquery.countdown-pl.js
index 34b805a..4d6d1d4 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown-pl.js
+++ b/wolnelektury/static/js/jquery.countdown-pl.js
@@ -7,7 +7,9 @@
                labels: ['lat', 'miesięcy', 'tygodni', 'dni', 'godzin', 'minut', 'sekund'],\r
                labels1: ['rok', 'miesiąc', 'tydzień', 'dzień', 'godzina', 'minuta', 'sekunda'],\r
         labels2: ['lata', 'miesiące', 'tygodnie', 'dni', 'godziny', 'minuty', 'sekundy'],\r
-               compactLabels: ['l', 'm', 't', 'd'], compactLabels1: ['r', 'm', 't', 'd'],\r
+               compactLabels: ['l', 'm', 't', 'd'],\r
+               compactLabels1: ['r', 'm', 't', 'd'],\r
+        compactLabels2: ['l', 'm', 't', 'd'],\r
                timeSeparator: ':', isRTL: false,\r
                which: function(n){\r
                        return n==1 ? 1 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 2 : 0;\r

diff --git a/wolnelektury/static/js/jquery.countdown.js b/wolnelektury/static/js/jquery.countdown.js
index 5375ce8..11d5506 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown.js
+++ b/wolnelektury/static/js/jquery.countdown.js
@@ -6,7 +6,7 @@
    Please attribute the author if you use it. */
 
 /* Modified by Radek Czajka, Fundacja Nowoczesna Polska (radoslaw.czajka(at)nowoczesnapolska.org.pl) */
-
+w
 /* Display a countdown timer.
    Attach it with options like:
    $('div selector').countdown(
@@ -471,7 +471,10 @@ $.extend(Countdown.prototype, {
                var timeSeparator = this._get(inst, 'timeSeparator');
                var description = this._get(inst, 'description') || '';
                var showCompact = function(period) {
-                       var labelsNum = $.countdown._get(inst, 'compactLabels' + periods[period]);
+            var which = $.countdown._get(inst, 'which');
+            if (which) {
+                var labelsNum = $.countdown._get(inst, 'compactLabels' + which(periods[period]));
+            }
                        return (show[period] ? periods[period] +
                                (labelsNum ? labelsNum[period] : labels[period]) + ' ' : '');
                };

diff --git a/wolnelektury/templates/1percent.html b/wolnelektury/templates/1percent.html
index 2e4c557..e53caee 100644 (file)
--- a/wolnelektury/templates/1percent.html
+++ b/wolnelektury/templates/1percent.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends 'base.html' %}
+{% load i18n %}
 
 {% block title %}1% podatku na WolneLektury.pl{% endblock title %}
 

diff --git a/wolnelektury/templates/admin/base_site.html b/wolnelektury/templates/admin/base_site.html
index 087a3bb..7e6b492 100644 (file)
--- a/wolnelektury/templates/admin/base_site.html
+++ b/wolnelektury/templates/admin/base_site.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "admin/base.html" %}
+{% load i18n %}
 
 {% block title %}{{ title }} | {% trans "Site administration" %} - WolneLektury.pl{% endblock %}
 

diff --git a/wolnelektury/templates/admin/catalogue/book/change_list.html b/wolnelektury/templates/admin/catalogue/book/change_list.html
index ee2b43f..09e567a 100644 (file)
--- a/wolnelektury/templates/admin/catalogue/book/change_list.html
+++ b/wolnelektury/templates/admin/catalogue/book/change_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "admin/change_list.html" %}
+{% load i18n %}
 
 {% block content %}
     <form action="{% url import_book %}" method="post" enctype="multipart/form-data">

diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index 733314d..2e80c55 100644 (file)
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block title %}{% trans "Sign in" %} / {% trans "Register on"%} WolneLektury.pl{% endblock %}
 

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 4cc4ea8..03b46bc 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}
@@ -34,10 +34,10 @@
                 <a href="{{ book.pdf_file.url }}">{% trans "Download PDF" %}</a>
             {% endif %}
             {% if book.odt_file %}
-                <a href="{{ book.odt_file.url }}">{% trans "Download ODT %}</a>
+                <a href="{{ book.odt_file.url }}">{% trans "Download ODT" %}</a>
             {% endif %}
             {% if book.txt_file %}
-                <a href="{{ book.txt_file.url }}">{% trans "Download TXT %}</a>
+                <a href="{{ book.txt_file.url }}">{% trans "Download TXT" %}</a>
             {% endif %}
             {% if book.mp3_file %}
                 <div id="czytamy-sluchajac-info">

diff --git a/wolnelektury/templates/catalogue/book_fragments.html b/wolnelektury/templates/catalogue/book_fragments.html
index bb5fba2..0a90e45 100644 (file)
--- a/wolnelektury/templates/catalogue/book_fragments.html
+++ b/wolnelektury/templates/catalogue/book_fragments.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% trans "Theme" %} {{ theme }} {% trans "in work " %} {{ book }} {% "on " %} WolneLektury.pl{% endblock %}

diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index b6a9e6c..3e6a9c5 100644 (file)
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}book-a-list{% endblock %}

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index beb3eae..b8d091a 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% block title %}{% title_from_tags tags %} w WolneLektury.pl{% endblock %}

diff --git a/wolnelektury/templates/lessons/document_detail.html b/wolnelektury/templates/lessons/document_detail.html
index 17faaea..7c6406c 100644 (file)
--- a/wolnelektury/templates/lessons/document_detail.html
+++ b/wolnelektury/templates/lessons/document_detail.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends 'base.html' %}
+{% load i18n %}
 
 {% block title %}{{ object.title }} w WolneLektury.pl{% endblock %}
 

diff --git a/wolnelektury/templates/lessons/document_list.html b/wolnelektury/templates/lessons/document_list.html
index 9d30d51..84dee53 100644 (file)
--- a/wolnelektury/templates/lessons/document_list.html
+++ b/wolnelektury/templates/lessons/document_list.html
@@ -1,5 +1,5 @@
-{% load i18n %}
 {% extends "base.html" %}
+{% load i18n %}
 {% load catalogue_tags chunks %}
 
 {% block bodyid %}document-list-body{% endblock %}