From: Marcin Koziej Date: Tue, 28 Aug 2012 10:37:08 +0000 (+0200) Subject: Merge branch 'master' of github.com:fnp/prawokultury X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/3f6f55a25872c1d1465f7bdb59e8a766da9c51cc?hp=d902ff50c0326143915c3e5deaa7059e6d57f6d4 Merge branch 'master' of github.com:fnp/prawokultury --- diff --git a/events/admin.py b/events/admin.py index 2fb55d6..e75c047 100644 --- a/events/admin.py +++ b/events/admin.py @@ -2,7 +2,17 @@ # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.conf import settings from django.contrib import admin from events.models import Event +from migdal.helpers import translated_fields -admin.site.register(Event) + +class EventAdmin(admin.ModelAdmin): + list_display = translated_fields( + ('title', 'place', 'organizer'), settings.LANGUAGES + ) + ('date',) + date_hierarchy = 'date' + + +admin.site.register(Event, EventAdmin) diff --git a/events/locale/pl/LC_MESSAGES/django.mo b/events/locale/pl/LC_MESSAGES/django.mo index 2f62cb1..bc4bd21 100644 Binary files a/events/locale/pl/LC_MESSAGES/django.mo and b/events/locale/pl/LC_MESSAGES/django.mo differ diff --git a/events/locale/pl/LC_MESSAGES/django.po b/events/locale/pl/LC_MESSAGES/django.po index 6d8568c..e758503 100644 --- a/events/locale/pl/LC_MESSAGES/django.po +++ b/events/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: prawokultury-events\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-07 17:28+0200\n" -"PO-Revision-Date: 2012-08-07 17:29+0100\n" +"POT-Creation-Date: 2012-08-28 11:24+0200\n" +"PO-Revision-Date: 2012-08-28 11:28+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" "Language: \n" @@ -33,23 +33,39 @@ msgstr "wydarzenie" msgid "events" msgstr "wydarzenia" -#: models.py:20 +#: models.py:24 msgid "title" msgstr "tytuł" -#: models.py:21 +#: models.py:25 msgid "organizer" msgstr "organizator" -#: models.py:22 +#: models.py:26 msgid "place" msgstr "miejsce" -#: templates/events/event_list.html:5 +#: urls.py:11 +msgid "past" +msgstr "przeszle" + +#: templates/events/event_list.html:7 msgid "Events" msgstr "Wydarzenia" -#: templates/events/snippets/events_box.html:15 +#: templates/events/event_list.html:18 +msgid "see upcoming events" +msgstr "zobaczy nadchodzące wydarzenia" + +#: templates/events/event_list.html:22 +msgid "see past events" +msgstr "zobacz przeszłe wydarzenia" + +#: templates/events/snippets/event_short.html:9 +msgid "Organizer" +msgstr "Organizator" + +#: templates/events/snippets/events_box.html:21 msgid "more events" msgstr "więcej wydarzeń" diff --git a/events/models.py b/events/models.py index 742c2f2..9c216af 100644 --- a/events/models.py +++ b/events/models.py @@ -16,6 +16,10 @@ class Event(models.Model): verbose_name_plural = _('events') ordering = ['date'] + def __unicode__(self): + return self.title + + add_translatable(Event, { 'title': models.CharField(_('title'), max_length=255), 'organizer': models.CharField(_('organizer'), max_length=255, db_index=True), diff --git a/events/templates/events/snippets/events_box.html b/events/templates/events/snippets/events_box.html index fc15f6c..16de000 100755 --- a/events/templates/events/snippets/events_box.html +++ b/events/templates/events/snippets/events_box.html @@ -10,9 +10,8 @@
{{ event.date|date:"b" }}
- {{ event.place }} {{ event.title }} - {{ event.organizer }} + ({{ event.organizer }}, {{ event.place }})
diff --git a/migdal/admin.py b/migdal/admin.py index ac0e640..4222368 100644 --- a/migdal/admin.py +++ b/migdal/admin.py @@ -2,17 +2,12 @@ # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.conf import settings from django.contrib import admin from django.utils.translation import ugettext_lazy as _ from migdal.models import Category, Entry, Attachment -from migdal import settings - - -def translated_fields(field_names, languages=settings.LANGUAGES): - return tuple("%s_%s" % (field_name, lang_code) - for field_name in field_names - for lang_code, lang_name in languages - ) +from migdal import app_settings +from migdal.helpers import translated_fields class AttachmentInline(admin.TabularInline): @@ -21,6 +16,7 @@ class AttachmentInline(admin.TabularInline): class EntryAdmin(admin.ModelAdmin): + date_hierarchy = 'date' fieldsets = ( (None, {'fields': (('type', 'promo'), 'author', 'author_email', 'image')}), ) + tuple( @@ -31,7 +27,7 @@ class EntryAdmin(admin.ModelAdmin): 'lead_%s' % lc, 'body_%s' % lc, )}) - for lc, ln in settings.OBLIGATORY_LANGUAGES + for lc, ln in app_settings.OBLIGATORY_LANGUAGES ) + tuple( (ln, {'fields': ( ('needed_%s' % lc, 'published_%s' % lc), @@ -40,7 +36,7 @@ class EntryAdmin(admin.ModelAdmin): 'lead_%s' % lc, 'body_%s' % lc, )}) - for lc, ln in settings.OPTIONAL_LANGUAGES + for lc, ln in app_settings.OPTIONAL_LANGUAGES ) + ( (_('Categories'), {'fields': ('categories',)}), ) @@ -49,12 +45,12 @@ class EntryAdmin(admin.ModelAdmin): for lang_code, lang_name in settings.LANGUAGES ]) - list_display = translated_fields(('title',), settings.OBLIGATORY_LANGUAGES - ) + ('type', 'date', 'author' + list_display = translated_fields(('title',), app_settings.OBLIGATORY_LANGUAGES + ) + ('type', 'date', 'author', 'promo' ) + translated_fields(('published',) - ) + translated_fields(('needed',), settings.OPTIONAL_LANGUAGES) - list_filter = ('type',) + translated_fields(('published',) - ) + translated_fields(('needed',), settings.OPTIONAL_LANGUAGES) + ) + translated_fields(('needed',), app_settings.OPTIONAL_LANGUAGES) + list_filter = ('type', 'promo') + translated_fields(('published',) + ) + translated_fields(('needed',), app_settings.OPTIONAL_LANGUAGES) inlines = (AttachmentInline,) diff --git a/migdal/api.py b/migdal/api.py old mode 100755 new mode 100644 diff --git a/migdal/feeds.py b/migdal/feeds.py old mode 100755 new mode 100644 diff --git a/migdal/forms.py b/migdal/forms.py old mode 100755 new mode 100644 index 5a9d5d0..9c87bd1 --- a/migdal/forms.py +++ b/migdal/forms.py @@ -23,8 +23,12 @@ def get_submit_form(*args, **kwargs): def __init__(self, *args, **kwargs): super(SubmitForm, self).__init__(*args, **kwargs) - self.fields['title_%s' % lang].required = True - self.fields['lead_%s' % lang].required = True + title = self.fields['title_%s' % lang] + title.required = True + title.label = _('Title') + lead = self.fields['lead_%s' % lang] + lead.required = True + lead.label = _('Content') def clean(self): data = super(SubmitForm, self).clean() diff --git a/migdal/helpers.py b/migdal/helpers.py index 2de7ab0..11f8ddc 100644 --- a/migdal/helpers.py +++ b/migdal/helpers.py @@ -89,3 +89,9 @@ def add_translatable_index(index_class, fields, languages=None): setattr(index_class, fname, new_field) index_class.fields[fname] = new_field + +def translated_fields(field_names, languages=settings.LANGUAGES): + return tuple("%s_%s" % (field_name, lang_code) + for field_name in field_names + for lang_code, lang_name in languages + ) diff --git a/migdal/locale/pl/LC_MESSAGES/django.mo b/migdal/locale/pl/LC_MESSAGES/django.mo index b461c96..c7885fb 100644 Binary files a/migdal/locale/pl/LC_MESSAGES/django.mo and b/migdal/locale/pl/LC_MESSAGES/django.mo differ diff --git a/migdal/locale/pl/LC_MESSAGES/django.po b/migdal/locale/pl/LC_MESSAGES/django.po index c737385..5338d10 100644 --- a/migdal/locale/pl/LC_MESSAGES/django.po +++ b/migdal/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django-migdal 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-08 15:23+0200\n" -"PO-Revision-Date: 2012-08-08 15:26+0100\n" +"POT-Creation-Date: 2012-08-28 12:10+0200\n" +"PO-Revision-Date: 2012-08-28 12:14+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" "Language: Polish\n" @@ -18,116 +18,136 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Poedit-Language: Polish\n" -#: admin.py:45 +#: __init__.py:17 +msgid "news" +msgstr "newsy" + +#: __init__.py:18 +msgid "publications" +msgstr "publikacje" + +#: __init__.py:19 +msgid "info" +msgstr "info" + +#: __init__.py:23 +msgid "topics" +msgstr "tematy" + +#: __init__.py:24 +msgid "types" +msgstr "rodzaje" + +#: admin.py:41 msgid "Categories" msgstr "Kategorie" -#: feeds.py:26 +#: feeds.py:28 msgid "latest" msgstr "ostatnie" -#: feeds.py:30 -#: models.py:46 +#: feeds.py:32 +#: models.py:49 msgid "entries" msgstr "wpisy" -#: feeds.py:32 +#: feeds.py:34 msgid "in category" msgstr "w kategorii" -#: models.py:15 +#: forms.py:28 +msgid "Title" +msgstr "Tytuł" + +#: forms.py:31 +msgid "Content" +msgstr "Treść" + +#: models.py:14 +msgid "taxonomy" +msgstr "taksonomia" + +#: models.py:18 msgid "category" msgstr "kategoria" -#: models.py:16 -#: urls.py:35 -#: urls.py:37 +#: models.py:19 +#: urls.py:40 +#: urls.py:42 msgid "categories" msgstr "kategorie" -#: models.py:37 +#: models.py:40 msgid "author" msgstr "autor" -#: models.py:38 +#: models.py:41 msgid "author email" msgstr "e-mail autora" -#: models.py:39 +#: models.py:42 msgid "Used only to display gravatar and send notifications." msgstr "Używany tylko do wyświetlenia gravatara i wysyłania powiadomień." -#: models.py:40 +#: models.py:43 msgid "image" msgstr "obrazek" -#: models.py:41 +#: models.py:44 msgid "promoted" msgstr "promowane" -#: models.py:45 +#: models.py:48 msgid "entry" msgstr "wpis" -#: models.py:68 +#: models.py:71 msgid "needed" msgstr "potrzebne" -#: models.py:69 +#: models.py:72 msgid "Unneeded" msgstr "Niepotrzebne" -#: models.py:69 +#: models.py:72 msgid "Needed" msgstr "Potrzebne" -#: models.py:69 +#: models.py:72 msgid "Done" msgstr "Ukończone" -#: models.py:75 +#: models.py:78 msgid "title" msgstr "tytuł" -#: models.py:76 +#: models.py:79 msgid "lead" msgstr "lead" -#: models.py:77 -#: models.py:79 +#: models.py:80 +#: models.py:82 msgid "Use Textile syntax." msgstr "Włączona składnia Textile." -#: models.py:78 +#: models.py:81 msgid "body" msgstr "treść" -#: models.py:80 +#: models.py:83 msgid "published" msgstr "opublikowane" -#: models.py:85 +#: models.py:88 msgid "file" msgstr "plik" -#: settings.py:19 -msgid "news" -msgstr "newsy" - -#: settings.py:20 -msgid "publications" -msgstr "publikacje" - -#: settings.py:21 -msgid "info" -msgstr "info" - -#: urls.py:32 -#: urls.py:33 +#: urls.py:37 +#: urls.py:38 msgid "submit" msgstr "wyslij" -#: urls.py:33 +#: urls.py:38 msgid "thanks" msgstr "dzieki" @@ -162,21 +182,13 @@ msgstr "Wyślij" msgid "Preview" msgstr "Podgląd" -#: templates/migdal/entry/entry_list.html:10 +#: templates/migdal/entry/entry_list.html:22 msgid "Category" msgstr "Kategoria" -#: templates/migdal/entry/entry_list.html:16 -msgid "Latest news" -msgstr "Ostatnie newsy" - -#: templates/migdal/entry/entry_list.html:21 -msgid "Submit a new story." -msgstr "Przyślij nowego newsa." - -#: templates/migdal/entry/entry_short.html:10 -msgid "read more" -msgstr "czytaj więcej" +#: templates/migdal/entry/entry_list.html:55 +msgid "Submit a new story, create Culture's Right with us!" +msgstr "Przyślij nowego newsa, twórz Prawo Kultury razem z nami!" #: templates/migdal/entry/entry_short.html:16 #, python-format @@ -186,10 +198,31 @@ msgstr[0] "%(c)s komentarz" msgstr[1] "%(c)s komentarze" msgstr[2] "%(c)s komentarzy" +#: templates/migdal/entry/entry_short.html:21 +msgid "read more" +msgstr "czytaj więcej" + #: templates/migdal/entry/submit.html:7 msgid "Submit new story" msgstr "Przyślij nowego newsa." +#: templates/migdal/entry/submit.html:9 +msgid "" +"\n" +"By submitting a story here, you agree to publish it under the terms of the\n" +"Creative Commons Attribution-Share Alike\n" +"free license." +msgstr "" +"\n" +"Wysyłając newsa, zgadzasz się najego publikację na warunkach wolnej licencji\n" +"Creative Commons Uznanie autorstwa – Na tych samych warunkach." + +#: templates/migdal/entry/submit.html:14 +msgid "" +"Stories are moderated, so please be\n" +"patient, you'll be notified when it's published." +msgstr "Newsy są moderowane. Bądź cierpliwy, otrzymasz powiadomienie o jego publikacji." + #: templates/migdal/entry/submit_thanks.html:7 msgid "Thanks for submitting" msgstr "Dziękujemy za zgłoszenie" @@ -204,3 +237,36 @@ msgstr "" "\n" "Dziękujemy za przysłanie nowego newsa, teraz czeka on na moderację.Jeśli podano adres e-mail, będziemy Cię informowali o zmianach statusui komentarzach\n" +#: templates/search/search.html:9 +msgid "Search results" +msgstr "Wyniki wyszukiwania" + +#: templates/search/search.html:18 +msgid "No results found." +msgstr "Brak wyników." + +#: templates/search/search.html:25 +msgid "previous" +msgstr "poprzednie" + +#: templates/search/search.html:28 +msgid "next" +msgstr "następne" + +#: templatetags/migdal_tags.py:128 +msgid "Publications" +msgstr "Publikacje" + +#: templatetags/migdal_tags.py:129 +msgid "Events" +msgstr "Wydarzenia" + +#: templatetags/migdal_tags.py:131 +msgid "Positions" +msgstr "Stanowiska" + +#~ msgid "Latest news" +#~ msgstr "Ostatnie newsy" + +#~ msgid "Submit a new story." +#~ msgstr "Przyślij nowego newsa." diff --git a/migdal/templates/migdal/entry/entry_begin.html b/migdal/templates/migdal/entry/entry_begin.html index c355ccf..097d29c 100755 --- a/migdal/templates/migdal/entry/entry_begin.html +++ b/migdal/templates/migdal/entry/entry_begin.html @@ -12,6 +12,7 @@
{{ object.date }}
{{ object.author }}
+{% comment %} {% if request.LANGUAGE_CODE == 'pl' %} {% if object.published_en %} {% language 'en' %} @@ -23,6 +24,7 @@ polska wersja {% endlanguage %} {% endif %} +{% endcomment %}
{% for category in object.categories.all %} @@ -43,5 +45,3 @@
{{ object.lead }}
-
- diff --git a/migdal/templates/migdal/entry/entry_list.html b/migdal/templates/migdal/entry/entry_list.html index 6fa3f01..eede699 100755 --- a/migdal/templates/migdal/entry/entry_list.html +++ b/migdal/templates/migdal/entry/entry_list.html @@ -52,7 +52,7 @@ {% if submit %}

- {% trans "Submit a new story." %} + {% trans "Submit a new story, create Culture's Right with us!" %}

{% endif %} diff --git a/migdal/templates/migdal/entry/entry_promobox.html b/migdal/templates/migdal/entry/entry_promobox.html index 84050d3..b1b0449 100755 --- a/migdal/templates/migdal/entry/entry_promobox.html +++ b/migdal/templates/migdal/entry/entry_promobox.html @@ -1,7 +1,7 @@ {% load i18n %} -
  • -{{ object.lead }} +{{ object.lead|striptags|truncatewords:8 }}
    • diff --git a/migdal/templates/migdal/entry/info/entry_begin.html b/migdal/templates/migdal/entry/info/entry_begin.html index e2843c9..e9eae95 100755 --- a/migdal/templates/migdal/entry/info/entry_begin.html +++ b/migdal/templates/migdal/entry/info/entry_begin.html @@ -8,6 +8,7 @@ {% endif %} +{% comment %}
    {% if request.LANGUAGE_CODE == 'pl' %} {% if object.published_en %} @@ -22,6 +23,7 @@ {% endlanguage %} {% endif %}
    +{% endcomment %} {% if object.image %} diff --git a/migdal/templates/migdal/entry/publications/entry_begin.html b/migdal/templates/migdal/entry/publications/entry_begin.html index e2843c9..e9eae95 100755 --- a/migdal/templates/migdal/entry/publications/entry_begin.html +++ b/migdal/templates/migdal/entry/publications/entry_begin.html @@ -8,6 +8,7 @@ {% endif %} +{% comment %}
    {% if request.LANGUAGE_CODE == 'pl' %} {% if object.published_en %} @@ -22,6 +23,7 @@ {% endlanguage %} {% endif %}
    +{% endcomment %} {% if object.image %} diff --git a/migdal/templates/migdal/entry/submit.html b/migdal/templates/migdal/entry/submit.html index 14906ba..ad3d6f2 100755 --- a/migdal/templates/migdal/entry/submit.html +++ b/migdal/templates/migdal/entry/submit.html @@ -6,14 +6,21 @@

    {% trans "Submit new story" %}

    +

    {% blocktrans %} +By submitting a story here, you agree to publish it under the terms of the +Creative Commons Attribution-Share Alike +free license.{% endblocktrans %}

    -
    - {% csrf_token %} - - {{ submit_form.as_table }} - -
    -
    +

    {% blocktrans %}Stories are moderated, so please be +patient, you'll be notified when it's published.{% endblocktrans %}

    + +
    +{% csrf_token %} + + {{ submit_form.as_table }} + +
    +
    {% endblock %} \ No newline at end of file diff --git a/migdal/templates/search/search.html b/migdal/templates/search/search.html index 1c561a4..84610ff 100644 --- a/migdal/templates/search/search.html +++ b/migdal/templates/search/search.html @@ -16,15 +16,17 @@ {% endif %} {% empty %}

    {% trans "No results found." %}

    +{# Show some example queries to run, maybe query syntax, something else? #} {% endfor %} {% if page.has_previous or page.has_next %} -
    - {% if page.has_previous %}{% endif %}{% trans "« Previous" %}{% if page.has_previous %}{% endif %} - | - {% if page.has_next %}{% endif %}{% trans "Next »" %}{% if page.has_next %}{% endif %} -
    -{% else %} -{# Show some example queries to run, maybe query syntax, something else? #} +

    + {% if page.has_previous %} + {% trans "previous" %} + {% endif %} + {% if page.has_next %} + {% trans "next" %} + {% endif %} {% endif %} + {% endblock "body" %} diff --git a/migdal/templatetags/migdal_tags.py b/migdal/templatetags/migdal_tags.py index 43371b1..380cb56 100644 --- a/migdal/templatetags/migdal_tags.py +++ b/migdal/templatetags/migdal_tags.py @@ -58,7 +58,8 @@ def entry_promobox(context, entry, counter): def categories(context, taxonomy): context = { 'request': context['request'], - 'object_list': Category.objects.filter(taxonomy=taxonomy) + 'object_list': Category.objects.filter(taxonomy=taxonomy + ).exclude(entry__isnull=True) } return context @@ -128,13 +129,13 @@ def main_menu(context, chooser=None, value=None): MenuItem(_(u'Events'), reverse('events')), CategoryMenuItem(Category.objects.get(slug_pl='stanowisko'), title=_('Positions')), - CategoryMenuItem(Category.objects.get(slug_pl='pierwsza-pomoc'), - title=_('First aid in copyright')), + #CategoryMenuItem(Category.objects.get(slug_pl='pierwsza-pomoc'), + # title=_('First aid in copyright')), ] - if context['request'].LANGUAGE_CODE == 'pl': - items.append(MenuItem(u'en', '/en/', html_id='item-lang')) - else: - items.append(MenuItem(u'pl', '/', html_id='item-lang')) + #if context['request'].LANGUAGE_CODE == 'pl': + # items.append(MenuItem(u'en', '/en/', html_id='item-lang')) + #else: + # items.append(MenuItem(u'pl', '/', html_id='item-lang')) for item in items: item.check_active(chooser, value) return {'items': items} diff --git a/migdal/urls.py b/migdal/urls.py index 9215078..63832f4 100644 --- a/migdal/urls.py +++ b/migdal/urls.py @@ -2,7 +2,7 @@ # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, include, url, handler404 from django.utils.translation import ugettext_lazy as _ from django.utils.translation import string_concat from migdal import feeds, app_settings @@ -24,7 +24,12 @@ for t in app_settings.TYPES: name='migdal_entry_%s' % t.db), ] -urlpatterns = i18n_patterns('', + +# Disable en for now. +urlpatterns = patterns('', + url(r'^en/', handler404), +) +urlpatterns += i18n_patterns('', # main page url(r'^$', 'migdal.views.entry_list', name='migdal_main'), url(r'^rss.xml$', feeds.EntriesFeed(), name='migdal_main_feed'), diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index ea9a5cf..5d7a555 100644 Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po index a16c5fe..02a7abd 100644 --- a/prawokultury/locale/pl/LC_MESSAGES/django.po +++ b/prawokultury/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: prawokultury\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-07 17:28+0200\n" -"PO-Revision-Date: 2012-08-07 17:31+0100\n" +"POT-Creation-Date: 2012-08-28 12:13+0200\n" +"PO-Revision-Date: 2012-08-28 12:13+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" "Language: \n" @@ -17,50 +17,72 @@ msgstr "" "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" -#: urls.py:23 +#: urls.py:24 msgid "events" msgstr "wydarzenia" #: templates/base.html:8 -#: templates/base.html.py:12 +#: templates/base.html.py:18 msgid "Culture's right" msgstr "Prawo kultury" -#: templates/base.html:15 -#: templates/base.html.py:17 -msgid "About us" -msgstr "O nas" +#: templates/base.html:23 +msgid "Organizer" +msgstr "Organizator" -#: templates/base.html:19 -msgid "Publications" -msgstr "Publikacje" +#: templates/base.html:26 +msgid "Modern Poland Foundation" +msgstr "Fundacja Nowoczesna Polska" -#: templates/base.html:20 -msgid "Events" -msgstr "Wydarzenia" +#: templates/base.html:28 +msgid "Sponsor" +msgstr "Sponsor" -#: templates/base.html:22 -#: templates/base.html.py:26 -msgid "Positions" -msgstr "Stanowiska" +#: templates/base.html:31 +msgid "Trust for Civil Society in Central and Eastern Europe" +msgstr "" -#: templates/base.html:23 -#: templates/base.html.py:27 -msgid "First aid" -msgstr "Pierwsza pomoc" +#: templates/base.html:40 +msgid "Search" +msgstr "Szukaj" -#: templates/base.html:35 +#: templates/base.html:55 msgid "Upcoming events" msgstr "Nadchodzące wydarzenia" -#: templates/base.html:39 -msgid "Categories" -msgstr "Kategorie" - -#: templates/base.html:43 +#: templates/base.html:66 msgid "Latest comments" msgstr "Ostatnie komentarze" -#: templates/base.html:47 -msgid "Follow us" -msgstr "Śledź nas" +#: templates/base.html:86 +msgid "If not explicitly stated otherwise, all texts are licensed under the Creative Commons Attribution-Share Alike free license." +msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją Creative Commons Uznanie autorstwa – Na tych samych warunkach." + +#: templates/prevnext/next.html:13 +msgid "next" +msgstr "następne" + +#: templates/prevnext/previous.html:13 +msgid "previous" +msgstr "poprzednie" + +#~ msgid "About us" +#~ msgstr "O nas" + +#~ msgid "Publications" +#~ msgstr "Publikacje" + +#~ msgid "Events" +#~ msgstr "Wydarzenia" + +#~ msgid "Positions" +#~ msgstr "Stanowiska" + +#~ msgid "First aid" +#~ msgstr "Pierwsza pomoc" + +#~ msgid "Categories" +#~ msgstr "Kategorie" + +#~ msgid "Follow us" +#~ msgstr "Śledź nas" diff --git a/prawokultury/settings.d/50-static.conf b/prawokultury/settings.d/50-static.conf index 1a90443..3f5f951 100755 --- a/prawokultury/settings.d/50-static.conf +++ b/prawokultury/settings.d/50-static.conf @@ -25,6 +25,7 @@ PIPELINE_CSS = { 'css/entry.scss', 'css/footer.scss', 'css/prevnext.scss', + 'css/forms.scss', 'events/events.scss', ), 'output_filename': 'compressed/base.css', diff --git a/prawokultury/static/css/entry.css b/prawokultury/static/css/entry.css index ed7e8a8..d8b835a 100644 --- a/prawokultury/static/css/entry.css +++ b/prawokultury/static/css/entry.css @@ -17,7 +17,7 @@ .entry-wrapped h1 a, .entry-wrapped h2 a { color: #01519a; } .entry-wrapped .entry-data { - font-size: 1.1em; + font-size: 1.2em; margin-top: 1.4em; margin-bottom: 1.4em; } .entry-wrapped .entry-data .date { @@ -29,12 +29,13 @@ .entry-wrapped .entry-data .categories a { color: black; } .entry-wrapped .lead { - font-size: 1.1em; } + font-size: 1.2em; } .entry-wrapped .body { - font-size: 1.1em; } + font-size: 1.2em; } .entry-wrapped .more { + clear: both; float: right; - font-size: 1.1em; + font-size: 1.2em; font-style: italic; margin-top: .6em; margin-bottom: 1.8em; } @@ -67,7 +68,7 @@ border-bottom: 1px solid #8b8b87; } .submit-link a { color: black; - font-size: 1.1em; } + font-size: 1.2em; } .submit-link a:before { content: url("/static/img/plus.png"); vertical-align: top; diff --git a/prawokultury/static/css/entry.scss b/prawokultury/static/css/entry.scss index 6e67528..77c2935 100755 --- a/prawokultury/static/css/entry.scss +++ b/prawokultury/static/css/entry.scss @@ -26,7 +26,7 @@ } .entry-data { - font-size: 1.1em; + font-size: 1.2em; margin-top: 1.4em; margin-bottom: 1.4em; .date { @@ -44,16 +44,17 @@ } .lead { - font-size: 1.1em; + font-size: 1.2em; } .body { - font-size: 1.1em; + font-size: 1.2em; } .more { + clear: both; float: right; - font-size: 1.1em; + font-size: 1.2em; font-style: italic; margin-top: .6em; margin-bottom: 1.8em; @@ -96,7 +97,7 @@ a { color: black; - font-size: 1.1em; + font-size: 1.2em; } a:before { content: url("/static/img/plus.png"); diff --git a/prawokultury/static/css/footer.css b/prawokultury/static/css/footer.css index cafef05..280815d 100644 --- a/prawokultury/static/css/footer.css +++ b/prawokultury/static/css/footer.css @@ -4,7 +4,8 @@ padding-top: 1.5em; margin-top: 4em; margin-left: 1em; - margin-right: 1em; } + margin-right: 1em; + margin-bottom: 1em; } .footer-item { width: 24em; diff --git a/prawokultury/static/css/footer.scss b/prawokultury/static/css/footer.scss index 0e9f54b..65b5672 100755 --- a/prawokultury/static/css/footer.scss +++ b/prawokultury/static/css/footer.scss @@ -5,6 +5,7 @@ margin-top: 4em; margin-left: 1em; margin-right: 1em; + margin-bottom: 1em; } .footer-item { diff --git a/prawokultury/static/css/forms.css b/prawokultury/static/css/forms.css new file mode 100644 index 0000000..0898882 --- /dev/null +++ b/prawokultury/static/css/forms.css @@ -0,0 +1,28 @@ +.form-info { + font-size: 1.2em; } + +.submit-form { + margin-top: 1.3em; } + .submit-form table { + border-spacing: 0 .5em; } + .submit-form tr { + background-color: #fdfdfd; } + .submit-form label { + font-size: 1.2em; + font-weight: normal; } + .submit-form input, .submit-form textarea, .submit-form select { + font-size: 1.2em; + border: 0; + background-color: #fdfdfd; + width: 100%; + margin-bottom: .5em; } + .submit-form th, .submit-form td { + text-align: left; + font-weight: normal; + vertical-align: top; + padding: .5em 0; } + .submit-form .helptext { + color: #acacac; + font-size: 1.1em; } + .submit-form .helptext a { + color: black; } diff --git a/prawokultury/static/css/forms.scss b/prawokultury/static/css/forms.scss new file mode 100755 index 0000000..ce7625a --- /dev/null +++ b/prawokultury/static/css/forms.scss @@ -0,0 +1,44 @@ +.form-info { + font-size: 1.2em; +} + +.submit-form { + margin-top: 1.3em; + + table { + border-spacing: 0 .5em; + } + + tr { + background-color: #fdfdfd; + } + + label { + font-size: 1.2em; + font-weight: normal; + } + + input, textarea, select { + font-size: 1.2em; + border: 0; + background-color: #fdfdfd; + width: 100%; + margin-bottom: .5em; + } + + + th, td { + text-align: left; + font-weight: normal; + vertical-align: top; + padding: .5em 0; + } + + .helptext { + color: #acacac; + font-size: 1.1em; + a { + color: black; + } + } +} diff --git a/prawokultury/static/css/prevnext.css b/prawokultury/static/css/prevnext.css index 34ad8d0..0ca5f77 100644 --- a/prawokultury/static/css/prevnext.css +++ b/prawokultury/static/css/prevnext.css @@ -1,5 +1,5 @@ .prevnext { - font-size: 1.1em; + font-size: 1.2em; font-style: italic; margin-top: 1.4em; } .prevnext a { diff --git a/prawokultury/static/css/prevnext.scss b/prawokultury/static/css/prevnext.scss index 7190f20..38ab2dd 100755 --- a/prawokultury/static/css/prevnext.scss +++ b/prawokultury/static/css/prevnext.scss @@ -1,5 +1,5 @@ .prevnext { - font-size: 1.1em; + font-size: 1.2em; font-style: italic; margin-top: 1.4em; diff --git a/prawokultury/static/css/search.css b/prawokultury/static/css/search.css index 61e75d5..eda6878 100644 --- a/prawokultury/static/css/search.css +++ b/prawokultury/static/css/search.css @@ -2,7 +2,7 @@ margin-top: .4em; } #search-form input { font-size: 1.1em; - width: 17.1em; + width: 16.1em; padding-left: 1em; border: none; border-radius: 1.5em 0 0 1.5em; diff --git a/prawokultury/static/css/search.scss b/prawokultury/static/css/search.scss index 7b73859..590dedb 100755 --- a/prawokultury/static/css/search.scss +++ b/prawokultury/static/css/search.scss @@ -3,7 +3,7 @@ input { font-size: 1.1em; - width: 17.1em; + width: 16.1em; padding-left: 1em; border: none; border-radius: 1.5em 0 0 1.5em; diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index 94a44f2..3d36dcf 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -26,7 +26,7 @@ alt="{% trans "Modern Poland Foundation" %}" />

    {% trans "Sponsor" %}
    - + {% trans
    @@ -78,10 +78,12 @@

    Fundacja Nowoczesna Polska

    - ul.Marszałkowska 84/92 lok. 125
    + ul. Marszałkowska 84/92 lok. 125
    00-514 Warszawa
    tel/fax: +48 22 621 30 17
    - e-mail: fundacja@nowoczesnapolska.org.pl + e-mail: fundacja@nowoczesnapolska.org.pl
    +
    + {% trans "If not explicitly stated otherwise, all texts are licensed under the Creative Commons Attribution-Share Alike free license." %}



    @@ -89,6 +91,7 @@ REGON: 017423865
    Nr konta: 46 10201097 0000 7502 0001 6766

    +