rss

diff --git a/events/static/events/events.css b/events/static/events/events.css
index 2dcefc2..e2bf881 100644 (file)
--- a/events/static/events/events.css
+++ b/events/static/events/events.css
@@ -5,10 +5,13 @@
   .event h2 {
     color: #01519a;
     font-weight: normal;
   .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; }
     margin-bottom: 1.1em; }
   .event a {
     display: block;
     color: #363a3b; }

+  .event .title {
+    font-size: 1.3em; }

   .event .description {
   .event .description {

+    font-size: 1.3em;

     margin-top: 1.4em; }
     margin-top: 1.4em; }

diff --git a/events/static/events/events.scss b/events/static/events/events.scss
index ba8b9ce..7fa58ed 100755 (executable)
--- a/events/static/events/events.scss
+++ b/events/static/events/events.scss
@@ -6,7 +6,7 @@
     h2 {
         color: #01519a;
         font-weight: normal;
     h2 {
         color: #01519a;
         font-weight: normal;

-        font-size: 1.3em;
+        font-size: 1.4em;

         margin-bottom: 1.1em;
     }
 
         margin-bottom: 1.1em;
     }
 


@@ -15,7 +15,12 @@
         color: #363a3b;
     }
 
         color: #363a3b;
     }
 

+    .title {
+        font-size: 1.3em;
+    }
+

     .description {
     .description {

+        font-size: 1.3em;

         margin-top: 1.4em;
     }
 
         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 (executable)
--- a/migdal/templates/migdal/entry/submit_thanks.html
+++ b/migdal/templates/migdal/entry/submit_thanks.html
@@ -1,16 +1,17 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load url from future %}

 {% load i18n %}
 
 {% block "body" %}
 
 <h1>{% trans "Thanks for submitting" %}</h1>
 
 {% load i18n %}
 
 {% block "body" %}
 
 <h1>{% trans "Thanks for submitting" %}</h1>
 

+<p class="notice">

 {% 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 %}
 {% 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 %}

+</p>

 
 
 
 
 
 

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index 4112166..04b7ae1 100644 (file)
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 cf7d400..a614f50 100644 (file)
--- 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"
 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 <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: \n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: \n"


@@ -22,42 +22,65 @@ msgid "events"
 msgstr "wydarzenia"
 
 #: templates/base.html:8
 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"
 
 msgid "Culture's right"
 msgstr "Prawo kultury"
 

-#: templates/base.html:23
+#: templates/base.html:30

 msgid "Organizer"
 msgstr "Organizator"
 
 msgid "Organizer"
 msgstr "Organizator"
 

-#: templates/base.html:26
+#: templates/base.html:33

 msgid "Modern Poland Foundation"
 msgstr "Fundacja Nowoczesna Polska"
 
 msgid "Modern Poland Foundation"
 msgstr "Fundacja Nowoczesna Polska"
 

-#: templates/base.html:28
+#: templates/base.html:35

 msgid "Sponsor"
 msgstr "Wspierane przez"
 
 msgid "Sponsor"
 msgstr "Wspierane przez"
 

-#: templates/base.html:31
+#: templates/base.html:38

 msgid "Trust for Civil Society in Central and Eastern Europe"
 msgstr ""
 
 msgid "Trust for Civil Society in Central and Eastern Europe"
 msgstr ""
 

-#: templates/base.html:40
+#: templates/base.html:47

 msgid "Search"
 msgstr "Szukaj"
 
 msgid "Search"
 msgstr "Szukaj"
 

-#: templates/base.html:55
+#: templates/base.html:62

 msgid "Upcoming events"
 msgstr "Nadchodzące wydarzenia"
 
 msgid "Upcoming events"
 msgstr "Nadchodzące wydarzenia"
 

-#: templates/base.html:66
+#: templates/base.html:77

 msgid "Latest comments"
 msgstr "Ostatnie komentarze"
 
 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 <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license."
 msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 
 msgid "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license."
 msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją <a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 

+#: 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"
 #: 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 (file)
--- a/prawokultury/static/css/prevnext.css
+++ b/prawokultury/static/css/prevnext.css
@@ -1,5 +1,5 @@
 .prevnext {
 .prevnext {

-  font-size: 1.2em;
+  font-size: 1.3em;

   font-style: italic;
   margin-top: 1.4em; }
   .prevnext a {
   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 (file)
--- a/prawokultury/static/css/prevnext.scss
+++ b/prawokultury/static/css/prevnext.scss
@@ -1,5 +1,5 @@
 .prevnext {
 .prevnext {

-    font-size: 1.2em;
+    font-size: 1.3em;

     font-style: italic;
     margin-top: 1.4em;
 
     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 (file)
--- 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 {
   padding-top: 2em;
   padding-bottom: 2em; }
   #sidebar .social a {

-    margin-right: 2em; }
+    margin-right: 1.8em; }

     #sidebar .social a img {
       vertical-align: middle; }
     #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 (file)
--- a/prawokultury/static/css/sidebar.scss
+++ b/prawokultury/static/css/sidebar.scss
@@ -130,7 +130,7 @@
     padding-bottom: 2em;
 
     a {
     padding-bottom: 2em;
 
     a {

-        margin-right: 2em;
+        margin-right: 1.8em;

         img {
             vertical-align: middle;
         }
         img {
             vertical-align: middle;
         }

diff --git a/prawokultury/static/img/rss.png b/prawokultury/static/img/rss.png
new file mode 100644 (file)
index 0000000..d1ab976
Binary files /dev/null and b/prawokultury/static/img/rss.png differ

diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html
index 57db2e9..879d30d 100755 (executable)
--- 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" %}
+
+<h1>{% trans "Page not found" %}</h1>
+
+<p class="notice">
+    {% trans "The page you were looking for doesn't exist." %}
+</p>
+
+{% endblock %}

diff --git a/prawokultury/templates/500.html b/prawokultury/templates/500.html
index eb1f494..be751c1 100755 (executable)
--- a/prawokultury/templates/500.html
+++ b/prawokultury/templates/500.html
@@ -1 +1,5 @@
-500
\ No newline at end of file
+<h1>Wystąpił błąd serwera.</h1>
+
+<p>Coś poszło nie tak. Administratorzy zostali już powiadomieni.</p>
+
+<p>Przepraszamy!</p>

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index aecf00b..0a92ff7 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -67,10 +67,11 @@
                     {% categories 'types' %}
                 </div>
                 <div class="sidebar-box social">
                     {% categories 'types' %}
                 </div>
                 <div class="sidebar-box social">

+                    <a href="{% url 'migdal_main_feed' %}" title="RSS feed">
+                        <img src="{% static 'img/rss.png' %}" alt="RSS feed" /></a>

                     {% url 'migdal_main' as main_url %}
                     {% trans "Culture's right" as site_name %}
                     {% share main_url site_name "big" %}
                     {% url 'migdal_main' as main_url %}
                     {% trans "Culture's right" as site_name %}
                     {% share main_url site_name "big" %}

-                    <!--a href="{% url 'migdal_main_feed' %}">RSS</a-->

                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>
                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>

diff --git a/prawokultury/templates/share.html b/prawokultury/templates/share.html
index 3f6b487..71b2c0e 100755 (executable)
--- 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 %}
 <a rel="nofollow" target="_blank" class="facebook"
 {% load i18n common_tags static %}
 {% with encoded_url=url|build_absolute_uri:request|urlencode encoded_desc=description|urlencode %}
 <a rel="nofollow" target="_blank" class="facebook"

-    href="https://www.facebook.com/sharer.php?u={{ encoded_url }}">
+    href="https://www.facebook.com/sharer.php?u={{ encoded_url }}"
+    title="{% trans 'Share on Facebook' %}">

     <img src="{% static "img/social/"|add:iconset|add:"facebook.png" %}"
         alt="{% trans 'Share on Facebook' %}"></a>
 <a rel="nofollow" target="_blank" class="google"
     <img src="{% static "img/social/"|add:iconset|add:"facebook.png" %}"
         alt="{% trans 'Share on Facebook' %}"></a>
 <a rel="nofollow" target="_blank" class="google"

-    href="https://plus.google.com/share?url={{ encoded_url }}">
+    href="https://plus.google.com/share?url={{ encoded_url }}"
+    title="{% trans 'Share on Google+' %}">

     <img src="{% static "img/social/"|add:iconset|add:"google.png" %}"
         alt="{% trans 'Share on Google+' %}"></a>
 <a rel="nofollow" target="_blank" class="twitter"
     <img src="{% static "img/social/"|add:iconset|add:"google.png" %}"
         alt="{% trans 'Share on Google+' %}"></a>
 <a rel="nofollow" target="_blank" class="twitter"

-    href="https://twitter.com/intent/tweet?url={{ encoded_url }}&amp;text={{ encoded_desc }}">
+    href="https://twitter.com/intent/tweet?url={{ encoded_url }}&amp;text={{ encoded_desc }}"
+    title="{% trans 'Share on Twitter' %}">

     <img src="{% static "img/social/"|add:iconset|add:"twitter.png" %}"
         alt="{% trans 'Share on Twitter' %}"></a>
 <a rel="nofollow" target="_blank" class="nk"
     <img src="{% static "img/social/"|add:iconset|add:"twitter.png" %}"
         alt="{% trans 'Share on Twitter' %}"></a>
 <a rel="nofollow" target="_blank" class="nk"

-    href="http://nk.pl/#sledzik?shout={{ encoded_desc }}%20{{ encoded_url }}">
+    href="http://nk.pl/#sledzik?shout={{ encoded_desc }}%20{{ encoded_url }}"
+    title="{% trans 'Share on NK.pl' %}">

     <img src="{% static "img/social/"|add:iconset|add:"nk.png" %}"
         alt="{% trans 'Share on NK.pl' %}"></a>
 {% comment %}
 <a rel="nofollow" target="_blank" class="diaspora"
     <img src="{% static "img/social/"|add:iconset|add:"nk.png" %}"
         alt="{% trans 'Share on NK.pl' %}"></a>
 {% comment %}
 <a rel="nofollow" target="_blank" class="diaspora"

-    href="http://sharetodiaspora.github.com/?title={{ encoded_desc }}&amp;url={{ encoded_url }}">
+    href="http://sharetodiaspora.github.com/?title={{ encoded_desc }}&amp;url={{ encoded_url }}"
+    title="{% trans 'Share on Diaspora' %}">

     <img src="{% static "img/social/"|add:iconset|add:"diaspora.png" %}"
         alt="{% trans 'Share on Diaspora' %}"></a>
 <a rel="nofollow" target="_blank" class="blip"
     <img src="{% static "img/social/"|add:iconset|add:"diaspora.png" %}"
         alt="{% trans 'Share on Diaspora' %}"></a>
 <a rel="nofollow" target="_blank" class="blip"

-    href="http://blip.pl/dashboard?body={{ encoded_desc }}%20{{ encoded_url }}">
+    href="http://blip.pl/dashboard?body={{ encoded_desc }}%20{{ encoded_url }}"
+    title="{% trans 'Share on Blip.pl' %}">

     <img src="{% static "img/social/"|add:iconset|add:"blip.png" %}"
         alt="{% trans 'Share on Blip.pl' %}"></a>
 {% endcomment %}
     <img src="{% static "img/social/"|add:iconset|add:"blip.png" %}"
         alt="{% trans 'Share on Blip.pl' %}"></a>
 {% endcomment %}