subscribe form minor changes

remotes/origin/1203
Ivan 10 years ago
parent 7178ffc734
commit 3eab7ca5c1
  1. 4
      emencia/django/newsletter/forms.py
  2. 2
      emencia/django/newsletter/models.py
  3. 22
      templates/client/newsletters/subcribe.html

@ -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())],

@ -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'Географические зоны'))

@ -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){

Loading…
Cancel
Save