From 3eab7ca5c1f7052d7f7e2561f3e0efa53d118bf5 Mon Sep 17 00:00:00 2001
From: Ivan <vaniakov95@gmail.com>
Date: Tue, 3 Nov 2015 13:45:42 +0200
Subject: [PATCH] subscribe form minor changes

---
 emencia/django/newsletter/forms.py         |  4 ++++
 emencia/django/newsletter/models.py        |  2 +-
 templates/client/newsletters/subcribe.html | 22 ++++++++++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py
index 2404c9b3..e4b8941a 100644
--- a/emencia/django/newsletter/forms.py
+++ b/emencia/django/newsletter/forms.py
@@ -73,6 +73,10 @@ class ContactForm(forms.ModelForm):
         model = Contact
         fields = ('email', 'first_name', )
 
+    def clean_first_name(self):
+        name = self.cleaned_data['first_name']
+        return name.capitalize()
+
 
 class ContactSettingsForm(forms.ModelForm):
     theme = forms.MultipleChoiceField(choices=[(str(item.id), item.name) for item in list(Theme.objects.language().all())],
diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py
index 4efb81a8..b5c02c51 100644
--- a/emencia/django/newsletter/models.py
+++ b/emencia/django/newsletter/models.py
@@ -246,7 +246,7 @@ class ContactSettings(models.Model):
     contact = models.OneToOneField(Contact)
     periodic = models.PositiveIntegerField(verbose_name=_(u'Периодичность отправки'),
                                            choices=PERIODIC_CHOICES, default=WEEK)
-    exponent_practicum = models.BooleanField(default=True, verbose_name=_(u'Практикум экспонента'))
+    exponent_practicum = models.BooleanField(default=False, verbose_name=_(u'Практикум экспонента'))
     organiser_practicum = models.BooleanField(default=True, verbose_name=_(u'Практикум организатора событий'))
     theme = models.ManyToManyField('theme.Theme', blank=True, null=True, verbose_name=_(u'Тематики'))
     area = models.ManyToManyField('country.Area', blank=True, null=True, verbose_name=_(u'Географические зоны'))
diff --git a/templates/client/newsletters/subcribe.html b/templates/client/newsletters/subcribe.html
index 4151a396..76bfb8d0 100644
--- a/templates/client/newsletters/subcribe.html
+++ b/templates/client/newsletters/subcribe.html
@@ -146,14 +146,24 @@
     <script>
         $(function(){
             $('#form1').on('submit', function(e){
-                $('#form2 :input').not(':submit').clone().hide().appendTo(this);
-                $('#form3 :input').not(':submit').clone().hide().appendTo(this);
-                return true;
+                if($('#form2').serialize() !== ""){
+                    $('#form2 :input').not(':submit').clone().hide().appendTo(this);
+                    $('#form3 :input').not(':submit').clone().hide().appendTo(this);
+                    return true;
+                }else{
+                    e.preventDefault();
+                    alert({%trans "Выберите тематику!"  %});
+                }
             });
             $('#form3').on('submit', function(e){
-                $('#form2 :input').not(':submit').clone().hide().appendTo(this);
-                $('#form1 :input').not(':submit').clone().hide().appendTo(this);
-                return true;
+                if($('#form2').serialize() !== ""){
+                    $('#form2 :input').not(':submit').clone().hide().appendTo(this);
+                    $('#form1 :input').not(':submit').clone().hide().appendTo(this);
+                    return true;
+                }else{
+                    e.preventDefault();
+                    alert({%trans "Выберите тематику!"  %});
+                }
             });
             /*
            $('button').on('click', function(e){