commit 09.07.2014

remotes/origin/1203
Nazar Kotyuk 12 years ago
parent c1386d000b
commit aeb045681d
  1. 2
      .gitignore
  2. 21
      core/forms.py
  3. 25
      core/simple_index_view.py
  4. 7
      exposition/models.py
  5. 28
      exposition/urls.py
  6. BIN
      media/cache/53/0d/530db5a840614c4cf08c3d3b6bf7679c.jpg
  7. BIN
      media/cache/64/f6/64f679ad3e7fea53ca0da8a9d7a5ada7.jpg
  8. BIN
      media/cache/76/52/7652299fb378f3d1c10997bfd80c8125.jpg
  9. BIN
      media/cache/96/db/96db4a0116a71a2f6afa9c6c9d012230.jpg
  10. BIN
      media/cache/c1/68/c16815516db365062f0e60140375a70c.jpg
  11. BIN
      media/cache/cc/6e/cc6e9a6aa9a756c99b5a62aacac00cf8.jpg
  12. BIN
      media/imgs/.jpg
  13. BIN
      media/imgs/.thumb_1155_444_Unbenannt%5B3983%5D.jpg
  14. BIN
      media/imgs/02.jpg
  15. BIN
      media/imgs/03.jpg
  16. BIN
      media/imgs/0917c8ee51c07fe95f7c46cfc37108de.1.jpg
  17. BIN
      media/imgs/0917c8ee51c07fe95f7c46cfc37108de.jpg
  18. BIN
      media/imgs/1.jpg
  19. BIN
      media/imgs/100percent Design.jpg
  20. BIN
      media/imgs/12-maz_logo_2.jpg
  21. BIN
      media/imgs/1287975075582.jpg
  22. BIN
      media/imgs/1287975075583.jpg
  23. BIN
      media/imgs/13.jpg
  24. BIN
      media/imgs/14059_map1.gif
  25. BIN
      media/imgs/14064_2.gif
  26. BIN
      media/imgs/19-huaxia.jpg
  27. BIN
      media/imgs/1Sokolniki_Map_2D-2_open%20exhibition%20space_ru_-sm.1.jpg
  28. BIN
      media/imgs/1Sokolniki_Map_2D-2_open%20exhibition%20space_ru_-sm.jpg
  29. BIN
      media/imgs/2011101822385110062.gif
  30. BIN
      media/imgs/2011911053248116.gif
  31. BIN
      media/imgs/27159.gif
  32. BIN
      media/imgs/3.jpg
  33. BIN
      media/imgs/3D-Plan_Hallenplan_Januar_2012.jpg
  34. BIN
      media/imgs/42306_1_org_1_hauptlogo_pos_rgb.jpg
  35. BIN
      media/imgs/4ecdd87997d53ab99e57434d74db8fd2.1.jpg
  36. BIN
      media/imgs/4ecdd87997d53ab99e57434d74db8fd2.jpg
  37. BIN
      media/imgs/51ca76d19fa35.jpg
  38. BIN
      media/imgs/51d91c1b9c910.jpg
  39. BIN
      media/imgs/71.jpg
  40. BIN
      media/imgs/7d7566d76e8d77d487b30c931443e1a3.1.jpg
  41. 0
      media/imgs/7d7566d76e8d77d487b30c931443e1a3.jpg
  42. BIN
      media/imgs/8589338140971003590.jpg
  43. BIN
      media/imgs/8589338140971003591.jpg
  44. BIN
      media/imgs/9342c76303cc8611870b1e0acce45d80.jpg
  45. BIN
      media/imgs/ALUMINIUM 2012.jpg
  46. BIN
      media/imgs/AMB 2012.jpg
  47. BIN
      media/imgs/APTA Expo.gif
  48. BIN
      media/imgs/Accenta.jpg
  49. BIN
      media/imgs/AccessoriesTheShow 2012.gif
  50. BIN
      media/imgs/Arabplast.jpg
  51. BIN
      media/imgs/Art Basel Miami Beach.jpg
  52. BIN
      media/imgs/Aysaf2013.gif
  53. BIN
      media/imgs/Best of bike logo.jpg
  54. BIN
      media/imgs/Bio-Europe.jpg
  55. BIN
      media/imgs/BioNord 2014.jpg
  56. BIN
      media/imgs/BioSud 2014.jpg
  57. BIN
      media/imgs/Biomedevice San Jose.jpg
  58. BIN
      media/imgs/Bizbarcelona.jpg
  59. BIN
      media/imgs/CBB-China Brew & China Beverage.jpg
  60. BIN
      media/imgs/CES-logo.jpg
  61. BIN
      media/imgs/CIMES china.jpg
  62. BIN
      media/imgs/CIOE.1.jpg
  63. BIN
      media/imgs/CIOE.2.jpg
  64. BIN
      media/imgs/CIOE.3.jpg
  65. BIN
      media/imgs/CIOE.jpg
  66. BIN
      media/imgs/CQCEC.jpg
  67. BIN
      media/imgs/CTIA 2014.jpg
  68. BIN
      media/imgs/CWIEME-Chicago.jpg
  69. BIN
      media/imgs/CWMEE China expo.jpg
  70. BIN
      media/imgs/Caravan-salon-Austria_logo.jpg
  71. BIN
      media/imgs/CeMATIndia.1.jpg
  72. BIN
      media/imgs/CeMATIndia.2.jpg
  73. BIN
      media/imgs/CeMATIndia.jpg
  74. BIN
      media/imgs/Cersaie_logo.jpg
  75. BIN
      media/imgs/Chelyabinsk_avatar.1.jpg
  76. BIN
      media/imgs/Chelyabinsk_avatar.jpg
  77. 7
      media/imgs/China Hi-Tech Fair (CHTF).1.gif
  78. 7
      media/imgs/China Hi-Tech Fair (CHTF).2.gif
  79. 7
      media/imgs/China Hi-Tech Fair (CHTF).3.gif
  80. 7
      media/imgs/China Hi-Tech Fair (CHTF).gif
  81. BIN
      media/imgs/ClothesShowLive.jpg
  82. BIN
      media/imgs/Cosmetic_Business.jpg
  83. BIN
      media/imgs/CosmoprofAsia.1.jpg
  84. BIN
      media/imgs/CosmoprofAsia.2.jpg
  85. BIN
      media/imgs/CosmoprofAsia.3.jpg
  86. BIN
      media/imgs/CosmoprofAsia.jpg
  87. BIN
      media/imgs/Eltec Nurnberg 2013 .gif
  88. BIN
      media/imgs/EuroBLECH 2012.jpg
  89. BIN
      media/imgs/Expohogar Otono.jpg
  90. BIN
      media/imgs/FILExpo China.gif
  91. BIN
      media/imgs/FMCity_Struttura%20base_ING.jpg
  92. BIN
      media/imgs/Fachdental Leipzig 2012.jpg
  93. BIN
      media/imgs/Fashion_Access_logo.1.jpg
  94. BIN
      media/imgs/Fashion_Access_logo.2.jpg
  95. BIN
      media/imgs/Fashion_Access_logo.3.jpg
  96. BIN
      media/imgs/Fashion_Access_logo.4.jpg
  97. BIN
      media/imgs/Fashion_Access_logo.5.jpg
  98. BIN
      media/imgs/Fashion_Access_logo.6.jpg
  99. BIN
      media/imgs/Fashion_Access_logo.7.jpg
  100. BIN
      media/imgs/Fashion_Access_logo.jpg
  101. Some files were not shown because too many files have changed in this diff Show More

2
.gitignore vendored

@ -3,8 +3,6 @@
*.[oa]
*~
*.egg-info
*.jpg
*.gif
*.doc
.idea/
/proj/local.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])

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

@ -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.

@ -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'),

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

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

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

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

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save