merging

accounts/views.py

@@ -6,7 +6,6 @@ from django.shortcuts import get_object_or_404
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _, get_language
-from django.utils import timezone
 from django_messages.forms import SendForm
 from django.views.generic import TemplateView, FormView
 from functions.custom_views import ListView
@@ -16,6 +15,8 @@ from company.forms import CreateCompanyForm
 from .models import User
 from .edit_forms import AvatarForm, NameForm, HomeForm, WorkForm, AboutCompanyForm, PhoneForm, EmailForm,\
                        WebPageForm, SocialForm, AboutForm
+from emencia.django.newsletter.forms import SubscribeSettingsForm
+from emencia.django.newsletter.models import Contact
 
 
 
@@ -25,11 +26,20 @@ class SettingsView(TemplateView):
         password, email notifications, social settings, subscription
 
     """
-    template_name = 'accounts/settings.html'
+    template_name = 'client/accounts/settings.html'
     def get_context_data(self, **kwargs):
         context = super(SettingsView, self).get_context_data(**kwargs)
         context['change_password_form'] = ChangePasswordForm()
-        context['email_announcement_form'] = EmailAnnouncementForm()
+        user = self.request.user
+        try:
+            contact = user.contact_set.get(email=user.username)
+        except Contact.DoesNotExist:
+            contact = None
+
+        if contact:
+            context['subscribe'] = SubscribeSettingsForm(instance=contact.contactsettings)
+        else:
+            context['subscribe'] = SubscribeSettingsForm()
         return context
 
 def dates_range(date1, date2):

city/views.py

@@ -1,7 +1,10 @@
 import json
 from django.views.generic import DetailView
 from django.http import HttpResponse
+from django.utils import translation
+from haystack.query import SearchQuerySet
 from models import City
+from settings.views import get_by_lang
 
 
 class CityView(DetailView):
@@ -12,14 +15,22 @@ class CityView(DetailView):
 
 def get_city(request):
     if request.is_ajax():
-        country = request.GET['country']
-        term = request.GET['term'].capitalize()
-        if not term:
-            qs = City.objects.language().filter(country=country).order_by('translations__name').distinct()[:100]
+        country = request.GET.get('country')
+        term = request.GET.get('term', '').capitalize()
+        lang = translation.get_language()
+        if country:
+            if not term:
+                qs = City.objects.language().filter(country=country).order_by('translations__name').distinct()[:100]
+            else:
+                qs = City.objects.language().filter(country=country, translations__name__contains=term).distinct()
+            result = [{'id': city.id, 'label': city.name} for city in qs]
         else:
-            qs = City.objects.language().filter(country=country, translations__name__contains=term).distinct()
-        result = [{'id': city.id, 'label': city.name} for city in qs]
+            if not term:
+                qs = SearchQuerySet().models(City).all().order_by('name_%s'%lang)[:30]
+            else:
+                qs = SearchQuerySet().models(City).autocomplete(content_auto=term).order_by('name_%s'%lang)[:30]
+            result = [{'id': city.pk, 'label': get_by_lang(city, 'name', lang)} for city in qs]
 
-        return HttpResponse(json.dumps(result), content_type='application/json')
+        return HttpResponse(json.dumps(result, indent=4), content_type='application/json')
     else:
         return HttpResponse('not ajax')

emencia/django/newsletter/admin_forms.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
+from django.utils import translation
 from ckeditor.widgets import CKEditorWidget
 from emencia.django.newsletter.models import Contact, ContactSettings, MailingList, Newsletter, Attachment
 from city.models import City
@@ -18,6 +19,13 @@ class ContactSettingsForm(forms.ModelForm):
     country = forms.MultipleChoiceField(choices=[(c.id,c.name) for c in list(set(Country.objects.language().all()))], required=False)
     area = forms.MultipleChoiceField(choices=[(a.id, a.name) for a in list(set(Area.objects.language().all()))], required=False)
 
+    def __init__(self, *args, **kwargs):
+        super(ContactSettingsForm, self).__init__(*args, **kwargs)
+        instance = getattr(self, 'instance', None)
+        if instance:
+            lang = translation.get_language()
+            self.fields['city'].widget.attrs['data-init-text'] = [(item.id, item.name) for item in list(instance.city.filter(translations__language_code=lang))]
+
     class Meta:
         model = ContactSettings
         fields = ('periodic', 'exponent_practicum', 'organiser_practicum',  'theme', 'area', 'country', 'city', )
@@ -39,7 +47,17 @@ class ContactSettingsForm(forms.ModelForm):
         return int(self.cleaned_data['periodic'])
 
     def clean_city(self):
-        return City.objects.none()
+        cities = self.cleaned_data.get('city')
+        if cities:
+            res = []
+            for id in cities.split(','):
+                try:
+                    res.append(int(id))
+                except ValueError:
+                    continue
+            return City.objects.filter(id__in=res)
+        else:
+            return City.objects.none()
 
 
 import xlrd

emencia/django/newsletter/forms.py

@@ -4,6 +4,10 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.http import Http404
 
+from django.core.exceptions import ValidationError
+from django.utils import translation
+from haystack.query import SearchQuerySet
+from functions.search_forms import get_by_lang
 from emencia.django.newsletter.models import Contact, ContactSettings
 from emencia.django.newsletter.models import MailingList
 from functions.form_check import translit_with_separator as tr
@@ -185,6 +189,86 @@ class ContactImportForm(forms.Form):
                 cs.country.add(country)
                 cs.save()
 
+class AbstractSubscribeForm(forms.ModelForm):
+    email = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': 'Email'}))
+
+    class Meta:
+        model = ContactSettings
+        fields = ('periodic', 'exponent_practicum', 'organiser_practicum', 'theme', 'country', 'city')
+
+    def clean_email(self):
+        email = self.cleaned_data['email']
+        try:
+            Contact.objects.get(email=email)
+        except Contact.DoesNotExist:
+            return email
+        raise ValidationError(_(u'Такой email уже есть в базе даных'))
+
+    def clean_city(self):
+        cities = self.cleaned_data.get('city')
+        if cities:
+            res = []
+            for id in cities.split(','):
+                try:
+                    res.append(int(id))
+                except ValueError:
+                    continue
+            return City.objects.filter(id__in=res)
+        else:
+            return City.objects.none()
+
+    def clean_country(self):
+        countries = self.cleaned_data['country']
+        return Country.objects.filter(id__in=countries)
+
+    def clean_theme(self):
+        themes = self.cleaned_data['theme']
+        return Theme.objects.filter(id__in=themes)
+
+
+
+class SubsribeAssideForm(AbstractSubscribeForm):
+    city = forms.CharField(
+        widget=forms.HiddenInput(attrs={'id': 'id_subscription_city', 'placeholder': _(u'Город')}),
+        required=False)
+
+    periodic = forms.ChoiceField(
+        choices=ContactSettings.PERIODIC_CHOICES, required=False,
+        widget=forms.Select(attrs={'placeholder': _(u'Периодичность'), 'id': 'id_subscription_periodic'}))
+
+    def __init__(self, *args, **kwargs):
+        super(SubsribeAssideForm, self).__init__(*args, **kwargs)
+        lang = translation.get_language()
+        self.fields['theme'] = forms.MultipleChoiceField(
+            choices=[(item.pk, get_by_lang(item, 'name', lang)) for item in SearchQuerySet().models(Theme).all()],
+            widget=forms.SelectMultiple(attrs={'placeholder': _(u'Тематики'), 'id': 'id_subscription_theme'}))
+        self.fields['country'] = forms.MultipleChoiceField(
+            choices=[(item.pk, get_by_lang(item, 'name', lang)) for item in SearchQuerySet().models(Country).all()],
+            required=False,
+            widget=forms.SelectMultiple(attrs={'placeholder': _(u'Страны'), 'id': 'id_subscription_country'}))
+
+
+class SubscribeSettingsForm(AbstractSubscribeForm):
+    city = forms.CharField(
+        widget=forms.HiddenInput(attrs={'id': 'id_sub_set_city', 'placeholder': _(u'Город')}),
+        required=False)
+    get_announce = forms.BooleanField(required=False, label=_(u'Получать анонсы'))
+    moscow_expo = forms.BooleanField(required=False, label=_(u'Выставки Москвы'))
+    saint_expo = forms.BooleanField(required=False, label=_(u'Выставки Санкт-Петербурга'))
+    europe_expo = forms.BooleanField(required=False, label=_(u'Выставки Европы'))
+
+    def __init__(self, *args, **kwargs):
+        super(SubscribeSettingsForm, self).__init__(*args, **kwargs)
+        lang = translation.get_language()
+        self.fields['theme'] = forms.MultipleChoiceField(
+            choices=[(item.pk, get_by_lang(item, 'name', lang)) for item in SearchQuerySet().models(Theme).all()],
+            widget=forms.SelectMultiple(attrs={'placeholder': _(u'Тематики'), 'id': 'id_sub_set_theme'}))
+        self.fields['country'] = forms.MultipleChoiceField(
+            choices=[(item.pk, get_by_lang(item, 'name', lang)) for item in SearchQuerySet().models(Country).all()],
+            required=False,
+            widget=forms.SelectMultiple(attrs={'placeholder': _(u'Страны'), 'id': 'id_sub_set_country'}))
+        
+        
 # do not watch
 # cursor = db.cursor()
 # sql = u"""

emencia/django/newsletter/managers.py

@@ -37,4 +37,13 @@ class ContactManager(models.Manager):
         contact.user = user
 
         contact.save()
+        return contact
+
+    def create_contact(self, email, user=None):
+        contact = self.model(user=user, email=email)
+        if user:
+            contact.first_name = user.first_name
+            contact.last_name = user.last_name
+        contact.save()
+        contact.send_activation()
         return contact

emencia/django/newsletter/models.py

@@ -237,9 +237,9 @@ class ContactSettings(models.Model):
     WEEK_2 = 2 # every 2 weeks
     MONTH = 3 # every 4 weeks
 
-    PERIODIC_CHOICES = [(WEEK, 'Раз в неделю'),
-                        (WEEK_2, 'Раз в 2 недели'),
-                        (MONTH, 'Разв месяц')
+    PERIODIC_CHOICES = [(WEEK, _(u'Раз в неделю')),
+                        (WEEK_2, _(u'Раз в 2 недели')),
+                        (MONTH, _(u'Раз в месяц'))
                       ]
 
     contact = models.OneToOneField(Contact)

emencia/django/newsletter/urls/__init__.py

@@ -16,5 +16,7 @@ urlpatterns = patterns('',
                        url(r'^activation/complete/', TemplateView.as_view(template_name='client/newsletters/activation_complete.html'),
                            name='subscription_activation_complete'),
                        url(r'^activate/(?P<activation_key>.*)/$', ActivationView.as_view(), name='subscription_activation'),
+                       url(r'^subsribe/aside/$', 'emencia.django.newsletter.views.expo_views.subscribe_aside',
+                           name='newsletter_subscription_aside'),
                        url(r'^$', SubscribeView.as_view(), name='newsletter_subscription'),
                        )

emencia/django/newsletter/views/admin_views.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.views.generic import CreateView, ListView, UpdateView, DeleteView, FormView
 from django.conf import settings
+from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from django.forms.formsets import formset_factory
 from django.http import HttpResponseRedirect, HttpResponse
@@ -71,14 +72,19 @@ class UpdateContact(UpdateView):
         self.object.theme = form.cleaned_data['theme']
         self.object.country = form.cleaned_data['country']
         self.object.area = form.cleaned_data['area']
+        self.object.city = form.cleaned_data['city']
         self.object.save()
         return HttpResponseRedirect(self.get_success_url())
 
     def get_initial(self):
+        lang = translation.get_language()
         obj = self.object.contact
         data = self.initial.copy()
+        city = ','.join(['%s:%s'%(item.id, item.name) for item in self.object.city.filter(translations__language_code=lang)])
+
         data.update({'first_name': obj.first_name, 'subscriber': obj.subscriber,
-                     'valid': obj.valid, 'tester': obj.tester})
+                     'valid': obj.valid, 'tester': obj.tester, 'city':city})
+
         return data
 
 

emencia/django/newsletter/views/expo_views.py

@@ -1,8 +1,13 @@
-from django.views.generic import TemplateView, View, FormView
-from django.http import HttpResponseRedirect
+# -*- coding: utf-8 -*-
+import json
+from django.views.generic import TemplateView, FormView
+from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import redirect
 from emencia.django.newsletter.forms import ContactForm, ContactSettingsForm
 from emencia.django.newsletter.models import Contact, ContactSettings
+from emencia.django.newsletter.forms import SubsribeAssideForm
+from accounts.models import User
+from country.models import Country
 
 class SubscribeView(FormView):
     form_class = ContactForm
@@ -32,13 +37,22 @@ class SubscribeView(FormView):
         else:
             form2 = ContactSettingsForm(self.request.POST)
 
-        ccc = self.request.POST
         if form2.is_valid():
             contact_setting = form2.save(commit=False)
+
+
             if not contact_setting.contact_id:
                 contact_setting.contact = contact
             contact_setting.save()
             form2.save_m2m()
+            # get country from request
+            country_code = self.request.META.get('HTTP_GEOIP_COUNTRY_CODE')
+            try:
+                country = Country.objects.get(country_code=country_code)
+                contact_setting.country.add(country)
+                contact_setting.area.add(country.area)
+            except Country.DoesNotExist:
+                pass
 
         contact.send_activation()
         return HttpResponseRedirect(self.success_url)
@@ -87,7 +101,6 @@ class ActivationView(TemplateView):
         Implement account-activation logic here.
 
         """
-        # todo: add country and city from geoip
         activated_contact = Contact.objects.activate(activation_key)
         return activated_contact
 
@@ -96,3 +109,31 @@ class ActivationView(TemplateView):
         return ('subscription_activation_complete', (), {})
 
 
+def subscribe_aside(request):
+    if request.POST:
+        response = {'success': False}
+        form = SubsribeAssideForm(request.POST)
+        if form.is_valid():
+            email = form.cleaned_data['email']
+            try:
+                user = User.objects.get(username=email)
+            except User.DoesNotExist:
+                user = None
+            contact = Contact.objects.create_contact(email, user)
+            contact_setting = form.save(commit=False)
+            contact_setting.contact = contact
+            contact_setting.exponent_practicum = True
+            contact_setting.organiser_practicum = True
+            contact_setting.save()
+            form.save_m2m()
+            response['success'] = True
+        else:
+            errors = form.errors
+            if 'theme' in errors:
+                errors['id_subscription_theme'] = errors['theme']
+            response['errors'] = errors
+        return HttpResponse(json.dumps(response, indent=2), content_type='application/json')
+    else:
+        return HttpResponse('not form request')
+
+

functions/search_forms.py

@@ -8,7 +8,6 @@ from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from haystack.query import EmptySearchQuerySet, SearchQuerySet
 from country.models import Area
-from theme.models import Theme
 from exposition.models import Exposition
 from conference.models import Conference
 from seminar.models import Seminar
@@ -20,6 +19,15 @@ from city.models import City
 from place_exposition.models import PlaceExposition
 from place_conference.models import PlaceConference
 
+def get_by_lang(item, field, lang='ru'):
+    """
+
+    :param item: searchresult object
+           field: translated field
+    :return:
+    """
+    return getattr(item, field+'_'+lang)
+
 
 class AbstactSearchForm(forms.Form):
     q = forms.CharField(label=_(u'Я ищу'), required=False, widget=forms.TextInput(attrs={'placeholder':_(u'Тематика, слово или название')}))

proj/views.py

@@ -13,6 +13,7 @@ from theme.models import Theme
 from article.models import Article
 from exposition.models import Exposition
 from conference.models import Conference
+from emencia.django.newsletter.forms import SubsribeAssideForm
 
 
 def clear_slashes(str_):
@@ -35,15 +36,10 @@ def add_seo(request):
     return seo_text
 
 def expo_context(request):
-    banners_themes = [24, 34, 4]
-    banner_tags = [141, 142, 143, 156, 206, 231, 232, 390, 391, 400, 457, 500, 536, 537, 539, 457, 500, 686, 715, 765,
-                   766, 857, 927, 964, 971, 972, 987, 1009, 1010, 1021, 2508, 2509, 2516, 2518, 2536, 2568, 2583, 2585,
-                   3811, 3940, 4130, 4192, 4236, 4512, 4841, 5353, 5532, 5854, 106, 107, 195, 380, 930, 931, 932, 3845,
-                   3846, 3863, 3873, 4141, 4142, 4343, 4344, 4347, 211, 212, 277, 631]
     cont = {'theme_search_form': ThemeSearch(), 'expo_catalog': Exposition.catalog,
             'book_aid': settings.BOOKING_AID, 'blogs': Article.objects.main_page_blogs(),
             'news_list': Article.objects.main_page_news(), 'sng_countries': settings.SNG_COUNTRIES,
-            'banner_themes': banners_themes, 'banner_tags': banner_tags, 'seo_text': add_seo(request)
+            'seo_text': add_seo(request), 'announce_subscribe': SubsribeAssideForm()
             }
 
     user = request.user

static/ninjaplugin/plugin/index.html

@@ -1,24 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>Plugin</title>
-    <link rel="stylesheet" href="/plugin/plugin.css" />
-    <script src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
-    <script src="/plugin/jquery.mousewheel.js"></script>
-    <script src="/plugin/plugin.js"></script>
-    <script>
-    $(document).ready(function() {
-        $('#region').ninjaSelect({
-            
-        });
-    })
-    </script>
-</head>
-<body>
-    <div style="width: 1000px; margin: 0 auto;">
-        <label>Плагин:</label>
-        <input id="region" name="region" value="" />
-    </div>
-</body>
-</html>

static/ninjaplugin/plugin/init.js

@@ -1,16 +0,0 @@
-$(document).ready(function() {
-    var idCountry = $('#id_country').ninjaSelect({
-        url: '/get/country/',
-        itemsPerPage: 10
-    });
-    
-    var plugin = idCountry.data().ninjaSelect;
-        plugin.options.data = {
-            city: '1'
-        };
-    
-    $('#id_theme').ninjaSelect({
-        url: '/get/theme/',
-        itemsPerPage: 10
-    });
-})

static/ninjaplugin/plugin/jquery.mousewheel.js

@@ -1,213 +0,0 @@
-(function (factory) {
-    if ( typeof define === 'function' && define.amd ) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS style for Browserify
-        module.exports = factory;
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
-}(function ($) {
-
-    var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
-        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
-                    ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
-        slice = Array.prototype.slice,
-        nullLowestDeltaTimeout, lowestDelta;
-
-    if ( $.event.fixHooks ) {
-        for ( var i = toFix.length; i; ) {
-            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
-        }
-    }
-
-    var special = $.event.special.mousewheel = {
-        version: '3.1.12',
-
-        setup: function() {
-            if ( this.addEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.addEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = handler;
-            }
-            // Store the line height and page height for this particular element
-            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
-            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
-        },
-
-        teardown: function() {
-            if ( this.removeEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.removeEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = null;
-            }
-            // Clean up the data we added to the element
-            $.removeData(this, 'mousewheel-line-height');
-            $.removeData(this, 'mousewheel-page-height');
-        },
-
-        getLineHeight: function(elem) {
-            var $elem = $(elem),
-                $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
-            if (!$parent.length) {
-                $parent = $('body');
-            }
-            return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
-        },
-
-        getPageHeight: function(elem) {
-            return $(elem).height();
-        },
-
-        settings: {
-            adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
-            normalizeOffset: true // calls getBoundingClientRect for each event
-        }
-    };
-
-    $.fn.extend({
-        mousewheel: function(fn) {
-            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
-        },
-
-        unmousewheel: function(fn) {
-            return this.unbind('mousewheel', fn);
-        }
-    });
-
-
-    function handler(event) {
-        var orgEvent = event || window.event,
-            args = slice.call(arguments, 1),
-            delta = 0,
-            deltaX = 0,
-            deltaY = 0,
-            absDelta = 0,
-            offsetX = 0,
-            offsetY = 0;
-        event = $.event.fix(orgEvent);
-        event.type = 'mousewheel';
-
-        // Old school scrollwheel delta
-        if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
-        if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
-        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
-        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
-
-        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
-        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-            deltaX = deltaY * -1;
-            deltaY = 0;
-        }
-
-        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
-        delta = deltaY === 0 ? deltaX : deltaY;
-
-        // New school wheel delta (wheel event)
-        if ( 'deltaY' in orgEvent ) {
-            deltaY = orgEvent.deltaY * -1;
-            delta = deltaY;
-        }
-        if ( 'deltaX' in orgEvent ) {
-            deltaX = orgEvent.deltaX;
-            if ( deltaY === 0 ) { delta = deltaX * -1; }
-        }
-
-        // No change actually happened, no reason to go any further
-        if ( deltaY === 0 && deltaX === 0 ) { return; }
-
-        // Need to convert lines and pages to pixels if we aren't already in pixels
-        // There are three delta modes:
-        // * deltaMode 0 is by pixels, nothing to do
-        // * deltaMode 1 is by lines
-        // * deltaMode 2 is by pages
-        if ( orgEvent.deltaMode === 1 ) {
-            var lineHeight = $.data(this, 'mousewheel-line-height');
-            delta *= lineHeight;
-            deltaY *= lineHeight;
-            deltaX *= lineHeight;
-        } else if ( orgEvent.deltaMode === 2 ) {
-            var pageHeight = $.data(this, 'mousewheel-page-height');
-            delta *= pageHeight;
-            deltaY *= pageHeight;
-            deltaX *= pageHeight;
-        }
-
-        // Store lowest absolute delta to normalize the delta values
-        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
-
-        if ( !lowestDelta || absDelta < lowestDelta ) {
-            lowestDelta = absDelta;
-
-            // Adjust older deltas if necessary
-            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-                lowestDelta /= 40;
-            }
-        }
-
-        // Adjust older deltas if necessary
-        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-            // Divide all the things by 40!
-            delta /= 40;
-            deltaX /= 40;
-            deltaY /= 40;
-        }
-
-        // Get a whole, normalized value for the deltas
-        delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
-        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
-        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
-
-        // Normalise offsetX and offsetY properties
-        if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
-            var boundingRect = this.getBoundingClientRect();
-            offsetX = event.clientX - boundingRect.left;
-            offsetY = event.clientY - boundingRect.top;
-        }
-
-        // Add information to the event object
-        event.deltaX = deltaX;
-        event.deltaY = deltaY;
-        event.deltaFactor = lowestDelta;
-        event.offsetX = offsetX;
-        event.offsetY = offsetY;
-        // Go ahead and set deltaMode to 0 since we converted to pixels
-        // Although this is a little odd since we overwrite the deltaX/Y
-        // properties with normalized deltas.
-        event.deltaMode = 0;
-
-        // Add event and delta to the front of the arguments
-        args.unshift(event, delta, deltaX, deltaY);
-
-        // Clearout lowestDelta after sometime to better
-        // handle multiple device types that give different
-        // a different lowestDelta
-        // Ex: trackpad = 3 and mouse wheel = 120
-        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
-        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
-
-        return ($.event.dispatch || $.event.handle).apply(this, args);
-    }
-
-    function nullLowestDelta() {
-        lowestDelta = null;
-    }
-
-    function shouldAdjustOldDeltas(orgEvent, absDelta) {
-        // If this is an older event and the delta is divisable by 120,
-        // then we are assuming that the browser is treating this as an
-        // older mouse wheel event and that we should divide the deltas
-        // by 40 to try and get a more usable deltaFactor.
-        // Side note, this actually impacts the reported scroll distance
-        // in older browsers and can cause scrolling to be slower than native.
-        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
-        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
-    }
-
-}));

static/ninjaplugin/plugin/plugin.css

@@ -1,69 +0,0 @@
-[for="id_country"], [for="id_theme"] {
-    float: left;
-    margin-right: 10px;
-}
-
-.ninjaSelect {
-    display: inline-block;
-    width: 300px;
-    min-height: 25px;
-    border: 1px solid #000;
-    border-radius: 4px;
-}
-.ninjaSelect > input {
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-    
-    min-height: 25px;
-    padding: 0 5px;
-    width: 100%;
-    border-radius: 4px;
-    border: 0;
-}
-.ninjaSelect_wrapper {
-    max-height: 185px;
-    overflow-y: scroll;
-    border-top: 1px solid #000;
-    background: #fff;
-    border-radius: 0 0 4px 4px;
-}
-
-.ninjaSelect_selected {
-    border-top: 1px dotted red;
-    border-bottom: 1px dotted red;
-    padding: 0 3px;
-    display: none;
-    background: #fff;
-}
-
-.ninjaSelect_item {
-    display: inline-block;
-    vertical-align: top;
-    background: orange;
-    border-radius: 4px;
-    color: #fff;
-    padding: 2px 8px;
-    margin: 2px 5px 2px 0;
-    cursor: pointer;
-}
-
-.ninjaSelect_list {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    padding: 3px 3px 0 3px;
-}
-.ninjaSelect_list > li {
-    border: 1px solid #b37550;
-    border-radius: 3px;
-    margin: 0 0 3px;
-    padding: 0 3px 2px;
-    line-height: normal;
-    cursor: pointer;
-    color: #b37550;
-}
-.ninjaSelect_list > li:hover, .ninjaSelect_list > li.active {
-    color: #000;
-    border-color: #000;
-}

static/ninjaplugin/plugin/plugin.js

@@ -1,147 +0,0 @@
-!function ($) {
-    
-    "use strict";
-    
-    function ninjaSelect(element, options) {
-        this.$element = $(element);
-        this.options = $.extend({}, $.fn.ninjaSelect.defaults, options);
-        this.page = 1;
-        
-        this.init();                
-    }
-    
-    ninjaSelect.prototype = {
-        
-        constructor: ninjaSelect,
-        
-        init: function() {
-            var self = this, allow = true;
-            
-            self.$div = $('<div>', {'id': 'ninja_' + this.$element.attr('id'), 'class': 'ninjaSelect'}),
-            self.$input = $('<input>'),
-            self.$list = $('<div>', {'class': 'ninjaSelect_wrapper'}).hide();
-            self.$selected = $('<div>', {'class': 'ninjaSelect_selected'});
-            self.$ul = $('<ul>', {'class': 'ninjaSelect_list'});
-            
-            self.$element.hide().after(
-                self.$div.append(
-                    self.$input, self.$selected, self.$list.append(
-                        self.$ul
-                    )
-                )
-            );
-            
-            self.$input.on('keyup', function(e) {                
-                self.loadData($(this).val());
-            });
-            
-            self.$ul.delegate('li', 'click', function(e) {
-                var id = $(this).data().id, allow = true;
-                
-                self.$selected.show().find('.ninjaSelect_item').each(function() {
-                    if ($(this).data().id == id) {
-                        allow = false;
-                    }
-                });
-                
-                if (!self.options.multiple && $('.ninjaSelect_item').length == 1) {
-                    allow = false;
-                }
-                
-                if (allow) {
-                    $(this).addClass('active');
-                    
-                    self.$selected.append(
-                        $('<div>', {'class': 'ninjaSelect_item'}).data({'id': id, 'index': $(this).index()}).text($(this).text()).click(function() {
-                            self.$ul.find('li').eq($(this).data().index).removeClass('active');
-                            $(this).next().remove().end().remove();
-                            
-                            if (!self.$selected.find('.ninjaSelect_item').length) {
-                                self.$selected.hide()
-                            }
-                        }),
-                        $('<input>', {'type': 'hidden', 'name': $(this).text() + '_' + id}).val($(this).text())
-                    )
-                }
-            });
-            
-            self.$list.mousewheel(function(e, delta) {
-                if (delta < 0) {
-                    if ($(this).scrollTop() + $(this).innerHeight() >= self.$ul.innerHeight() && allow) {
-                        allow = false;
-                        
-                        self.loadData(self.$input.val(), function() {
-                            allow = true;
-                        })
-                    }
-                }
-            });
-            
-            $(document).delegate('body', 'click', function(e) {
-                if ($(e.target).closest('.ninjaSelect_list').length == 0) {
-                    self.$list.hide();
-                    self.$ul.empty();
-                }
-            })
-        },
-        
-        loadData: function(val, callback) {
-            var self = this, len = val.length;
-            
-            if (len >= self.options.minLength) {
-                $.get(self.options.url, {offset: self.page, count: self.options.itemsPerPage, value: val, data: self.options.data}, function(json) {
-                    if (json.length) {
-                        if (json.length >= self.options.itemsPerPage) {
-                            self.page++;
-                        } 
-                        
-                        self.$list.show();                        
-                        
-                        json.forEach(function(item, i, arr) {
-                            self.$ul.append(
-                                $('<li>').text(item.text).data('id', item.id)
-                            )
-                        })
-                        
-                        
-                        if (self.page == 1) {
-                            self.$list.animate({scrollTop: 0}, 0);
-                        } else {
-                            self.$list.css({scrollTop: self.$list.scrollTop()}, 0);
-                        }
-
-                        if (callback) {
-                            callback();
-                        }
-                    } else {
-                        self.$list.hide();
-                        self.$ul.empty();
-                    }
-                }, 'json');
-            } else {
-                self.$list.hide();
-                self.$ul.empty();
-            }
-        }
-        
-    }
-    
-    $.fn.ninjaSelect = function(options) {
-        return this.each(function() {
-            var $this = $(this), data = $this.data('ninjaSelect');
-            
-            if (!data) {
-                $this.data('ninjaSelect', (data = new ninjaSelect(this, options)))
-            }
-        })
-    }
-    
-    $.fn.ninjaSelect.defaults = {
-        url: '/ajax.php',
-        data: {},
-        minLength: 2,
-        itemsPerPage: 3,
-        multiple: true
-    }
-    
-}(jQuery);

templates/admin/newsletters/contact.html

@@ -11,6 +11,47 @@
             $('#id_theme').select2({width: "element"});
             $('#id_country').select2({width: "element"});
             $('#id_area').select2({width:'element'});
+            $("#id_city").select2('destroy');
+
+            $('#id_city').select2({
+					placeholder: $(this).attr('города'),
+                    multiple: true,
+					width: 'element',
+					ajax: {
+
+						url: "/city/get-city/",
+						dataType: "json",
+						quietMillis: 200,
+
+						data: function(term, page){
+							return {term: term,
+								page: page};
+						},
+
+						results: function (data) {
+							var results = [];
+							$.each(data, function(index, item){
+								results.push({
+									id: item.id,
+									text: item.label
+								});
+							});
+							return {results: results};
+						}
+					},
+					initSelection : function(element, callback) {
+						var data = [];
+                        $(element.val().split(",")).each(function(i) {
+                            var item = this.split(':');
+                            data.push({
+                                    id: item[0],
+                                    text: item[1]
+                                });
+                        });
+                        callback(data);
+					}
+
+				});
 
         })
         </script>

templates/client/accounts/settings.html

@@ -55,28 +55,7 @@
 			</div>
 		</div>
        {% endif %}
-       <!--
-       <div class="set-sect">
-			<header>{% trans 'настройка e-mail уведомлений' %}</header>
-			<div class="set-sect-body">
-
-				<form method="post" action="#">{% csrf_token %}
-                    {% for choice in email_announcement_form.announcement.field.choices %}
-                    <div class="mf-line">
-                        <label class="check">
-                            <input type="checkbox" name="sType" value="{{ choice.0 }}" />
-                            {{ choice.1 }}
-                        </label>
-                    </div>
-                    {% endfor %}
 
-					<div class="mf-buttons-line">
-						<button type="submit" class="icon-save">{% trans 'сохранить' %}</button>
-					</div>
-				</form>
-			</div>
-		</div>
-        -->
         <!--
        <div class="set-sect">
 			<header>{% trans 'социализация и sharing' %}</header>
@@ -134,550 +113,87 @@
     </div>
         -->
     <div class="set-sect subscribe">
-							<header>{% trans 'настройка подписки' %}</header>
-							<div class="set-sect-body">
-								<form action="#">
-
-									<ul class="tabs clearfix">
-										<li class="active"><a class="icon-big-email" href="#">{% trans 'по e-mail' %}</a></li>
-										<li><a class="icon-big-rss" href="#">{% trans 'через RSS' %}</a></li>
-										<li><a class="icon-big-twitter" href="#">{% trans 'на twitter' %}</a></li>
-										<li><a class="icon-big-ical" href="#">{% trans 'в iCal' %}</a></li>
-									</ul>
-									<ul class="tabs-content">
-
-										<li class="active">
-
-											<div class="mf-announces clearfix">
-												<div class="mf-subj-checks-title">
-													<label class="check">
-                                                        <input type="checkbox" class="annoncesFlag" name="annoncesFlag" />
-                                                        Получать анонсы</label>
-												</div>
-
-												<div class="mf-announces-body">
-													<div class="mf-line subj-checks">
-
-														<label class="check"><input type="checkbox" name="sType" value="exhb" />выставок</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="smnr" />семинаров</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="conf" />конференций</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="webn" />вебинаров</label>
-
-													</div>
-
-													<!--<div class="mf-line mail">
-														<div class="mf-field"><input type="text" name="umail" placeholder="Введите e-mail" /></div>
-														<div class="mf-msg"></div>
-													</div>-->
-
-													<div class="mf-line country">
-														<label>Cтрана</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="country" value="1" />Россия</label></li>
-																				<li><label><input type="checkbox" name="country" value="2" />Украина</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line city">
-														<label>Город</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="city" value="1" />Москва</label></li>
-																				<li><label><input type="checkbox" name="city" value="2" />Санкт-Петербург</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line subj">
-														<label>Тематика</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="subj" value="1" />Бизнес, инвестиции, финансы</label></li>
-																				<li><label><input type="checkbox" name="subj" value="2" />Индустрия развлечений, шоу, СМИ</label></li>
-																				<li><label><input type="checkbox" name="subj" value="3" />Косметика и парфюмерия</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line period">
-														<div class="mf-field">
-															<select name="period">
-																<option value="">Периодичность</option>
-																<option value="1">Еженедельно</option>
-																<option value="2">2 раза в месяц</option>
-																<option value="3">Ежемесячно</option>
-															</select>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-												</div>
-											</div>
-
-											<hr />
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Москвы</label>
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Санкт-Петербурга</label>
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Европы</label>
-											</div>
-											<hr />
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Новости и фотообзоры выставок</label>
-											</div>
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Рубрика «Экспо профессионал» <i>(аналитически материалы, практические кейсы для маркетологов)</i></label>
-											</div>
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Рубрика «Секреты успеха» <i>(материалы по личной эффективности)</i></label>
-											</div>
-
-										</li>
-
-										<li>
-
-											<div class="mf-announces clearfix">
-												<div class="mf-subj-checks-title">
-													<label class="check"><input type="checkbox" class="annoncesFlag" name="annoncesFlag" />Получать анонсы</label>
-												</div>
-
-												<div class="mf-announces-body">
-													<div class="mf-line subj-checks">
-
-														<label class="check"><input type="checkbox" name="sType" value="exhb" />выставок</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="smnr" />семинаров</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="conf" />конференций</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="webn" />вебинаров</label>
-
-													</div>
-
-													<!--<div class="mf-line mail">
-														<div class="mf-field"><input type="text" name="umail" placeholder="Введите e-mail" /></div>
-														<div class="mf-msg"></div>
-													</div>-->
-
-													<div class="mf-line country">
-														<label>Cтрана</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="country" value="1" />Россия</label></li>
-																				<li><label><input type="checkbox" name="country" value="2" />Украина</label></li>
-																				<li><label><input type="checkbox" name="country" value="3" />Беларусь</label></li>
-																				<li><label><input type="checkbox" name="country" value="4" />Бельгия</label></li>
-																				<li><label><input type="checkbox" name="country" value="5" />Германия</label></li>
-																				<li><label><input type="checkbox" name="country" value="6" />Франция</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line city">
-														<label>Город</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="city" value="1" />Москва</label></li>
-																				<li><label><input type="checkbox" name="city" value="2" />Санкт-Петербург</label></li>
-																				<li><label><input type="checkbox" name="city" value="3" />Владивосток</label></li>
-																				<li><label><input type="checkbox" name="city" value="4" />Краснодар</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line subj">
-														<label>Тематика</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="subj" value="1" />Бизнес, инвестиции, финансы</label></li>
-																				<li><label><input type="checkbox" name="subj" value="2" />Индустрия развлечений, шоу, СМИ</label></li>
-																				<li><label><input type="checkbox" name="subj" value="3" />Косметика и парфюмерия</label></li>
-																				<li><label><input type="checkbox" name="subj" value="4" />Маркетинг, реклама, PR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="5" />Мебель, интерьер, декор</label></li>
-																				<li><label><input type="checkbox" name="subj" value="6" />Наука и инновации</label></li>
-																				<li><label><input type="checkbox" name="subj" value="7" />Анализ, измерение и контроль</label></li>
-																				<li><label><input type="checkbox" name="subj" value="8" />Здравоохранение</label></li>
-																				<li><label><input type="checkbox" name="subj" value="9" />Культура, искусство, церковь</label></li>
-																				<li><label><input type="checkbox" name="subj" value="10" />Менеджмент, HR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="11" />Транспорт, склад, логистика</label></li>
-																				<li><label><input type="checkbox" name="subj" value="12" />Экология, очистка, утилизация</label></li>
-																				<li><label><input type="checkbox" name="subj" value="13" />Безопасность</label></li>
-																				<li><label><input type="checkbox" name="subj" value="14" />Городское хозяйство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="15" />Гостиничное, ресторанное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="16" />Нефть, газ, горное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="17" />Строительство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="18" />Телекоммуникации</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line">
-														<div class="mf-field">
-															<select name="period">
-																<option value="">Периодичность</option>
-																<option value="1">Еженедельно</option>
-																<option value="2">2 раза в месяц</option>
-																<option value="3">Ежемесячно</option>
-															</select>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-												</div>
-											</div>
-
-											<hr />
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Москвы</label>
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Санкт-Петербурга</label>
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Выставки Европы</label>
-											</div>
-											<hr />
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Новости и фотообзоры выставок</label>
-											</div>
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Рубрика «Экспо профессионал» <i>(аналитически материалы, практические кейсы для маркетологов)</i></label>
-											</div>
-
-											<div class="mf-line">
-												<label class="check"><input type="checkbox" name="sType" value="exhb" />Рубрика «Секреты успеха» <i>(материалы по личной эффективности)</i></label>
-											</div>
-
-										</li>
-
-										<li>
-
-											<div class="mf-announces clearfix">
-												<div class="mf-subj-checks-title">
-													<label class="check"><input type="checkbox" class="annoncesFlag" name="annoncesFlag" />Получать анонсы</label>
-												</div>
-
-												<div class="mf-announces-body">
-													<div class="mf-line subj-checks">
-
-														<label class="check"><input type="checkbox" name="sType" value="exhb" />выставок</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="smnr" />семинаров</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="conf" />конференций</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="webn" />вебинаров</label>
-
-													</div>
-
-													<!--<div class="mf-line mail">
-														<div class="mf-field"><input type="text" name="umail" placeholder="Введите e-mail" /></div>
-														<div class="mf-msg"></div>
-													</div>-->
-
-													<div class="mf-line country">
-														<label>Cтрана</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="country" value="1" />Россия</label></li>
-																				<li><label><input type="checkbox" name="country" value="2" />Украина</label></li>
-																				<li><label><input type="checkbox" name="country" value="3" />Беларусь</label></li>
-																				<li><label><input type="checkbox" name="country" value="4" />Бельгия</label></li>
-																				<li><label><input type="checkbox" name="country" value="5" />Германия</label></li>
-																				<li><label><input type="checkbox" name="country" value="6" />Франция</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line city">
-														<label>Город</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="city" value="1" />Москва</label></li>
-																				<li><label><input type="checkbox" name="city" value="2" />Санкт-Петербург</label></li>
-																				<li><label><input type="checkbox" name="city" value="3" />Владивосток</label></li>
-																				<li><label><input type="checkbox" name="city" value="4" />Краснодар</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line subj">
-														<label>Тематика</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="subj" value="1" />Бизнес, инвестиции, финансы</label></li>
-																				<li><label><input type="checkbox" name="subj" value="2" />Индустрия развлечений, шоу, СМИ</label></li>
-																				<li><label><input type="checkbox" name="subj" value="3" />Косметика и парфюмерия</label></li>
-																				<li><label><input type="checkbox" name="subj" value="4" />Маркетинг, реклама, PR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="5" />Мебель, интерьер, декор</label></li>
-																				<li><label><input type="checkbox" name="subj" value="6" />Наука и инновации</label></li>
-																				<li><label><input type="checkbox" name="subj" value="7" />Анализ, измерение и контроль</label></li>
-																				<li><label><input type="checkbox" name="subj" value="8" />Здравоохранение</label></li>
-																				<li><label><input type="checkbox" name="subj" value="9" />Культура, искусство, церковь</label></li>
-																				<li><label><input type="checkbox" name="subj" value="10" />Менеджмент, HR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="11" />Транспорт, склад, логистика</label></li>
-																				<li><label><input type="checkbox" name="subj" value="12" />Экология, очистка, утилизация</label></li>
-																				<li><label><input type="checkbox" name="subj" value="13" />Безопасность</label></li>
-																				<li><label><input type="checkbox" name="subj" value="14" />Городское хозяйство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="15" />Гостиничное, ресторанное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="16" />Нефть, газ, горное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="17" />Строительство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="18" />Телекоммуникации</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line">
-														<div class="mf-field">
-															<select name="period">
-																<option value="">Периодичность</option>
-																<option value="1">Еженедельно</option>
-																<option value="2">2 раза в месяц</option>
-																<option value="3">Ежемесячно</option>
-															</select>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-												</div>
-											</div>
-
-										</li>
-
-										<li>
-
-											<div class="mf-announces clearfix">
-												<div class="mf-subj-checks-title">
-													<label class="check"><input type="checkbox" class="annoncesFlag" name="annoncesFlag" />Получать анонсы</label>
-												</div>
-
-												<div class="mf-announces-body">
-													<div class="mf-line subj-checks">
-
-														<label class="check"><input type="checkbox" name="sType" value="exhb" />выставок</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="smnr" />семинаров</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="conf" />конференций</label>
-
-														<label class="check"><input type="checkbox" name="sType" value="webn" />вебинаров</label>
-
-													</div>
-
-													<!--<div class="mf-line mail">
-														<div class="mf-field"><input type="text" name="umail" placeholder="Введите e-mail" /></div>
-														<div class="mf-msg"></div>
-													</div>-->
-
-													<div class="mf-line country">
-														<label>Cтрана</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="country" value="1" />Россия</label></li>
-																				<li><label><input type="checkbox" name="country" value="2" />Украина</label></li>
-																				<li><label><input type="checkbox" name="country" value="3" />Беларусь</label></li>
-																				<li><label><input type="checkbox" name="country" value="4" />Бельгия</label></li>
-																				<li><label><input type="checkbox" name="country" value="5" />Германия</label></li>
-																				<li><label><input type="checkbox" name="country" value="6" />Франция</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line city">
-														<label>Город</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="city" value="1" />Москва</label></li>
-																				<li><label><input type="checkbox" name="city" value="2" />Санкт-Петербург</label></li>
-																				<li><label><input type="checkbox" name="city" value="3" />Владивосток</label></li>
-																				<li><label><input type="checkbox" name="city" value="4" />Краснодар</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line subj">
-														<label>Тематика</label>
-														<div class="mf-field">
-															<div class="c-select-box select">
-																<div class="csb-selected-items"></div>
-																<div class="csb-menu-wrap">
-																	<div class="scroll-container csb-menu">
-																		<div class="scroll-content clearfix">
-																			<ul>
-																				<li><label><input type="checkbox" name="subj" value="1" />Бизнес, инвестиции, финансы</label></li>
-																				<li><label><input type="checkbox" name="subj" value="2" />Индустрия развлечений, шоу, СМИ</label></li>
-																				<li><label><input type="checkbox" name="subj" value="3" />Косметика и парфюмерия</label></li>
-																				<li><label><input type="checkbox" name="subj" value="4" />Маркетинг, реклама, PR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="5" />Мебель, интерьер, декор</label></li>
-																				<li><label><input type="checkbox" name="subj" value="6" />Наука и инновации</label></li>
-																				<li><label><input type="checkbox" name="subj" value="7" />Анализ, измерение и контроль</label></li>
-																				<li><label><input type="checkbox" name="subj" value="8" />Здравоохранение</label></li>
-																				<li><label><input type="checkbox" name="subj" value="9" />Культура, искусство, церковь</label></li>
-																				<li><label><input type="checkbox" name="subj" value="10" />Менеджмент, HR</label></li>
-																				<li><label><input type="checkbox" name="subj" value="11" />Транспорт, склад, логистика</label></li>
-																				<li><label><input type="checkbox" name="subj" value="12" />Экология, очистка, утилизация</label></li>
-																				<li><label><input type="checkbox" name="subj" value="13" />Безопасность</label></li>
-																				<li><label><input type="checkbox" name="subj" value="14" />Городское хозяйство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="15" />Гостиничное, ресторанное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="16" />Нефть, газ, горное дело</label></li>
-																				<li><label><input type="checkbox" name="subj" value="17" />Строительство</label></li>
-																				<li><label><input type="checkbox" name="subj" value="18" />Телекоммуникации</label></li>
-																			</ul>
-																		</div>
-																	</div>
-																</div>
-
-															</div>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-
-													<div class="mf-line">
-														<div class="mf-field">
-															<select name="period">
-																<option value="">Периодичность</option>
-																<option value="1">Еженедельно</option>
-																<option value="2">2 раза в месяц</option>
-																<option value="3">Ежемесячно</option>
-															</select>
-														</div>
-														<div class="mf-msg"></div>
-													</div>
-												</div>
-											</div>
-
-										</li>
-
-									</ul>
-
-									<div class="mf-buttons-line">
-										<button type="submit" class="icon-save">{% trans 'сохранить' %}</button>
-									</div>
-								</form>
-							</div>
-						</div>
+        <header>{% trans 'настройка подписки' %}</header>
+        <div class="set-sect-body">
+            <form action="#">
+
+                <ul class="tabs clearfix">
+                    <li class="active"><a class="icon-big-email" href="#">{% trans 'по e-mail' %}</a></li>
+                </ul>
+                <ul class="tabs-content">
+
+                    <li class="active">
+
+                        <div class="mf-announces clearfix">
+                            <div class="mf-subj-checks-title">
+                                <label class="check">
+                                    <input type="checkbox" class="annoncesFlag" name="annoncesFlag" />
+                                    Получать анонсы</label>
+                            </div>
+
+                            <div class="mf-announces-body">
+
+
+                                <div class="mf-line mail">
+                                    <div class="mf-field">{{ subscribe.email }}</div>
+                                    <div class="mf-msg"></div>
+                                </div>
+
+                                <div class="mf-line country">
+                                    <div class="mf-field">
+                                        {{ subscribe.country }}
+                                    </div>
+                                    <div class="mf-msg"></div>
+                                </div>
+
+                                <div class="mf-line city">
+                                    <div class="mf-field">
+                                        {{ subscribe.city }}
+                                    </div>
+                                    <div class="mf-msg"></div>
+                                </div>
+
+                                <div class="mf-line subj">
+                                    <div class="mf-field">
+                                        {{ subscribe.theme }}
+                                    </div>
+                                    <div class="mf-msg"></div>
+                                </div>
+
+                                <div class="mf-line period">
+                                    <div class="mf-field">
+                                        {{ subscribe.periodic }}
+                                    </div>
+                                    <div class="mf-msg"></div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <hr />
+                        <div class="mf-line">
+                            <label class="check">{{ subscribe.moscow_expo }}{{ subscribe.moscow_expo.label }}</label>
+                            <label class="check">{{ subscribe.saint_expo }}{{ subscribe.saint_expo.label }}</label>
+                            <label class="check">{{ subscribe.europe_expo }}{{ subscribe.europe_expo.label }}</label>
+                        </div>
+                        <hr />
+
+                        <div class="mf-line">
+                            <label class="check">{{ subscribe.exponent_practicum }}«Практикум экспонента»<i>(учимся эффективно участвовать в выставках и грамотно пиарить свою компанию на событиях)</i></label>
+                        </div>
+
+                        <div class="mf-line">
+                            <label class="check">{{ subscribe.organiser_practicum }}«Практикум организатора событий» <i>(Создаем, наполняем и продвигаем собственные ивэнты)</i></label>
+                        </div>
+
+                    </li>
+
+                </ul>
+
+                <div class="mf-buttons-line">
+                    <button type="submit" class="icon-save">{% trans 'сохранить' %}</button>
+                </div>
+            </form>
+        </div>
+    </div>
 
 {% endblock %}

templates/client/base_catalog.html

@@ -16,7 +16,7 @@
                     {% include 'client/includes/feedback.html' %}
                     <hr />
 
-                    {% include 'client/includes/online_consult.html' %}
+                    {# {% include 'client/includes/online_consult.html' %} #}
 
                     {% include 'client/includes/banners/aside_1.html' %}
 
@@ -93,3 +93,7 @@
         </div>
     </section>
 {% endblock %}
+
+{% block popup %}
+    {% include 'client/popups/announces.html' %}
+{% endblock %}

templates/client/company.html

@@ -1,146 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="/companies">Участники</a>
-		<strong>{{ company.name }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap event clearfix">
-            <aside>
-                <div class="i-pict">
-                    <img src="{% if company.get_logo %}{{ company.get_logo.file_path.url }}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt=""/>
-                </div>
-            </aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ company.name|safe }}
-                    </div>
-                </header>
-                <div class="i-descr">
-                    {{ company.description }}
-                </div>
-                <div class="i-area"><a href="#">{{ company.specialization }}</a></div>
-                <hr />
-
-                <div class="i-address">
-                    <header>
-						<div class="address">{{ company.address.address }}</div>
-						<div class="show-map"><a class="toggle-map" href="#">Раскрыть карту</a></div>
-					</header>
-				    <div class="i-map">
-						<div class="close-map"><a class="toggle-map" href="#">Скрыть карту</a></div>
-
-						<!-- позиция для карты задается в атрибуте data-coords -->
-						<div class="map-canvas" id="map-canvas" data-coords="{{ company.address.lat }},{{ company.address.lng }}" ></div>
-					</div>
-                </div>
-                <hr />
-                <div class="i-tags">
-                {% for tag in company.tag.all %}
-                     <a href="#">{{ tag }}</a>,
-                {% endfor %}
-                </div>
-                </hr>
-
-                <div class="i-contacts clearfix">
-                    <div class="ic-buttons">
-						<a class="button icon-msg" href="#">отправить сообщение</a>
-
-						<ul class="soc-media-buttons">
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png' %}" title="Facebook" alt="Facebook" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png' %}" title="LinkedIn" alt="LinkedIn" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png' %}" title="В контакте" alt="В контакте" /></a></li>
-							<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png' %}" title="Twitter" alt="Twitter" /></a></li>
-						</ul>
-					</div>
-
-                    <div class="ic-links">
-                        {% if company.phone %}
-						<div class="ic-tel">
-							{{ company.phone }}
-						</div>
-                        {% endif %}
-
-                        {% if company.email %}
-						<div class="ic-mail">
-							<a class="icon-mail" href="mailto:{{ company.email }}">{{ company.email }}</a>
-						</div>
-                        {% endif %}
-
-                        {% if company.web_page %}
-						<div class="ic-site">
-							<a class="icon-ext-link" href="http://{{ company.web_page }}" target="_blank">http://{{ company.web_page }}</a>
-						</div>
-                        {% endif %}
-					</div>
-                </div>
-
-                <hr />
-
-                <div class="i-additional">
-                    <div class="ia-title">Дополнительная информация</div>
-                    <dl class="add-info">
-						<dt>Год основания:</dt>
-						<dd>{{ company.foundation }}</dd>
-
-						<dt>Количество сотрудников:</dt>
-						<dd>{{ company.staff_number }}</dd>
-
-						<dt>О компании:</dt>
-						<dd>{{ company.description }}</dd>
-
-					</dl>
-                 </div>
-
-            </div>
-        </div>
-        <hr />
-
-        <div class="i-statistics">
-        </div>
-        <div class="i-photos">
-            <div class="sect-title"><a href="#">Фотографии компании с событий</a></div>
-            <div id="cli-pg" class="cli-photo-gallery">
-                <ul class="clearfix">
-                {% for photo in company.get_photos %}
-                    <li>
-                        <a class="open-photo" href="#">
-                            <img src="{{ photo.file_path.url }}" alt="" />
-                            <span class="pg-title">{{ photo.name }}</span>
-                        </a>
-                    </li>
-                {% endfor %}
-                </ul>
-            </div>
-            <a class="button more" href="#">Все фотографии</a>
-        </div>
-        <hr />
-        <div class="i-staff">
-            <div class="sect-title"><a href="#">Сотрудники</a></div>
-            <div class="i-staff-list">
-                <ul>
-                    {% for member in company.members %}
-
-                    {% endfor %}
-                </ul>
-            </div>
-            <a class="button more" href="#">Все сотрудники</a>
-        </div>
-    </div>
-{% endblock %}

templates/client/company_catalog.html

@@ -1,28 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-{% load template_filters %}
-
-{% if single_page %}
-    {% block title %} {{ object_list.0.name|safe }} {% endblock %}
-    {% block keywords %} {{ object_list.0.keywords }} {% endblock %}
-    {% block descriptions %} {{ object_list.0.descriptions }} {% endblock %}
-{% endif %}
-
-
-{% block content_list %}
-    {% if object_list %}
-        {% if single_page %}
-            {% with company=object_list.0 %}
-                {% include 'includes/company/company_object.html' %}
-            {% endwith %}
-        {% else %}
-            {% with object_list=object_list %}
-                {% include 'includes/company/company_list.html' %}
-            {% endwith %}
-        {% endif %}
-    {% else %}
-        <h1> Ничего не найдено</h1>
-    {% endif %}
-
-{% endblock %}

templates/client/conference.html

@@ -1,304 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block title %} {{ conference.title }} {% endblock %}
-{% block keywords %} {{ conference.keywords }} {% endblock %}
-{% block descriptions %} {{ conference.descriptions }} {% endblock %}
-
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="/conferences">Конференции</a>
-        <a href="#">{{ conference.theme.all.0 }}</a>
-		<strong>{{ conference.name }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap event clearfix">
-            <aside>
-                {% if conference.expohit %}
-                    <div class="hit"></div>
-                {% endif %}
-                <div class="i-pict">
-                    <img src="{% if conference.get_logo %}{{ conference.get_logo.file_path.url }}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt=""/>
-                </div>
-
-                <div class="i-rating" title="Рейтинг: 551">551</div>
-
-                <div class="i-stats">
-                        <span class="visitors" title="Посетители">N/A</span>
-                        <span class="participants" title="Участники">{{ conference.users.all|length }}</span>
-                </div>
-
-                <div class="i-discount">
-                {% if conference.discount %}
-                    <a class="discount-button" href="#">Скидка -{{ conference.discount }}%</a>
-                    <div class="dsc-text">{{ conference.discount_description|safe }}</div>
-                    {% endif %}
-                 </div>
-            </aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ conference.main_title|safe }}
-                    </div>
-                </header>
-
-                <div class="i-date">
-                    {% trans 'с' %}{{ conference.data_begin }} {% trans 'по' %} {{ conference.data_end }}
-                </div>
-
-                <div class="i-address">
-                    <header>
-                        <div class="address">
-                            {{ conference.place.address.address }}
-                        </div>
-                        <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
-                    </header>
-
-                    <div class="i-map">
-                        <div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
-                        </div>
-                        <div class="map-canvas" id="map-canvas" data-coords="{{ conference.place.address.lat }},{{ conference.place.address.lng }}" ></div>
-                    </div>
-                </div>
-                <hr />
-                <div class="i-buttons clearfix">
-                    <div class="ib-main">
-                        <a class="button icon-check" href="#">{% trans 'Я планирую посетить' %}</a>
-                        <a class="button blue icon-calendar" href="#">{% trans 'в расписание' %}</a>
-                        <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
-                    </div>
-                    <div class="ib-add"><a class="button blue2 icon-find" href="#">{% trans 'Найти отель' %}</a></div>
-                </div>
-                <hr />
-                <div class="i-divs clearfix">
-                    <div class="i-subj">
-                        <ul>
-                        {% for theme in conference.theme.all %}
-                            <li><a href="#">{{ theme }} ({{ theme.conferences_number }})</a></li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-
-                    <div class="i-tags">
-                        {% for tag in conference.tag.all %}
-                            <a href="#">{{ tag }}</a>,
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    <div class="i-sub-articles">
-        <ul>
-        {% for service in conference.service.all %}
-            <li><a href="#">{{ service }}</a></li>
-        {% endfor %}
-        </ul>
-    </div>
-
-    <div class="i-steps">
-        <div class="is-title">{% trans 'Посетить конференцию' %}</div>
-        <ul>
-            <li class="s1">
-				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
-			    <a class="step" href="#">{% trans 'Билеты на конференцию' %}</a>
-			</li>
-
-			<li class="s2">
-				<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
-				<a class="step" href="#"><b>booking</b>.com</a>
-			</li>
-
-			<li class="s3">
-				<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-				<a class="step" href="#">Any<b>way</b>Any<b>day</b></a>
-			</li>
-        </ul>
-    </div>
-    {% if conference.get_photos %}
-    <hr />
-
-    <div class="i-photo-slides">
-        <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой выставки' %}</a></div>
-        <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-            <ul class="swiper-wrapper">
-                {% for photo in conference.get_photos %}
-                <li class="swiper-slide"><a class="open-photo" href="#"><img src="{{ photo.file_path.url }}" alt="" /></a></li>
-                {% endfor %}
-            </ul>
-            <div class="re-controls">
-			    <a class="prev" href="#">&lt;</a>
-				<a class="next" href="#">&gt;</a>
-			</div>
-        </div>
-    </div>
-    {% endif %}
-
-    <div class="i-event-description">
-        <div class="ied-title">{{ conference.main_title|safe }}</div>
-        <div class="ied-text">{{ conference.description|safe }}</div>
-    </div>
-    <hr />
-    <div class="i-event-additional clearfix">
-        <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
-        <ul class="e-docs">
-            <li><a href="#">{% trans 'Деловая программа' %}</a></li>
-            <li><a href="#">{% trans 'Условия участия' %}</a></li>
-        </ul>
-        <dl class="add-info">
-            <dt>{% trans 'Организатор' %}:</dt>
-            <dd>
-                {{ conference.organiser.0 }}<br />
-                <a target="_blank" href="{{ conference.organiser.0.web_page }}">{{ conference.organiser.0.web_page }}</a><br />
-                <a href="{{ conference.organiser.email }}">{{ conference.organiser.0.email }}</a>
-            </dd>
-
-            <dt>{% trans 'Веб-сайт' %}:</dt>
-            <dd>
-                <a target="_blank" href="http://{{ conference.web_page }}">{{ conference.web_page }}</a>
-            </dd>
-
-            <dt>{% trans 'Аудитория' %}:</dt>
-            <dd>
-                {{ conference.get_audience }}
-            </dd>
-
-            <dt>{% trans 'Периодичность' %}:</dt>
-            <dd>{{ conference.get_periodic }}</dd>
-
-            <dt>{% trans 'Экспонируемые продукты' %}:</dt>
-            <dd>{{ conference.products|safe }}</dd>
-
-        </dl>
-
-    </div>
-    {% if conference.company.all %}
-    <hr />
-    <div class="i-members clearfix">
-        <div class="im-participants">
-            <header>
-                <div class="im-title">{% trans 'Участники' %}</div>
-                <a class="more" href="#">{% trans 'Все участники' %}</a>
-            </header>
-            <ul>
-                {% for company in conference.companies.all|slice:":6" %}
-
-                        <li>
-                            <a href="#">
-                                <span class="imp-pict"><img src="{% if company.photo %}{{ company.photo }}
-                                {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" /></span>
-                                {{ company.name }}
-                            </a>
-                        </li>
-                {% endfor %}
-            </ul>
-        </div>
-
-        <div class="im-visitors">
-            <header>
-                <div class="im-title">{% trans 'Посетители' %}</div>
-            </header>
-            <ul>
-                {% for user in conference.users.all|slice:":17" %}
-                    <li><a href="#">{{ user }}</a></li>
-                {% endfor %}
-            </ul>
-            <a class="more" href="#">{% trans 'Все посетители' %}</a>
-        </div>
-    </div>
-    {% endif %}
-    {% if conference.place %}
-    <hr/>
-    <div class="e-num-info">
-        <div class="eni-area-wrap">
-            <div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
-            <div class="eni-area">
-                {% if conference.place.total_area %}
-                {{ conference.place.total_area }} {% trans 'м²' %}
-                {% endif %}
-            </div>
-        </div>
-
-        <div class="eni-stats">
-            <div class="enis-item"><b>300</b> {% trans 'учасников' %}</div>
-            <div class="enis-item"><b>200 000</b> {% trans 'посетителей' %}</div>
-            {% if conference.foundation_year %}
-            <div class="eni-founded">{% trans 'Основано в' %} <b>{{ conference.foundation_year }}</b> {% trans 'году' %}</div>
-            {% endif %}
-        </div>
-    </div>
-    {% endif %}
-
-    </div>
-
-    <div class="h-booking">
-        <header class="clearfix">
-            <div class="sect-title">
-                <a href="#">{% trans 'Отели рядом с выставкой от' %} <b>Booking</b>.com</a>
-            </div>
-			<a class="more blue2" href="#">{% trans 'Все отели поблизости' %}</a>
-            <ul>
-            </ul>
-        </header>
-    </div>
-    <hr />
-    <div class="e-cat">
-        <div class="sect-title">{% trans 'Ближайшие выставки по тематике' %} <a href="#">«{{ conference.theme.all.0 }}»</a></div>
-        <ul class="cat-list cl-exhibitions">
-            {% for exp in conference.get_nearest_events %}
-                <li class="cl-item">
-                    <div class="cl-item-wrap clearfix">
-                        <a href="/conferences/{{ exp.url }}">
-                            <div class="cli-pict">
-                                <img src="{% if exp.get_logo %}{{ exp.get_logo.file_path.url }}{% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" />
-                            </div>
-                        </a>
-                        <div class="cli-info">
-                            <div class="cli-top clearfix">
-                            {% if exp.approved %}
-                                <div class="cli-approved">
-                                    <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                                </div>
-                            {% endif %}
-                                <header>
-                                    <div class="cli-title"><a href="/conferences/{{ exp.url }}">{{ exp.name }}</a></div>
-                                </header>
-
-                                <div class="cli-descr">
-                                    {{ exp.main_title }}
-                                </div>
-
-                                <div class="cli-bot clearfix">
-                                    <div class="cli-date">{% trans 'с' %} {{ exp.data_begin }} {% trans 'по' %} {{ exp.data_end }}</div>
-                                    <div class="cli-place">
-                                        <a href="#">{{ exp.country }}</a>, <a href="#">{{ exp.city }}</a>
-                                        {% if exp.place %}
-                                        , <a href="#">{{ exp.place }}</a>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-    <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-
-{% endblock %}
-

templates/client/event_catalog.html

@@ -1,27 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-{% load template_filters %}
-
-
-{% if single_page %}
-
-{% endif %}
-
-
-{% block content_list %}
-    {% if object_list %}
-        {% if single_page %}
-            {% with exposition=object_list.0 %}
-                {% include 'includes/event_object.html' %}
-            {% endwith %}
-        {% else %}
-            {% with object_list=object_list %}
-                {% include 'includes/event_list.html' %}
-            {% endwith %}
-        {% endif %}
-    {% else %}
-        <h1> Ничего не найдено</h1>
-    {% endif %}
-
-{% endblock %}

templates/client/event_members.html

@@ -1,18 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-{% load template_filters %}
-
-
-{% block page_title %}
-{% endblock %}
-
-{% block content_list %}
-    {% with object_list=object_list %}
-        {% include 'includes/exposition/members.html' %}
-    {% endwith %}
-
-{% endblock %}
-
-{% block content_text %}
-{% endblock %}

templates/client/event_visitors.html

@@ -1,21 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-{% load template_filters %}
-
-
-{% block page_title %}
-
-{% endblock %}
-
-{% block content_list %}
-    {% with object_list=object_list %}
-        {% include 'includes/exposition/visitors.html' %}
-    {% endwith %}
-
-{% endblock %}
-
-{% block content_text %}
-{% endblock %}
-
-

templates/client/exposition.html

@@ -1,320 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block title %} {{ exposition.title }} {% endblock %}
-{% block keywords %} {{ exposition.keywords }} {% endblock %}
-{% block descriptions %} {{ exposition.descriptions }} {% endblock %}
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="{{ exposition.get_catalog_url }}">{{ exposition.get_event_type }}</a>
-        <a href="#">{{ exposition.theme.all.0 }}</a>
-		<strong>{{ exposition.name|safe }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap event clearfix">
-            <aside>
-                {% if exposition.expohit %}
-                    <div class="hit"></div>
-                {% endif %}
-                <div class="i-pict">
-                {% with obj=exposition  %}
-                    {% include 'client/includes/show_logo.html' %}
-                {% endwith %}
-                </div>
-
-                <div class="i-rating" title="Рейтинг: 551">551</div>
-
-                <div class="i-stats">
-                        <span class="visitors" title="Посетители">N/A</span>
-                        <span class="participants" title="Участники">{{ exposition.users.all|length }}</span>
-                </div>
-
-                <div class="i-discount">
-                {% if exposition.discount %}
-                    <a class="discount-button" href="#">Скидка -{{ exposition.discount }}%</a>
-                    <div class="dsc-text">{{ exposition.discount_description|safe }}</div>
-                    {% endif %}
-                 </div>
-            </aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ exposition.main_title|safe }}
-                    </div>
-                </header>
-
-                <div class="i-date">
-                    {% with obj=exposition  %}
-                        {% include 'client/includes/show_date_block.html' %}
-                    {% endwith %}
-                </div>
-
-                <div class="i-address">
-                    <header>
-                        <div class="address">
-                            {{ exposition.place.address.address }}
-                        </div>
-                        <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
-                    </header>
-
-                    <div class="i-map">
-                        <div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
-                        </div>
-                        <div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat }},{{ exposition.place.address.lng }}" ></div>
-                    </div>
-                </div>
-                <hr />
-                <div class="i-buttons clearfix">
-                    <div class="ib-main">
-                        <a class="button icon-check" href="#">{% trans 'Я планирую посетить' %}</a>
-                        <a class="button blue icon-calendar" href="#">{% trans 'в расписание' %}</a>
-                        <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
-                    </div>
-                    <div class="ib-add"><a class="button blue2 icon-find" href="#">{% trans 'Найти отель' %}</a></div>
-                </div>
-                <hr />
-                <div class="i-divs clearfix">
-                    <div class="i-subj">
-                        <ul>
-                        {% for theme in exposition.theme.all %}
-                            <li><a href="#">{{ theme }} ({{ theme.expositions_number }})</a></li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-
-                    <div class="i-tags">
-                        {% for tag in exposition.tag.all %}
-                            <a href="#">{{ tag }}</a>,
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    <div class="i-sub-articles">
-        <ul>
-        {% for service in exposition.service.all %}
-            <li><a href="#">{{ service }}</a></li>
-        {% endfor %}
-        </ul>
-    </div>
-
-    <div class="i-steps">
-        <div class="is-title">{% trans 'Посетить выставку' %}</div>
-        <ul>
-            <li class="s1">
-				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
-			    <a class="step" href="#">{% trans 'Билеты на выставку' %}</a>
-			</li>
-
-			<li class="s2">
-				<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
-				<a class="step" href="http://www.booking.com/"><b>booking</b>.com</a>
-			</li>
-
-			<li class="s3">
-				<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-				<a class="step" href="http://www.aviasales.ru/"><b>aviasales.ru</b>.ru</a>
-			</li>
-        </ul>
-    </div>
-    {% if exposition.get_photos %}
-    <hr />
-
-    <div class="i-photo-slides">
-        <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой выставки' %}</a></div>
-        <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-            <ul class="swiper-wrapper">
-                {% for photo in exposition.get_photos %}
-                <li class="swiper-slide"><a class="open-photo" href="#"><img src="{{ photo.file_path.url }}" alt="" /></a></li>
-                {% endfor %}
-            </ul>
-            <div class="re-controls">
-			    <a class="prev" href="#">&lt;</a>
-				<a class="next" href="#">&gt;</a>
-			</div>
-        </div>
-    </div>
-    {% endif %}
-
-    <div class="i-event-description">
-        <div class="ied-title">{{ exposition.main_title|safe }}</div>
-        <div class="ied-text">{{ exposition.description|safe }}</div>
-    </div>
-    <hr />
-    <div class="i-event-additional clearfix">
-        <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
-        <ul class="e-docs">
-            <li><a href="#">{% trans 'Деловая программа' %}</a></li>
-            <li><a href="#">{% trans 'Условия участия' %}</a></li>
-        </ul>
-        <dl class="add-info">
-            <dt>{% trans 'Организатор' %}:</dt>
-            <dd>
-                {% for organiser in exposition.organiser.all %}
-                {{ organiser.name }}<br />
-                <a target="_blank" href="{{ exposition.organiser.web_page }}">{{ organiser.web_page }}</a><br />
-                <a href="{{ organiser.email }}">{{ organiser.email }}</a>
-                {% endfor %}
-            </dd>
-
-            <dt>{% trans 'Веб-сайт' %}:</dt>
-            <dd>
-                <a target="_blank" href="http://{{ exposition.web_page }}">{{ exposition.web_page }}</a>
-            </dd>
-            {% if exposition.get_audience %}
-            <dt>{% trans 'Аудитория' %}:</dt>
-            <dd>
-                {{ exposition.get_audience }}
-            </dd>
-            {% endif %}
-
-            <dt>{% trans 'Периодичность' %}:</dt>
-            <dd>{{ exposition.get_periodic }}</dd>
-
-            <dt>{% trans 'Экспонируемые продукты' %}:</dt>
-            <dd>{{ exposition.products|safe }}</dd>
-
-        </dl>
-
-    </div>
-
-    {% if exposition.company.all %}
-    <hr />
-    <div class="i-members clearfix">
-        <div class="im-participants">
-            <header>
-                <div class="im-title">{% trans 'Участники' %}</div>
-                <a class="more" href="#">{% trans 'Все участники' %}</a>
-            </header>
-            <ul>
-                {% for company in exposition.companies.all|slice:":6" %}
-
-                        <li>
-                            <a href="#">
-                                <span class="imp-pict"><img src="{% if company.photo %}{{ company.photo }}
-                                {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" /></span>
-                                {{ company.name }}
-                            </a>
-                        </li>
-                {% endfor %}
-            </ul>
-        </div>
-
-        <div class="im-visitors">
-            <header>
-                <div class="im-title">{% trans 'Посетители' %}</div>
-            </header>
-            <ul>
-                {% for user in exposition.users.all|slice:":17" %}
-                    <li><a href="#">{{ user }}</a></li>
-                {% endfor %}
-            </ul>
-            <a class="more" href="#">{% trans 'Все посетители' %}</a>
-        </div>
-    </div>
-    {% endif %}
-    {% if exposition.place %}
-    <hr/>
-    <div class="e-num-info">
-        {% if exposition.place %}
-        <div class="eni-area-wrap">
-            <div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
-            <div class="eni-area">
-                {% if exposition.place.total_area %}
-                {{ exposition.place.total_area }} {% trans 'м²' %}
-                {% endif %}
-            </div>
-        </div>
-        {% endif %}
-
-        <div class="eni-stats">
-            <div class="enis-item"><b>300</b> {% trans 'учасников' %}</div>
-            <div class="enis-item"><b>200 000</b> {% trans 'посетителей' %}</div>
-            {% if exposition.foundation_year %}
-            <div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
-            {% endif %}
-        </div>
-    </div>
-    {% endif %}
-
-    </div>
-
-    <div class="h-booking">
-        <header class="clearfix">
-            <div class="sect-title">
-                <a href="#">{% trans 'Отели рядом с выставкой от' %} <b>Booking</b>.com</a>
-            </div>
-			<a class="more blue2" href="#">{% trans 'Все отели поблизости' %}</a>
-            <ul>
-            </ul>
-        </header>
-    </div>
-    <hr />
-    <div class="e-cat">
-        <div class="sect-title">{% trans 'Ближайшие выставки по тематике' %} <a href="#">«{{ exposition.theme.all.0 }}»</a></div>
-        <ul class="cat-list cl-exhibitions">
-            {% for exp in exposition.get_nearest_events %}
-                <li class="cl-item">
-                    <div class="cl-item-wrap clearfix">
-                        <a href="/expositions/{{ exp.url }}">
-                            <div class="cli-pict">
-                            {% with obj=exp  %}
-                                {% include 'client/includes/show_logo.html' %}
-                            {% endwith %}
-
-                                <img src="{% if exp.get_logo %}{{ exp.get_logo.file_path.url }}{% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" />
-                            </div>
-                        </a>
-                        <div class="cli-info">
-                            <div class="cli-top clearfix">
-                            {% if exp.approved %}
-                                <div class="cli-approved">
-                                    <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                                </div>
-                            {% endif %}
-                                <header>
-                                    <div class="cli-title"><a href="/expositions/{{ exp.url }}">{{ exp.name|safe }}</a></div>
-                                </header>
-
-                                <div class="cli-descr">
-                                    {{ exp.main_title|safe }}
-                                </div>
-
-                                <div class="cli-bot clearfix">
-                                    <div class="cli-date">
-                                    {% with obj=exp  %}
-                                        {% include 'client/includes/show_date_block.html' %}
-                                    {% endwith %}
-                                    </div>
-                                    <div class="cli-place">
-                                        <a href="#">{{ exp.country }}</a>, <a href="#">{{ exp.city }}</a>
-                                        {% if exp.place %}
-                                        , <a href="#">{{ exp.place }}</a>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-
-            {% endfor %}
-        </ul>
-    </div>
-    <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-
-{% endblock %}

templates/client/includes/announces.html

@@ -1,15 +1,12 @@
 {% load i18n %}
 
-{% comment %}
-<!-- task EXPO-145-->
 <div id="subscribe-sm" class="subscribe-sm">
-<header>{% trans 'получать анонсЫ' %}</header>
+    <header><a href="#" style="text-decoration: none">{% trans 'получать анонсЫ' %}</a></header>
+    {% comment %}
 	<ul>
 		<li><a class="icon-big-email" href="#">{% trans 'по e-mail' %}</a></li>
-		<li><a class="icon-big-rss" href="#">{% trans 'через RSS' %}</a></li>
-		<li><a class="icon-big-twitter" href="#">{% trans 'на twitter' %}</a></li>
-
-		<!--<li><a class="icon-big-ical" href="#">{% trans 'в iCal' %}</a></li>-->
 	</ul>
+	{% endcomment %}
 </div>
-{% endcomment %}
+<hr>
+

templates/client/includes/banners/expo_list_baner.html

@@ -1,6 +0,0 @@
-{% load static %}
-<div class="abn">
-    {% if theme_for_filter.id in banner_themes or tag_for_filter.id in banner_tags %}
-          <a target="_blank" href="/redirect/redirect/24/"><img src="{% static 'client/img/partners/unnamed_2.gif' %}" alt="" /></a>
-    {% endif %}
-</div>

templates/client/includes/footer.html

@@ -36,14 +36,8 @@
 					<li><a href="/about/">{% trans 'о нас' %}</a></li>
 					<li><a href="/partners/">{% trans 'партнеры' %}</a></li>
 					<li><a href="/advertising/">{% trans 'реклама' %}</a></li>
-					{% comment %}
-					<!-- task EXPO-145-->
-
-					<li><a href="#">{% trans 'сервис' %}</a></li>
-					<li><a href="#">{% trans 'для партнеров' %}</a></li>
-					{% endcomment %}
-
 					<li><a href="/contacts/">{% trans 'контакты' %}</a></li>
+                    <li><a href="/newsletters/{% if themes %}?{% for th in themes %}theme={{ th }}&{% endfor %}{% endif %}">{% trans 'подписаться' %}</a></li>
 				</ul>
 			</nav>
 

templates/client/main_page.html

@@ -1,263 +0,0 @@
-{% extends "blank.html" %}
-{% load static %}
-{% load i18n %}
-{% load thumbnail %}
-
-{% block body_class %} class="main-page" {% endblock %}
-
-{% block top %}
-
-    <section class="layout mp-top">
-			<div class="layout-wrap">
-
-				<aside>
-                    {% include 'menu.html' %}
-				</aside>
-
-				<div class="mcl">
-					<div id="mp-recent-expo" class="recent-expo swiper-container">
-						<ul class="swiper-wrapper">
-                            {% for event in events %}
-                            <li class="swiper-slide">
-								<div class="re-pict">
-                                    {% if event.logo %}
-                                    <a href="{{ event.get_permanent_url }}">
-                                    <img src="{{ event.logo.url }}">
-                                    {% comment %}
-                                    {% thumbnail event.logo "220x220" crop="center" as im %}
-                                        <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
-                                    {% endthumbnail %}
-                                    {% endcomment %}
-                                    </a>
-                                    {% endif %}
-                                </div>
-								<div class="re-body">
-									<div class="re-info">
-										<a href="{{ event.get_permanent_url }}">
-										<div class="re-title">{{ event.name|safe }}</div>
-										<div class="re-date">
-                                        {% with obj=event %}
-                                            {% include 'client/includes/show_date_block.html' %}
-                                        {% endwith %}
-                                        </div>
-										<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
-										</a>
-									</div>
-									<footer>
-										<div class="re-buttons">
-											<a class="button blue icon-calendar addcalendar" href="{{ event.get_calendar_url }}">{% trans 'добавить в календарь' %}</a>
-											<a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
-										</div>
-										<div class="re-tags">
-                                        {% for tag in event.tag.all %}
-                                            <a href="{{ event.get_catalog_url }}tag-{{ tag.url }}">{{ tag }}</a>,
-                                        {% endfor %}
-										</div>
-									</footer>
-								</div>
-							</li>
-                            {% endfor %}
-						</ul>
-						<div class="re-controls">
-							<a class="prev" href="#">&lt;</a>
-							<a class="next" href="#">&gt;</a>
-						</div>
-					</div>
-				</div>
-
-			</div>
-		</section>
-{% endblock %}
-
-{% block search %}
-    {% include 'includes/catalog_search_main.html' with search_form=search_form %}
-{% endblock %}
-
-{% block catalog %}
-    <section class="layout mp-catalog">
-			<div class="layout-wrap">
-
-				<aside>
-
-					{% include 'client/includes/feedback.html' %}
-
-					{% include 'client/includes/online_consult.html' %}
-
-					{% include 'client/includes/announces.html' %}
-
-				</aside>
-
-				<div class="mcl">
-					<div class="mp-catalog-lists">
-
-						<div class="mpc-list">
-							<header>{% trans 'Выставки' %}</header>
-							<ul>
-                                {% for theme in exposition_themes %}
-                                    <li><a href="/expositions/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.expositions_number }})</i></a></li>
-                                {% endfor %}
-							</ul>
-							<footer><a class="more" href="/expositions/">{% trans 'Все выставки' %}</a></footer>
-						</div>
-
-						<div class="mpc-list">
-							<header>{% trans 'конференции' %}</header>
-							<ul>
-								{% for theme in conference_themes %}
-                                    <li><a href="/conferences/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.conferences_number }})</i></a></li>
-                                {% endfor %}
-							</ul>
-							<footer><a class="more" href="/conferences/">{% trans 'Все конференции' %}</a></footer>
-						</div>
-						{% comment %}
-
-						<div class="mpc-list">
-							<header>{%  trans 'семинары' %}</header>
-							<ul>
-                                {% for theme in seminar_themes %}
-                                    <li><a href="/seminars/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.seminars_number }})</i></a></li>
-                                {% endfor %}
-							</ul>
-							<footer><a class="more" href="/seminars/">{% trans 'Все семинары' %}</a></footer>
-						</div>
-						{% endcomment %}
-
-					</div>
-
-					<div class="abn">
-                        {% block menu_banner %}
-                        <a href="#">
-                            <img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" />
-                        </a>
-                        {% endblock %}
-                    </div>
-				</div>
-
-			</div>
-		</section>
-{% endblock %}
-
-{% block announces %}
-    <section class="layout mp-announces">
-			<div class="layout-wrap">
-				<aside>
-					<div class="mp-news-list">
-						<header>
-							<a href="#">{% trans 'Новости событий' %}</a>
-						</header>
-						<ul>
-                            {% for news in news_list %}
-                                <li>
-                                    <a href="{{ news.get_permanent_url }}">
-                                        <span class="nl-pict">
-                                            {# add logo #}
-                                            <img src="{% static 'client/img/_del-temp/expo-bn-2-s.jpg' %}" alt="" />
-                                        </span>
-                                        <span class="nl-body">
-                                            <span class="nl-text">{{ news.main_title %}</span>
-                                            <span class="nl-date">{{ news.date }}</span>
-                                        </span>
-                                    </a>
-							    </li>
-                            {% endfor %}
-						</ul>
-						<footer><a class="more" href="#">{% trans 'Все новости' %}</a></footer>
-					</div>
-				</aside>
-
-				<div class="mcl">
-					<div class="mp-photo-gallery">
-						<header class="clearfix">
-							<div class="pg-title"><a href="#">{% trans 'Фоторепортажи:' %}</a></div>
-							<h2><a href="#">Edinburgh International Festival 2013</a></h2>
-						</header>
-						<div id="mp-photo-gallery" class="photo-gallery swiper-container">
-							<ul class="swiper-wrapper">
-
-								<li class="swiper-slide">
-									<div class="pg-item">
-										<div class="pgi-pict"><img src="{% static 'client/img/_del-temp/mp-phg-1.jpg' %}" alt="" /></div>
-										<div class="pgi-descr clearfix">
-											<div class="pgi-date"><b>с 1 по 8 августа</b> 2013 года</div>
-											<div class="pgi-text">Международный фестиваль оперы, музыки, драматических и танцевальных постановок Edinburgh International Festival 2013</div>
-										</div>
-									</div>
-								</li>
-
-								<li class="swiper-slide">
-									<div class="pg-item">
-										<div class="pgi-pict"><img src="{% static 'client/img/_del-temp/mp-phg-1.jpg' %}" alt="" /></div>
-										<div class="pgi-descr clearfix">
-											<div class="pgi-date"><b>с 1 по 8 августа</b> 2013 года</div>
-											<div class="pgi-text">Международный фестиваль оперы, музыки, драматических и танцевальных постановок Edinburgh International Festival 2013</div>
-										</div>
-									</div>
-								</li>
-
-							</ul>
-							<div class="re-controls">
-								<a class="prev" href="#">&lt;</a>
-								<a class="next" href="#">&gt;</a>
-							</div>
-						</div>
-					</div>
-				</div>
-
-			</div>
-		</section>
-{% endblock %}
-
-{% block partners %}
-    <section class="layout mp-partners">
-				<div class="mpp-wrap">
-					<header>{% trans 'Наши партнеры:' %}</header>
-					<ul class="mp-partners-list">
-						<li><img src="{% static 'client/img/partners/deutsche-messe-2.png' %}" /></li>
-						<li><img src="{% static 'client/img/partners/ite.png' %}"/></li>
-						<li><img src="{% static 'client/img/partners/nurnberg-messe.png' %}"/></li>
-						<li><img src="{% static 'client/img/partners/reed-exhibitions.png' %}"/></li>
-						<li><img src="{% static 'client/img/partners/messe-dusseldorf.png' %}"/></li>
-					</ul>
-				</div>
-		</section>
-{% endblock %}
-
-{% block services %}
-    <section class="layout mp-services">
-			<div class="layout-wrap">
-
-				<aside>
-
-				    {% include 'client/includes/services.html' %}
-
-				</aside>
-
-				<div class="mcl">
-					<div class="mp-reviews-wrap clearfix">
-						<div class="mp-reviews">
-							<header>
-								<div class="mpr-title"><a href="#">{%  trans 'Обзоры и аналитика' %}</a></div>
-								<div class="more-link"><a class="more" href="/articles/">{%  trans 'Все обзоры' %}</a></div>
-							</header>
-
-							<ul>
-                                {% for article in articles %}
-                                    <li>
-                                        <a href="{{ article.get_permanent_url }}">
-                                            <span class="mpr-pict"><img src="{% static 'client/img/_del-temp/review-1.jpg' %}" alt="" /></span>
-                                            <span class="mpr-text">{{ article.main_title }}</span>
-                                        </a>
-                                    </li>
-                                {% endfor %}
-							</ul>
-						</div>
-
-						<div class="sbnr">
-							<div class="sbnr-wrap"><a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a></div>
-						</div>
-					</div>
-				</div>
-
-			</div>
-		</section>
-{% endblock %}

templates/client/newsletters/activation_template.html

@@ -39,7 +39,7 @@
 
             <table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
                 <tr>
-                    <td style="padding: 20px 0 0;"><p style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px; margin-bottom: 0;" >Ваша регистрация на портале <a href="http://expomap.ru/" style="color: #ffffff;text-decoration: none;border-bottom: 1px dashed #ee3824;">Expomap</a></p></td>
+                    <td style="padding: 20px 0 0;"><p style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px; margin-bottom: 0;" >Ваша подписка на портале <a href="http://expomap.ru/" style="color: #ffffff;text-decoration: none;border-bottom: 1px dashed #ee3824;">Expomap</a></p></td>
                 </tr>
                 <tr>
                     <td style="padding: 10px 30px 15px; background: #faf9f7;">

templates/client/newsletters/subcribe.html

@@ -31,15 +31,15 @@
 					<div class="pr-header-box">
 						<a class="pr-phone" href="tel:+7 (499) 999-12-07">+7 (499) 999-12-07</a>
 						<ul class="pr-social">
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-inst.png' %}" /></a></li>
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-youtube.png' %}" /></a></li>
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-fb.png' %}" /></a></li>
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-lin.png' %}" /></a></li>
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-vk.png' %}" /></a></li>
-							<li><a href="#"><img src="{% static 'subscribe_lending/images/sm-icon-twit.png' %}" /></a></li>
+							<li><a href="https://instagram.com/expomap/"><img src="{% static 'subscribe_lending/images/sm-icon-inst.png' %}" /></a></li>
+							<li><a href="https://www.youtube.com/user/expomaptv"><img src="{% static 'subscribe_lending/images/sm-icon-youtube.png' %}" /></a></li>
+							<li><a href="https://www.facebook.com/Expomap"><img src="{% static 'subscribe_lending/images/sm-icon-fb.png' %}" /></a></li>
+							<li><a href="http://www.linkedin.com/company/expomap-ru/"><img src="{% static 'subscribe_lending/images/sm-icon-lin.png' %}" /></a></li>
+							<li><a href="http://vk.com/expomap"><img src="{% static 'subscribe_lending/images/sm-icon-vk.png' %}" /></a></li>
+							<li><a href="https://twitter.com/expomap_ru"><img src="{% static 'subscribe_lending/images/sm-icon-twit.png' %}" /></a></li>
 						</ul>
 					</div>
-					<strong class="pr-logo"><a href="#">Expomap</a></strong>
+					<strong class="pr-logo"><a href="/">Expomap</a></strong>
 					<span class="pr-slogan">{% blocktrans %}П<span class="pr-search-icon"></span>исковик деловых событий{% endblocktrans %}</span>
 				</div>
 			</header>
@@ -120,7 +120,6 @@
 										</div>
 										<div class="pr-title">
 											<p>{% trans 'Учимся эффективно участвовать в выставках и грамотно пиарить свою компанию на событиях.' %}</p>
-											<a href="#">{% trans 'Пример письма' %}</a>
 										</div>
 									</li>
 									<li>
@@ -130,7 +129,6 @@
 										</div>
 										<div class="pr-title">
 											<p>{% trans 'Создаем, наполняем и продвигаем собственные ивэнты.' %}</p>
-											<a href="#">{% trans 'Пример письма' %}</a>
 										</div>
 									</li>
 								</ul>

templates/client/place.html

@@ -1,314 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load template_filters %}
-
-{% load static %}
-{% load i18n %}
-
-{% block title %} {{ place.title }} {% endblock %}
-{% block keywords %} {{ place.keywords }} {% endblock %}
-{% block descriptions %} {{ place.descriptions }} {% endblock %}
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="/places">Места</a>
-		<strong>{{ place.name }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap place clearfix">
-            <aside>
-				<div class="i-pict"><img src="{% if place.get_logo %}{{ place.get_logo.file_path.url }}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" /></div>
-				<!--<div class="i-rating">551</div>-->
-			</aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ place.main_title|safe }}
-                    </div>
-                    <div class="i-descr">
-                        {{ place.description|safe }}
-                    </div>
-                    <div class="i-address map-opened">
-                        <header>
-                            <div class="address">
-                                {{ place.address.address }}
-                            </div>
-
-                            <div class="show-map"><a class="toggle-map" href="#">Раскрыть карту</a></div>
-                        </header>
-                        <div class="i-map">
-						    <div class="close-map"><a class="toggle-map" href="#">Скрыть карту</a></div>
-							<!-- позиция для карты задается в атрибуте data-coords -->
-							<div class="map-canvas" id="map-canvas" data-coords="{{ place.address.lat }},{{ place.address.lng }}" ></div>
-						</div>
-                    </div>
-                </header>
-            </div>
-        </div>
-
-        <div class="i-services">
-            <div class="sect-title">Услуги</div>
-            <div class="is-wrap clearfix">
-                <ul>
-                    {% if place.bank %}
-                    <li>Банк / банкоматы / обмен валюты</li>
-                    {% endif %}
-                    {% if place.wifi %}
-                    <li>Wi-Fi</li>
-                    {% endif %}
-                    {% if place.children_room %}
-                    <li>Детская комната</li>
-                    {% endif %}
-                    {% if place.disabled_service %}
-                    <li>Сервис для инвалидов</li>
-                    {% endif %}
-                </ul>
-                <ul>
-                    {% if place.conference_centre %}
-                    <li>Конгресс-центр</li>
-                    {% endif %}
-                    {% if place.business_centre %}
-                    <li>Бизнес центр</li>
-                    {% endif %}
-                    {% if place.online_registration %}
-                    <li>Онлайн-регистрация</li>
-                    {% endif %}
-                    {% if place.cafe %}
-                    <li>Кафе и рестораны</li>
-                    {% endif %}
-                </ul>
-                <ul>
-                    {% if place.terminals %}
-                    <li>Информационные терминалы</li>
-                    {% endif %}
-                    {% if place.parking %}
-                    <li>Парковка</li>
-                    {% endif %}
-                    {% if place.press_centre %}
-                    <li>Пресс-центр</li>
-                    {% endif %}
-                    {% if place.mobile_application %}
-                    <li>Мобильное приложение</li>
-                    {% endif %}
-                </ul>
-             </div>
-        </div>
-        <hr />
-        {% if place.get_photos %}
-        <div class="i-photo-slides">
-            <div class="sect-title">Фотогалерея</div>
-            <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-                <ul class="swiper-wrapper">
-                {% for photo in place.get_photos %}
-                    <li class="swiper-slide"><img src="{{ photo.file_path.url }}" alt="" /></li>
-                {% endfor %}
-                </ul>
-                <div class="re-controls">
-                    <a class="prev" href="#">&lt;</a>
-				    <a class="next" href="#">&gt;</a>
-                </div>
-            </div>
-        </div>
-        {% endif %}
-        <div class="e-num-info">
-            {% if place.total_area %}
-            <div class="eni-area-wrap">
-				<div class="eni-title">Общая выставочная площадь</div>
-				<div class="eni-area">{{ place.total_area|int_format }} м²</div>
-		    </div>
-            {% endif %}
-
-			<div class="eni-areas clearfix">
-                {% if place.closed_area %}
-				<div class="enis-col">
-					<b>{{ place.closed_area|int_format }} м²</b>
-					закрытая выставочная площадь
-				</div>
-                {% endif %}
-                {% if place.open_area %}
-				<div class="enis-col">
-				<b>{{ place.open_area|int_format }} м²</b>
-				открытая выставочная площадь
-			    </div>
-                {% endif %}
-			</div>
-
-            <div class="eni-areas clearfix">
-                <div class="enis-col">
-                    <ul>
-                    {% for hall in place.halls.all %}
-                        <li>{{ hall.name }} №{{ hall.number }} — {{ hall.capacity }}</li>
-                    {% endfor %}
-                    </ul>
-                </div>
-            </div>
-
-            <div class="eni-holds">
-                {{ place.total_year_action }}
-            </div>
-
-            <div class="eni-holds">
-                {% if place.foundation_year %}
-                <div class="eni-founded">Основано в <b>{{ place.foundation_year }}</b> году</div>
-                {% endif %}
-            </div>
-
-
-        </div>
-            {% if place.get_scheme %}
-            <hr />
-            <div class="e-pv-container">
-                <div class="sect-title">Схема павильонов</div>
-                <div class="div-img-wrap"><img src="{{ place.get_scheme.file_path.url }}" alt="" /></div>
-            </div>
-            {% endif %}
-        <div class="i-contacts clearfix">
-            <div class="sect-title">Контактная информация</div>
-            <div class="ic-wrap">
-                <div class="ic-col">
-                    <div class="ic-addr">{{ place.address.address }}</div>
-                    <div class="ic-links"><a target="_blank" href="http://{{ place.web_page }}">{{ place.web_page }}</a></div>
-                </div>
-
-                <div class="ic-col">
-				    <ul class="tels">
-                        {% if place.phone %}
-                       <li>{{ place.phone|phone }} (телефон)</li>
-                        {% endif %}
-                        {% if place.fax %}
-                       <li>{{ place.fax|phone }}  (факс)</li>
-                        {% endif %}
-                    </ul>
-				</div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="i-events-list">
-        <div class="sect-title">Список событий</div>
-        <ul class="cat-list cl-exhibitions">
-            {% for event in place.events %}
-                <li class="cl-item" data-link="#">
-                    <div class="cl-item-wrap clearfix">
-                        <a href="#">
-                            {% if event.expohit %}
-                            <span class="hit"></span>
-                            {% endif %}
-                            <div class="cli-pict">
-                                {% with obj=event %}
-                                    {% include 'show_logo.html' %}
-                                {% endwith %}
-                            </div>
-                        </a>
-
-                        <div class="cli-info">
-                            <div class="cli-top clearfix">
-                                <header>
-                                    <div class="cli-title"><a href="#">{{ event.name }}</a></div>
-                                </header>
-
-                                <div class="cli-descr">{{ event.main_title|safe }}</div>
-                            </div>
-
-                            <div class="cli-bot clearfix">
-                                <div class="cli-date">
-                                    {% with obj=event %}
-                                        {% include 'show_date_block.html' %}
-                                    {% endwith %}
-                                </div>
-                                <div class="cli-place">
-                                    <a href="#">{{ event.country }}</a>, <a href="#">{{ event.city }}</a>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="cli-buttons clearfix">
-                            <div class="cli-m-buttons">
-                                <div class="cli-services">
-                                    <a class="button icon-sm" href="#">услуги</a>
-                                    <div class="cli-services-sm">
-                                        <ul>
-                                        {% for service in event.service %}
-                                            <li><a href="#">{{ service }}</a></li>
-                                        {% endfor %}
-                                        </ul>
-                                    </div>
-                                </div>
-                                <a class="button blue icon-calendar" href="#">в расписание</a>
-	    						<a class="button green icon-note" href="#">заметка</a>
-                            </div>
-
-                            <div class="cli-s-buttons">
-			        			<a class="button blue2 lc" href="#">Лучшие цены на отели на <i>Booking</i>.com</a>
-						    </div>
-                        </div>
-                    </div>
-
-                    <footer class="clearfix">
-						<div class="cli-stats">
-							<span class="visitors">{{ event.visitors }}</span>
-							<span class="participants">{{ event.members }}</span>
-						</div>
-
-						<div class="cli-tags">
-                            {% with obj=event %}
-                                {% include 'client/includes/show_tags.html' %}
-                            {% endwith %}
-                        </div>
-					</footer>
-
-
-            {% endfor %}
-        </ul>
-    </div>
-    {% if place.get_nearest_places %}
-    <div class="e-cat">
-        <div class="sect-title">Ближайшие выставочные центры</div>
-        <ul class="cat-list cl-places">
-        {% for pl in place.get_nearest_places %}
-
-            <li class="cl-item">
-                <div class="cl-item-wrap clearfix">
-                    <a href="/place/{{ pl.url }}">
-                        <div class="cli-pict">
-                        {% with obj=pl %}
-                            {% include 'show_logo.html' %}
-                        {% endwith %}
-                        </div>
-                    </a>
-
-                    <div class="cli-info">
-                        <div class="cli-top clearfix">
-                            <header>
-                                <div class="cli-title">
-                                    <a href="/place/{{ pl.url }}"> {{ pl.name }}</a>
-                                </div>
-                            </header>
-                            <div class="cli-descr">{{ pl.get_type }}</div>
-                        </div>
-                        <div class="cli-bot clearfix">
-                            <div class="cli-dim">{{ pl.total_area }}</div>
-                            <div class="cli-place">
-                                <a href="#">{{ pl.country }}</a>, <a href="#">{{ pl.city }}</a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </li>
-        {% endfor %}
-        </ul>
-    </div>
-    {% endif %}
-{% endblock %}

templates/client/place_catalog.html

@@ -1,70 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<strong>Места</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-    <h1>Места:</h1>
-{% endblock %}
-{% block content_list %}
-    <ul class="cat-list cl-places">
-    {% for object in objects %}
-        <li class="cl-item">
-            <div class="cl-item-wrap clearfix">
-                <a href="/places/{{ object.url }}">
-					<div class="cli-pict"><img src="{% if object.get_logo %}{{ object.get_logo.file_path.url }}
-					                                {% else %}
-                                                    {% static 'client/img/no-logo.png' %}
-					                                {% endif %}" alt="" />
-                    </div>
-				</a>
-                <div class="cli-info">
-					<div class="cli-top clearfix">
-						<div class="cli-approved">
-                            {% if object.approved %}
-                            <img src="{% static 'clint/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                            {% endif %}
-                        </div>
-						<header>
-							<div class="cli-title"><a href="/places/{{ object.url }}">{{ object.name|safe }}</a></div>
-							<!--<div class="cli-rate">551</div>-->
-						</header>
-
-						<div class="cli-descr">{{ object.get_type }}</div>
-					</div>
-
-					<div class="cli-bot clearfix">
-                        {% if object.total_area %}
-						<div class="cli-dim">{{ object.total_area }} м2</div>
-                        {% endif %}
-						<div class="cli-place"><a href="#">{{ object.country }}</a>, <a href="#">{{ object.city }}</a>, <a href="/places/{{ object.url }}">{{ object.address.address }}</a></div>
-					</div>
-				</div>
-
-                <div class="cli-buttons clearfix">
-					<div class="cli-m-buttons">
-						<a class="button icon-info" href="/places/{{ object.url }}">описание</a>
-                        {% if object.get_events_number %}
-					    <a class="button green icon-list" href="#">события ({{ object.get_events_number }})</a>
-                        {% endif %}
-                        {% if object.get_photos %}
-					    <a class="button blue icon-photo" href="{{ object.get_catalog_url }}/{{ object.url }}/photo">{% trans 'фото' %}</a>
-                        {% endif %}
-					</div>
-
-					<div class="cli-s-buttons">
-					    <a class="button blue2 lc" href="#">Найти отели поблизости</a>
-					</div>
-			    </div>
-
-            </div>
-        </li>
-    {% endfor %}
-    </ul>
-{% endblock %}

templates/client/place_catalog_test.html

@@ -1,28 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-{% load template_filters %}
-
-{% if single_page %}
-    {% block title %} {{ object_list.0.name|safe }} {% endblock %}
-    {% block keywords %} {{ object_list.0.keywords }} {% endblock %}
-    {% block descriptions %} {{ object_list.0.descriptions }} {% endblock %}
-{% endif %}
-
-{% block content_list %}
-    {% if object_list %}
-        {% if single_page %}
-            {% with place=object_list.0 %}
-                {% include 'includes/place/place_object.html' %}
-            {% endwith %}
-        {% else %}
-            {% with object_list=object_list %}
-                {% include 'includes/place/place_list.html' %}
-            {% endwith %}
-        {% endif %}
-
-    {% else %}
-        <h1>Nothing found</h1>
-    {% endif %}
-
-{% endblock %}

templates/client/popups/announces.html

@@ -0,0 +1,56 @@
+<div id="pw-subscribe" class="popup-window pw-subscribe">
+    <header class="clearfix">
+        <div class="pw-title">Получать анонсы </div>
+        <ul class="tabs">
+            <li class="active"><a class="icon-big-email" href="#">по e-mail</a></li>
+        </ul>
+    </header>
+    <div class="pw-body clearfix">
+        <ul class="tabs-content">
+            <li class="active">
+                <form id="id_subscription_aside_form" class="pw-form simple-validate" action="/newsletters/subsribe/aside/" method="post">{% csrf_token %}
+
+                    <div class="pwf-line mail">
+                        <div class="pwf-field">{{ announce_subscribe.email }}</div>
+                        <div class="pwf-msg"><a href="#">Пример рассылки</a></div>
+                    </div>
+
+                    <div class="pwf-line country">
+                        <div class="pwf-field">
+                             {{ announce_subscribe.country }}
+                        </div>
+                        <div class="pwf-msg"></div>
+                    </div>
+
+                    <div class="pwf-line city">
+                        <div class="pwf-field">
+                            {{ announce_subscribe.city }}
+                        </div>
+                        <div class="pwf-msg"></div>
+                    </div>
+
+                    <div class="pwf-line subj">
+                        <div class="pwf-field">
+                            {{ announce_subscribe.theme }}
+                        </div>
+                        <div class="mf-msg"></div>
+                    </div>
+
+                    <div class="pwf-line subj">
+                        <div class="pwf-field">
+                            {{ announce_subscribe.periodic }}
+                        </div>
+                        <div class="mf-msg"></div>
+                    </div>
+
+                    <div class="pwf-buttons-line">
+					    <button type="submit" class="icon-check">подписаться</button>
+				    </div>
+
+
+
+                </form>
+            </li>
+        </ul>
+    </div>
+</div>

templates/client/popups/auto_banner.html

@@ -1,8 +0,0 @@
-<div id="expo-ad-popup" data-rdr="51" class="popup-window"  style="width:800px;">
-    <header class="clearfix">
-        <div class="pw-title"></div>
-    </header>
-    <div class="pw-body clearfix">
-        <a href="/redirect/redirect/51/"><img src="/static/client/img/expo_b/mims15.gif"/></a>
-    </div>
-</div>

templates/client/popups/auto_modal.html

@@ -1,23 +0,0 @@
-<div id="expo-ad-popup" data-rdr="52" class="popup-window" style="width:500px;">
-    <header class="clearfix">
-        <div class="pw-title">Вы планируете посещение MIMS Automechanika Moscow в Экспоцентре?</div>
-    </header>
-    <div class="pw-body clearfix">
-        <form id="expo-form-popup" class="pw-form simple-validate" action="/redirect/redirect/52/">
-            <div class="pwf-line">
-                С 24 по 27 августа 2015 г. в Экспоцентре будут представлены лучшие предложения производителей и поставщиков автозапчастей, оборудования и товаров для технического обслуживания автомобилей.
-            </div>
-            <div class="pwf-line">
-                <a href="/redirect/redirect/52/">
-                    <img src="/static/client/img/expo_b/mims.png">
-                </a>
-            </div>
-            <button>Узнать подробнее</button>
-        </form>
-
-
-    </div>
-
-</div>
-
-

templates/client/popups/cemat_banner1.html

@@ -1,8 +0,0 @@
-<div id="expo-ad-popup" data-rdr="49" class="popup-window"  style="width:800px;">
-    <header class="clearfix">
-        <div class="pw-title"></div>
-    </header>
-    <div class="pw-body clearfix">
-        <a href="/redirect/redirect/49/"><img src="/static/client/img/expo_b/cemat15.gif"/></a>
-    </div>
-</div>

templates/client/popups/cemat_banner2.html

@@ -1,8 +0,0 @@
-<div id="expo-ad-popup" data-rdr="50" class="popup-window"  style="width:800px;">
-    <header class="clearfix">
-        <div class="pw-title"></div>
-    </header>
-    <div class="pw-body clearfix">
-        <a href="/redirect/redirect/50/"><img src="/static/client/img/expo_b/cemat15_v2.gif"/></a>
-    </div>
-</div>

templates/client/popups/cemat_modal.html

@@ -1,24 +0,0 @@
-
-<div id="expo-ad-popup" data-rdr="53" class="popup-window">
-    <header class="clearfix">
-        <div class="pw-title">Ваш логист пойдет на выставку CEMAT?</div>
-    </header>
-    <div class="pw-body clearfix">
-        <form id="expo-form-popup" class="pw-form simple-validate" action="/redirect/redirect/53/">
-            <div class="pwf-line">
-                С 22 по 25 сентября 2015 г. в Крокус Экспо производители складского оборудования и техники представят свои выгодные предложения.
-            </div>
-            <div class="pwf-line">
-                <a href="/redirect/redirect/53/">
-                    <img src="/static/client/img/expo_b/cemat_modal1.png">
-                </a>
-                <a href="/redirect/redirect/53. /" style="margin-left: 10px;">
-                    <img src="/static/client/img/expo_b/cemat_modal2.png">
-                </a>
-            </div>
-            <button>Узнать подробнее</button>
-        </form>
-
-    </div>
-
-</div>

templates/client/seminar.html

@@ -1,282 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block title %} {{ seminar.title }} {% endblock %}
-{% block keywords %} {{ seminar.keywords }} {% endblock %}
-{% block descriptions %} {{ seminar.descriptions }} {% endblock %}
-
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="/seminars">Семинары</a>
-        <a href="#">{{ seminar.theme.all.0 }}</a>
-		<strong>{{ seminar.name }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap event clearfix">
-            <aside>
-                {% if seminar.expohit %}
-                    <div class="hit"></div>
-                {% endif %}
-                <div class="i-pict">
-                    <img src="{% if seminar.get_logo %}{{ seminar.get_logo.file_path.url }}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt=""/>
-                </div>
-
-                <div class="i-rating" title="Рейтинг: 551">551</div>
-
-                <div class="i-stats">
-                        <span class="visitors" title="Посетители">N/A</span>
-                        <span class="participants" title="Участники">{{ expositiin.users.all|length }}</span>
-                </div>
-
-                <div class="i-discount">
-                {% if seminar.discount %}
-                    <a class="discount-button" href="#">Скидка -{{ seminar.discount }}%</a>
-                    <div class="dsc-text">{{ seminar.discount_description|safe }}</div>
-                    {% endif %}
-                 </div>
-            </aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ seminar.main_title|safe }}
-                    </div>
-                </header>
-
-                <div class="i-date">
-                    {% trans 'с' %}{{ seminar.data_begin }} {% trans 'по' %} {{ seminar.data_end }}
-                </div>
-
-                <div class="i-address">
-                    <header>
-                        <div class="address">
-                            {{ seminar.address.address }}
-                        </div>
-                        <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
-                    </header>
-
-                    <div class="i-map">
-                        <div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
-                        </div>
-                        <div class="map-canvas" id="map-canvas" data-coords="{{ seminar.address.lat }},{{ seminar.address.lng }}" ></div>
-                    </div>
-                </div>
-                <hr />
-                <div class="i-buttons clearfix">
-                    <div class="ib-main">
-                        <a class="button icon-check" href="#">{% trans 'Я планирую посетить' %}</a>
-                        <a class="button blue icon-calendar" href="#">{% trans 'в расписание' %}</a>
-                        <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
-                    </div>
-                    <div class="ib-add"><a class="button blue2 icon-find" href="#">{% trans 'Найти отель' %}</a></div>
-                </div>
-                <hr />
-                <div class="i-divs clearfix">
-                    <div class="i-subj">
-                        <ul>
-                        {% for theme in seminar.theme.all %}
-                            <li><a href="#">{{ theme }} ({{ theme.seminars_number }})</a></li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-
-                    <div class="i-tags">
-                        {% for tag in seminar.tag.all %}
-                            <a href="#">{{ tag }}</a>,
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    <div class="i-sub-articles">
-        <ul>
-        {% for service in seminar.service.all %}
-            <li><a href="#">{{ service }}</a></li>
-        {% endfor %}
-        </ul>
-    </div>
-
-    <div class="i-steps">
-        <div class="is-title">{% trans 'Посетить семинар' %}</div>
-        <ul>
-            <li class="s1">
-				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
-			    <a class="step" href="#">{% trans 'Билеты на семинар' %}</a>
-			</li>
-
-			<li class="s2">
-				<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
-				<a class="step" href="#"><b>booking</b>.com</a>
-			</li>
-
-			<li class="s3">
-				<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-				<a class="step" href="#">Any<b>way</b>Any<b>day</b></a>
-			</li>
-        </ul>
-    </div>
-    {% if seminar.get_photos %}
-    <hr />
-
-    <div class="i-photo-slides">
-        <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой выставки' %}</a></div>
-        <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-            <ul class="swiper-wrapper">
-                {% for photo in seminar.get_photos %}
-                <li class="swiper-slide"><a class="open-photo" href="#"><img src="{{ photo.file_path.url }}" alt="" /></a></li>
-                {% endfor %}
-            </ul>
-            <div class="re-controls">
-			    <a class="prev" href="#">&lt;</a>
-				<a class="next" href="#">&gt;</a>
-			</div>
-        </div>
-    </div>
-    {% endif %}
-
-    <div class="i-event-description">
-        <div class="ied-title">{{ seminar.main_title|safe }}</div>
-        <div class="ied-text">{{ seminar.description|safe }}</div>
-    </div>
-    <hr />
-    <div class="i-event-additional clearfix">
-        <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
-        <ul class="e-docs">
-            <li><a href="#">{% trans 'Деловая программа' %}</a></li>
-            <li><a href="#">{% trans 'Условия участия' %}</a></li>
-        </ul>
-        <dl class="add-info">
-            <dt>{% trans 'Организатор' %}:</dt>
-            <dd>
-                {{ seminar.organiser.0 }}<br />
-                <a target="_blank" href="{{ seminar.organiser.0.web_page }}">{{ seminar.organiser.0.web_page }}</a><br />
-                <a href="{{ seminar.organiser.email }}">{{ seminar.organiser.0.email }}</a>
-            </dd>
-
-            <dt>{% trans 'Веб-сайт' %}:</dt>
-            <dd>
-                <a target="_blank" href="http://{{ seminar.web_page }}">{{ seminar.web_page }}</a>
-            </dd>
-
-            <dt>{% trans 'Аудитория' %}:</dt>
-            <dd>
-                {{ seminar.get_audience }}
-            </dd>
-
-            <dt>{% trans 'Периодичность' %}:</dt>
-            <dd>{{ seminar.get_periodic }}</dd>
-
-            <dt>{% trans 'Экспонируемые продукты' %}:</dt>
-            <dd>{{ seminar.products|safe }}</dd>
-
-        </dl>
-
-    </div>
-    {% if seminar.company.all %}
-    <hr />
-    <div class="i-members clearfix">
-        <div class="im-participants">
-            <header>
-                <div class="im-title">{% trans 'Участники' %}</div>
-                <a class="more" href="#">{% trans 'Все участники' %}</a>
-            </header>
-            <ul>
-                {% for company in seminar.companies.all|slice:":6" %}
-
-                        <li>
-                            <a href="#">
-                                <span class="imp-pict"><img src="{% if company.photo %}{{ company.photo }}
-                                {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" /></span>
-                                {{ company.name }}
-                            </a>
-                        </li>
-                {% endfor %}
-            </ul>
-        </div>
-
-        <div class="im-visitors">
-            <header>
-                <div class="im-title">{% trans 'Посетители' %}</div>
-            </header>
-            <ul>
-                {% for user in seminar.users.all|slice:":17" %}
-                    <li><a href="#">{{ user }}</a></li>
-                {% endfor %}
-            </ul>
-            <a class="more" href="#">{% trans 'Все посетители' %}</a>
-        </div>
-    </div>
-    {% endif %}
-
-    </div>
-
-    <div class="h-booking">
-        <header class="clearfix">
-            <div class="sect-title">
-                <a href="#">{% trans 'Отели рядом с выставкой от' %} <b>Booking</b>.com</a>
-            </div>
-			<a class="more blue2" href="#">{% trans 'Все отели поблизости' %}</a>
-            <ul>
-            </ul>
-        </header>
-    </div>
-    <hr />
-    <div class="e-cat">
-        <div class="sect-title">{% trans 'Ближайшие выставки по тематике' %} <a href="#">«{{ seminar.theme.all.0 }}»</a></div>
-        <ul class="cat-list cl-exhibitions">
-            {% for exp in seminar.get_nearest_events %}
-                <li class="cl-item">
-                    <div class="cl-item-wrap clearfix">
-                        <a href="/seminars/{{ exp.url }}">
-                            <div class="cli-pict">
-                                <img src="{% if exp.get_logo %}{{ exp.get_logo.file_path.url }}{% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" />
-                            </div>
-                        </a>
-                        <div class="cli-info">
-                            <div class="cli-top clearfix">
-                            {% if exp.approved %}
-                                <div class="cli-approved">
-                                    <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                                </div>
-                            {% endif %}
-                                <header>
-                                    <div class="cli-title"><a href="/seminars/{{ exp.url }}">{{ exp.name }}</a></div>
-                                </header>
-
-                                <div class="cli-descr">
-                                    {{ exp.main_title }}
-                                </div>
-
-                                <div class="cli-bot clearfix">
-                                    <div class="cli-date">{% trans 'с' %} {{ exp.data_begin }} {% trans 'по' %} {{ exp.data_end }}</div>
-                                    <div class="cli-place">
-                                        <a href="#">{{ exp.country }}</a>, <a href="#">{{ exp.city }}</a>
-                                        {% if exp.place %}
-                                        , <a href="#">{{ exp.place }}</a>
-                                        {% endif %}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-    <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-
-{% endblock %}

templates/client/static_client/js/_modules/block.common.js

@@ -166,13 +166,55 @@ if (EXPO.common){
 
 			}
 
-		};
+		},
+        subscriptionInput = function (width) {
+				$('#id_subscription_country, #id_subscription_theme')
+					.select2({
+						placeholder: $(this).attr('placeholder'),
+						width: width
+					});
+
+				$('#id_subscription_city').select2({
+					placeholder: $(this).attr('placeholder'),
+                    multiple: true,
+					width: width,
+					ajax: {
+
+						url: "/city/get-city/",
+						dataType: "json",
+						quietMillis: 200,
+
+						data: function(term, page){
+							return {term: term,
+								page: page};
+						},
+
+						results: function (data) {
+							var results = [];
+							$.each(data, function(index, item){
+								results.push({
+									id: item.id,
+									text: item.label
+								});
+							});
+							return {results: results};
+						}
+					},
+					initSelection : function(element, callback) {
+						var id=	$(element).val();
+						var text = $(element).attr('data-init-text');
+						callback({id: id, text:text});
+					}
+
+				});
+			};
 //dependences
 		that.forms = [];
 		$(function () {
 			/**
 			 * registration and login form validation
 			 */
+            subscriptionInput('100%');
 			$('form.validate').each(function () {
 				that.forms.push(new Validation(this));
 			});

templates/client/test_list.html

@@ -1,3 +0,0 @@
-{% load template_filters %}
-{{ filter}}<br>
-        {{ object_list.0 }}

templates/client/test_plugin.html

@@ -1,25 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-
-
-{% block style %}
-    <link rel="stylesheet" href="{% static 'ninjaplugin/plugin/plugin.css' %}">
-{% endblock %}
-
-{% block scripts %}
-    <script src="{% static 'ninjaplugin/plugin/jquery.mousewheel.js' %}"></script>
-    <script src="{% static 'ninjaplugin/plugin/plugin.js' %}"></script>
-    <script src="{% static 'ninjaplugin/plugin/init.js' %}"></script>
-
-{% endblock %}
-
-{% block content_list %}
-<div class="m-article">
-<label for="id_country">Country</label><input type="hidden" id="id_country"/>
-
-<br/>
-</br>
-<label for="id_theme">Theme</label><input type="hidden" id="id_theme"/>
-</div>
-
-{% endblock %}

templates/client/webinar.html

@@ -1,237 +0,0 @@
-{% extends 'base_catalog.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block title %} {{ webinar.title }} {% endblock %}
-{% block keywords %} {{ webinar.keywords }} {% endblock %}
-{% block descriptions %} {{ webinar.descriptions }} {% endblock %}
-
-
-{% block content_bread_scrumbs %}
-    <div class="bread-crumbs">
-		<a href="/">Главная страница</a>
-		<a href="/webinars">Вебинары</a>
-        <a href="#">{{ webinar.theme.all.0 }}</a>
-		<strong>{{ webinar.name }}</strong>
-	</div>
-{% endblock %}
-
-{% block page_title %}
-{% endblock %}
-
-{% block page_filter %}
-{% endblock %}
-
-{% block page_body %}
-    <div class="m-article">
-        <div class="item-wrap event clearfix">
-            <aside>
-                {% if webinar.expohit %}
-                    <div class="hit"></div>
-                {% endif %}
-                <div class="i-pict">
-                    <img src="{% if webinar.get_logo %}{{ webinar.get_logo.file_path.url }}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt=""/>
-                </div>
-
-                <div class="i-rating" title="Рейтинг: 551">551</div>
-
-                <div class="i-stats">
-                        <span class="visitors" title="Посетители">N/A</span>
-                        <span class="participants" title="Участники">{{ webinar.users.all|length }}</span>
-                </div>
-
-                <div class="i-discount">
-                {% if webinar.discount %}
-                    <a class="discount-button" href="#">Скидка -{{ webinar.discount }}%</a>
-                    <div class="dsc-text">{{ webinar.discount_description|safe }}</div>
-                    {% endif %}
-                 </div>
-            </aside>
-
-            <div class="i-info">
-                <header>
-                    <div class="i-title">
-                        {{ webinar.main_title|safe }}
-                    </div>
-                </header>
-
-                <div class="i-date">
-                   {{ webinar.data_begin }}
-                </div>
-
-                <hr />
-                <div class="i-buttons clearfix">
-                    <div class="ib-main">
-                        <a class="button icon-check" href="#">{% trans 'Я планирую посетить' %}</a>
-                        <a class="button blue icon-calendar" href="#">{% trans 'в расписание' %}</a>
-                        <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
-                    </div>
-                </div>
-                <hr />
-                <div class="i-divs clearfix">
-                    <div class="i-subj">
-                        <ul>
-                        {% for theme in webinar.theme.all %}
-                            <li><a href="#">{{ theme }} ({{ theme.webinars_number }})</a></li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-
-                    <div class="i-tags">
-                        {% for tag in webinar.tag.all %}
-                            <a href="#">{{ tag }}</a>,
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    <div class="i-sub-articles">
-        <ul>
-        {% for service in webinar.service.all %}
-            <li><a href="#">{{ service }}</a></li>
-        {% endfor %}
-        </ul>
-    </div>
-
-    <div class="i-steps">
-        <div class="is-title">{% trans 'Посетить вебинар' %}</div>
-        <ul>
-            <li class="s1">
-				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
-			    <a class="step" href="#">{% trans 'Билеты на вебинар' %}</a>
-			</li>
-
-			<li class="s2">
-				<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
-				<a class="step" href="#"><b>booking</b>.com</a>
-			</li>
-
-			<li class="s3">
-				<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-				<a class="step" href="#">Any<b>way</b>Any<b>day</b></a>
-			</li>
-        </ul>
-    </div>
-    {% if webinar.get_photos %}
-    <hr />
-
-    <div class="i-photo-slides">
-        <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлого вебинара' %}</a></div>
-        <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-            <ul class="swiper-wrapper">
-                {% for photo in webinar.get_photos %}
-                <li class="swiper-slide"><a class="open-photo" href="#"><img src="{{ photo.file_path.url }}" alt="" /></a></li>
-                {% endfor %}
-            </ul>
-            <div class="re-controls">
-			    <a class="prev" href="#">&lt;</a>
-				<a class="next" href="#">&gt;</a>
-			</div>
-        </div>
-    </div>
-    {% endif %}
-
-    <div class="i-event-description">
-        <div class="ied-title">{{ webinar.main_title|safe }}</div>
-        <div class="ied-text">{{ webinar.description|safe }}</div>
-    </div>
-    <hr />
-    <div class="i-event-additional clearfix">
-        <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
-
-        <dl class="add-info">
-            <dt>{% trans 'Организатор' %}:</dt>
-            <dd>
-                {{ webinar.organiser.0 }}<br />
-                <a target="_blank" href="{{ webinar.organiser.0.web_page }}">{{ webinar.organiser.0.web_page }}</a><br />
-                <a href="{{ webinar.organiser.email }}">{{ webinar.organiser.0.email }}</a>
-            </dd>
-
-            <dt>{% trans 'Веб-сайт' %}:</dt>
-            <dd>
-                <a target="_blank" href="http://{{ webinar.web_page }}">{{ webinar.web_page }}</a>
-            </dd>
-
-        </dl>
-
-    </div>
-    {% if webinar.company.all %}
-    <hr />
-    <div class="i-members clearfix">
-        <div class="im-participants">
-            <header>
-                <div class="im-title">{% trans 'Участники' %}</div>
-                <a class="more" href="#">{% trans 'Все участники' %}</a>
-            </header>
-            <ul>
-                {% for company in webinar.companies.all|slice:":6" %}
-
-                        <li>
-                            <a href="#">
-                                <span class="imp-pict"><img src="{% if company.photo %}{{ company.photo }}
-                                {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" /></span>
-                                {{ company.name }}
-                            </a>
-                        </li>
-                {% endfor %}
-            </ul>
-        </div>
-
-        <div class="im-visitors">
-            <header>
-                <div class="im-title">{% trans 'Посетители' %}</div>
-            </header>
-            <ul>
-                {% for user in webinar.users.all|slice:":17" %}
-                    <li><a href="#">{{ user }}</a></li>
-                {% endfor %}
-            </ul>
-            <a class="more" href="#">{% trans 'Все посетители' %}</a>
-        </div>
-    </div>
-    {% endif %}
-
-    </div>
-
-    <hr />
-    <div class="e-cat">
-        <div class="sect-title">{% trans 'Ближайшие вебинары по тематике' %} <a href="#">«{{ webinar.theme.all.0 }}»</a></div>
-        <ul class="cat-list cl-exhibitions">
-            {% for exp in webinar.get_nearest_events %}
-                <li class="cl-item">
-                    <div class="cl-item-wrap clearfix">
-                        <a href="/webinars/{{ exp.url }}">
-                            <div class="cli-pict">
-                                <img src="{% if exp.get_logo %}{{ exp.get_logo.file_path.url }}{% else %}{% static 'client/img/no-logo.png' %} {% endif %}" alt="" />
-                            </div>
-                        </a>
-                        <div class="cli-info">
-                            <div class="cli-top clearfix">
-                            {% if exp.approved %}
-                                <div class="cli-approved">
-                                    <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
-                                </div>
-                            {% endif %}
-                                <header>
-                                    <div class="cli-title"><a href="/webinars/{{ exp.url }}">{{ exp.name }}</a></div>
-                                </header>
-
-                                <div class="cli-descr">
-                                    {{ exp.main_title }}
-                                </div>
-
-                                <div class="cli-bot clearfix">
-                                    <div class="cli-date">{{ exp.data_begin }}</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-    <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-
-{% endblock %}

templates/done.html

@@ -1 +0,0 @@
-{{form_data}}