commit 09.07.2014

.gitignore

@@ -3,8 +3,6 @@
 *.[oa]
 *~
 *.egg-info
-*.jpg
-*.gif
 *.doc
 .idea/
 /proj/local.py

core/forms.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from django.conf import settings
+from django.core.mail import send_mail
 from place_exposition.models import PlaceExposition
 from place_conference.models import PlaceConference
 from django.utils.translation import ugettext_lazy as _
 from haystack.query import SearchQuerySet, EmptySearchQuerySet
 
+
 class PlaceSearchForm(forms.Form):
     q = forms.CharField(label=_(u'Поиск'), required=False)
     w = forms.CharField(label=_(u'Где'), required=False)
@@ -24,3 +27,21 @@ class PlaceSearchForm(forms.Form):
             sqs = sqs.filter(where__contains=w)
 
         return sqs
+
+class CallbackForm(forms.Form):
+    callback_phone = forms.CharField()
+
+    def clean_callback_phone(self):
+        phone = self.cleaned_data['callback_phone']
+        phone_str = self.cleaned_data['callback_phone']
+        deduct = ('-','(',')','.',' ')
+        for elem in deduct:
+            phone = phone.replace(elem, '')
+        if phone.isdigit():
+            return phone_str
+        else:
+            raise forms.ValidationError(_(u'Введите правильный телефон'))
+
+    def send(self):
+        phone = self.cleaned_data['callback_phone']
+        send_mail(phone, phone, None, [settings.CALLBACK_EMAIL])

core/simple_index_view.py

@@ -0,0 +1,25 @@
+import json
+from django.views.generic import TemplateView
+from django.shortcuts import HttpResponse
+from forms import CallbackForm
+
+
+class AdvertisingView(TemplateView):
+    template_name = 'simple_pages/advertising.html'
+
+
+class AboutView(TemplateView):
+    template_name = 'simple_pages/about.html'
+
+
+def callback(request):
+    response = {'success': False}
+    if request.GET:
+        form = CallbackForm(request.GET)
+        if form.is_valid():
+            form.send()
+            response['success'] = True
+        else:
+            response['errors'] = form.errors
+
+    return HttpResponse(json.dumps(response), content_type='application/json')

exposition/models.py

@@ -41,6 +41,7 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
     """
     #set manager of this model
     objects = ExpoManager()
+    catalog = '/expo/'
 
     url = models.SlugField(unique=True)
     data_begin = models.DateField(verbose_name='Дата начала')
@@ -170,7 +171,8 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
             return []
 
     def get_catalog_url(self):
-        return '/expositions/'
+        return self.catalog
+        #return '/expositions/'
 
 
     def get_event_type(self):
@@ -192,9 +194,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
 
         return days
 
-
-
-
     def clone(self):
         """
         Return an identical copy of the instance with a new ID.

exposition/urls.py

@@ -11,23 +11,23 @@ def test(request):
     return HttpResponse('123')
 
 urlpatterns = patterns('',
-    url(r'expositions/search/', ExpositionSearchView.as_view()),
-    url(r'expositions/country/', ExpositionByCountry.as_view()),
-    url(r'expositions/city/', ExpositionByCity.as_view()),
-    url(r'expositions/theme/', ExpositionByTheme.as_view()),
+    url(r'expo/search/', ExpositionSearchView.as_view()),
+    url(r'expo/country/', ExpositionByCountry.as_view()),
+    url(r'expo/city/', ExpositionByCity.as_view()),
+    url(r'expo/theme/', ExpositionByTheme.as_view()),
 
-    url(r'expositions/(?P<params>.*)/(?P<page>\d+)/$', ExpositionView.as_view()),
-    url(r'expositions/(?P<page>\d+)/$', ExpositionView.as_view()),
+    url(r'expo/(?P<params>.*)/(?P<page>\d+)/$', ExpositionView.as_view()),
+    url(r'expo/(?P<page>\d+)/$', ExpositionView.as_view()),
     #
-    url(r'expositions/(?P<params>.*)/service/(?P<url>.*)/$', ExpositionServiceView.as_view()),
-    url(r'expositions/(?P<params>.*)/statistic/$', ExpositionStatistic.as_view()),
-    url(r'expositions/(?P<params>.*)/price/$', ExpositionPrice.as_view()),
-    url(r'expositions/(?P<params>.*)/program/$', ExpositionProgramme.as_view()),
+    url(r'expo/(?P<params>.*)/service/(?P<url>.*)/$', ExpositionServiceView.as_view()),
+    url(r'expo/(?P<params>.*)/statistic/$', ExpositionStatistic.as_view()),
+    url(r'expo/(?P<params>.*)/price/$', ExpositionPrice.as_view()),
+    url(r'expo/(?P<params>.*)/program/$', ExpositionProgramme.as_view()),
     #
-    url(r'expositions/(?P<params>.*)/visitors/$', ExpositionVisitors.as_view()),
-    url(r'expositions/(?P<params>.*)/members/$', ExpositionMembers.as_view()),
-    url(r'expositions/(?P<params>.*)/$', ExpositionView.as_view()),
-    url(r'expositions/$', ExpositionView.as_view()),
+    url(r'expo/(?P<params>.*)/visitors/$', ExpositionVisitors.as_view()),
+    url(r'expo/(?P<params>.*)/members/$', ExpositionMembers.as_view()),
+    url(r'expo/(?P<params>.*)/$', ExpositionView.as_view()),
+    url(r'expo/$', ExpositionView.as_view()),
     #
     url(r'exposition-add-calendar/(?P<id>\d+)/$', 'exposition.views.exposition_add_calendar'),
     url(r'exposition-visit/(?P<id>\d+)/$', 'exposition.views.exposition_visit'),

media/imgs/China Hi-Tech Fair (CHTF).1.gif

@@ -0,0 +1,7 @@
+<html>
+<head><title>400 Bad Request</title></head>
+<body bgcolor="white">
+<center><h1>400 Bad Request</h1></center>
+<hr><center>nginx/1.2.2</center>
+</body>
+</html>

media/imgs/China Hi-Tech Fair (CHTF).2.gif

@@ -0,0 +1,7 @@
+<html>
+<head><title>400 Bad Request</title></head>
+<body bgcolor="white">
+<center><h1>400 Bad Request</h1></center>
+<hr><center>nginx/1.2.2</center>
+</body>
+</html>

media/imgs/China Hi-Tech Fair (CHTF).3.gif

@@ -0,0 +1,7 @@
+<html>
+<head><title>400 Bad Request</title></head>
+<body bgcolor="white">
+<center><h1>400 Bad Request</h1></center>
+<hr><center>nginx/1.2.2</center>
+</body>
+</html>

media/imgs/China Hi-Tech Fair (CHTF).gif

@@ -0,0 +1,7 @@
+<html>
+<head><title>400 Bad Request</title></head>
+<body bgcolor="white">
+<center><h1>400 Bad Request</h1></center>
+<hr><center>nginx/1.2.2</center>
+</body>
+</html>