comment form

diff --git a/events/locale/pl/LC_MESSAGES/django.po b/events/locale/pl/LC_MESSAGES/django.po
index e758503..c5bf9ce 100644 (file)
--- a/events/locale/pl/LC_MESSAGES/django.po
+++ b/events/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: prawokultury-events\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: prawokultury-events\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-08-28 11:24+0200\n"
+"POT-Creation-Date: 2012-08-28 15:15+0200\n"

 "PO-Revision-Date: 2012-08-28 11:28+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "PO-Revision-Date: 2012-08-28 11:28+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"


@@ -15,7 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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:11
 msgid "date"
 
 #: models.py:11
 msgid "date"


@@ -68,4 +69,3 @@ msgstr "Organizator"
 #: templates/events/snippets/events_box.html:21
 msgid "more events"
 msgstr "więcej wydarzeń"
 #: templates/events/snippets/events_box.html:21
 msgid "more events"
 msgstr "więcej wydarzeń"

-

diff --git a/migdal/locale/pl/LC_MESSAGES/django.mo b/migdal/locale/pl/LC_MESSAGES/django.mo
index 83ff231..70fc97d 100644 (file)
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 4588ee9..617d631 100644 (file)
--- a/migdal/locale/pl/LC_MESSAGES/django.po
+++ b/migdal/locale/pl/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-migdal 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: django-migdal 0.1\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-08-28 12:37+0200\n"
-"PO-Revision-Date: 2012-08-28 12:38+0100\n"
-"Last-Translator: Marcin Koziej <marcin@lolownia.org>\n"
+"POT-Creation-Date: 2012-08-28 15:15+0200\n"
+"PO-Revision-Date: 2012-08-28 15:17+0100\n"
+"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"

 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: Polish\n"
 "MIME-Version: 1.0\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: Polish\n"
 "MIME-Version: 1.0\n"


@@ -155,44 +155,33 @@ msgstr "dzieki"
 msgid "search"
 msgstr "szukaj"
 
 msgid "search"
 msgstr "szukaj"
 

-#: templates/comments/migdal/entry/preview.html:19
-msgid "Please correct the error below"
-msgid_plural "Please correct the errors below"
-msgstr[0] "Proszę poprawić poniższy błąd"
-msgstr[1] "Proszę poprawić poniższe błędy"
-msgstr[2] "Proszę poprawić poniższe błędy"
+#: templates/comments/form.html:3
+msgid "Add comment"
+msgstr "Dodaj komentarz"

 
 

-#: templates/comments/migdal/entry/preview.html:21
-msgid "Preview your comment"
-msgstr "Podgląd komentarza"
-
-#: templates/comments/migdal/entry/preview.html:29
-msgid "and"
-msgstr "i"
-
-#: templates/comments/migdal/entry/preview.html:29
-msgid "Post your comment"
-msgstr "Wyślij komentarz"
-
-#: templates/comments/migdal/entry/preview.html:29
-msgid "or make changes"
-msgstr "lub zmień"
-
-#: templates/comments/migdal/entry/preview.html:45
+#: templates/comments/form.html:24

 msgid "Post"
 msgstr "Wyślij"
 
 msgid "Post"
 msgstr "Wyślij"
 

-#: templates/comments/migdal/entry/preview.html:46
+#: templates/comments/form.html:25

 msgid "Preview"
 msgstr "Podgląd"
 
 msgid "Preview"
 msgstr "Podgląd"
 

+#: templates/comments/migdal/entry/list.html:5
+msgid "Comments"
+msgstr "Komentarze"
+
+#: templates/comments/migdal/entry/preview.html:26
+msgid "Preview your comment"
+msgstr "Podgląd komentarza"
+

 #: templates/migdal/entry/entry_list.html:22
 msgid "Category"
 msgstr "Kategoria"
 
 #: templates/migdal/entry/entry_list.html:55
 msgid "Submit a new story, create Culture's Right with us!"
 #: templates/migdal/entry/entry_list.html:22
 msgid "Category"
 msgstr "Kategoria"
 
 #: 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!"
+msgstr "Dodaj nowy wpis, twórz Prawo Kultury razem z nami!"

 
 #: templates/migdal/entry/entry_short.html:16
 #, python-format
 
 #: templates/migdal/entry/entry_short.html:16
 #, python-format


@@ -208,7 +197,7 @@ msgstr "czytaj więcej"
 
 #: templates/migdal/entry/submit.html:7
 msgid "Submit new story"
 
 #: templates/migdal/entry/submit.html:7
 msgid "Submit new story"

-msgstr "Przyślij nowego newsa."
+msgstr "Dodaj nowy wpis"

 
 #: templates/migdal/entry/submit.html:9
 msgid ""
 
 #: templates/migdal/entry/submit.html:9
 msgid ""


@@ -218,14 +207,18 @@ msgid ""
 "free license."
 msgstr ""
 "\n"
 "free license."
 msgstr ""
 "\n"

-"Wysyłając newsa, zgadzasz się najego publikację na warunkach wolnej licencji\n"
+"Dodając wpis, zgadzasz się najego publikację na warunkach wolnej licencji\n"

 "<a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 
 #: templates/migdal/entry/submit.html:14
 msgid ""
 "Stories are moderated, so please be\n"
 "patient, you'll be notified when it's published."
 "<a href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative Commons Uznanie autorstwa – Na tych samych warunkach</a>."
 
 #: 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."
+msgstr "Wpisy są moderowane. Bądź cierpliwy, otrzymasz powiadomienie o jego publikacji."
+
+#: templates/migdal/entry/submit.html:21
+msgid "Submit"
+msgstr "Wyślij"

 
 #: templates/migdal/entry/submit_thanks.html:7
 msgid "Thanks for submitting"
 
 #: templates/migdal/entry/submit_thanks.html:7
 msgid "Thanks for submitting"


@@ -239,7 +232,7 @@ msgid ""
 "and comments.\n"
 msgstr ""
 "\n"
 "and comments.\n"
 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"
+"Dziękujemy za dodanie nowego wpisu, 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"
 
 #: templates/search/search.html:9
 msgid "Search results"


@@ -269,6 +262,22 @@ msgstr "Wydarzenia"
 msgid "Positions"
 msgstr "Stanowiska"
 
 msgid "Positions"
 msgstr "Stanowiska"
 

+#~ msgid "Please correct the error below"
+
+#~ msgid_plural "Please correct the errors below"
+#~ msgstr[0] "Proszę poprawić poniższy błąd"
+#~ msgstr[1] "Proszę poprawić poniższe błędy"
+#~ msgstr[2] "Proszę poprawić poniższe błędy"
+
+#~ msgid "and"
+#~ msgstr "i"
+
+#~ msgid "Post your comment"
+#~ msgstr "Wyślij komentarz"
+
+#~ msgid "or make changes"
+#~ msgstr "lub zmień"
+

 #~ msgid "Latest news"
 #~ msgstr "Ostatnie newsy"
 
 #~ msgid "Latest news"
 #~ msgstr "Ostatnie newsy"
 

diff --git a/migdal/templates/comments/form.html b/migdal/templates/comments/form.html
new file mode 100755 (executable)
index 0000000..341750f
--- /dev/null
+++ b/migdal/templates/comments/form.html
@@ -0,0 +1,29 @@
+{% load comments i18n %}
+<div class="comment-form">
+<h2 class="section">{% trans "Add comment" %}</h2>
+<form class="submit-form" action="{% comment_form_target %}" method="post">{% csrf_token %}
+  {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+  {% for field in form %}
+    {% if field.is_hidden %}
+      {{ field }}
+    {% endif %}
+  {% endfor %}
+  <table>
+  {% for field in form %}
+    {% if not field.is_hidden %}
+      <tr
+        {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}>
+        <th>{{ field.label_tag }}
+      </th><td>
+        {% if field.errors %}<p class="error">{{ field.errors }}</p>{% endif %}
+        {{ field }}
+      </td></tr>
+    {% endif %}
+  {% endfor %}
+  <tr><td></td><td>
+    <button type="submit" name="post" class="submit-post">{% trans "Post" %}</button>
+    <button type="submit" name="preview" class="submit-preview">{% trans "Preview" %}</button>
+  </td></tr>
+  </table>
+</form>
+</div>

diff --git a/migdal/templates/comments/migdal/entry/list.html b/migdal/templates/comments/migdal/entry/list.html
index c01f256..9f7241b 100755 (executable)
--- a/migdal/templates/comments/migdal/entry/list.html
+++ b/migdal/templates/comments/migdal/entry/list.html
@@ -1,13 +1,26 @@
+{% load i18n %}

 {% load gravatar %}
 {% load markup_tags %}
 {% load gravatar %}
 {% load markup_tags %}

-<dl id="comments">
+<a name="comment"></a>
+<h2 class="section">{% trans "Comments" %}</h2>
+<div class="comments">

   {% for comment in comment_list %}
   {% for comment in comment_list %}

-    <dt id="c{{ comment.id }}">
-        <img src="{% gravatar_for_email comment.email 24 %}"/>
-        {{ comment.submit_date }} - {{ comment.name }}
-    </dt>
-    <dd>
-        <p>{{ comment.comment|textile_restricted_pl }}</p>
-    </dd>
+    <div class="comment" id="c{{ comment.id }}">
+        <img class="avatar" src="{% gravatar_for_email comment.email 64 %}" alt="Avatar"/>
+        <div class="comment-data">
+        <div class="comment-author">
+            {% if comment.url %}
+                <a rel="nofollow" href="{{ comment.url }}">
+            {% endif %}
+            {{ comment.name }}
+            {% if comment.url %}
+                </a>
+            {% endif %}
+        </div>
+        <div class="comment-date">{{ comment.submit_date }}</div>
+        </div>
+        <div class="body">{{ comment.comment|textile_restricted_pl }}</div>
+    </div>

   {% endfor %}
   {% endfor %}

-</dl>
\ No newline at end of file
+  <div style="clear: both"></div>
+</div>
\ No newline at end of file

diff --git a/migdal/templates/comments/migdal/entry/preview.html b/migdal/templates/comments/migdal/entry/preview.html
index c322f9a..6d2b5ff 100755 (executable)
--- a/migdal/templates/comments/migdal/entry/preview.html
+++ b/migdal/templates/comments/migdal/entry/preview.html
@@ -1,51 +1,45 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load i18n %}
-{% load comments %}
-{% load gravatar %}
+{% load comments gravatar i18n %}

 {% load migdal_tags markup_tags %}
 
 
 {% load migdal_tags markup_tags %}
 
 

+{% block "main_menu" %}
+    {% main_menu 'object' entry %}
+{% endblock "main_menu" %}
+
+

 {% block "body" %}
 
 {% block "body" %}
 

-{% entry_begin form.target_object %}
+<div class="entry entry-detail entry-{{ entry.type }}">
+<div class="entry-wrapped">
+
+{% entry_begin form.target_object 1 %}
+<div class="body">

 {{ form.target_object.body }}
 {{ form.target_object.body }}

+</div>
+
+{% if form.target_object.get_type.commentable %}
+    <div style="clear: both"></div>
+
+    {% render_comment_list for form.target_object %}
+
+    <h2 class="section">{% trans "Preview your comment" %}</h2>
+    <div class="comments">
+
+    <div class="comment preview">
+        <img class="avatar" src="{% gravatar_for_email form.email.value 64 %}" alt="Avatar"/>
+        <div class="comment-data">
+        <div class="comment-author">{{ form.name.value }}</div>
+        </div>
+        <div class="body">{{ comment|textile_restricted_pl }}</div>
+        <div style="clear: both"></div>
+    </div>

 
 

-{% render_comment_list for form.target_object %}
-
-
-  <form action="{% comment_form_target %}" method="post">{% csrf_token %}
-    {% if next %}<div><input type="hidden" name="next" value="{{ next }}" /></div>{% endif %}
-    {% if form.errors %}
-    <h1>{% blocktrans count counter=form.errors|length %}Please correct the error below{% plural %}Please correct the errors below{% endblocktrans %}</h1>
-    {% else %}
-    <h1>{% trans "Preview your comment" %}</h1>
-    <dt>
-        <img src="{% gravatar_for_email form.email.value 24 %}"/>
-        {{ form.name.value }}
-    </dt>
-
-      <blockquote>{{ comment|textile_restricted_pl }}</blockquote>
-      <p>
-      {% trans "and" %} <input type="submit" name="submit" class="submit-post" value="{% trans "Post your comment" %}" id="submit" /> {% trans "or make changes" %}:
-      </p>
-    {% endif %}
-    {% for field in form %}
-      {% if field.is_hidden %}
-        <div>{{ field }}</div>
-      {% else %}
-        {% if field.errors %}{{ field.errors }}{% endif %}
-        <p
-          {% if field.errors %} class="error"{% endif %}
-          {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}>
-          {{ field.label_tag }} {{ field }}
-        </p>
-      {% endif %}
-    {% endfor %}
-    <p class="submit">
-    <input type="submit" name="submit" class="submit-post" value="{% trans "Post" %}" />
-    <input type="submit" name="preview" class="submit-preview" value="{% trans "Preview" %}" />
-    </p>
-  </form>
+    {% include "comments/form.html" %}

 
 

+    </div>
+{% endif %}
+</div>
+</div>

 
 {% endblock %}
 
 {% endblock %}

diff --git a/migdal/templates/django_comments_xtd/email_followup_comment.html b/migdal/templates/django_comments_xtd/email_followup_comment.html
index 1987906..2e5e858 100644 (file)
--- a/migdal/templates/django_comments_xtd/email_followup_comment.html
+++ b/migdal/templates/django_comments_xtd/email_followup_comment.html
@@ -2,16 +2,11 @@
 <p>{{ user_name }},</p>
 
 <p>Pojawił się nowy komentarz w wątku z Twoim udziałem.</p>
 <p>{{ user_name }},</p>
 
 <p>Pojawił się nowy komentarz w wątku z Twoim udziałem.</p>

-<p>(There is a new comment following up yours.)</p>

 
 <p>
 
 <p>

-{% if content_object.published_pl %}{% language 'pl' %}
+{% language 'pl' %}

   <a href="http://{{ site.domain }}{{ content_object.get_absolute_url }}">„{{ content_object.title }}”</a>
   <a href="http://{{ site.domain }}{{ content_object.get_absolute_url }}">„{{ content_object.title }}”</a>

-{% endlanguage %}{% endif %}
-{% if content_object.published_en %}{% language 'en' %}
-  <br/>
-  <a href="http://{{ site.domain }}{{ content_object.get_absolute_url }}">“{{ content_object.title}}</a></p>
-{% endlanguage %}{% endif %}
+{% endlanguage %}

 </p>
 
 <p>{{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}:</p>
 </p>
 
 <p>{{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}:</p>

diff --git a/migdal/templates/django_comments_xtd/email_followup_comment.txt b/migdal/templates/django_comments_xtd/email_followup_comment.txt
index a1ca8f1..834c60e 100755 (executable)
--- a/migdal/templates/django_comments_xtd/email_followup_comment.txt
+++ b/migdal/templates/django_comments_xtd/email_followup_comment.txt
@@ -1,12 +1,9 @@
 {% load i18n %}{{ user_name }},
 
 Pojawił się nowy komentarz w wątku z Twoim udziałem.
 {% load i18n %}{{ user_name }},
 
 Pojawił się nowy komentarz w wątku z Twoim udziałem.

-(There is a new comment following up yours.)

 
 

-{% if content_object.published_pl %}{% language 'pl' %}Polska wersja: „{{ content_object.title }}”
-    http://{{ site.domain }}{{ content_object.get_absolute_url }}{% endlanguage %}{% endif %}
-{% if content_object.published_en %}{% language 'en' %}English version: “{{ content_object.title }}”
-    http://{{ site.domain }}{{ content_object.get_absolute_url }}{% endlanguage %}{% endif %}
+{% language 'pl' %}„{{ content_object.title }}”
+http://{{ site.domain }}{{ content_object.get_absolute_url }}{% endlanguage %}

 
 
 {{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}:
 
 
 {{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}:

diff --git a/migdal/templates/migdal/entry/entry_begin.html b/migdal/templates/migdal/entry/entry_begin.html
index 097d29c..9f07e0d 100755 (executable)
--- a/migdal/templates/migdal/entry/entry_begin.html
+++ b/migdal/templates/migdal/entry/entry_begin.html
@@ -36,7 +36,7 @@
 </div>
 
 {% if object.image %}
 </div>
 
 {% if object.image %}

-    <img class="entry-picture" src="{% thumbnail object.image "250x300" as thumb %}
+    <img class="entry-picture" src="{% thumbnail object.image "200x150" as thumb %}

                     {{ thumb.url }}
                 {% empty %}
                     {{ object.image.url }}
                     {{ thumb.url }}
                 {% empty %}
                     {{ object.image.url }}

diff --git a/migdal/templates/migdal/entry/entry_detail.html b/migdal/templates/migdal/entry/entry_detail.html
index 637ed89..990d7f4 100755 (executable)
--- a/migdal/templates/migdal/entry/entry_detail.html
+++ b/migdal/templates/migdal/entry/entry_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load comments %}
+{% load comments i18n %}

 {% load migdal_tags %}
 
 
 {% load migdal_tags %}
 
 


@@ -17,10 +17,13 @@
 <div class="body">
 {{ entry.body }}
 </div>
 <div class="body">
 {{ entry.body }}
 </div>

+<div style="clear: both"></div>

 
 {% if entry.get_type.commentable %}
     {% render_comment_list for entry %}
 
 {% if entry.get_type.commentable %}
     {% render_comment_list for entry %}

+    <div class="comments">

     {% entry_comment_form entry %}
     {% entry_comment_form entry %}

+    </div>

 {% endif %}
 </div>
 </div>
 {% endif %}
 </div>
 </div>

diff --git a/migdal/templates/migdal/entry/submit.html b/migdal/templates/migdal/entry/submit.html
index ad3d6f2..cc376d7 100755 (executable)
--- a/migdal/templates/migdal/entry/submit.html
+++ b/migdal/templates/migdal/entry/submit.html
@@ -11,14 +11,14 @@ By submitting a story here, you agree to publish it under the terms of the
 <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a>
 free license.{% endblocktrans %}</p>
 
 <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a>
 free license.{% endblocktrans %}</p>
 

-<p>{% blocktrans %}Stories are moderated, so please be
+<p class="form-info">{% blocktrans %}Stories are moderated, so please be

 patient, you'll be notified when it's published.{% endblocktrans %}</p>
 
 <form class="submit-form" method="post" action="{% url 'migdal_submit' %}">
 {% csrf_token %}
 <table>
     {{ submit_form.as_table }}
 patient, you'll be notified when it's published.{% endblocktrans %}</p>
 
 <form class="submit-form" method="post" action="{% url 'migdal_submit' %}">
 {% csrf_token %}
 <table>
     {{ submit_form.as_table }}

-    <tr><td><button type="submit">Go!</button></td></tr>
+    <tr><td></td><td><button type="submit">{% trans "Submit" %}</button></td></tr>

 </table>
 </form>
 
 </table>
 </form>
 

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po
index 02a7abd..88bb799 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: prawokultury\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-08-28 12:13+0200\n"
+"POT-Creation-Date: 2012-08-28 15:15+0200\n"

 "PO-Revision-Date: 2012-08-28 12:13+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
 "PO-Revision-Date: 2012-08-28 12:13+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"


@@ -15,14 +15,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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:24
+#: urls.py:23

 msgid "events"
 msgstr "wydarzenia"
 
 msgid "events"
 msgstr "wydarzenia"
 

-#: templates/base.html:8
-#: templates/base.html.py:18
+#: templates/base.html:8 templates/base.html.py:18

 msgid "Culture's right"
 msgstr "Prawo kultury"
 
 msgid "Culture's right"
 msgstr "Prawo kultury"
 


@@ -55,8 +55,14 @@ msgid "Latest comments"
 msgstr "Ostatnie komentarze"
 
 #: templates/base.html:86
 msgstr "Ostatnie komentarze"
 
 #: templates/base.html:86

-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/prevnext/next.html:13
 msgid "next"
 
 #: templates/prevnext/next.html:13
 msgid "next"

diff --git a/prawokultury/static/css/entry.css b/prawokultury/static/css/entry.css
index d8b835a..6c19bf1 100644 (file)
--- a/prawokultury/static/css/entry.css
+++ b/prawokultury/static/css/entry.css
@@ -16,6 +16,8 @@
     font-size: 1.2em; }
     .entry-wrapped h1 a, .entry-wrapped h2 a {
       color: #01519a; }
     font-size: 1.2em; }
     .entry-wrapped h1 a, .entry-wrapped h2 a {
       color: #01519a; }

+  .entry-wrapped h2.section {
+    margin: 2em 0; }

   .entry-wrapped .entry-data {
     font-size: 1.2em;
     margin-top: 1.4em;
   .entry-wrapped .entry-data {
     font-size: 1.2em;
     margin-top: 1.4em;


@@ -73,3 +75,18 @@
     content: url("/static/img/plus.png");
     vertical-align: top;
     margin-right: 1em; }
     content: url("/static/img/plus.png");
     vertical-align: top;
     margin-right: 1em; }

+
+.comments {
+  margin-left: 8em; }
+  .comments .comment-form {
+    border-top: 1px solid #494948; }
+  .comments .comment-data {
+    font-size: 1.2em;
+    margin-top: 1.4em;
+    margin-bottom: 1.4em; }
+    .comments .comment-data .comment-date {
+      color: #acacac; }
+    .comments .comment-data .comment-author {
+      font-weight: bold; }
+  .comments .body {
+    font-size: 1.2em; }

diff --git a/prawokultury/static/css/entry.scss b/prawokultury/static/css/entry.scss
index 77c2935..e6b5056 100755 (executable)
--- a/prawokultury/static/css/entry.scss
+++ b/prawokultury/static/css/entry.scss
@@ -25,6 +25,10 @@
         }
     }
 
         }
     }
 

+    h2.section {
+        margin: 2em 0;
+    }
+

     .entry-data {
         font-size: 1.2em;
         margin-top: 1.4em;
     .entry-data {
         font-size: 1.2em;
         margin-top: 1.4em;


@@ -104,4 +108,29 @@
         vertical-align: top;
         margin-right: 1em;
     }
         vertical-align: top;
         margin-right: 1em;
     }

-}
\ No newline at end of file
+}
+
+
+.comments {
+    margin-left: 8em;
+
+    .comment-form {
+        border-top: 1px solid #494948;
+    }
+
+    .comment-data {
+        font-size: 1.2em;
+        margin-top: 1.4em;
+        margin-bottom: 1.4em;
+        .comment-date {
+            color: #acacac;
+        }
+        .comment-author {
+            font-weight: bold;
+        }
+    }
+
+    .body {
+        font-size: 1.2em;
+    }
+}

diff --git a/prawokultury/static/css/forms.css b/prawokultury/static/css/forms.css
index 0898882..9b3957d 100644 (file)
--- a/prawokultury/static/css/forms.css
+++ b/prawokultury/static/css/forms.css
@@ -2,7 +2,7 @@
   font-size: 1.2em; }
 
 .submit-form {
   font-size: 1.2em; }
 
 .submit-form {

-  margin-top: 1.3em; }
+  margin-top: 3em; }

   .submit-form table {
     border-spacing: 0 .5em; }
   .submit-form tr {
   .submit-form table {
     border-spacing: 0 .5em; }
   .submit-form tr {


@@ -10,19 +10,27 @@
   .submit-form label {
     font-size: 1.2em;
     font-weight: normal; }
   .submit-form label {
     font-size: 1.2em;
     font-weight: normal; }

+  .submit-form .errorlist {
+    color: #e41b13;
+    font-size: 1.2em;
+    padding: 0 0 0 1.3em;
+    margin: 0 0 .5em 0;
+    list-style: url("/static/img/read-more.png"); }

   .submit-form input, .submit-form textarea, .submit-form select {
     font-size: 1.2em;
     border: 0;
   .submit-form input, .submit-form textarea, .submit-form select {
     font-size: 1.2em;
     border: 0;

-    background-color: #fdfdfd;
+    background-color: white;
+    color: #363A3B;

     width: 100%;
     width: 100%;

-    margin-bottom: .5em; }
+    margin-bottom: .5em;
+    border: 1px solid #EDECE7; }

   .submit-form th, .submit-form td {
     text-align: left;
     font-weight: normal;
     vertical-align: top;
   .submit-form th, .submit-form td {
     text-align: left;
     font-weight: normal;
     vertical-align: top;

-    padding: .5em 0; }
+    padding: .5em; }

   .submit-form .helptext {
     color: #acacac;
     font-size: 1.1em; }
     .submit-form .helptext a {
   .submit-form .helptext {
     color: #acacac;
     font-size: 1.1em; }
     .submit-form .helptext a {

-      color: black; }
+      color: #363A3B; }

diff --git a/prawokultury/static/css/forms.scss b/prawokultury/static/css/forms.scss
index ce7625a..626702e 100755 (executable)
--- a/prawokultury/static/css/forms.scss
+++ b/prawokultury/static/css/forms.scss
@@ -3,7 +3,7 @@
 }
 
 .submit-form {
 }
 
 .submit-form {

-    margin-top: 1.3em;
+    margin-top: 3em;

 
     table {
         border-spacing: 0 .5em;
 
     table {
         border-spacing: 0 .5em;


@@ -18,12 +18,22 @@
         font-weight: normal;
     }
 
         font-weight: normal;
     }
 

+    .errorlist {
+        color: #e41b13;
+        font-size: 1.2em;
+        padding: 0 0 0 1.3em;
+        margin: 0 0 .5em 0;
+        list-style: url("/static/img/read-more.png");
+    }
+

     input, textarea, select {
         font-size: 1.2em;
         border: 0;
     input, textarea, select {
         font-size: 1.2em;
         border: 0;

-        background-color: #fdfdfd;
+        background-color: white;
+        color: #363A3B;

         width: 100%;
         margin-bottom: .5em;
         width: 100%;
         margin-bottom: .5em;

+        border: 1px solid #EDECE7;

     }
     
 
     }
     
 


@@ -31,14 +41,14 @@
         text-align: left;
         font-weight: normal;
         vertical-align: top;
         text-align: left;
         font-weight: normal;
         vertical-align: top;

-        padding: .5em 0;
+        padding: .5em;

     }
 
     .helptext {
         color: #acacac;
         font-size: 1.1em;
         a {
     }
 
     .helptext {
         color: #acacac;
         font-size: 1.1em;
         a {

-            color: black;
+            color: #363A3B;

         }
     }
 }
         }
     }
 }

diff --git a/prawokultury/static/css/sidebar.css b/prawokultury/static/css/sidebar.css
index f5baa3d..0bc8a60 100644 (file)
--- a/prawokultury/static/css/sidebar.css
+++ b/prawokultury/static/css/sidebar.css
@@ -8,6 +8,8 @@
     font-weight: normal;
     margin-top: 0;
     margin-bottom: 1.1em; }
     font-weight: normal;
     margin-top: 0;
     margin-bottom: 1.1em; }

+    .sidebar-box h3 a {
+      color: #363A3B; }

   .sidebar-box .more {
     text-align: right; }
   .sidebar-box .event-list {
   .sidebar-box .more {
     text-align: right; }
   .sidebar-box .event-list {

diff --git a/prawokultury/static/css/sidebar.scss b/prawokultury/static/css/sidebar.scss
index ecc6416..2ff8674 100755 (executable)
--- a/prawokultury/static/css/sidebar.scss
+++ b/prawokultury/static/css/sidebar.scss
@@ -9,6 +9,10 @@
         font-weight: normal;
         margin-top: 0;
         margin-bottom: 1.1em;
         font-weight: normal;
         margin-top: 0;
         margin-bottom: 1.1em;

+
+        a {
+            color: #363A3B;
+        }

     }
 
     .more {
     }
 
     .more {

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 9977e37..976b56e 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -52,7 +52,7 @@
         <div id="sidebar" class="bar-right">
             {% block "sidebar" %}
                 <div class="sidebar-box">
         <div id="sidebar" class="bar-right">
             {% block "sidebar" %}
                 <div class="sidebar-box">

-                    <h3>{% trans "Upcoming events" %}</h3>
+                    <h3><a href="{% url 'events' %}">{% trans "Upcoming events" %}</a></h3>

                     {% events_box %}
                 </div>
                 <div id="sidebar-box-categories" class="sidebar-box">
                     {% events_box %}
                 </div>
                 <div id="sidebar-box-categories" class="sidebar-box">