Merge branch 'master' into production
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
25 files changed:
apps/api/locale/pl/LC_MESSAGES/django.mo
apps/api/locale/pl/LC_MESSAGES/django.po
apps/catalogue/templates/catalogue/book_text.html
apps/libraries/__init__.py [new file with mode: 0644]
apps/libraries/admin.py [new file with mode: 0644]
apps/libraries/locale/pl/LC_MESSAGES/django.mo [new file with mode: 0644]
apps/libraries/locale/pl/LC_MESSAGES/django.po [new file with mode: 0644]
apps/libraries/migrations/0001_initial.py [new file with mode: 0644]
apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py [new file with mode: 0644]
apps/libraries/migrations/0003_auto__add_field_library_slug.py [new file with mode: 0644]
apps/libraries/migrations/__init__.py [new file with mode: 0644]
apps/libraries/models.py [new file with mode: 0644]
apps/libraries/templates/libraries/catalog_view.html [new file with mode: 0644]
apps/libraries/templates/libraries/library_view.html [new file with mode: 0644]
apps/libraries/templates/libraries/main_view.html [new file with mode: 0644]
apps/libraries/urls.py [new file with mode: 0644]
apps/libraries/views.py [new file with mode: 0644]
apps/pdcounter/locale/pl/LC_MESSAGES/django.mo
apps/pdcounter/locale/pl/LC_MESSAGES/django.po
apps/pdcounter/templates/pdcounter/author_detail.html
apps/pdcounter/templates/pdcounter/book_stub_detail.html
apps/wolnelektury_core/templates/superbase.html
wolnelektury/settings/__init__.py
wolnelektury/settings/static.py
wolnelektury/urls.py

index d7a620e..45b7db8 100644 (file)
Binary files a/apps/api/locale/pl/LC_MESSAGES/django.mo and b/apps/api/locale/pl/LC_MESSAGES/django.mo differ
index e777d05..bc4373b 100644 (file)
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-19 11:38+0200\n"
-"PO-Revision-Date: 2012-03-20 12:50+0100\n"
+"PO-Revision-Date: 2013-06-11 15:36+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: templates/api/main.html:6
 msgid "WolneLektury.pl API"
@@ -59,17 +59,16 @@ msgstr ""
 "API Wolnych Lektur zawiera następujące adresy URL:\n"
 
 #: templates/api/main.html:41
-#, fuzzy
 msgid "All books"
-msgstr "Lista utworów"
+msgstr "Wszystkie utwory"
 
 #: templates/api/main.html:43
 msgid "Audiobooks"
-msgstr ""
+msgstr "Audiobooki"
 
 #: templates/api/main.html:45
 msgid "DAISY"
-msgstr ""
+msgstr "DAISY"
 
 #: templates/api/main.html:48
 msgid "List of all authors"
index aa2b392..362af1b 100644 (file)
@@ -17,7 +17,6 @@
 
     </head>
     <body>
-        {% include "annoy.html" %}
         <div id="menu">
             <ul>
                 <li><a class="menu" href="#toc">{% trans "Table of contents" %}</a></li>
diff --git a/apps/libraries/__init__.py b/apps/libraries/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/apps/libraries/admin.py b/apps/libraries/admin.py
new file mode 100644 (file)
index 0000000..5fa88df
--- /dev/null
@@ -0,0 +1,7 @@
+from django.contrib import admin\r
+\r
+from libraries.models import Library, Catalog\r
+\r
+\r
+admin.site.register(Catalog)\r
+admin.site.register(Library)\r
diff --git a/apps/libraries/locale/pl/LC_MESSAGES/django.mo b/apps/libraries/locale/pl/LC_MESSAGES/django.mo
new file mode 100644 (file)
index 0000000..4aa3d52
Binary files /dev/null and b/apps/libraries/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/apps/libraries/locale/pl/LC_MESSAGES/django.po b/apps/libraries/locale/pl/LC_MESSAGES/django.po
new file mode 100644 (file)
index 0000000..0b0a8a4
--- /dev/null
@@ -0,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-10 10:38+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: models.py:8 models.py:26
+msgid "name"
+msgstr "nazwa"
+
+#: models.py:9
+msgid "slug"
+msgstr ""
+
+#: models.py:12
+msgid "catalog"
+msgstr "katalog"
+
+#: models.py:13
+msgid "catalogs"
+msgstr "katalogi"
+
+#: models.py:28
+msgid "url"
+msgstr "url"
+
+#: models.py:29
+msgid "description"
+msgstr "opis"
+
+#: models.py:32
+msgid "library"
+msgstr "biblioteka"
+
+#: models.py:33
+msgid "libraries"
+msgstr "biblioteki"
+
+#: templates/libraries/library_view.html:4
+#: templates/libraries/library_view.html:8
+msgid "Libraries directory"
+msgstr "Katalog bibliotek"
+
+#: templates/libraries/main_view.html:4 templates/libraries/main_view.html:8
+msgid "Library directories"
+msgstr "Katalogi bibliotek"
+
diff --git a/apps/libraries/migrations/0001_initial.py b/apps/libraries/migrations/0001_initial.py
new file mode 100644 (file)
index 0000000..0411c87
--- /dev/null
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Library'
+        db.create_table(u'libraries_library', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)),
+            ('url', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal(u'libraries', ['Library'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Library'
+        db.delete_table(u'libraries_library')
+
+
+    models = {
+        u'libraries.library': {
+            'Meta': {'object_name': 'Library'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['libraries']
\ No newline at end of file
diff --git a/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py b/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py
new file mode 100644 (file)
index 0000000..c37abf5
--- /dev/null
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Catalog'
+        db.create_table(u'libraries_catalog', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=120)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120)),
+        ))
+        db.send_create_signal(u'libraries', ['Catalog'])
+
+        # Adding field 'Library.catalog'
+        db.add_column(u'libraries_library', 'catalog',
+                      self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='libraries', on_delete=models.PROTECT, to=orm['libraries.Catalog']),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting model 'Catalog'
+        db.delete_table(u'libraries_catalog')
+
+        # Deleting field 'Library.catalog'
+        db.delete_column(u'libraries_library', 'catalog_id')
+
+
+    models = {
+        u'libraries.catalog': {
+            'Meta': {'object_name': 'Catalog'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120'})
+        },
+        u'libraries.library': {
+            'Meta': {'object_name': 'Library'},
+            'catalog': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'libraries'", 'on_delete': 'models.PROTECT', 'to': u"orm['libraries.Catalog']"}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['libraries']
\ No newline at end of file
diff --git a/apps/libraries/migrations/0003_auto__add_field_library_slug.py b/apps/libraries/migrations/0003_auto__add_field_library_slug.py
new file mode 100644 (file)
index 0000000..de0cdf0
--- /dev/null
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Library.slug'
+        db.add_column(u'libraries_library', 'slug',
+                      self.gf('django.db.models.fields.SlugField')(max_length=120, unique=True, null=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Library.slug'
+        db.delete_column(u'libraries_library', 'slug')
+
+
+    models = {
+        u'libraries.catalog': {
+            'Meta': {'object_name': 'Catalog'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120'})
+        },
+        u'libraries.library': {
+            'Meta': {'object_name': 'Library'},
+            'catalog': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'libraries'", 'on_delete': 'models.PROTECT', 'to': u"orm['libraries.Catalog']"}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'unique': 'True', 'null': 'True'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['libraries']
\ No newline at end of file
diff --git a/apps/libraries/migrations/__init__.py b/apps/libraries/migrations/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/apps/libraries/models.py b/apps/libraries/models.py
new file mode 100644 (file)
index 0000000..5f92421
--- /dev/null
@@ -0,0 +1,41 @@
+from django.db import models\r
+from django.utils.translation import ugettext_lazy as _\r
+\r
+\r
+class Catalog(models.Model):\r
+    """Represents a dictionary of libraries"""\r
+\r
+    name = models.CharField(_('name'), max_length = 120, null = False)\r
+    slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True)\r
+\r
+    class Meta:\r
+        verbose_name = _('catalog')\r
+        verbose_name_plural = _('catalogs')\r
+    \r
+    def __unicode__(self):\r
+        return self.name\r
+        \r
+    @models.permalink\r
+    def get_absolute_url(self):\r
+        return ('libraries_catalog_view', [self.slug])\r
+        \r
+        \r
+class Library(models.Model):\r
+    """Represent a single library in the libraries dictionary"""\r
+\r
+    name = models.CharField(_('name'), max_length = 120, blank = True)
+    slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True, null = True)
+    catalog = models.ForeignKey(Catalog, null = False, related_name = 'libraries', on_delete = models.PROTECT)\r
+    url = models.CharField(_('url'), max_length = 120, blank = True)
+    description = models.TextField(_('description'), blank = True)\r
+\r
+    class Meta:\r
+        verbose_name = _('library')\r
+        verbose_name_plural = _('libraries')\r
+\r
+    def __unicode__(self):\r
+        return self.name\r
+\r
+    @models.permalink\r
+    def get_absolute_url(self):\r
+        return ('libraries_library_view', [self.catalog.slug, self.slug])
\ No newline at end of file
diff --git a/apps/libraries/templates/libraries/catalog_view.html b/apps/libraries/templates/libraries/catalog_view.html
new file mode 100644 (file)
index 0000000..5d35fd9
--- /dev/null
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block titleextra %}{% trans 'Libraries directory' %}{% endblock %}
+
+
+{% block body %}
+    <h1>{{ catalog.name }}</h1>
+    <div class="left-column">
+        <div class="normal-text">
+            <ul>
+                {% for library in catalog.libraries.all %}
+                    <li><a href="{{library.get_absolute_url}}">{{library.name}}</a></li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/apps/libraries/templates/libraries/library_view.html b/apps/libraries/templates/libraries/library_view.html
new file mode 100644 (file)
index 0000000..a972829
--- /dev/null
@@ -0,0 +1,13 @@
+{% extends "base.html" %}\r
+{% load i18n %}\r
+\r
+{% block titleextra %}{{ library.name }}{% endblock %}\r
+\r
+\r
+{% block body %}
+    <h1>{{ library.name }}</h1>
+    <div class="normal-text">
+        <p>Adres strony www: <a href="{{library.url}}">{{library.url}}</a></p>\r
+        {% autoescape off %}{{library.description}}{% endautoescape%}
+    </div>\r
+{% endblock %}
\ No newline at end of file
diff --git a/apps/libraries/templates/libraries/main_view.html b/apps/libraries/templates/libraries/main_view.html
new file mode 100644 (file)
index 0000000..55e5f02
--- /dev/null
@@ -0,0 +1,19 @@
+{% extends "base.html" %}\r
+{% load i18n %}\r
+\r
+{% block titleextra %}{% trans 'Library directories' %}{% endblock %}\r
+\r
+\r
+{% block body %}\r
+    <h1>{% trans 'Library directories' %}</h1>
+    <div class="left-column">\r
+        <div class="normal-text">\r
+            <ul>
+            {% for catalog in catalogs %}
+                <li><a href="{{catalog.get_absolute_url}}">{{catalog}}</a></li>
+            {% endfor %}\r
+            </ul>\r
+        </div>
+    </div>\r
+\r
+{% endblock %}
\ No newline at end of file
diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py
new file mode 100644 (file)
index 0000000..01531a9
--- /dev/null
@@ -0,0 +1,10 @@
+from django.conf.urls.defaults import patterns, url
+from django.http import HttpResponseRedirect
+
+
+urlpatterns = patterns('libraries.views',
+    url(r'^$', 'main_view', name='libraries_main_view'),
+    url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
+    url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
+    url(r'^/(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),
+)
\ No newline at end of file
diff --git a/apps/libraries/views.py b/apps/libraries/views.py
new file mode 100644 (file)
index 0000000..f79f2a1
--- /dev/null
@@ -0,0 +1,20 @@
+from django.shortcuts import render_to_response, get_object_or_404\r
+from django.template import RequestContext, Template, TemplateSyntaxError\r
+\r
+from libraries.models import Catalog, Library\r
+\r
+\r
+def main_view(request):\r
+    context = RequestContext(request)\r
+    context['catalogs'] = Catalog.objects.all()\r
+    return render_to_response('libraries/main_view.html', context_instance = context)\r
+\r
+def catalog_view(request, slug):\r
+    context = RequestContext(request)\r
+    context['catalog'] = get_object_or_404(Catalog.objects.filter(slug = slug).select_related())\r
+    return render_to_response('libraries/catalog_view.html', context_instance = context)\r
+    \r
+def library_view(request, catalog_slug, slug):\r
+    context = RequestContext(request)\r
+    context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug))\r
+    return render_to_response('libraries/library_view.html', context_instance = context)
\ No newline at end of file
index ddd53cb..a4a1feb 100644 (file)
Binary files a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo and b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo differ
index a2d082e..3231b8f 100644 (file)
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-19 11:39+0200\n"
-"PO-Revision-Date: 2012-01-27 16:40+0100\n"
+"POT-Creation-Date: 2013-06-11 15:46+0200\n"
+"PO-Revision-Date: 2013-06-11 15:47+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.6\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: models.py:13
 msgid "name"
@@ -65,17 +65,22 @@ msgstr "zapowiedź książki"
 msgid "book stubs"
 msgstr "zapowiedzi książek"
 
+#: templates/pdcounter/author_detail.html:6
+#: templates/pdcounter/book_stub_detail.html:6
+msgid "Public domain counter"
+msgstr "Licznik domeny publicznej"
+
 #: templates/pdcounter/author_detail.html:25
 msgid "Read work's study of this author on Lektury.Gazeta.pl"
-msgstr ""
+msgstr "Przeczytaj omówienia utworów autora w serwisie Lektury.Gazeta.pl"
 
 #: templates/pdcounter/author_detail.html:30
 msgid "Read article about this author on Wikipedia"
-msgstr ""
+msgstr "Przeczytaj artykuł o autorze w Wikipedii"
 
 #: templates/pdcounter/author_detail.html:35
 msgid "This author's works are copyrighted."
-msgstr ""
+msgstr "Dzieła tego autora objęte są prawem autorskim."
 
 #: templates/pdcounter/author_detail.html:36
 #: templates/pdcounter/author_detail.html:44
@@ -83,30 +88,41 @@ msgid ""
 "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</"
 "a> why Internet libraries can't publish this author's works."
 msgstr ""
+"<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Dowiedz "
+"się</a>, dlaczego biblioteki internetowe nie mogą udostępniać dzieł tego "
+"autora."
 
 #: templates/pdcounter/author_detail.html:39
 msgid ""
 "This author's works are in public domain and will be published on Internet "
-"school library of Wolne Lektury soon."
+"library of Wolne Lektury soon."
 msgstr ""
+"Dzieła tego autora znajdują się w domenie publicznej i niedługo zostaną "
+"opublikowane w bibliotece internetowej Wolne Lektury."
 
 #: templates/pdcounter/author_detail.html:42
 msgid ""
 "This author's works will become part of public domain and will be allowed to "
 "be published without restrictions in"
 msgstr ""
+"Dzieła tego autora przejdą do zasobów domeny publicznej i będą mogły być "
+"publikowane bez żadnych ograniczeń za"
 
 #: templates/pdcounter/book_stub_detail.html:16
 msgid ""
-"This work is in public domain and will be published on Internet school "
-"library of Wolne Lektury soon."
+"This work is in public domain and will be published on Internet library of "
+"Wolne Lektury soon."
 msgstr ""
+"Ten utwór znajduje się w domenie publicznej i niedługo zostanie opublikowany "
+"w bibliotece internetowej Wolne Lektury."
 
 #: templates/pdcounter/book_stub_detail.html:19
 msgid ""
 "This work will become part of public domain and will be allowed to be "
 "published without restrictions in"
 msgstr ""
+"Ten utwór przejdzie do zasobów domeny publicznej i będzie mógł być "
+"publikowany bez żadnych ograniczeń za"
 
 #: templates/pdcounter/book_stub_detail.html:21
 #: templates/pdcounter/book_stub_detail.html:24
@@ -114,10 +130,12 @@ msgid ""
 "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</"
 "a> why Internet libraries can't publish this work."
 msgstr ""
+"<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Dowiedz "
+"się</a>, dlaczego biblioteki internetowe nie mogą udostępniać tego utworu."
 
 #: templates/pdcounter/book_stub_detail.html:23
 msgid "This work is copyrighted."
-msgstr ""
+msgstr "Ten utwór objęty jest prawem autorskim."
 
 #~ msgid "year of translator's death"
 #~ msgstr "rok śmierci tłumacza"
index 3810a45..fc3bd5b 100644 (file)
@@ -3,7 +3,7 @@
 
 {% block titleextra %}{{ author.name }}{% endblock %}
 
-{% block metadescription %}Licznik domeny publicznej: {{author.name}}.{% endblock %}
+{% block metadescription %}{% trans "Public domain counter" %}: {{author.name}}.{% endblock %}
 
 {% block bodyid %}author-detail{% endblock %}
 
@@ -36,7 +36,7 @@
             {% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this author's works." %}</p>
         {% else %}
             {% if author.in_pd %}
-                <p>{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
+                <p>{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
             {% else %}
                 <div>
                     <p>{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}</p>
index f76edd1..40ddbd8 100644 (file)
@@ -3,7 +3,7 @@
 
 {% block titleextra %}{{ book.title }}{% endblock %}
 
-{% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %}
+{% block metadescription %}{% trans "Public domain counter" %}: {{ book.title }}.{% endblock %}
 
 {% block bodyid %}book-stub-detail{% endblock %}
 
@@ -13,7 +13,7 @@
        <div class="normal-text white-box">
 
     {% if book.in_pd %}
-               <p>{% trans "This work is in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
+               <p>{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}</p>
        {% else %}
            {% if book.pd %}
                        <p>{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}</p>
index 182d2b0..3eaf962 100644 (file)
@@ -32,7 +32,6 @@
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
-        {% include "annoy.html" %}
 
         {% block bodycontent %}
 
index 1f0d1d2..caec10b 100644 (file)
@@ -65,6 +65,7 @@ INSTALLED_APPS_OUR = [
     'waiter',
     'search',
     'oai',
+    'libraries',
     ]
 
 INSTALLED_APPS_CONTRIB = [
index 4e104c4..2ed7b38 100644 (file)
@@ -33,8 +33,6 @@ PIPELINE_CSS = {
 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
-
-            'css/annoy.css',
         ],
         'output_filename': 'css/compressed/all.css',
     },
@@ -47,8 +45,6 @@ PIPELINE_CSS = {
     'book': {
         'source_filenames': [
             'css/master.book.css',
-
-            'css/annoy.css',
         ],
         'output_filename': 'css/compressed/book.css',
     },
@@ -85,8 +81,6 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',
-
-            'js/annoy.js',
             ),
         'output_filename': 'js/base.min.js',
     },
@@ -105,8 +99,6 @@ PIPELINE_JS = {
             'js/jquery.highlightfade.js',
             'js/book.js',
             'player/openplayer.js',
-
-            'js/annoy.js',
         ],
         'output_filename': 'js/book.min.js',
     },
index 7224b20..e99b081 100644 (file)
@@ -35,6 +35,7 @@ urlpatterns += patterns('',
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.urls')),
+    url(r'^biblioteki', include('libraries.urls')),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),