Some old changes

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index e57983d..12d2c48 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -15,12 +15,12 @@ class RegistrationForm(ContactForm):
     contact = forms.EmailField(label=_('E-mail'), max_length=128)
     organization = forms.CharField(label=_('Organization'), 
             max_length=256, required=False)
     contact = forms.EmailField(label=_('E-mail'), max_length=128)
     organization = forms.CharField(label=_('Organization'), 
             max_length=256, required=False)

-    title = forms.CharField(label=_('Title of presentation'), 
-            max_length=256, required=False)
-    presentation = forms.FileField(label=_('Presentation'),
-            required=False)
-    summary = forms.CharField(label=_('Summary of presentation (max. 1800 characters)'),
-            widget=forms.Textarea, max_length=1800, required=False)
+    #title = forms.CharField(label=_('Title of presentation'), 
+    #        max_length=256, required=False)
+    #presentation = forms.FileField(label=_('Presentation'),
+    #        required=False)
+    #summary = forms.CharField(label=_('Summary of presentation (max. 1800 characters)'),
+    #        widget=forms.Textarea, max_length=1800, required=False)

     agree_data = forms.BooleanField(
         label=_('Permission for data processing'),
         help_text=_(u'I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data (name, e-mail address) for purposes of registration for CopyCamp conference.')
     agree_data = forms.BooleanField(
         label=_('Permission for data processing'),
         help_text=_(u'I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data (name, e-mail address) for purposes of registration for CopyCamp conference.')


@@ -33,6 +33,6 @@ class RegistrationForm(ContactForm):
     def __init__(self, *args, **kwargs):
         super(RegistrationForm, self).__init__(*args, **kwargs)
         self.limit_reached = Contact.objects.all().count() >= settings.REGISTRATION_LIMIT
     def __init__(self, *args, **kwargs):
         super(RegistrationForm, self).__init__(*args, **kwargs)
         self.limit_reached = Contact.objects.all().count() >= settings.REGISTRATION_LIMIT

-        if self.limit_reached:
-            for field in ('title', 'summary'):
-                self.fields[field].required = True
+    #    if self.limit_reached:
+    #        for field in ('title', 'summary'):
+    #            self.fields[field].required = True

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index b64ebaa..c58a18a 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 4f784a8..5ff515e 100644 (file)
--- a/prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/prawokultury/locale/pl/LC_MESSAGES/django.po
@@ -89,11 +89,9 @@ msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licenc
 
 #: templates/contact/register/form.html:8
 msgid ""
 
 #: templates/contact/register/form.html:8
 msgid ""

-"Conference registration limit has been reached.\n"
-"We are now accepting speaker submissions only."
+"Conference registration limit has been reached."

 msgstr ""
 msgstr ""

-"Limit rejestracji uczestników konferencji został osiągnięty.\n"
-"Obecnie przyjmujemy tylko zgłoszenia prezentacji."
+"Limit rejestracji uczestników konferencji został osiągnięty."

 
 #: templates/contact/register/mail_body.txt:2
 #: templates/contact/register/mail_subject.txt:1
 
 #: templates/contact/register/mail_body.txt:2
 #: templates/contact/register/mail_subject.txt:1

diff --git a/prawokultury/static/css/base.css b/prawokultury/static/css/base.css
index cc08544..9c3ddd8 100644 (file)
--- a/prawokultury/static/css/base.css
+++ b/prawokultury/static/css/base.css
@@ -27,7 +27,8 @@ h1 {
 .warning {
   border: 1px solid #ddd;
   padding: 1em;
 .warning {
   border: 1px solid #ddd;
   padding: 1em;

-  background: #ffd; }
+  background: #ffd;
+  font-size: 1.3em; }

 
 .notice {
   font-size: 1.3em; }
 
 .notice {
   font-size: 1.3em; }

diff --git a/prawokultury/static/css/base.scss b/prawokultury/static/css/base.scss
index adcb27c..18db75e 100644 (file)
--- a/prawokultury/static/css/base.scss
+++ b/prawokultury/static/css/base.scss
@@ -35,6 +35,7 @@ h1 {
     border: 1px solid #ddd;
     padding: 1em;
     background: #ffd;
     border: 1px solid #ddd;
     padding: 1em;
     background: #ffd;

+    font-size: 1.3em;

 }
 
 .notice {
 }
 
 .notice {

diff --git a/prawokultury/templates/contact/register/form.html b/prawokultury/templates/contact/register/form.html
old mode 100755 (executable)
new mode 100644 (file)
index 75d99a9..42e127d
--- a/prawokultury/templates/contact/register/form.html
+++ b/prawokultury/templates/contact/register/form.html
@@ -1,12 +1,30 @@
-{% extends "contact/form.html" %}
-{% load i18n %}
+{% extends "base.html" %}
+{% load i18n chunks %}

 
 

-{% block contact_form_description %}
-{{ block.super }}
+{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}

 
 

-{% if form.limit_reached %}
-<p class="warning">{% blocktrans %}Conference registration limit has been reached.
-We are now accepting speaker submissions only.{% endblocktrans %}</p>
-{% endif %}
+{% block "body" %}
+
+    <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
+
+    <div class="form-info">
+    {% block contact_form_description %}
+        {% chunk "contact_form__"|add:form.form_tag %}
+    {% endblock %}
+    </div>
+
+  {% if form.limit_reached %}
+    <div class="warning">
+        {% chunk "contact_form__"|add:form.form_tag|add:"__full" %}
+    </div>
+  {% else %}
+    <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
+    {% csrf_token %}
+    <table>
+        {{ form.as_table }}
+        <tr><td></td><td><button>{% block contact_form_submit %}{{ form.submit_label }}{% endblock %}</button></td></tr>
+    </table>
+    </form>
+  {% endif %}

 
 {% endblock %}
 
 {% endblock %}