From 28aec988e16b2df6a1960532fb16c0397c709e75 Mon Sep 17 00:00:00 2001
From: Ivan Kovalkovskyi <vaniakov95@gmail.com>
Date: Wed, 2 Sep 2015 17:58:02 +0300
Subject: [PATCH]  deleted static/client

---
 meta/models.py                            |  6 +++---
 templates/admin/meta/create_seo_text.html |  2 +-
 wizard/forms.py                           | 17 +++++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/meta/models.py b/meta/models.py
index 5dd80db9..2079be66 100644
--- a/meta/models.py
+++ b/meta/models.py
@@ -144,11 +144,11 @@ class SeoTextManager(TranslationManager):
 
 class SeoText(TranslatableModel):
 
-    url = models.CharField(max_length=50, unique=True)
+    url = models.CharField(max_length=50, unique=True, verbose_name=u"URL: expomap.ru")
 
     translations = TranslatedFields(
-        title=models.CharField(max_length=255),
-        body=models.TextField()
+        title=models.CharField(max_length=255, verbose_name=u"Заголовок"),
+        body=models.TextField(verbose_name=u"Текст")
     )
 
     objects = SeoTextManager()
diff --git a/templates/admin/meta/create_seo_text.html b/templates/admin/meta/create_seo_text.html
index d11af3d7..a18a44c5 100644
--- a/templates/admin/meta/create_seo_text.html
+++ b/templates/admin/meta/create_seo_text.html
@@ -29,7 +29,7 @@
                     <label class="control-label"><b>{{ form.url.label }}:</b></label>
                         <div class="controls">
                             {{ form.langs }}
-                            {{ form.url }}
+                            {{ form.url }}<span class="help-inline"></span>
                             <span class="help-inline">{{  form.url.errors }}</span>
                         </div>
                 </div>
diff --git a/wizard/forms.py b/wizard/forms.py
index c65a248a..e77ee6a8 100644
--- a/wizard/forms.py
+++ b/wizard/forms.py
@@ -11,25 +11,30 @@ choices = ((0, ''), (1.0, u'Ежегодно'), (2.0, u'2 раза в год'),
             (5.0, u'5 раз в год'), (0.5, u'Раз в 2 года'), (
                 0.33, u'Раз в 3 года'), (0.25, u'Раз в 4 года'))
 
+places = [(item.id, item.name) for item in PlaceExposition.objects.language().all()]
+places.insert(0,('', 'Не выбрано'))
+
 
 class ExpoForm1(forms.Form):
     """
     main information about exposition
     """
-    theme = forms.ModelChoiceField(queryset=Theme.objects.filter(id=50))
-    tag = forms.ModelChoiceField(queryset=Tag.objects.filter(id=50))
     name = forms.CharField(max_length=255, widget=forms.TextInput(attrs={'placeholder': "Введите название выставки"}))
     main_title = forms.CharField(max_length=255, widget=forms.TextInput(attrs={'placeholder': "Краткое описание выставки (необязательно)"}))
     description = forms.CharField(widget=forms.Textarea(attrs={'placeholder': "Полное описание выставки", 'cols':30, 'rows':10}))
     date_start = forms.DateField(widget=forms.TextInput(attrs={'class':'data dateFrom', 'placeholder':'дд.мм.гг'}))
     date_end = forms.DateField(widget=forms.TextInput(attrs={'class':'data dateTo','placeholder':'дд.мм.гг'}))
-    country = forms.ModelChoiceField(queryset=Country.objects.filter(id=50))
-    city = forms.ModelChoiceField(queryset=City.objects.language('ru').filter(id=900052419))
-    place = forms.ModelChoiceField(queryset=PlaceExposition.objects.filter(id=50))
+
+    country = forms.ChoiceField(label=u'Страна', choices=[(c.id, c.name) for c in Country.objects.all()])
+    theme = forms.MultipleChoiceField(label='Тематики', choices=[(item.id, item.name) for item in Theme.objects.language().all()])
+    place = forms.ChoiceField(label=u'Место проведения', required=False, choices=places)
+    city = forms.CharField(label=u'Город', widget=forms.HiddenInput())
+    tag = forms.CharField(label=u'Теги', widget=forms.HiddenInput(), required=False)
+
     audience1 = forms.BooleanField(required=False)
     audience2 = forms.BooleanField(required=False)
     audience3 = forms.BooleanField(required=False)
-    periodic = forms.ChoiceField(choices=choices)
+    periodic = forms.ChoiceField(choices=choices, required=False, widget=forms.Select(attrs={'placeholder':u'Периодичность'}))
     membership1= forms.BooleanField(required=False)
     membership2= forms.BooleanField(required=False)
     membership3= forms.BooleanField(required=False)