conflict

apps/conference/models.py

@@ -146,30 +146,6 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
     def __unicode__(self):
         return self.lazy_translation_getter('name', unicode(self.pk))
 
-    def get_services(self):
-        return self.get_services_detail()
-        # country_ids = [item for item, bool in self.country.services if bool==True]
-        # ids = [item for item, bool in self.services if bool==True]
-
-        # qs = Service.objects.filter(Q(Q(url__in=country_ids) & Q(type=Service.type.conference)) | Q(url__in=ids))
-
-        # return list(qs)
-        #return list(Service.objects.language().filter(url__in=ids, type=Service.type.conference).order_by('sort'))
-
-    def get_services_detail(self):
-        # excluded = ['tickets']
-        return super(Conference, self).get_services_detail(None, Service.type.conference)
-
-    # def get_nearest_events(self):
-    #     if self.theme.all():
-    #         theme = self.theme.all()[0]
-    #         now = datetime.datetime.now()
-    #         now = now - datetime.timedelta(days=1)
-    #         conferences = Conference.objects.filter(theme__in=[theme], data_begin__gt=now).exclude(id=self.id).order_by('data_begin')
-    #         return conferences[:3]
-    #     else:
-    #         return []
-
     def get_audience(self):
         return self.audience.all()
 

apps/conference/tests/test_models.py

@@ -1,11 +1,8 @@
 import datetime
 
-from accounts.models import User
-from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.test import TestCase
 from expobanner.models import Paid, Banner
-from service.models import Service
 from stats_collector.models import ObjectStats
 from theme.models import Tag, Theme
 
@@ -71,16 +68,6 @@ class ConferenceTest(TestCase):
                 'name', unicode(self.conference.pk))
         )
 
-    def test_method_get_services(self):
-        services = [item for item, bool in self.conference.services if bool]
-        qs = Service.objects.language()
-        qs = qs.filter(url__in=services)
-
-        self.assertEqual(
-            sorted(self.conference.get_services(), key=lambda x: x.pk),
-            sorted(list(qs), key=lambda x: x.pk)
-        )
-
     def test_method_get_news_url(self):
         self.assertEqual(
             self.conference.get_news_url(),

apps/country/admin.py

@@ -81,7 +81,7 @@ def country_change(request, url):
                 'logo': c.logo}
 
         if c.capital:
-            data['capital'] = c.capital.id
+            data['capital'] = c.capital_id
 
         #data from translated fields
         for code, name in settings.LANGUAGES:

apps/emencia/django/newsletter/forms.py

@@ -107,15 +107,12 @@ class MailingSettingsForm(forms.ModelForm):
         model = Contact
         fields = [
             'email', 'first_name', 'moscow', 'russia', 'r_cities', 'foreign',
-            'periodic', 'periodic_day', 'content_news', 'content_overview',
-            'content_articles',
+            'content_news', 'content_overview', 'content_articles',
         ]
         widgets = {
             'first_name': forms.TextInput(attrs={'placeholder': _(u'Ваше имя')}),
             'moscow': forms.CheckboxInput(),
             'foreign': forms.CheckboxInput(),
-            'periodic': forms.RadioSelect(),
-            'periodic_day': forms.RadioSelect(),
             'content_news': forms.CheckboxInput(),
             'content_overview': forms.CheckboxInput(),
             'content_articles': forms.CheckboxInput(),
@@ -437,27 +434,6 @@ class AbstractSubscribeForm(forms.ModelForm):
         return Theme.objects.filter(id__in=themes)
 
 
-class SubscribeAssideForm(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(SubscribeAssideForm, 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):
     NA_ID = 12
     ASIA_ID = 9

apps/emencia/django/newsletter/mailer.py

@@ -412,7 +412,6 @@ class NewsLetterSender(object):
                            })
         if self.announce:
             # render template by default announce template
-            # template = get_template('newsletter/announce_template.html')
             template = get_template('newsletter/AutomaticEmail_v2.html')
             context.update(announce_context)
             content = template.render(context)

apps/emencia/django/newsletter/urls/__init__.py

@@ -12,7 +12,6 @@ urlpatterns = patterns('',
        url(r'^statistics/', include('emencia.django.newsletter.urls.statistics')),
        url(r'^', include('emencia.django.newsletter.urls.newsletter')),
 
-       url(r'^test-letter/', TemplateView.as_view(template_name='client/newsletters/announce_template.html'), name='newsletter_test_letter'),
        url(r'^activation/send/', TemplateView.as_view(template_name='client/newsletters/activation_send.html'),
            name='subscription_activation_send'),
        url(r'^activation/complete/', TemplateView.as_view(template_name='client/newsletters/activation_complete.html'),
@@ -22,7 +21,5 @@ urlpatterns = patterns('',
            name='newsletter_subscription_popup_validate'),
        url(r'^partisipation/validate/$', 'emencia.django.newsletter.views.expo_views.landing_partisipation_validate',
            name='landing_partisipation_validate'),
-       url(r'^subsribe/aside/$', 'emencia.django.newsletter.views.expo_views.subscribe_aside',
-           name='newsletter_subscription_aside'),
        url(r'^$', SubscribeView.as_view(), name='newsletter_subscription'),
        )

apps/emencia/django/newsletter/views/expo_views.py

@@ -2,19 +2,18 @@
 import json
 
 from django.core.urlresolvers import reverse_lazy
+from django.db.models import Count
 from django.views.generic import TemplateView, FormView
 from django.http import HttpResponse
 from django.shortcuts import redirect
 
 from emencia.django.newsletter.forms import ContactForm
 from emencia.django.newsletter.models import Contact, MailingList
-from emencia.django.newsletter.forms import (
-    SubscribeAssideForm, MailingSettingsForm
-)
-from accounts.models import User
+from emencia.django.newsletter.forms import MailingSettingsForm
 from accounts.views import GetUserMixin
 from functions.http import JsonResponse
 from city.models import City
+from theme.models import Theme
 
 
 class SubscribeView(GetUserMixin, FormView):
@@ -81,6 +80,7 @@ class SubscribeView(GetUserMixin, FormView):
         ctx['object'] = self.object
         ctx['r_cities'] = self.get_russian_cities()
         ctx['checked_th'] = self.get_checked_th()
+        ctx['popular_themes'] = self.get_popular_themes()
 
         if self.object is not None:
             if self.request.GET.get('unsibscribe') and self.object.subscriber:
@@ -105,6 +105,17 @@ class SubscribeView(GetUserMixin, FormView):
             return self.object.themes.values_list('pk', flat=True)
         return []
 
+    def get_popular_themes(self):
+        """
+        :return: 7 популярных тем (где больше всего подписчиков)
+        """
+        qs = Theme.objects.annotate(c=Count('contact'))\
+                          .values('pk', 'c')\
+                          .order_by('-c')[:7]
+        return Theme.objects.language()\
+                            .filter(pk__in=[x['pk'] for x in qs])\
+                            .order_by('name')
+
 
 class ActivationView(TemplateView):
     http_method_names = ['get']
@@ -137,34 +148,6 @@ class ActivationView(TemplateView):
         return ('subscription_activation_complete', (), {})
 
 
-def subscribe_aside(request):
-    if request.POST:
-        response = {'success': False}
-        form = SubscribeAssideForm(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')
-
-
 def popup_validate(request):
     response = {'success': False}
     if request.GET:

apps/expobanner/views.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import json
 import re
+
 from django.http import HttpResponse
-from django.shortcuts import redirect, get_object_or_404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import redirect, get_object_or_404, render
+
 from .models import Banner, BannerGroup, URL, Top
 from expobanner.utils import get_banner_by_params, get_client_ip, get_top_events, get_referer_view, set_cookie
 
@@ -102,7 +102,13 @@ def get_top(request):
 
     tops = Top.cached.all()
     events = get_top_events(tops, params, request)
-    context = {'objects': events}
+    ctx = {'objects': events}
+
+    if not events:
+        return HttpResponse('')
+
     if catalog == 'places':
-        return render_to_response('client/includes/exposition/expo_top_place.html', context, context_instance=RequestContext(request))
-    return render_to_response('client/includes/exposition/expo_top.html', context, context_instance=RequestContext(request))
+        return render(
+            request, 'client/includes/exposition/expo_top_place.html', ctx
+        )
+    return render(request, 'client/includes/exposition/expo_top.html', ctx)

apps/exposition/models.py

@@ -5,7 +5,6 @@ from django.contrib.contenttypes import generic
 from django.core.urlresolvers import reverse_lazy
 from django.db import models
 from django.db.models.signals import post_save, pre_save
-from django.dispatch import receiver
 from django.utils import translation
 from django.utils.translation import ugettext as _
 from events.models import TargetAudience
@@ -174,19 +173,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
     def get_price(self):
         return self.price_day or self.price_all
 
-    def get_services(self):
-        return self.get_services_detail()
-        # country_ids = [item for item, bool in self.country.services if bool==True]
-        # ids = [item for item, bool in self.services if bool==True]
-
-        # qs = Service.objects.language().filter(Q(Q(url__in=country_ids) & Q(type=Service.type.expo)) | Q(url__in=ids))
-
-        # return list(qs)
-
-    def get_services_detail(self):
-        excluded = ['visit']
-        return super(Exposition, self).get_services_detail(excluded, Service.type.expo)
-
     def get_parent(self):
         return {}
 

apps/functions/model_mixin.py

@@ -245,38 +245,6 @@ class EventMixin(object):
     def cancel(self):
         self.canceled_by_administrator = True
 
-    def get_services(self):
-
-        country_ids = [item for item, bool in self.country.services if bool==True]
-        ids = [item for item, bool in self.services if bool==True and item in country_ids]
-
-        return list(Service.objects.language().filter(url__in=ids).order_by('sort'))
-
-    def get_services_detail(self, excluded, _type):
-        if not isinstance(getattr(self, '_get_services_detail', None), list):
-            # excluded = ['visit', 'tickets']
-            # country_ids = [item for item, bool in self.country.services if bool==True]
-            services = [item for item, bool in self.services if bool]
-            qs = Service.objects.language()
-            if excluded is not None:
-                qs = qs.exclude(url__in=excluded)
-            # qs = qs.filter(Q(Q(url__in=country_ids) & Q(type=_type)) | Q(url__in=ids))
-            qs = qs.filter(url__in=services)
-            self._get_services_detail = list(qs)
-            # import pdb; pdb.set_trace()
-            #двигаем билеты сразу за переводом
-            if excluded is None or 'tickets' not in excluded:
-                translator_idx = tickets = None
-                for idx, service in enumerate(self._get_services_detail):
-                    if service.url == 'translator':
-                        translator_idx = idx + 1
-                    elif service.url == 'tickets':
-                        tickets = service
-                if tickets and translator_idx:
-                    self._get_services_detail.remove(tickets)
-                    self._get_services_detail.insert(translator_idx, tickets)
-        return self._get_services_detail
-
     def duration_days(self, month=None):
         if not month:
             d = self.data_end - self.data_begin

apps/place_exposition/views.py

@@ -237,7 +237,6 @@ class PlaceExpositionListView(MetadataMixin, ListView):
     места, по ссылке "Все события"
     """
     template_name = 'client/place/place_exposition_list.html'
-    # cache_range = settings.CACHE_RANGE
 
     def get_object(self):
         slug = self.kwargs.get('slug')

apps/service/models.py

@@ -6,7 +6,7 @@ from django.db.models.signals import post_save
 from django.utils.translation import ugettext as _
 from functions.custom_fields import EnumField
 from functions.signal_handlers import post_save_handler
-from hvad.models import TranslatableModel, TranslatedFields, TranslationManager
+from hvad.models import TranslatableModel, TranslatedFields
 
 CURENCIES = ('', 'USD', 'RUB', 'EUR')
 

apps/service/urls.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
 from views import ServiceView, CallBackListView, VisitListView, TranslationListView, AdvertisingListView, \
     ParticipationListView, RemoteListView,TicketsListView, Thanks
 

apps/service/views.py

@@ -2,23 +2,17 @@
 import json
 from itertools import chain
 
-from django.http import HttpResponse
 from django.views.generic import ListView, FormView, TemplateView
 from django.shortcuts import get_object_or_404
-from django.http import Http404
 from django.http import HttpResponseRedirect, HttpResponse
 
-from haystack.query import EmptySearchQuerySet
-
 from meta.views import MetadataMixin
-from accounts.models import UserLog
 from exposition.models import Exposition
 from conference.models import Conference
-from functions.custom_views import ExpoListView
 from models import Service
 from order_forms import TranslationForm, CatalogForm, VisitForm, RemoteForm, ParticipationForm, TicketsForm,\
     AdvertiseForm, BuildStandForm
-#from functions.search_forms import CompanySearchForm
+from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets
 
 
 order_forms = {'translator': TranslationForm, 'catalog': CatalogForm, 'participation': ParticipationForm,
@@ -121,12 +115,12 @@ def advertise(request, catalog=None, event_url=None):
         raise HttpResponse('not ajax')
 
 
-from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets
 
 class AbstractOrderListView(ListView):
     template_name = 'c_admin/service/order_list.html'
     paginate_by = 20
 
+
 class CallBackListView(AbstractOrderListView):
     model = CallBack
 
@@ -138,15 +132,19 @@ class VisitListView(AbstractOrderListView):
 class TranslationListView(AbstractOrderListView):
     model = Translation
 
+
 class AdvertisingListView(AbstractOrderListView):
     model = Advertising
 
+
 class ParticipationListView(AbstractOrderListView):
     model = Participation
 
+
 class RemoteListView(AbstractOrderListView):
     model = Remote
 
+
 class TicketsListView(AbstractOrderListView):
     model = Tickets
 

proj/views.py

@@ -16,8 +16,6 @@ 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 SubscribeAssideForm
-
 
 from django.db.models.loading import get_model
 
@@ -40,7 +38,7 @@ def expo_context(request):
             'main_page_blogs': Article.objects.main_page_blogs(),
             'blogs': Article.objects.every_page_blogs(),
             'news_list': Article.objects.main_page_news(), 'sng_countries': settings.SNG_COUNTRIES,
-            'seo_text': add_seo(request), 'announce_subscribe': SubscribeAssideForm(),
+            'seo_text': add_seo(request),
             'NO_EXTERNAL_JS': getattr(settings, 'NO_EXTERNAL_JS', False),
             'NO_BANNERS': getattr(settings, 'NO_BANNERS', False),
             'SUBSCRIBERS_COUNT': get_subscribers_count(),

static/client.old/js/main.js

@@ -1020,23 +1020,6 @@ function placeInput(width){
 			$scrollContainer.mCustomScrollbar(customScrollOptions);
 		});
 
-		/* Открыть диалог подписки на нужной вкладке */
-		$('#subscribe-sm').each(function () {
-			var $container = $(this);
-			var $links = $container.find('a');
-
-			$links.on('click', function () {
-				var $link = $(this);
-				var index = $links.index(this);
-				var popupSubscribe = $('#pw-subscribe');
-
-				$.fancybox(popupSubscribe, fbPopupOptions);
-				var $tabs = popupSubscribe.find('ul.tabs > li');
-				$tabs.eq(index).trigger('click');
-				return false;
-			});
-		});
-
 		/* Обработка поведения вкладок */
 		$("ul.tabs > li").on('click', function () {
 			var $curTab = $(this);

static/client/js/_modules/block.exposition.list.js

@@ -9,47 +9,7 @@ if (EXPO.exposition.list){
         var com = EXPO.common;
 
 // variables
-		var that = {},
-			Note = function (it, opt) {
-				this.opt = opt;
-				this.DOMthis = it;
-				this.DOMbutton = it.querySelector('.'+opt.buttonClass);
-				this.DOMinput = it.querySelector('.'+opt.inputClass);
-				this.inputName = this.DOMinput.getAttribute('name');
-				this.url = this.DOMbutton.getAttribute('href');
-				this._controller();
-			};
-		Note.prototype = {
-			_init: function () {
-				
-			},
-			_controller: function () {
-				var self = this;
-				$(this.DOMinput).on('blur', function () {
-					self.send();
-				});
-				$(this.DOMbutton).on('click', function () {
-					return false;
-				});
-			},
-			send: function () {
-				var data = {},
-					response,
-					self = this,
-					handler = function (data) {
-						if (data.success) {
-							console.log('ok');
-							$(self.DOMbutton).addClass('active');
-						} else {
-							console.log('data not send');
-						}
-
-					};
-				data[this.inputName] = this.DOMinput.value;
-				response = com.getRequest(data,this.url,handler);
-			}
-		};
-
+        var that = {};
         that.opt = {}; //свойства по умолчанию
 //private
         $(function () {
@@ -59,17 +19,6 @@ if (EXPO.exposition.list){
         //инициализация общих свойств
         that.init = function (options) {
             $.extend(this.opt, options);
-			this.notes = [];
-			var self = this;
-
-			$('.'+this.opt.note.wrapClass).each(function () {
-				var note = new Note(this,self.opt.note);
-				self.notes.push(note);
-			});
-			$('.'+this.opt.note.wrapDisabledClass).on('click', function () {
-				$.fancybox.open('#pw-login');
-				return false;
-			});
             com.opt.addCalendarText = this.opt.addCalendarText;
             com.opt.removeCalendarText = this.opt.removeCalendarText;
         };

static/client/js/_modules/page.events.feed.js

@@ -1339,7 +1339,7 @@ if (EXPO.events.feed) {
                     Uri = Json2URI(dataObj),
                     ajaxHandler = function (data) {
                         if(data.length){
-							dna.load(template, (self.opt.ajaxUrl + Uri),{callback: function () {
+                            dna.rest.get(template, (self.opt.ajaxUrl + Uri),{callback: function () {
                                 handler(data.length);
                             },container:self.curDNA[template][item]});
 

static/client/js/_modules/page.exposition.object.js

@@ -9,46 +9,8 @@ if (EXPO.exposition.object){
         var com = EXPO.common,
             $waiter;
 // variables
-        var that = {},
-            Note = function (it, opt) {
-                this.opt = opt;
-                this.DOMthis = it;
-                this.DOMbutton = it.querySelector('.'+opt.buttonClass);
-                this.DOMinput = it.querySelector('.'+opt.inputClass);
-                this.inputName = this.DOMinput.getAttribute('name');
-                this.url = this.DOMbutton.getAttribute('href');
-                this._controller();
-            };
-        Note.prototype = {
-            _init: function () {
-
-            },
-            _controller: function () {
-                var self = this;
-                $(this.DOMinput).on('blur', function () {
-                    self.send();
-                });
-                $(this.DOMbutton).on('click', function () {
-                    return false;
-                });
-            },
-            send: function () {
-                var data = {},
-                    response,
-                    self = this,
-                    handler = function (data) {
-                        if (data.success){
-                            console.log('ok');
-                            $(self.DOMbutton).addClass('active');
-                        }else{
-                            console.log('data not send');
-                        }
 
-                    };
-                data[this.inputName] = this.DOMinput.value;
-                response = com.getRequest(data,this.url,handler);
-            }
-        };
+        var that = {};
         that.opt = {}; //свойства по умолчанию
 //private
         $(function () {
@@ -61,16 +23,7 @@ if (EXPO.exposition.object){
             $.extend(this.opt, options);
             var self = this,
                 $visitButtons = $('.'+this.opt.visit.activeClass+', .'+this.opt.visit.passiveClass);
-            this.notes = [];
 
-            $('.'+this.opt.note.wrapClass).each(function () {
-                var note = new Note(this,self.opt.note);
-                self.notes.push(note);
-            });
-            $('.'+this.opt.note.wrapDisabledClass).on('click', function () {
-                $.fancybox.open('#pw-login');
-                return false;
-            });
             com.opt.addCalendarText = this.opt.addCalendarText;
             com.opt.removeCalendarText = this.opt.removeCalendarText;
             /**
@@ -124,7 +77,8 @@ if (EXPO.exposition.object){
                             $('.err',$form).removeClass("err");
                             $('.pwf-msg',$form).text('');
                         };
-                        if (data.success != true){
+
+                        if (data.success !== true){
                             clearValue();
                             for (var k in data.errors){
                                 if (data.errors.hasOwnProperty(k)) {

static/client/js/_modules/page.index.js

@@ -1,74 +0,0 @@
-var EXPO = EXPO || {}; //isolated namespace
-if (EXPO.index) {
-	console.warn('WARNING: EXPO.eventsFeed is already defined!');
-} else {
-	EXPO.index = (function () {
-		// variables
-		var that = {};
-
-		//default module setting
-		that.opt = {};
-		//dependence's
-		var com = EXPO.common;
-		//private
-		var Note = function (it, opt) {
-			this.opt = opt;
-			this.DOMthis = it;
-			this.DOMbutton = it.querySelector('.'+opt.buttonClass);
-			this.DOMinput = it.querySelector('.'+opt.inputClass);
-			this.inputName = this.DOMinput.getAttribute('name');
-			this.url = this.DOMbutton.getAttribute('href');
-			this._controller();
-		};
-		Note.prototype = {
-			_init: function () {
-
-			},
-			_controller: function () {
-				var self = this;
-				$(this.DOMinput).on('blur', function () {
-					self.send();
-				});
-				$(this.DOMbutton).on('click', function () {
-					return false;
-				});
-			},
-			send: function () {
-				var data = {},
-					response,
-					self = this,
-					handler = function (data) {
-						if (data.success){
-							console.log('ok');
-							$(self.DOMbutton).addClass('active');
-						}else{
-							console.log('data not send');
-						}
-
-					};
-				data[this.inputName] = this.DOMinput.value;
-				response = com.getRequest(data,this.url,handler);
-			}
-		};
-
-		///////////////////////////
-		//инициализация общих свойств
-		that.init = function (options) {
-			// settings extending
-			$.extend(this.opt, options);
-			// begin of initialization
-			var self = this;
-			this.notes = [];
-			$('.'+this.opt.note.wrapClass).each(function () {
-				var note = new Note(this,self.opt.note);
-				self.notes.push(note);
-			});
-			$('.'+this.opt.note.wrapDisabledClass).on('click', function () {
-				$.fancybox.open('#pw-login');
-				return false;
-			});
-
-		};
-		return that;
-	}());
-}

static/client/js/main.js

@@ -694,23 +694,6 @@ function placeInput(width){
             $scrollContainer.mCustomScrollbar(customScrollOptions);
         });
 
-        /* Открыть диалог подписки на нужной вкладке */
-        $('#subscribe-sm').each(function () {
-            var $container = $(this);
-            var $links = $container.find('a');
-
-            $links.on('click', function () {
-                var $link = $(this);
-                var index = $links.index(this);
-                var popupSubscribe = $('#pw-subscribe');
-
-                $.fancybox(popupSubscribe, fbPopupOptions);
-                var $tabs = popupSubscribe.find('ul.tabs > li');
-                $tabs.eq(index).trigger('click');
-                return false;
-            });
-        });
-
         /* Обработка поведения вкладок */
         $("ul.tabs > li").on('click', function () {
             var $curTab = $(this);

static/client/js/rejs/tops.js

@@ -72,7 +72,7 @@
         $('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) {
             $('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove();
         });
-    }
+    };
 
     var insertTops = function (text) {
         var parent = document.getElementById(PARENT_ID);

static/client/js/vendor.js

@@ -4373,23 +4373,6 @@ function placeInput(width){
             $scrollContainer.mCustomScrollbar(customScrollOptions);
         });
 
-        /* Открыть диалог подписки на нужной вкладке */
-        $('#subscribe-sm').each(function () {
-            var $container = $(this);
-            var $links = $container.find('a');
-
-            $links.on('click', function () {
-                var $link = $(this);
-                var index = $links.index(this);
-                var popupSubscribe = $('#pw-subscribe');
-
-                $.fancybox(popupSubscribe, fbPopupOptions);
-                var $tabs = popupSubscribe.find('ul.tabs > li');
-                $tabs.eq(index).trigger('click');
-                return false;
-            });
-        });
-
         /* Обработка поведения вкладок */
         $("ul.tabs > li").on('click', function () {
             var $curTab = $(this);

static/client/js_min/_modules/block.exposition.list.min.js

@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var t=EXPO.common,n={},o=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return o.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var n,o={},i=this,e=function(t){t.success?(console.log("ok"),$(i.DOMbutton).addClass("active")):console.log("data not send")};o[this.inputName]=this.DOMinput.value,n=t.getRequest(o,this.url,e)}},n.opt={},$(function(){}),n.init=function(n){$.extend(this.opt,n),this.notes=[];var i=this;$("."+this.opt.note.wrapClass).each(function(){var t=new o(this,i.opt.note);i.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText},n}();
+var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var t=EXPO.common,e={};return e.opt={},$(function(){}),e.init=function(e){$.extend(this.opt,e),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText},e}();

static/client/js_min/_modules/page.exposition.object.min.js

@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,s=EXPO.common,i={},e=function(t,s){this.opt=s,this.DOMthis=t,this.DOMbutton=t.querySelector("."+s.buttonClass),this.DOMinput=t.querySelector("."+s.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=s.getRequest(i,this.url,o)}},i.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),i.init=function(i){$.extend(this.opt,i);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),s.opt.addCalendarText=this.opt.addCalendarText,s.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass("no_auth")||($(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden")))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),s.postRequest(i,e,n),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)console.log(s.errors.hasOwnProperty(e)),console.log(e),s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==s.sent?window.location=s.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);t.hide()};return t.show(),s.postRequest(i,e,n),!1})},i}();
+var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var s,t=EXPO.common,e={};return e.opt={},$(function(){s=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),e.init=function(e){$.extend(this.opt,e);var i=this,o=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,o.off("click"),o.on("click",function(){return $(this).hasClass("no_auth")||($(this).hasClass(i.opt.visit.activeClass)?($("."+i.opt.visit.activeClass).hide().siblings("."+i.opt.visit.passiveClass).show(),$("#"+i.opt.visit.visitorsListId).append(i.opt.visit.currentHtml),$("#"+i.opt.visit.somebodyId).removeClass("hidden"),$("#"+i.opt.visit.nobodyId).addClass("hidden")):($("."+i.opt.visit.passiveClass).hide().siblings("."+i.opt.visit.activeClass).show(),$("#"+i.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+i.opt.visit.visitorsListId).children().length&&($("#"+i.opt.visit.somebodyId).addClass("hidden"),$("#"+i.opt.visit.nobodyId).removeClass("hidden")))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(t.success!==!0){e();for(var i in t.errors)t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();s.hide()};return s.show(),t.postRequest(e,i,r),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=t.success){e();for(var i in t.errors)console.log(t.errors.hasOwnProperty(i)),console.log(i),t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==t.sent?window.location=t.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);s.hide()};return s.show(),t.postRequest(e,i,r),!1})},e}();

static/client/js_min/_modules/page.index.min.js

@@ -1 +0,0 @@
-var EXPO=EXPO||{};EXPO.index?console.warn("WARNING: EXPO.eventsFeed is already defined!"):EXPO.index=function(){var t={};t.opt={};var n=EXPO.common,i=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return i.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},o=this,e=function(t){t.success?(console.log("ok"),$(o.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=n.getRequest(i,this.url,e)}},t.init=function(t){$.extend(this.opt,t);var n=this;this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new i(this,n.opt.note);n.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1})},t}();

static/mailing_settings/css/main.css

@@ -88,11 +88,29 @@ h3{
 }
 
 .themes_block h3 {
-    margin-bottom: 30px;
+    margin-bottom: 20px;
+}
+
+.themes_block p {
+    font-size: 18px;
+    color: #999999;
+    margin-bottom: 20px;
+}
+
+.popular_themes {
+    font-size: 18px;
+    margin-bottom: 20px;
+    list-style: none;
+}
+
+.popular_themes li {
+    padding: 5px 0;
+    font-weight: 300;
 }
 
 .subjects_block{
     padding: 50px 0;
+    margin-bottom: 10px;
 }
 
 .page_footer{
@@ -262,12 +280,14 @@ h3{
 
 .subjects_block input,
 .periodic input,
-.mailing_day input{
+.mailing_day input,
+.popular_themes input{
     display: none;
 }
 
 .subjects_block input + label,
-.periodic input + .radio{
+.periodic input + .radio,
+.popular_themes input + label{
     position: relative;
     padding-left: 40px;
     cursor: pointer;
@@ -275,6 +295,7 @@ h3{
 }
 
 .subjects_block input + label:before,
+.popular_themes input + label:before,
 .periodic input + .radio:before,
 .mailing_day input + .radio:before{
     content: "";
@@ -290,6 +311,7 @@ h3{
 }
 
 .subjects_block input + label:after,
+.popular_themes input + label:after,
 .periodic input + .radio:after,
 .mailing_day input + .radio:after{
     content: '';
@@ -305,6 +327,7 @@ h3{
 }
 
 .subjects_block input:checked + label:before,
+.popular_themes input:checked + label:before,
 .periodic input:checked + .radio:before,
 .mailing_day input:checked + .radio:before{
     border-color: #FF6600;
@@ -312,6 +335,7 @@ h3{
 }
 
 .subjects_block input:checked + label:after,
+.popular_themes input:checked + label:after,
 .periodic input:checked + .radio:after,
 .mailing_day input:checked + .radio:after{
     opacity: 1;
@@ -354,6 +378,7 @@ h3{
 }
 
 .mailing_day label:hover .radio:before,
+.popular_themes label:hover .radio:before,
 .periodic label:hover .radio:before,
 .subjects_block label:hover:before {
     border-color: #FF6600;
@@ -416,8 +441,8 @@ h3{
 }
 
 a.themes_trigger{
-    display: block;
-    width: 190px;
+    display: inline-block;
+    min-width: 190px;
     height: 35px;
     line-height: 35px;
     background-color: #FF6600;
@@ -427,6 +452,7 @@ a.themes_trigger{
     text-decoration: none;
     text-align: center;
     font-weight: 300;
+    padding: 0 40px;
 }
 
 .selected{
@@ -922,8 +948,10 @@ a.themes_trigger{
     opacity:1;
 }
 
-.pr-form button{
+.pr-form button,
+.pr-form .button{
     display:block;
+    text-decoration: none;
     border:2px solid #fff;
     border-radius:4px;
     background:#ff6900;

static/mailing_settings/js/main.js

@@ -58,6 +58,7 @@ function sendForm (show_modal) {
         $autocomplete = $('#autocomplete_themes', $themes_modal),
         $autocomplete_results = $('#autocomplete_themes_results', $themes_modal),
         $selected_themes = $('.selected_themes', $themes_modal),
+        $popular_themes = $('#popular_themes'),
         timer,
         themes_data = {},
         // template for mustache.js
@@ -218,6 +219,16 @@ function sendForm (show_modal) {
     }
 
 
+    $popular_themes.on('change', 'input[type="checkbox"]', function () {
+        var theme_id = this.value;
+        changeThemeData(theme_id, !themes_data[theme_id].checked, true);
+        $themes_modal
+            .find('#id_th_' + theme_id)
+            .prop('checked', themes_data[theme_id].checked)
+            .trigger('change');
+    });
+
+
     $themes_modal.on('change', 'input[type="checkbox"]', function (e) {
         e.preventDefault();
         // sendForm();
@@ -232,6 +243,7 @@ function sendForm (show_modal) {
             if ($checkbox.is(':checked')) {
                 changeThemeData($checkbox.val(), true, true);
 
+                // Отмечаем выбранными все теги у темы
                 $sub_list.find('input[name="tg"]').each(function (i, checkbox) {
                     $(checkbox).prop('checked', true);
                 });
@@ -243,6 +255,14 @@ function sendForm (show_modal) {
                 var rendered_theme = renderTheme($checkbox.val());
                 $selected_themes.append(rendered_theme);
 
+
+                console.log($popular_themes.find('#id_popular_theme_' + $checkbox.val()));
+
+                // Ставим чекбокс на популярных темах
+                $popular_themes
+                    .find('#id_popular_theme_' + $checkbox.val())
+                    .prop('checked', true);
+
             // Сняли чекбокс темы
             } else {
                 changeThemeData($checkbox.val(), false, true);
@@ -252,6 +272,10 @@ function sendForm (show_modal) {
                 });
 
                 removeSelectedItem($checkbox.attr('name'), $checkbox.val());
+
+                $popular_themes
+                    .find('#id_popular_theme_' + $checkbox.val())
+                    .prop('checked', false);
             }
 
         // Изменили чекбокс тега
@@ -381,6 +405,10 @@ function sendForm (show_modal) {
             $this.parents('li').remove();
         }
 
+        if (!$('#selected_themes').find('li').length) {
+            $popular_themes.show();
+        }
+
         checkSelected();
     }
 
@@ -409,6 +437,8 @@ function sendForm (show_modal) {
         $('#selected_themes').html($selected);
         sendForm();
 
+        $selected.length ? $popular_themes.hide() : $popular_themes.show();
+
         $.fancybox.close();
     });
 
@@ -675,4 +705,8 @@ $(function () {
 
     if ($('#unsibscribed').length)
         $.fancybox.open({href: '#unsibscribed'});
+
+    $('.smooth_scroll').on('click', function (event) {
+        var target = $()
+    })
 });

templates/c_admin/country/country_add.html

@@ -50,7 +50,7 @@
             {# capital #}
             <div class="control-group {% if form.capital.errors %}error{% endif %}">
                 <label class="control-label">{{ form.capital.label }}:</label>
-                    <div class="controls">{{ form.capital}}
+                    <div class="controls">{{ form.capital }}
                         <span class="help-inline">{{  form.capital.errors }}</span>
                     </div>
             </div>

templates/c_admin/country/country_list.html

@@ -34,7 +34,7 @@
             <tr>
               <td>{{ item.id }}</td>
               <td>{{ item.name }}</td>
-			  <td>{% ifnotequal item.capital None %}{{ item.capital }} {% endifnotequal %}</td>
+              <td>{{ item.capital|default_if_none:'' }}</td>
               <td class="center sorting_1">
                   <a class="btn btn-info" href="/admin/country/change/{{ item.url|lower }}">
                   <i class="icon-edit icon-white"></i> Изменить

templates/client/base_catalog.html

@@ -53,7 +53,9 @@
 
                     {% block aside_vk %}
                         <div class="vk-widget">
+                            {% if not request.GET.debug == '1' %}
                                 {% include 'client/includes/social_widjet.html' %}
+                            {% endif %}
                         </div>
                     {% endblock %}
 
@@ -115,6 +117,5 @@
 {% endblock %}
 
 {% block popup %}
-    {% include 'client/popups/announces.html' %}
     {% include 'client/popups/announce_subscription.html' %}
 {% endblock %}

templates/client/base_page.html

@@ -46,7 +46,9 @@
 
                     {% block aside_vk %}
                     <div class="vk-widget">
+                        {% if not request.GET.debug == '1' %}
 						    {% include 'client/includes/social_widjet.html' %}
+                        {% endif %}
 					</div>
                     {% endblock %}
             </aside>

templates/client/blank.html

@@ -169,7 +169,7 @@ This template include basic anf main styles and js files,
 
             {% block main_part %}{% endblock %}
 
-            {% block top %}{% endblock %}
+{#            {% block top %}{% endblock %}#}
 
             {% block search %}{% endblock %}
 

templates/client/includes/announces.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 {% load staticfiles %}
 
-<div id="subscribe-sm" class="subscribe-sm">
+<div class="subscribe-sm">
     <header>
-        <a href="#" style="text-decoration: none"> {% trans 'получать анонсЫ' %}
+        <a href="{% url 'newsletter_subscription' %}" style="text-decoration: none"> {% trans 'получать анонсЫ' %}
             <span>
                 <img style="margin-right: -2px; margin-bottom: 4px; width: 12%;" src="{% static 'img/announce-letter.png' %}">
             </span>

templates/client/includes/conference/conference_list.html

@@ -136,12 +136,6 @@
 
     <script>
         EXPO.exposition.list.init({
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            },
             addCalendarText:"{% trans 'В расписание' %}",
             removeCalendarText:"{% trans 'Из расписания' %}"
         });

templates/client/includes/conference/conference_object.html

@@ -110,7 +110,6 @@
                 </div>
             </div>
         </div>
-	{% include 'client/includes/conference/conference_services.html' with event=event %}
     {% include 'includes/event_steps.html' with event=event %}
     {% if event.get_photos %}
         {% with photos=event.get_photos|slice:"5" %}
@@ -387,12 +386,6 @@
                 somebodyId:"somebody",
                 nobodyId:"nobody"
             },
-			note:{
-				wrapClass:'note-wrap',
-				wrapDisabledClass:'note-wrap-disabled',
-				buttonClass:'note-button',
-				inputClass:'note-text'
-			},
             advertise:{
                 id:"advert-member-form"
             },

templates/client/includes/conference/conference_paid.html

@@ -422,12 +422,6 @@
             somebodyId:"somebody",
             nobodyId:"nobody"
         },
-        note:{
-            wrapClass:'note-wrap',
-            wrapDisabledClass:'note-wrap-disabled',
-            buttonClass:'note-button',
-            inputClass:'note-text'
-        },
         advertise:{
             id:"advert-member-form"
         },

templates/client/includes/conference/conference_partner.html

@@ -87,7 +87,6 @@
                     {% if event.org %}
                         {% trans 'Организатор' %}: {{ event.org }}
                     {% endif %}
-                    <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
                 </div>
             </div>
         </div>
@@ -110,6 +109,7 @@
                     <a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a>
                 {% endif %}
             </div>
+            <div class="ib-add"><a class="button pw-open blue2" href="#pw-event-news-subscribe"><i class="fa fa-at"></i> {% trans 'Напомнить о выставке' %}</a></div>
         </div>
 
         <hr />
@@ -165,10 +165,6 @@
             {% endif %}
         {% endwith %}
 
-{#        <p><a href="#pw-event-news-subscribe" class="button pw-open"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>&nbsp;&nbsp;&nbsp;<i>{% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}</i></p>#}
-
-
-{#        {% include 'client/includes/conference/conference_services.html' with event=event %}#}
         {% include 'client/includes/event_steps.html' with event=event %}
 
         <hr>
@@ -583,12 +579,6 @@
                 somebodyId:"somebody",
                 nobodyId:"nobody"
             },
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            },
             advertise:{
                 id:"advert-member-form"
             },

templates/client/includes/conference/conference_services.html

@@ -1,13 +0,0 @@
-{% load i18n %}
-
-<div class="i-sub-articles">
-    <ul>
-        {% with services=object.get_services_detail %}
-            {% for service in services %}
-                <li>
-                    <a href="{{ exposition.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a>
-                </li>
-            {% endfor %}
-        {% endwith %}
-    </ul>
-</div>

templates/client/includes/event_list.html

@@ -68,16 +68,6 @@
 
             <div class="cli-buttons clearfix">
                 <div class="cli-m-buttons">
-                    <div class="cli-services">
-                        <a class="button icon-sm" href="#">{% trans 'услуги' %}</a>
-                        <div class="cli-services-sm">
-                            <ul>
-                                {% for service in obj.get_services %}
-                                <li><a href="{{ service.get_permanent_url }}">{{ service.name }}</a></li>
-                                {% endfor %}
-                            </ul>
-                        </div>
-                    </div>
                     {% with event=obj user=user %}
                         {% include 'client/includes/calendar_button.html' %}
                     {% endwith %}

templates/client/includes/event_steps.html

@@ -38,19 +38,18 @@
 
         <ul>
             <li class="s1">
-                <div class="label">{% trans 'Закажите отель по лучшей цене' %}</div>
-                <a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
+                <div class="label">{% trans 'Устраните языковые барьеры' %}</div>
+                <a class="step" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ event.city.name }}" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>
             </li>
 
             <li class="s2">
-                <div class="label">{% trans 'Возьмите авто в аренду' %}</div>
-                <span class="step">Rental Cars</span>
-{#                <a class="step" href="#" target="_blank">Rental Cars</a>#}
+                <div class="label">{% trans 'Закажите отель по лучшей цене' %}</div>
+                <a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
             </li>
 
             <li class="s3">
-                <div class="label">{% trans 'Устраните языковые барьеры' %}</div>
-                <a class="step" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ event.city.name }}" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>
+                <div class="label">{% trans 'Возьмите авто в аренду' %}</div>
+                <a class="step" href="http://www.rentalcars.com/SearchResults.do?enabler=&country={{ object.country }}&doYear={{ object.data_begin|date:'Y' }}&city={{ object.city }}&driverage=on&doFiltering=true&dropCity={{ object.city }}&driversAge=30&filterTo=49&fromLocChoose=true&dropLocationName={{ object.city }}+(Все+места)+&dropCountryCode=&doMinute=0&countryCode=&puYear={{ object.data_begin|date:'Y' }}&locationName={{ object.city }}+(Все+места)+&puMinute=0&doDay={{ object.data_end|date:'d' }}&searchType=allareasgeosearch&filterFrom=0&puMonth={{ object.data_end|date:'m' }}&dropLocation=-1&doHour=10&dropCountry={{ object.country }}&puDay={{ object.data_begin|date:'d' }}&puHour=10&location=-1&doMonth={{ object.data_begin|date:'m' }}&filterName=CarCategorisationSupplierFilter&affiliateCode=expomap790&preflang=ru" target="_blank">Rental Cars</a>
             </li>
         </ul>
     </div>

templates/client/includes/events/filter_result.html

@@ -133,12 +133,6 @@
 
     <script>
         EXPO.exposition.list.init({
-			note:{
-				wrapClass:'note-wrap',
-				wrapDisabledClass:'note-wrap-disabled',
-				buttonClass:'note-button',
-				inputClass:'note-text'
-			},
             addCalendarText:"{% trans 'В расписание' %}",
             removeCalendarText:"{% trans 'Из расписания' %}"
         });

templates/client/includes/exposition/expo_list_paid.html

@@ -134,12 +134,6 @@
 <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
 {% endif %}<script>
     EXPO.exposition.list.init({
-		note:{
-			wrapClass:'note-wrap',
-			wrapDisabledClass:'note-wrap-disabled',
-			buttonClass:'note-button',
-			inputClass:'note-text'
-		},
         addCalendarText:"{% trans 'В расписание' %}",
         removeCalendarText:"{% trans 'Из расписания' %}"
     });

templates/client/includes/exposition/expo_paid.html

@@ -429,12 +429,6 @@
                 somebodyId:"somebody",
                 nobodyId:"nobody"
             },
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            },
             advertise:{
                 id:"advert-member-form"
             },

templates/client/includes/exposition/exposition_list.html

@@ -139,12 +139,6 @@
 
     <script>
         EXPO.exposition.list.init({
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            },
             addCalendarText:"{% trans 'В расписание' %}",
             removeCalendarText:"{% trans 'Из расписания' %}"
         });

templates/client/includes/exposition/exposition_object.html

@@ -54,7 +54,9 @@
                         {% include 'client/includes/show_date_block.html' %}
                     {% endwith %}
 
+                    {% if not request.GET.debug == '1' %}
                         {% include "client/includes/sharing_block.html" %}
+                    {% endif %}
                 </div>
 
                 {% if exposition.place %}
@@ -527,12 +529,6 @@
                 somebodyId:"somebody",
                 nobodyId:"nobody"
             },
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            },
             advertise:{
                 id:"advert-member-form"
             },

templates/client/includes/exposition/exposition_services.html

@@ -1,18 +0,0 @@
-{% load i18n %}
-
-<div class="i-sub-articles">
-    <ul>
-        {% with services=object.get_services_detail %}
-            {% for service in services %}
-                <li>
-                    {# временно создаём условие, т.к. для переводчиков подключаем партнёров #}
-                    {% if service.name == 'Переводчик' %}
-                        <a href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place.city }}&search_date={{ object.data_begin|date:'Y-m-d' }}" target="_blank">{{ service.name }}</a>
-                    {% else %}
-                        <a href="{{ exposition.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a>
-                    {% endif %}
-                </li>
-            {% endfor %}
-        {% endwith %}
-    </ul>
-</div>

templates/client/includes/exposition/price.html

@@ -257,13 +257,3 @@
 <div class="ed-back">
     <a href="{{ exposition.get_permanent_url }}">{{ exposition.name|safe }}</a>
 </div>
-
-<div class="i-sub-articles">
-    <ul>
-    {% with services=exposition.get_services %}
-        {% for service in services %}
-            <li><a href="{{ exposition.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
-        {% endfor %}
-    {% endwith %}
-    </ul>
-</div>

templates/client/includes/exposition/programm.html

@@ -130,13 +130,3 @@
 <div class="ed-back">
 <a href="{{ exposition.get_permanent_url }}">{{ exposition.name|safe }}</a>
 </div>
-
-<div class="i-sub-articles">
-<ul>
-{% with services=exposition.get_services %}
-{% for service in services %}
-    <li><a href="{{ exposition.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
-{% endfor %}
-{% endwith %}
-</ul>
-</div>

templates/client/includes/exposition/search_result.html

@@ -116,12 +116,6 @@
 
     <script>
         EXPO.exposition.list.init({
-			note:{
-				wrapClass:'note-wrap',
-				wrapDisabledClass:'note-wrap-disabled',
-				buttonClass:'note-button',
-				inputClass:'note-text'
-			},
             addCalendarText:"{% trans 'В расписание' %}",
             removeCalendarText:"{% trans 'Из расписания' %}"
         });

templates/client/includes/exposition/services.html

@@ -15,12 +15,6 @@
         {% elif obj.partner %}
             <li><a target="_blank" href="{{ obj.web_page }}">{% trans 'Официальный сайт' %}</a></li>
             <li><a target="_blank" href="{{ obj.link }}">{% trans 'Билеты' %}</a></li>
-        {% else %}
-            {% with services=obj.get_services %}
-                {% for service in services %}
-                <li><a href="{{ obj.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
-                {% endfor %}
-            {% endwith %}
         {% endif %}
         </ul>
     </div>

templates/client/includes/exposition/statistic.html

@@ -154,14 +154,3 @@
 <div class="ed-back">
     <a href="{{ exposition.get_permanent_url }}">{{ exposition.name|safe }}</a>
 </div>
-
-<div class="i-sub-articles">
-    <ul>
-    {% with services=exposition.get_services %}
-        {% for service in services %}
-            <li><a href="{{ exposition.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
-        {% endfor %}
-    {% endwith %}
-    </ul>
-</div>
-

templates/client/includes/services.html

@@ -4,7 +4,7 @@
     <nav>
         <ul>
             <li><a href="/advertising/">{% trans 'Продвижение событий' %}</a></li>
-            <li><a href="/service/participation/">{% trans 'Участие в выставках' %}</a></li>
+            <li><a href="/service/participation/">{% trans 'Организация участия в выставках' %}</a></li>
         </ul>
     </nav>
 </div>

templates/client/index.html

@@ -100,10 +100,6 @@
 
                 {% include 'client/includes/online_consult.html' %}
 
-                {% comment %}
-                <!-- task EXPO-145-->
-                {% include 'client/includes/announces.html' %}
-                {% endcomment %}
                 {% include 'client/includes/services.html' %}
 
             </aside>
@@ -211,21 +207,5 @@
         </div>
     </section>
 
-    {% if request.GET.debug == '1' %}
-        <script src="{% static 'client/js/_modules/page.index.js' %}"></script>
-    {% else %}
-        <script src="{% static 'client/js_min/_modules/page.index.min.js' %}"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/2.1.6/jquery.cycle2.min.js" defer></script>
-    {% endif %}
-
-    <script>
-        EXPO.index.init({
-            note:{
-                wrapClass:'note-wrap',
-                wrapDisabledClass:'note-wrap-disabled',
-                buttonClass:'note-button',
-                inputClass:'note-text'
-            }
-        });
-    </script>
 {% endblock %}

templates/client/newsletters/announce_template.html

@@ -1,312 +0,0 @@
-{% load static %}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd">
-<html style="margin: 0; padding: 0; height: 100%;">
-<head>
-	<title>Тестовове письмо</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-</head>
-<body style="margin: 0; padding: 0; min-height: 100%; background: #f4f2ee;">
-<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" bgcolor="#f4f2ee" style="font-family: Arial, sans-serif; background: #f4f2ee;">
-	<tr>
-		<td align="center" style="padding: 50px 0">
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px;">
-				<tr>
-					<td style="vertical-align: top;">
-						<div class="logo">
-							<a style="text-decoration: none; color: #a2a2a2; font-size: 12px;" href="#">
-								<img src="{% static 'client/img/logo.png' %}" alt="Expomap.ru" />
-								<b style="display: block; padding-left: 67px; margin-top: -5px;">Выставки, конференции, семинары</b>
-							</a>
-						</div>
-					</td>
-					<td style="vertical-align: top; padding-top: 22px;">
-						<ul class="t-links" style="margin: 0 0 15px; padding: 0; list-style: none; text-align: right; font-size: 16px; line-height: 17px; font-weight: bold;">
-							<li style="display: inline-block;"><a style="text-decoration: none; color: #ff6600" href="#">СОБЫТИЯ</a></li>
-							<li style="display: inline-block; margin-left: 20px;"><a style="text-decoration: none; color: #ff6600" href="#">МЕСТА</a></li>
-							<li style="display: inline-block; margin-left: 20px;"><a style="text-decoration: none; color: #ff6600" href="#">УЧАСТНИКИ</a></li>
-						</ul>
-
-						<ul class="soc-media-buttons" style="margin: 0; padding: 0; list-style: none; text-align: right;">
-							<li style="display: inline-block;"><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %}" title="RSS" alt="RSS" /></a></li>
-							<li style="display: inline-block; margin-left: 5px;"><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png' %}" title="Facebook" alt="Facebook" /></a></li>
-							<li style="display: inline-block; margin-left: 5px;"><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png' %}" title="LinkedIn" alt="LinkedIn" /></a></li>
-							<li style="display: inline-block; margin-left: 5px;"><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png' %}" title="В контакте" alt="В контакте" /></a></li>
-							<li style="display: inline-block; margin-left: 5px;"><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png' %}" title="Twitter" alt="Twitter" /></a></li>
-						</ul>
-					</td>
-				</tr>
-			</table>
-
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
-				<tr>
-					<td style="padding: 20px 0 0;"><a style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px;" href="#">Выставки в Москве по тематике: <b style="display: block; font-size: 26px;">Мебель, Дизайн интерьеров</b></a></td>
-				</tr>
-				<tr>
-					<td style="padding: 10px 30px 15px; background: #faf9f7;">
-
-						<table cellpadding="0" cellspacing="0" border="0" width="540" style="margin-bottom: 15px;">
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 3px; width: 70px; height: 70px; vertical-align: middle; text-align: center; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;"><a href="#"><img src="{% static 'client/img/_del-temp/cl-logo-1.png' %}" style="width: 100%;" alt="" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 15px 15px 0; border-bottom: 1px dotted #cccccc;">
-									<h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2>
-									<p style="margin: 0 0 7px; font-size: 12px; line-height: 15px; color: #a2a2a2"><a style="color: #a2a2a2; text-decoration: none;" href="#">Международная ярмарка потребительских товаров</a></p>
-									<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #ff6600; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #feb17d; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" href="#">добавить в расписание</a>
-									<div class="addr" style="margin-top: 10px; font-size: 13px; line-height: 15px;"><img src="{% static 'client/img/pin.png' %}" width="10" height="15" alt="" style="vertical-align: middle; margin-top: -1px;" /> Россия, Москва, ЦВК «Экспоцентр»</div>
-								</td>
-								<td style="padding: 17px 0; text-align: right; font-size: 13px; line-height: 16px; color: #ff6600; width: 140px; border-bottom: 1px dotted #cccccc;">
-									<img src="{% static 'client/img/clock.png' %}" width="14" height="15" style="vertical-align: middle; margin-top: -1px;" alt="" /> с 5 по 20 октября
-								</td>
-							</tr>
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 3px; width: 70px; height: 70px; vertical-align: middle; text-align: center; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;"><a href="#"><img src="{% static 'client/img/_del-temp/cl-logo-2.png' %}" style="width: 100%;" alt="" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 15px 15px 0; border-bottom: 1px dotted #cccccc;">
-									<h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2>
-									<p style="margin: 0 0 7px; font-size: 12px; line-height: 15px; color: #a2a2a2"><a style="color: #a2a2a2; text-decoration: none;" href="#">Международная ярмарка потребительских товаров</a></p>
-									<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #ff6600; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #feb17d; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" href="#">добавить в расписание</a>
-									<div class="addr" style="margin-top: 10px; font-size: 13px; line-height: 15px;"><img src="{% static 'client/img/pin.png' %}" width="10" height="15" alt="" style="vertical-align: middle; margin-top: -1px;" /> Россия, Москва, ЦВК «Экспоцентр»</div>
-								</td>
-								<td style="padding: 17px 0; text-align: right; font-size: 13px; line-height: 16px; color: #ff6600; width: 140px; border-bottom: 1px dotted #cccccc;">
-									<img src="{% static 'client/img/clock.png' %}" width="14" height="15" style="vertical-align: middle; margin-top: -1px;" alt="" /> с 5 по 20 октября
-								</td>
-							</tr>
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 3px; width: 70px; height: 70px; vertical-align: middle; text-align: center; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;"><a href="#"><img src="{% static 'client/img/_del-temp/cl-logo-3.png' %}" style="width: 100%;" alt="" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 15px 15px 0; border-bottom: 1px dotted #cccccc;">
-									<h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2>
-									<p style="margin: 0 0 7px; font-size: 12px; line-height: 15px; color: #a2a2a2"><a style="color: #a2a2a2; text-decoration: none;" href="#">Международная ярмарка потребительских товаров</a></p>
-									<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #ff6600; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #feb17d; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" href="#">добавить в расписание</a>
-									<div class="addr" style="margin-top: 10px; font-size: 13px; line-height: 15px;"><img src="{% static 'client/img/pin.png' %}" width="10" height="15" alt="" style="vertical-align: middle; margin-top: -1px;" /> Россия, Москва, ЦВК «Экспоцентр»</div>
-								</td>
-								<td style="padding: 17px 0; text-align: right; font-size: 13px; line-height: 16px; color: #ff6600; width: 140px; border-bottom: 1px dotted #cccccc;">
-									<img src="{% static 'client/img/clock.png' %}" width="14" height="15" style="vertical-align: middle; margin-top: -1px;" alt="" /> с 5 по 20 октября
-								</td>
-							</tr>
-
-						</table>
-
-						<div class="more" style="text-align: center;">
-							<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #2592c5; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #90c7e0; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; width: 336px;" href="#">посмотреть все события</a>
-						</div>
-
-					</td>
-				</tr>
-			</table>
-
-
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
-				<tr>
-					<td style="padding: 20px 0 0;"><a style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px;" href="#">Новости событий</a></td>
-				</tr>
-				<tr>
-					<td style="padding: 10px 30px 15px; background: #faf9f7;">
-
-						<table cellpadding="0" cellspacing="0" border="0" width="540" style="margin-bottom: 15px;">
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 0; width: 76px; height: 76px; vertical-align: middle; text-align: center;"><a href="#"><img style="width: 100%; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" alt="" src="{% static 'client/img/_del-temp/news-1.jpg' %}" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 0; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 5px;">
-										<tr>
-											<td><h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2></td>
-											<td style="font-size: 13px; line-height: 15px; text-align: right; color: #ff6600;">05.10.2013</td>
-										</tr>
-									</table>
-
-									<p style="margin: 0 0 7px; font-size: 13px; line-height: 17px;"><a style="color: #464646; text-decoration: none;" href="#">VII Международный форум «АтомЭко 2013»  пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим <span style="text-decoration: underline; color: #ff6600;">...</span></a></p>
-
-								</td>
-							</tr>
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 0; width: 76px; height: 76px; vertical-align: middle; text-align: center;"><a href="#"><img style="width: 100%; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" alt="" src="{% static 'client/img/_del-temp/news-1.jpg' %}" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 0; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 5px;">
-										<tr>
-											<td><h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2></td>
-											<td style="font-size: 13px; line-height: 15px; text-align: right; color: #ff6600;">05.10.2013</td>
-										</tr>
-									</table>
-
-									<p style="margin: 0 0 7px; font-size: 13px; line-height: 17px;"><a style="color: #464646; text-decoration: none;" href="#">VII Международный форум «АтомЭко 2013»  пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим <span style="text-decoration: underline; color: #ff6600;">...</span></a></p>
-
-								</td>
-							</tr>
-
-							<tr valign="top">
-								<td style="padding: 15px 0; width: 76px; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 0; width: 76px; height: 76px; vertical-align: middle; text-align: center;"><a href="#"><img style="width: 100%; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" alt="" src="{% static 'client/img/_del-temp/news-1.jpg' %}" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 15px 15px 0; border-bottom: 1px dotted #cccccc;">
-									<table cellpadding="0" cellspacing="0" border="0" width="100%" style="margin-bottom: 5px;">
-										<tr>
-											<td><h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Foire de Pau 2013</a></h2></td>
-											<td style="font-size: 13px; line-height: 15px; text-align: right; color: #ff6600;">05.10.2013</td>
-										</tr>
-									</table>
-
-									<p style="margin: 0 0 7px; font-size: 13px; line-height: 17px;"><a style="color: #464646; text-decoration: none;" href="#">VII Международный форум «АтомЭко 2013»  пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим <span style="text-decoration: underline; color: #ff6600;">...</span></a></p>
-
-								</td>
-							</tr>
-
-						</table>
-
-						<div class="more" style="text-align: center;">
-							<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #2592c5; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #90c7e0; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; width: 336px;" href="#">посмотреть все новости</a>
-						</div>
-
-					</td>
-				</tr>
-			</table>
-
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
-				<tr>
-					<td style="padding: 20px 0 0;"><a style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px;" href="#">Фоторепортаж: Международный форум «АтомЭко 2013»</a></td>
-				</tr>
-				<tr>
-					<td style="padding: 10px 30px 15px; background: #faf9f7;">
-
-						<table cellpadding="0" cellspacing="0" border="0" width="540" style="margin-bottom: 15px;">
-
-							<tr valign="top">
-								<td style="padding: 15px 0; border-bottom: 1px dotted #cccccc;">
-
-									<table cellpadding="0" cellspacing="0" border="0" style="margin-bottom: 10px;">
-										<tr>
-											<td style="width: 100px;"><a href="#"><img src="{% static 'client/img/_del-temp/phr-1.jpg' %}" width="100" height="100" alt="" /></a></td>
-											<td style="width: 100px; padding-left: 10px;"><a href="#"><img src="{% static 'client/img/_del-temp/phr-2.jpg' %}" width="100" height="100" alt="" /></a></td>
-											<td style="width: 100px; padding-left: 10px;"><a href="#"><img src="{% static 'client/img/_del-temp/phr-3.jpg' %}" width="100" height="100" alt="" /></a></td>
-											<td style="width: 100px; padding-left: 10px;"><a href="#"><img src="{% static 'client/img/_del-temp/phr-4.jpg' %}" width="100" height="100" alt="" /></a></td>
-											<td style="width: 100px; padding-left: 10px;"><a href="#"><img src="{% static 'client/img/_del-temp/phr-2.jpg' %}" width="100" height="100" alt="" /></a></td>
-										</tr>
-									</table>
-
-									<p style="margin: 0 0 7px; font-size: 12px; line-height: 15px;"><a style="color: #464646; text-decoration: none;" href="#">Идея Russian Affiliate Congress and Expo возникла в ответ на необходимость развития бизнеса России и стран СНГ в соответствии с мировыми тенденциями. Партнерские программы — один из наиболее эффективных и широко применяемых на западе инструментов интернет маркетинга, доля которого на рынке интернет продвижения развитых стран около 40 %, для сравнения в России и странах СНГ на этот сегмент приходится около 10%. Разница очевидна.</a></p>
-
-								</td>
-							</tr>
-
-						</table>
-
-						<div class="more" style="text-align: center;">
-							<a class="button" style="display: inline-block; padding: 4px 10px 3px; text-decoration: none; color: #2592c5; font-size: 11px; font-weight: bold; line-height: 14px; border: 1px solid #90c7e0; text-transform: uppercase; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; width: 336px;" href="#">посмотреть все фотрепортажи</a>
-						</div>
-
-					</td>
-				</tr>
-			</table>
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
-				<tr>
-					<td style="padding: 20px 0 0;"><a href="#"><img src="{% static 'client/img/_del-temp/mail-banner.jpg' %}" width="600" height="145" alt="" /></a></td>
-				</tr>
-			</table>
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; margin-bottom: 10px;">
-				<tr>
-					<td style="padding: 20px 0 0;"><a style="display: block; padding: 25px 30px; text-decoration: none; background: #ff6600; color: #ffffff; font-size: 20px; line-height: 26px;" href="#">Аналитика для профессионалов</a></td>
-				</tr>
-				<tr>
-					<td style="padding: 10px 30px 15px; background: #faf9f7;">
-
-						<table cellpadding="0" cellspacing="0" border="0" width="540">
-
-							<tr valign="top">
-								<td style="padding: 15px 15px 0 0; width: 76px;">
-									<table cellpadding="0" cellspacing="0" border="0">
-										<tr>
-											<td style="background: #ffffff; padding: 0; width: 76px; height: 76px; vertical-align: middle; text-align: center;"><a href="#"><img style="width: 100%; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;" alt="" src="{% static 'client/img/_del-temp/news-1.jpg' %}" /></a></td>
-										</tr>
-									</table>
-								</td>
-								<td style="padding: 15px 0 0;">
-
-									<h2 style="margin: 0 0 5px; font-family: Tahoma, Arial, sans-serif; font-size: 18px; line-height: 21px;"><a style="color: #464646; text-decoration: none;" href="#">Древние славянские практики для оздоровления души и тела презентуют на красноярской Ярмарке здоровья</a></h2>
-									<p style="margin: 0 0 7px; font-size: 13px; line-height: 17px;"><a style="color: #464646; text-decoration: none;" href="#">VII Международный форум «АтомЭко 2013»  пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим <span style="text-decoration: underline; color: #ff6600;">...</span></a></p>
-
-								</td>
-							</tr>
-
-						</table>
-
-					</td>
-				</tr>
-			</table>
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; border-bottom: 1px dotted #cccccc;">
-				<tr>
-					<td style="vertical-align: top; padding: 15px 0 10px;">
-						<div class="logo">
-							<a style="text-decoration: none; color: #a2a2a2; font-size: 12px;" href="#">
-								<img src="{% static 'client/img/mail-logo-2.jpg' %}" alt="Expomap.ru" />
-							</a>
-						</div>
-					</td>
-					<td style="vertical-align: top; padding: 25px 0 5px;">
-						<ul class="t-links" style="margin: 0 0 15px; padding: 0; list-style: none; text-align: right; font-size: 14px; line-height: 15px; font-weight: bold;">
-							<li style="display: inline-block;"><a style="text-decoration: none; color: #ff6600" href="#">СОБЫТИЯ</a></li>
-							<li style="display: inline-block; margin-left: 20px;"><a style="text-decoration: none; color: #ff6600" href="#">МЕСТА</a></li>
-							<li style="display: inline-block; margin-left: 20px;"><a style="text-decoration: none; color: #ff6600" href="#">УЧАСТНИКИ</a></li>
-						</ul>
-					</td>
-				</tr>
-			</table>
-
-			<table cellpadding="0" cellspacing="0" border="0" width="600" style="width: 600px; font-size: 12px; line-height: 15px;">
-				<tr>
-					<td style="vertical-align: top; padding: 15px 0 15px;">
-						Чтобы отписаться от этой рассылки, перейдите <a style="color: #ff6600;" href="#">по ссылке</a>
-					</td>
-					<td style="vertical-align: top; padding: 15px 0 15px; color: #a2a2a2; text-align: right;">
-						© 2018 — 2013 <a style="color: #a2a2a2; text-decoration: none;" href="#">Expomap.ru</a>
-					</td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
-</body>
-</html>

templates/client/newsletters/mailing_settings.html

@@ -70,19 +70,34 @@
                                         {{ form.email }}
                                     </span>
                                 </div>
-                                <button>{% trans 'Подписаться' %}</button>
+                                {% comment %}<button>{% trans 'Выбрать рубрики' %}</button>{% endcomment %}
+                                <a href="#themes_block" class="button smooth_scroll">{% trans 'Выбрать рубрики' %}</a>
                             </fieldset>
                         </div>
                     </div>
                 </section>
             {% endif %}
 
-            <div class="themes_block">
+            <div id="themes_block" class="themes_block">
                 <div class="container">
                     <h2>{% trans 'Какие события включать в ваше письмо?' %}</h2>
                     <div class="columns">
                         <div class="column">
+                            <div id="selected_themes_block">
                                 <h3>{% trans 'Ваши темы:' %}</h3>
+                                <p>Отметьте темы, по которым вы хотите получать анонсы событий</p>
+
+                                {% if not user.is_authenticated %}
+                                    <ul id="popular_themes" class="popular_themes">
+                                        {% for theme in popular_themes %}
+                                            <li>
+                                                <input id="id_popular_theme_{{ theme.pk }}" type="checkbox" name="th" value="{{ theme.pk }}">
+                                                <label for="id_popular_theme_{{ theme.pk }}">{{ theme }}</label>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                {% endif %}
+
                                 <ul id="selected_themes" class="selected selected_themes">
                                     {% for theme in object.themes.all %}
                                         <li data-id="{{ theme.pk }}" data-type="th" class="theme_{{ theme.pk }}">
@@ -99,7 +114,11 @@
                                         </li>
                                     {% endfor %}
                                 </ul>
-                            <a href="#search-modal" class="modal_trigger themes_trigger">{% trans 'Уточнить темы' %}</a>
+                                <a href="#search-modal" class="modal_trigger themes_trigger">
+                                    {% comment %}{% trans 'Уточнить темы' %}{% endcomment %}
+                                    {% trans 'Выбрать из полного списка' %}
+                                </a>
+                            </div>
                         </div>
                         <div class="column">
                             <h3>{% trans 'Ваши гео-фильтры:' %}</h3>
@@ -169,37 +188,7 @@
                     </div>
                 </div>
             </div>
-            <div class="period_block">
-                <div class="container">
-                    <h2>{% trans 'Регулярность получения писем' %}</h2>
-                    <div class="columns">
-                        <div class="column periodic">
-                            <ul>
-                                {% for field in form.periodic %}
-                                    <li>
-                                        <label>
-                                            {{ field.tag }}
-                                            <span class="radio">
-                                                {{ field.choice_label }}
-                                            </span>
-                                        </label>
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        </div>
-                        <div class="column mailing_day">
-                            {% for field in form.periodic_day %}
-                                <label>
-                                    {{ field.tag }}
-                                    <span class="radio">
-                                        {{ field.choice_label }}
-                                    </span>
-                                </label>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </div>
-            </div>
+
             <div class="button_block">
                 <div class="container">
                     {% if not user.is_authenticated %}

templates/client/place/place_detail.html

@@ -260,20 +260,7 @@
 
                                 <div class="cli-buttons clearfix">
                                     <div class="cli-m-buttons">
-                                        <div class="cli-services">
-                                            <a class="button icon-sm" href="#">{% trans 'услуги' %}</a>
-
-                                            <div class="cli-services-sm">
-                                                <ul>
-                                                    {% for service in event.get_services %}
-                                                        <li><a href="{{ service.get_permanent_url }}">{{ service.name }}</a></li>
-                                                    {% endfor %}
-                                                </ul>
-                                            </div>
-                                        </div>
-
                                         <a class="button blue icon-calendar" href="{{ event.get_calendar_url }}">{% trans 'в расписание' %}</a>
-                                        <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
                                     </div>
 
                                     <div class="cli-s-buttons">

templates/client/place/place_exposition_list.html

@@ -60,20 +60,7 @@
 
                         <div class="cli-buttons clearfix">
                             <div class="cli-m-buttons">
-                                <div class="cli-services">
-                                    <a class="button icon-sm" href="#">{% trans 'услуги' %}</a>
-
-                                    <div class="cli-services-sm">
-                                        <ul>
-                                            {% for service in event.get_services %}
-                                                <li><a href="{{ service.get_permanent_url }}">{{ service.name }}</a></li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                </div>
-
                                 <a class="button blue icon-calendar" href="{{ event.get_calendar_url }}">{% trans 'в расписание' %}</a>
-                                <a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
                             </div>
 
                             <div class="cli-s-buttons">

templates/client/popups/announces.html

@@ -1,58 +0,0 @@
-{% load i18n %}
-
-<div id="pw-subscribe" class="popup-window pw-subscribe">
-    <header class="clearfix">
-        <div class="pw-title">{% trans 'Получать анонсы' %} </div>
-        <ul class="tabs">
-            <li class="active"><a class="icon-big-email" href="#">{% trans 'по 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 target="_blank" href="/newsletters/test-letter/">{% trans 'Пример рассылки' %}</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">{% trans 'подписаться' %}</button>
-				    </div>
-
-
-
-                </form>
-            </li>
-        </ul>
-    </div>
-</div>

templates/client/specialist_catalog/catalog_detailed.html

@@ -230,9 +230,9 @@
                                 <div class="rqob-button">
                                     {# вместо формы выше временно ставим ссылку на партнёров #}
                                     {% if object.type == 1 %}
-                                        <a class="ob-text" href="#">{% trans 'заказать услугу' %}</a>
+                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place.capital }}" target="_blank">{% trans 'найти переводчика' %}</a>
                                     {% else %}
-                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place }}" target="_blank">{% trans 'заказать услугу' %}</a>
+                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place }}" target="_blank">{% trans 'найти переводчика' %}</a>
                                     {% endif %}
                                 </div>
                             </div>