From 83c4c99bd2c1785bf0c9d47a4584278c8083d20c Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 30 Aug 2012 11:05:34 +0200 Subject: [PATCH 1/1] rss --- events/static/events/events.css | 5 +- events/static/events/events.scss | 7 ++- .../templates/migdal/entry/submit_thanks.html | 3 +- prawokultury/locale/pl/LC_MESSAGES/django.mo | Bin 1419 -> 1672 bytes prawokultury/locale/pl/LC_MESSAGES/django.po | 45 +++++++++++++----- prawokultury/static/css/prevnext.css | 2 +- prawokultury/static/css/prevnext.scss | 2 +- prawokultury/static/css/sidebar.css | 2 +- prawokultury/static/css/sidebar.scss | 2 +- prawokultury/static/img/rss.png | Bin 0 -> 766 bytes prawokultury/templates/404.html | 17 ++++++- prawokultury/templates/500.html | 6 ++- prawokultury/templates/base.html | 3 +- prawokultury/templates/share.html | 18 ++++--- 14 files changed, 85 insertions(+), 27 deletions(-) create mode 100644 prawokultury/static/img/rss.png diff --git a/events/static/events/events.css b/events/static/events/events.css index 2dcefc2..e2bf881 100644 --- a/events/static/events/events.css +++ b/events/static/events/events.css @@ -5,10 +5,13 @@ .event h2 { color: #01519a; font-weight: normal; - font-size: 1.3em; + font-size: 1.4em; margin-bottom: 1.1em; } .event a { display: block; color: #363a3b; } + .event .title { + font-size: 1.3em; } .event .description { + font-size: 1.3em; margin-top: 1.4em; } diff --git a/events/static/events/events.scss b/events/static/events/events.scss index ba8b9ce..7fa58ed 100755 --- a/events/static/events/events.scss +++ b/events/static/events/events.scss @@ -6,7 +6,7 @@ h2 { color: #01519a; font-weight: normal; - font-size: 1.3em; + font-size: 1.4em; margin-bottom: 1.1em; } @@ -15,7 +15,12 @@ color: #363a3b; } + .title { + font-size: 1.3em; + } + .description { + font-size: 1.3em; margin-top: 1.4em; } diff --git a/migdal/templates/migdal/entry/submit_thanks.html b/migdal/templates/migdal/entry/submit_thanks.html index 48a55d1..99cecaf 100755 --- a/migdal/templates/migdal/entry/submit_thanks.html +++ b/migdal/templates/migdal/entry/submit_thanks.html @@ -1,16 +1,17 @@ {% extends "base.html" %} -{% load url from future %} {% load i18n %} {% block "body" %}

{% trans "Thanks for submitting" %}

+

{% blocktrans %} Thank you for submitting this new story, it's waiting for moderation. If you provided an email, we'll inform you about changes in it's status and comments. {% endblocktrans %} +

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index 41121668554a4f0ea3073f7c53488423192e60ca..04b7ae148114c78cd8a561a0510e9f3ba161c33f 100644 GIT binary patch delta 621 zcmZ9{ze~eF6bJB2Y_(deRgtPV9EdIjsn*HKAE1L!iVCjA^su3!7m^e;D8)fg1ef9< z6dYVd1Q!=^DLA-v5Zt=B`Ug1reQDZ4A6!58-Zl5`T}Llt<;G~}mLcL;(^yrk1nm|4 zAdcZMJb|z9D#+JV#wL(&!+uzRy|4sF;3=d#Z{QHT5ArA2hx{Gl-ZJ~ZhCcj;A=rQs z_yg-`_6uXk-*8xmpKuIT!;DSAXBeeA^zVU_$QzIb`Geyyjzg-?K^kZUCeWW{u^B)i z4`~u7$j>19GkotyPaxjoKZqVnlTpz3_`5$bT~0xF4f?z018FFlydCQ$(|wp#l-0au z3oeU%L(|29lm)ias%%PmXo_T~klC8I%uc#{WVo)dD>LeOB%R_5spZ9VOWTWz@pL%2?d+Wu&Yjf{ DpM4qg diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po index cf7d400..a614f50 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-28 15:15+0200\n" -"PO-Revision-Date: 2012-08-28 16:42+0100\n" +"POT-Creation-Date: 2012-08-30 10:23+0200\n" +"PO-Revision-Date: 2012-08-30 10:24+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" "Language: \n" @@ -22,42 +22,65 @@ msgid "events" msgstr "wydarzenia" #: templates/base.html:8 -#: templates/base.html.py:18 +#: templates/base.html.py:13 +#: templates/base.html:14 +#: templates/base.html.py:25 +#: templates/base.html:73 msgid "Culture's right" msgstr "Prawo kultury" -#: templates/base.html:23 +#: templates/base.html:30 msgid "Organizer" msgstr "Organizator" -#: templates/base.html:26 +#: templates/base.html:33 msgid "Modern Poland Foundation" msgstr "Fundacja Nowoczesna Polska" -#: templates/base.html:28 +#: templates/base.html:35 msgid "Sponsor" msgstr "Wspierane przez" -#: templates/base.html:31 +#: templates/base.html:38 msgid "Trust for Civil Society in Central and Eastern Europe" msgstr "" -#: templates/base.html:40 +#: templates/base.html:47 msgid "Search" msgstr "Szukaj" -#: templates/base.html:55 +#: templates/base.html:62 msgid "Upcoming events" msgstr "Nadchodzące wydarzenia" -#: templates/base.html:66 +#: templates/base.html:77 msgid "Latest comments" msgstr "Ostatnie komentarze" -#: templates/base.html:86 +#: templates/base.html:105 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/share.html:5 +#: templates/share.html.py:7 +msgid "Share on Facebook" +msgstr "Podziel się na Facebooku" + +#: templates/share.html:10 +#: templates/share.html.py:12 +msgid "Share on Google+" +msgstr "Podziel się na Google+" + +#: templates/share.html:15 +#: templates/share.html.py:17 +msgid "Share on Twitter" +msgstr "Podziel się na Twitterze" + +#: templates/share.html:20 +#: templates/share.html.py:22 +msgid "Share on NK.pl" +msgstr "Podziel się na NK.pl" + #: templates/prevnext/next.html:13 msgid "next" msgstr "następne" diff --git a/prawokultury/static/css/prevnext.css b/prawokultury/static/css/prevnext.css index 0ca5f77..3a4d901 100644 --- a/prawokultury/static/css/prevnext.css +++ b/prawokultury/static/css/prevnext.css @@ -1,5 +1,5 @@ .prevnext { - font-size: 1.2em; + font-size: 1.3em; font-style: italic; margin-top: 1.4em; } .prevnext a { diff --git a/prawokultury/static/css/prevnext.scss b/prawokultury/static/css/prevnext.scss index 38ab2dd..b6b33d0 100644 --- a/prawokultury/static/css/prevnext.scss +++ b/prawokultury/static/css/prevnext.scss @@ -1,5 +1,5 @@ .prevnext { - font-size: 1.2em; + font-size: 1.3em; font-style: italic; margin-top: 1.4em; diff --git a/prawokultury/static/css/sidebar.css b/prawokultury/static/css/sidebar.css index 01b291f..52e2235 100644 --- a/prawokultury/static/css/sidebar.css +++ b/prawokultury/static/css/sidebar.css @@ -89,6 +89,6 @@ padding-top: 2em; padding-bottom: 2em; } #sidebar .social a { - margin-right: 2em; } + margin-right: 1.8em; } #sidebar .social a img { vertical-align: middle; } diff --git a/prawokultury/static/css/sidebar.scss b/prawokultury/static/css/sidebar.scss index df4ab3e..572be03 100644 --- a/prawokultury/static/css/sidebar.scss +++ b/prawokultury/static/css/sidebar.scss @@ -130,7 +130,7 @@ padding-bottom: 2em; a { - margin-right: 2em; + margin-right: 1.8em; img { vertical-align: middle; } diff --git a/prawokultury/static/img/rss.png b/prawokultury/static/img/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ab976853462bc22f7883105a50d00dfa57e27e GIT binary patch literal 766 zcmVP000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1{B6eim)9*F<|02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00L%7L_t(Y$DP*Oi_K9K2k_51 z<5H7L6lR2oc#+Ek;(_wuQZ6HT5&i(T^5pXBlJZPmm~ttS@WLA*iXoa3iclkEa!Z2- zGhWs&+wOPfj9Ino?0weS-@Vp%U49iT$9#N7Ctl+X-s88w(tsZH`cD~z#n>17-}r=A zcz}Co!?OgiG7z8xVN`3qK`Yjw(E#OO9gt%E!ZoZJ2*{B-m-j@div4#S!}$IJG{g&E z;cb<~VY0az{bY&v#FH!fb8*2WV|O7xdRQ_c0Z zBn4knW(DzOKxZ@E<0X2R``b_(gY+_jHzj(rV-}^^_9a63k5n-O)3WoSxRP8@Tyisd zTp{O6l4nS$589dl3;xmqxOV literal 0 HcmV?d00001 diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html index 57db2e9..879d30d 100755 --- a/prawokultury/templates/404.html +++ b/prawokultury/templates/404.html @@ -1 +1,16 @@ -404 \ No newline at end of file +{% extends "base.html" %} +{% load i18n %} + + +{% block "titleextra" %}{% trans "Page not found." %}{% endblock %} + + +{% block "body" %} + +

{% trans "Page not found" %}

+ +

+ {% trans "The page you were looking for doesn't exist." %} +

+ +{% endblock %} diff --git a/prawokultury/templates/500.html b/prawokultury/templates/500.html index eb1f494..be751c1 100755 --- a/prawokultury/templates/500.html +++ b/prawokultury/templates/500.html @@ -1 +1,5 @@ -500 \ No newline at end of file +

Wystąpił błąd serwera.

+ +

Coś poszło nie tak. Administratorzy zostali już powiadomieni.

+ +

Przepraszamy!

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index aecf00b..0a92ff7 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -67,10 +67,11 @@ {% categories 'types' %}

{% trans "Latest comments" %}

diff --git a/prawokultury/templates/share.html b/prawokultury/templates/share.html index 3f6b487..71b2c0e 100755 --- a/prawokultury/templates/share.html +++ b/prawokultury/templates/share.html @@ -1,28 +1,34 @@ {% load i18n common_tags static %} {% with encoded_url=url|build_absolute_uri:request|urlencode encoded_desc=description|urlencode %} + href="https://plus.google.com/share?url={{ encoded_url }}" + title="{% trans 'Share on Google+' %}"> {% trans 'Share on Google+' %} + href="http://nk.pl/#sledzik?shout={{ encoded_desc }}%20{{ encoded_url }}" + title="{% trans 'Share on NK.pl' %}"> {% trans 'Share on NK.pl' %} {% comment %} + href="http://sharetodiaspora.github.com/?title={{ encoded_desc }}&url={{ encoded_url }}" + title="{% trans 'Share on Diaspora' %}"> {% trans 'Share on Diaspora' %} + href="http://blip.pl/dashboard?body={{ encoded_desc }}%20{{ encoded_url }}" + title="{% trans 'Share on Blip.pl' %}"> {% trans 'Share on Blip.pl' %} {% endcomment %} -- 2.20.1