From: Prawo Kultury Date: Thu, 10 Jan 2013 12:08:08 +0000 (+0000) Subject: aid in menu, aigrain on the side X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/4df6b2c6b149e9c0055cd0ab98a6568facefea84?ds=sidebyside aid in menu, aigrain on the side --- diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index 1f143d7..fc93ca5 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 c907755..c36366b 100644 --- a/prawokultury/locale/pl/LC_MESSAGES/django.po +++ b/prawokultury/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: prawokultury\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-12 10:10+0100\n" +"POT-Creation-Date: 2012-12-17 03:56+0000\n" "PO-Revision-Date: 2012-12-11 13:33+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" @@ -15,7 +15,8 @@ msgstr "" "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" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2)\n" #: menu_items.py:21 msgid "Publications" @@ -29,6 +30,10 @@ msgstr "Wydarzenia" msgid "Positions" msgstr "Stanowiska" +#: menu_items.py:32 +msgid "First aid in copyright" +msgstr "Pierwsza pomoc w prawie autorskim" + #: urls.py:31 msgid "events" msgstr "wydarzenia" @@ -45,8 +50,7 @@ msgstr "publikacje" msgid "info" msgstr "info" -#: templates/404.html:5 -#: templates/404.html.py:10 +#: templates/404.html:5 templates/404.html.py:10 msgid "Page not found" msgstr "Strona nie znaleziona" @@ -54,45 +58,48 @@ msgstr "Strona nie znaleziona" msgid "The page you were looking for doesn't exist." msgstr "Strona, której szukasz, nie istnieje." -#: templates/base.html:8 -#: templates/base.html.py:13 -#: templates/base.html:14 -#: templates/base.html.py:25 -#: templates/base.html:74 +#: templates/base.html:8 templates/base.html.py:14 templates/base.html:15 +#: templates/base.html.py:26 templates/base.html:75 msgid "Right to Culture" msgstr "Prawo kultury" -#: templates/base.html:30 +#: templates/base.html:31 msgid "Organizer" msgstr "Organizator" -#: templates/base.html:33 +#: templates/base.html:34 msgid "Modern Poland Foundation" msgstr "Fundacja Nowoczesna Polska" -#: templates/base.html:35 +#: templates/base.html:36 msgid "Sponsor" msgstr "Wspierane przez" -#: templates/base.html:38 +#: templates/base.html:39 msgid "Trust for Civil Society in Central and Eastern Europe" msgstr "" -#: templates/base.html:47 +#: templates/base.html:48 msgid "Search" msgstr "Szukaj" -#: templates/base.html:63 +#: templates/base.html:64 msgid "Upcoming events" msgstr "Nadchodzące wydarzenia" -#: templates/base.html:78 +#: templates/base.html:79 msgid "Latest comments" msgstr "Ostatnie komentarze" -#: templates/base.html:106 -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/base.html:107 +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." #~ msgid "Page not found." #~ msgstr "Strona nie znaleziona." diff --git a/prawokultury/menu_items.py b/prawokultury/menu_items.py index eb3f766..f68b005 100644 --- a/prawokultury/menu_items.py +++ b/prawokultury/menu_items.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 from migdal.models import Category, Entry from menu.helpers import ObjectMenuItem, MenuItem, ModelMenuItem from django.core.urlresolvers import reverse_lazy @@ -27,3 +28,7 @@ ITEMS.append(ObjectMenuItem(Category.objects.get(slug_pl='stanowisko'), rev_lookups={Entry: 'categories'}, title=_('Positions'))) #CategoryMenuItem(Category.objects.get(slug_pl='stanowisko'), # title=_('Positions')), + +ITEMS.append(ObjectMenuItem(Entry.objects.get(slug_pl='pierwsza-pomoc'), + title=_('First aid in copyright'))) + diff --git a/prawokultury/static/css/base.css b/prawokultury/static/css/base.css index aa0c016..8f3fbfc 100644 --- a/prawokultury/static/css/base.css +++ b/prawokultury/static/css/base.css @@ -31,3 +31,16 @@ h1 { .notice { font-size: 1.3em; } + +.entry-wrapped .gallery-item { + float: left; + width: 300px; + text-align: center; + margin-top: 2em; } +.entry-wrapped .gallery-image { + height: 240px; + width: 300px; + display: table-cell; + vertical-align: middle; } +.entry-wrapped .gallery-image img { + margin: 0; } diff --git a/prawokultury/static/css/base.scss b/prawokultury/static/css/base.scss index 67115d2..0ae42b9 100644 --- a/prawokultury/static/css/base.scss +++ b/prawokultury/static/css/base.scss @@ -40,3 +40,9 @@ h1 { .notice { font-size: 1.3em; } +.entry-wrapped { +.gallery-item{float:left; width:300px;text-align:center;margin-top:2em;} +.gallery-image{height:240px; width:300px; display: table-cell; vertical-align:middle;} +.gallery-image img{margin: 0;} + +} diff --git a/prawokultury/static/css/entry.css b/prawokultury/static/css/entry.css index 33eb3aa..79fff9f 100644 --- a/prawokultury/static/css/entry.css +++ b/prawokultury/static/css/entry.css @@ -1,7 +1,6 @@ -.avatar { +.entry-wrapped img.avatar { float: left; - margin-left: -8em; - margin-top: 0em; } + margin: 0 0 0 -8em; } .entry-short { border-bottom: 1px solid #8b8b87; } @@ -60,6 +59,8 @@ .entry-wrapped .more .read-more:after { content: url("/static/img/read-more.png"); margin-left: .7em; } + .entry-wrapped img { + margin: 1em; } .entry-info .entry-wrapped, .entry-publications .entry-wrapped { @@ -68,10 +69,9 @@ .entry-publications .entry-wrapped h1 { font-size: 2em; } -.entry-picture { +.entry-wrapped img.entry-picture { float: left; - margin-right: 1.5em; - margin-bottom: 1em; } + margin: 0 1.5em 1em 0; } .submit-link { margin-top: 1em; @@ -100,3 +100,9 @@ font-weight: bold; } .comments .body { font-size: 1.3em; } + +table.borders { + border-collapse: collapse; } + table.borders td { + border: 1px solid #777; + padding: .3em; } diff --git a/prawokultury/static/css/entry.scss b/prawokultury/static/css/entry.scss index 80917b4..2cc65b1 100644 --- a/prawokultury/static/css/entry.scss +++ b/prawokultury/static/css/entry.scss @@ -1,7 +1,6 @@ -.avatar { +.entry-wrapped img.avatar { float: left; - margin-left: -8em; - margin-top: 0em; + margin: 0 0 0 -8em; } .entry-short { @@ -94,6 +93,10 @@ margin-left: .7em; } } + + img { + margin: 1em; + } } .entry-info .entry-wrapped, @@ -104,10 +107,9 @@ } } -.entry-picture { +.entry-wrapped img.entry-picture { float: left; - margin-right: 1.5em; - margin-bottom: 1em; + margin: 0 1.5em 1em 0; } .submit-link { @@ -151,3 +153,11 @@ font-size: 1.3em; } } + +table.borders { + border-collapse: collapse; + td { + border: 1px solid #777; + padding: .3em; + } +} diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index 54bdb93..f31d0a7 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -64,6 +64,9 @@

{% trans "Upcoming events" %}

{% events_box %} +
+ Publikacja: Philippe Aigrain, Dzielenie się +