{% trans "Table of contents" %}

{% trans "Recent audiobooks" %}

+ {% work_list object_list %} +

{% trans "Recent DAISY files" %}

+ {% work_list object_list %} +

{% trans "Recent publications" %}

+ {% blocktrans %}You can also see recent audiobooks + and recent DAISY files.{% endblocktrans %} +

+ {% work_list object_list %} +

%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'), diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 92ecebf00..d69e5428c 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -103,13 +103,7 @@ def daisy_list(request): def collection(request, slug): coll = get_object_or_404(models.Collection, slug=slug) - def get_filter(): - slugs = coll.book_slugs.split() - # allow URIs - slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug - for slug in slugs] - return Q(slug__in=slugs) - return book_list(request, get_filter=get_filter, + return book_list(request, get_filter=coll.get_query, template_name='catalogue/collection.html', cache_key='catalogue.collection:%s' % coll.slug, context={'collection': coll}) diff --git a/apps/libraries/__init__.py b/apps/libraries/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/libraries/admin.py b/apps/libraries/admin.py new file mode 100644 index 000000000..5fa88df54 --- /dev/null +++ b/apps/libraries/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +from libraries.models import Library, Catalog + + +admin.site.register(Catalog) +admin.site.register(Library) diff --git a/apps/libraries/locale/pl/LC_MESSAGES/django.mo b/apps/libraries/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 000000000..4aa3d522e 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 index 000000000..0b0a8a441 --- /dev/null +++ b/apps/libraries/locale/pl/LC_MESSAGES/django.po @@ -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 , 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 \n" +"Language-Team: LANGUAGE \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 index 000000000..0411c878a --- /dev/null +++ b/apps/libraries/migrations/0001_initial.py @@ -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 index 000000000..c37abf526 --- /dev/null +++ b/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py @@ -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 index 000000000..de0cdf0b1 --- /dev/null +++ b/apps/libraries/migrations/0003_auto__add_field_library_slug.py @@ -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 index 000000000..e69de29bb diff --git a/apps/libraries/models.py b/apps/libraries/models.py new file mode 100644 index 000000000..5f92421fc --- /dev/null +++ b/apps/libraries/models.py @@ -0,0 +1,41 @@ +from django.db import models +from django.utils.translation import ugettext_lazy as _ + + +class Catalog(models.Model): + """Represents a dictionary of libraries""" + + name = models.CharField(_('name'), max_length = 120, null = False) + slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True) + + class Meta: + verbose_name = _('catalog') + verbose_name_plural = _('catalogs') + + def __unicode__(self): + return self.name + + @models.permalink + def get_absolute_url(self): + return ('libraries_catalog_view', [self.slug]) + + +class Library(models.Model): + """Represent a single library in the libraries dictionary""" + + 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) + url = models.CharField(_('url'), max_length = 120, blank = True) + description = models.TextField(_('description'), blank = True) + + class Meta: + verbose_name = _('library') + verbose_name_plural = _('libraries') + + def __unicode__(self): + return self.name + + @models.permalink + def get_absolute_url(self): + 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 index 000000000..5d35fd973 --- /dev/null +++ b/apps/libraries/templates/libraries/catalog_view.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{% trans 'Libraries directory' %}{% endblock %} + + +{% block body %} +

{{library.name}}

+ +{% 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 index 000000000..a97282987 --- /dev/null +++ b/apps/libraries/templates/libraries/library_view.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{{ library.name }}{% endblock %} + + +{% block body %} +

Adres strony www: {{library.url}}

+ {% autoescape off %}{{library.description}}{% endautoescape%} +

+{% 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 index 000000000..55e5f0249 --- /dev/null +++ b/apps/libraries/templates/libraries/main_view.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{% trans 'Library directories' %}{% endblock %} + + +{% block body %} +

{% trans 'Library directories' %}

{{catalog}}

+ +{% endblock %} \ No newline at end of file diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py new file mode 100644 index 000000000..01531a9ed --- /dev/null +++ b/apps/libraries/urls.py @@ -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[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'), + url(r'^/(?P[a-zA-Z0-9_-]+)/(?P[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 index 000000000..f79f2a1ea --- /dev/null +++ b/apps/libraries/views.py @@ -0,0 +1,20 @@ +from django.shortcuts import render_to_response, get_object_or_404 +from django.template import RequestContext, Template, TemplateSyntaxError + +from libraries.models import Catalog, Library + + +def main_view(request): + context = RequestContext(request) + context['catalogs'] = Catalog.objects.all() + return render_to_response('libraries/main_view.html', context_instance = context) + +def catalog_view(request, slug): + context = RequestContext(request) + context['catalog'] = get_object_or_404(Catalog.objects.filter(slug = slug).select_related()) + return render_to_response('libraries/catalog_view.html', context_instance = context) + +def library_view(request, catalog_slug, slug): + context = RequestContext(request) + context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug)) + return render_to_response('libraries/library_view.html', context_instance = context) \ No newline at end of file diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo index ddd53cbfb..a4a1feb23 100644 Binary files a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo and b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po index a2d082e91..3231b8f83 100644 --- a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po +++ b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \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 "" "Find out why Internet libraries can't publish this author's works." msgstr "" +"Dowiedz " +"siÄ, 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 "" "Find out why Internet libraries can't publish this work." msgstr "" +"Dowiedz " +"siÄ, 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" diff --git a/apps/pdcounter/templates/pdcounter/author_detail.html b/apps/pdcounter/templates/pdcounter/author_detail.html index 7ed5fa7b2..50eef63fb 100644 --- a/apps/pdcounter/templates/pdcounter/author_detail.html +++ b/apps/pdcounter/templates/pdcounter/author_detail.html @@ -4,7 +4,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 %} @@ -37,7 +37,7 @@ {% trans "Find out why Internet libraries can't publish this author's works." %}

{% else %} {% if author.in_pd %} -

{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}

{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}

{% else %}

{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}

diff --git a/apps/pdcounter/templates/pdcounter/book_stub_detail.html b/apps/pdcounter/templates/pdcounter/book_stub_detail.html index af91fcbb6..640d68ebe 100644 --- a/apps/pdcounter/templates/pdcounter/book_stub_detail.html +++ b/apps/pdcounter/templates/pdcounter/book_stub_detail.html @@ -4,7 +4,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 %} @@ -14,7 +14,7 @@

{% if book.in_pd %} -

{% trans "This work is in public domain and will be published on Internet school library of Wolne Lektury soon." %}

{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}

{% else %} {% if book.pd %}

{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}

diff --git a/apps/sponsors/migrations/0001_initial.py b/apps/sponsors/migrations/0001_initial.py index 640659532..5233db3c0 100644 --- a/apps/sponsors/migrations/0001_initial.py +++ b/apps/sponsors/migrations/0001_initial.py @@ -1,60 +1,59 @@ -# encoding: utf-8 +# -*- 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 'Sponsor' - db.create_table('sponsors_sponsor', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table(u'sponsors_sponsor', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=120)), ('_description', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), ('logo', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), ('url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)), )) - db.send_create_signal('sponsors', ['Sponsor']) + db.send_create_signal(u'sponsors', ['Sponsor']) # Adding model 'SponsorPage' - db.create_table('sponsors_sponsorpage', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table(u'sponsors_sponsorpage', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=120)), - ('sponsors', self.gf('jsonfield.fields.JSONField')(default={})), + ('sponsors', self.gf('jsonfield.fields.JSONField')(default='{}')), ('_html', self.gf('django.db.models.fields.TextField')(blank=True)), ('sprite', self.gf('django.db.models.fields.files.ImageField')(max_length=100, blank=True)), )) - db.send_create_signal('sponsors', ['SponsorPage']) + db.send_create_signal(u'sponsors', ['SponsorPage']) def backwards(self, orm): - # Deleting model 'Sponsor' - db.delete_table('sponsors_sponsor') + db.delete_table(u'sponsors_sponsor') # Deleting model 'SponsorPage' - db.delete_table('sponsors_sponsorpage') + db.delete_table(u'sponsors_sponsorpage') models = { - 'sponsors.sponsor': { + u'sponsors.sponsor': { 'Meta': {'object_name': 'Sponsor'}, '_description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}), 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) }, - 'sponsors.sponsorpage': { + u'sponsors.sponsorpage': { 'Meta': {'object_name': 'SponsorPage'}, '_html': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}), - 'sponsors': ('jsonfield.fields.JSONField', [], {'default': '{}'}), + 'sponsors': ('jsonfield.fields.JSONField', [], {'default': "'{}'"}), 'sprite': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}) } } - complete_apps = ['sponsors'] + complete_apps = ['sponsors'] \ No newline at end of file diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py index cbc8d9ba4..2d18d1664 100644 --- a/apps/sponsors/models.py +++ b/apps/sponsors/models.py @@ -35,7 +35,7 @@ class Sponsor(models.Model): class SponsorPage(models.Model): name = models.CharField(_('name'), max_length=120) - sponsors = JSONField(_('sponsors'), default={}) + sponsors = JSONField(_('sponsors'), default='{}') _html = models.TextField(blank=True, editable=False) sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True) diff --git a/apps/suggest/migrations/0003_auto__chg_field_suggestion_ip.py b/apps/suggest/migrations/0003_auto__chg_field_suggestion_ip.py new file mode 100644 index 000000000..70c2e6e14 --- /dev/null +++ b/apps/suggest/migrations/0003_auto__chg_field_suggestion_ip.py @@ -0,0 +1,78 @@ +# -*- 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): + + # Changing field 'Suggestion.ip' + db.alter_column(u'suggest_suggestion', 'ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39)) + + def backwards(self, orm): + + # Changing field 'Suggestion.ip' + db.alter_column(u'suggest_suggestion', 'ip', self.gf('django.db.models.fields.IPAddressField')(max_length=15)) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'suggest.publishingsuggestion': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'PublishingSuggestion'}, + 'audiobooks': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'books': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'suggest.suggestion': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'Suggestion'}, + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['suggest'] \ No newline at end of file diff --git a/apps/suggest/migrations/0004_auto__chg_field_publishingsuggestion_ip.py b/apps/suggest/migrations/0004_auto__chg_field_publishingsuggestion_ip.py new file mode 100644 index 000000000..ea48b2439 --- /dev/null +++ b/apps/suggest/migrations/0004_auto__chg_field_publishingsuggestion_ip.py @@ -0,0 +1,78 @@ +# -*- 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): + + # Changing field 'PublishingSuggestion.ip' + db.alter_column(u'suggest_publishingsuggestion', 'ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39)) + + def backwards(self, orm): + + # Changing field 'PublishingSuggestion.ip' + db.alter_column(u'suggest_publishingsuggestion', 'ip', self.gf('django.db.models.fields.IPAddressField')(max_length=15)) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'suggest.publishingsuggestion': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'PublishingSuggestion'}, + 'audiobooks': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'books': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'suggest.suggestion': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'Suggestion'}, + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['suggest'] \ No newline at end of file diff --git a/apps/suggest/models.py b/apps/suggest/models.py index e58c9a805..c0f8658f5 100644 --- a/apps/suggest/models.py +++ b/apps/suggest/models.py @@ -10,7 +10,7 @@ class Suggestion(models.Model): contact = models.CharField(_('contact'), blank=True, max_length=120) description = models.TextField(_('description'), blank=True) created_at = models.DateTimeField(_('creation date'), auto_now=True) - ip = models.IPAddressField(_('IP address')) + ip = models.GenericIPAddressField(_('IP address')) user = models.ForeignKey(User, blank=True, null=True) class Meta: @@ -27,7 +27,7 @@ class PublishingSuggestion(models.Model): books = models.TextField(_('books'), null=True, blank=True) audiobooks = models.TextField(_('audiobooks'), null=True, blank=True) created_at = models.DateTimeField(_('creation date'), auto_now_add=True) - ip = models.IPAddressField(_('IP address')) + ip = models.GenericIPAddressField(_('IP address')) user = models.ForeignKey(User, blank=True, null=True) class Meta: diff --git a/apps/wolnelektury_core/static/css/main_page.css b/apps/wolnelektury_core/static/css/main_page.css index a53b9de5e..4bf75ea23 100755 --- a/apps/wolnelektury_core/static/css/main_page.css +++ b/apps/wolnelektury_core/static/css/main_page.css @@ -51,6 +51,10 @@ } .main-last span { font-size: 1.1em; + color: black; +} +.main-last span:after { + content: " >"; } diff --git a/apps/wolnelektury_core/static/js/book.js b/apps/wolnelektury_core/static/js/book.js index 335fe39c0..72d8174fc 100644 --- a/apps/wolnelektury_core/static/js/book.js +++ b/apps/wolnelektury_core/static/js/book.js @@ -19,6 +19,9 @@ $(function() { if ($('#toc li').length == 0) { $('#menu li a[href="#toc"]').remove(); } + if ($('#themes li').length == 0) { + $('#menu li a[href="#themes"]').remove(); + } if ($('#nota_red').length == 0) { $('#menu li a[href="#nota_red"]').remove(); } diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html index 8bb401bb7..a751022e1 100755 --- a/apps/wolnelektury_core/templates/main_page.html +++ b/apps/wolnelektury_core/templates/main_page.html @@ -28,7 +28,7 @@

{% trans "Recent publications" %}

{% cache 60 last-published-on-main %} {% for book in last_published %} {% book_mini book %} diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html index 0d1ffa6a7..a338b97ff 100644 --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@ -32,7 +32,6 @@ {% endblock %} - {% include "annoy.html" %} {% block bodycontent %} {% funding link=1 closeable=1 add_class="funding-top-header" %} diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 4300aafa5..8d7c00f82 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -66,7 +66,8 @@ INSTALLED_APPS_OUR = [ 'search', 'oai', 'funding', - 'polls' + 'polls', + 'libraries', ] GETPAID_BACKENDS = ( diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py index e5bd333f6..a3ff42430 100644 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@ -36,8 +36,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', }, @@ -50,8 +48,6 @@ PIPELINE_CSS = { 'book': { 'source_filenames': [ 'css/master.book.css', - - 'css/annoy.css', ], 'output_filename': 'css/compressed/book.css', }, @@ -89,8 +85,6 @@ PIPELINE_JS = { 'player/openplayer.js', 'js/search.js', 'funding/funding.js', - - 'js/annoy.js', ), 'output_filename': 'js/base.min.js', }, @@ -109,8 +103,6 @@ PIPELINE_JS = { 'js/jquery.highlightfade.js', 'js/book.js', 'player/openplayer.js', - - 'js/annoy.js', ], 'output_filename': 'js/book.min.js', }, diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index fd8ed63bf..6c254519c 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -37,6 +37,7 @@ urlpatterns += patterns('', url(r'^czekaj/', include('waiter.urls')), url(r'^wesprzyj/', include('funding.urls')), url(r'^ankieta/', include('polls.urls')), + url(r'^biblioteki', include('libraries.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),

{% trans "Recent audiobooks" %}

{% trans "Recent DAISY files" %}

{% trans "Recent publications" %}

{{ catalog.name }}

{{ library.name }}

{% trans 'Library directories' %}

{% trans "Recent publications" %}

{% trans "Recent publications" %}