diff --git a/accounts/admin.py b/accounts/admin.py index 50504df9..1ebe3a35 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -1,29 +1,25 @@ # -*- coding: utf-8 -*- +import random +import json +from hashlib import md5 from django.shortcuts import render_to_response +from django.conf import settings from django.http import HttpResponseRedirect, HttpResponse -from django.template import RequestContext from django.core.context_processors import csrf from django.contrib.auth.decorators import login_required -import random from django.utils.translation import ugettext as _ #models and forms from models import User -from forms import UserForm, UserCreationForm, ChangePasswordForm, EmailAnnouncementForm +from forms import UserForm, UserCreationForm, ChangePasswordForm, EmailAnnouncementForm, UserFilterForm #custom views -from functions.custom_views import objects_list - -from hashlib import md5 -import json - +from functions.admin_views import AdminView, AdminListView +class UserListView(AdminListView): + template_name = 'admin/accounts/user_list.html' + form_class = UserFilterForm + model = User -def user_all(request): - """ - Return list of all users with pagination - """ - return objects_list(request, User, 'user_all.html') - def user_change(request, url): """ Return form of user and post it on the server. @@ -38,12 +34,30 @@ def user_change(request, url): return HttpResponseRedirect('/admin/accounts/all') if request.POST: + # bug with saving staff users(set is_staff to False) + staff = user.is_staff + form = UserForm(request.POST, instance=user) if form.is_valid(): - form.save() + + user = form.save() + if staff: + # + user.is_staff = True + user.save() return HttpResponseRedirect('/admin/accounts/all') + else: + form.fields['city'].widget.attrs['data-init-text'] = user.profile.city.name + else: - form = UserForm(instance=user) + profile = user.profile + data = {'country':profile.country_id, 'city': profile.city_id, + 'title': profile.title, 'descriptions': profile.descriptions, + 'keywords': profile.keywords, 'phone': profile.phone, 'web_page': profile.web_page, + 'about': profile.about} + + form = UserForm(instance=user,initial=data) + if user.profile.city: form.fields['city'].widget.attrs['data-init-text'] = user.profile.city.name @@ -51,6 +65,7 @@ def user_change(request, url): args.update(csrf(request)) args['form'] = form + args['object'] = user return render_to_response('user_change.html', args) @@ -95,26 +110,6 @@ def create_md5(request): return render_to_response('create_admin.html', args) -from django.core.mail import EmailMessage - - -def registration(request): - if request.POST: - form = UserCreationForm(request.POST) - if form.is_valid(): - user = form.save() - email = EmailMessage('Subject', 'Body', to=['%s'%user.email]) - email.send() - return HttpResponseRedirect('/admin/accounts/registration') - else: - form = UserCreationForm() - - args = {} - args.update(csrf(request)) - - args['form'] = form - - return render_to_response('registration.html', args) def generatePassword(): """ @@ -131,7 +126,7 @@ def generatePassword(): newPassword.append(SYMBOLS[random.randrange(0, len(SYMBOLS))]) return ''.join(newPassword) -from django.conf import settings + def reset_password_email(request): """ @@ -174,4 +169,4 @@ def change_password(request): success.update(errors) return HttpResponse(json.dumps(success), content_type='application/json') else: - return HttpResponse(json.dumps(success), content_type='application/json') + return HttpResponse(json.dumps(success), content_type='application/json') \ No newline at end of file diff --git a/accounts/admin_urls.py b/accounts/admin_urls.py index f1d8a39c..e4e99efc 100644 --- a/accounts/admin_urls.py +++ b/accounts/admin_urls.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, url +from admin import UserListView urlpatterns = patterns('', #url(r'^registration/$', 'accounts.admin.registration'), - #url(r'^create_admin/$', 'accounts.admin.create_admin'), + #url(r'^create_admin/$', 'accounts.admin.create_admin'), #url(r'^create_md5user/$', 'accounts.admin.create_md5'), url(r'^change/(.*)/$', 'accounts.admin.user_change'), -# url(r'^change/(?P\d+).*/$', 'accounts.views.user_change'), - url(r'^all/$', 'accounts.admin.user_all'), + url(r'^all/$', UserListView.as_view()), url(r'^reset_password_email/$', 'accounts.admin.reset_password_email'), ) \ No newline at end of file diff --git a/accounts/edit_forms.py b/accounts/edit_forms.py index 7635e9f2..ee602621 100644 --- a/accounts/edit_forms.py +++ b/accounts/edit_forms.py @@ -59,7 +59,7 @@ class HomeForm(forms.ModelForm): class WorkForm(forms.ModelForm): position = forms.CharField(label=_(u'Укажите вашу должность'), - required=False, widget=forms.TextInput(attrs={'style': 'height: 42px;'})) + required=False, widget=forms.TextInput()) company = forms.CharField(label=_(u'Место работы'), widget=forms.HiddenInput(attrs={'class': 'select2'})) def __init__(self, *args, **kwargs): diff --git a/accounts/forms.py b/accounts/forms.py index f00557f8..5e08cb92 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -11,6 +11,18 @@ from organiser.models import Organiser #functions from functions.form_check import translit_with_separator, is_latin + +def clean_relation_field(inst, field_name, model): + id = inst.cleaned_data[field_name] + if id: + try: + return model.objects.get(id=id) + except model.DoesNotExist: + return None + return None + + + class UserCreationForm(forms.ModelForm): password1 = forms.CharField(label='Пароль', widget=forms.PasswordInput(render_value=False)) password2 = forms.CharField(label='Повторите пароль', widget=forms.PasswordInput(render_value=False)) @@ -19,6 +31,7 @@ class UserCreationForm(forms.ModelForm): model = User fields = ('email', 'first_name', 'last_name') + def clean_email(self): """ checking if user already exist @@ -57,22 +70,46 @@ class UserChangeForm(forms.ModelForm): def clean_password(self): return self.initial['password'] + + class UserForm(forms.ModelForm): - email = forms.EmailField(widget=forms.TextInput(attrs={'disabled' : True}), required=False) - country = forms.ModelChoiceField(label='Страна', queryset=Country.objects.all(), empty_label=None, required=False) + #email = forms.EmailField(widget=forms.TextInput(attrs={'disabled' : True}), required=False) + country = forms.ChoiceField(label='Страна', choices=[(item.id, item.name) for item in Country.objects.all()], required=False) city = forms.CharField(label='Город', widget=forms.HiddenInput()) - company = forms.ModelChoiceField(label='Компания', queryset=Company.objects.all(), empty_label='', required=False) - organiser = forms.ModelChoiceField(label='Организатор', queryset=Organiser.objects.all(), empty_label='', required=False) + company = forms.ChoiceField(label='Компания', choices=[(item.id, item.name) for item in Company.objects.language().all()], required=False) + organiser = forms.ChoiceField(label='Организатор', choices=[(item.id, item.name) for item in Organiser.objects.language().all()], required=False) title = forms.CharField(widget=forms.TextInput(attrs={'style':'width: 550px'}), required=False) descriptions = forms.CharField(widget=forms.TextInput(attrs={'style':'width: 550px'}), required=False) keywords = forms.CharField(widget=forms.TextInput(attrs={'style':'width: 550px'}), required=False) + phone = forms.CharField(widget=forms.TextInput(attrs={'style':'width: 550px'}), required=False) + web_page = forms.URLField(required=False) + about = forms.CharField(widget=forms.Textarea()) class Meta: model = User - exclude = ('last_login', 'password', 'is_active', 'is_admin', 'is_superuser', 'is_staff' + exclude = ('username', 'email','last_login', 'password', 'is_active', 'is_admin', 'is_superuser', 'is_staff' 'date_joined', 'date_registered', 'date_modified') + def save(self, force_insert=False, force_update=False, commit=True): + + user = super(UserForm, self).save(commit=False) + data = self.cleaned_data + profile = user.profile + profile.country = data.get('country') + profile.city = data.get('city') + profile.title = data.get('title', '') + profile.descriptions = data.get('descriptions', '') + profile.keywords = data.get('keywords', '') + profile.phone = data.get('phone') + profile.web_page = data.get('web_page') + profile.about = data.get('about') + if commit: + user.save() + profile.save() + return user + + """ def clean_url(self): url = self.cleaned_data.get('url') try: @@ -82,6 +119,21 @@ class UserForm(forms.ModelForm): except: return url raise forms.ValidationError('Такой урл уже занят') + """ + + def clean_organiser(self): + return clean_relation_field(self, 'organiser', Organiser) + + + def clean_company(self): + return clean_relation_field(self, 'company', Company) + + def clean_country(self): + return clean_relation_field(self, 'country', Country) + + def clean_city(self): + return clean_relation_field(self, 'city', City) + def clean_phone(self): """ @@ -99,7 +151,7 @@ class UserForm(forms.ModelForm): return phone else: raise forms.ValidationError('Введите правильный код страны') - + """ def clean_web_page(self): cleaned_data = super(UserForm, self).clean() web_page = cleaned_data.get('web_page') @@ -112,6 +164,7 @@ class UserForm(forms.ModelForm): return web_page except: return forms.ValidationError('Введите правильный адрес страници') + """ class ChangePasswordForm(forms.Form): """ @@ -232,3 +285,21 @@ class RecoveryForm(forms.Form): +class UserFilterForm(forms.Form): + model = User + email = forms.CharField(label=_(u'Email'), required=False) + def filter(self): + """ + + return filtered queryset + form must be cleaned before calling this method + + """ + data = self.cleaned_data + email = data['email'] + model = self.model + qs = model.objects.all() + if email: + qs = qs.filter(email__contains=email) + + return qs \ No newline at end of file diff --git a/accounts/models.py b/accounts/models.py index f3b3481e..2eaad1bb 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -1,16 +1,18 @@ # -*- coding: utf-8 -*- +import random, string from django.db import models -from hvad.models import TranslatableModel, TranslatedFields +from django.core.validators import email_re +from django.db.models import Q from django.contrib.auth.models import BaseUserManager, AbstractBaseUser, PermissionsMixin from django.core.mail import send_mail from django.utils import timezone from django.utils.translation import ugettext as _ from django.db.models.signals import post_save +from django.db.models.loading import get_model #custom functions from functions.form_check import translit_with_separator -import random, string -from django.core.validators import email_re -from django.db.models import Q + + """ from django.contrib.auth.hashers import check_password @@ -96,9 +98,14 @@ class User(AbstractBaseUser, PermissionsMixin): Implementing a fully featured User model with admin-compliant permissions. + stored main data about users + Email, first name, last name and password are required. Other fields are optional. + """ + catalog = '/user/' + email = models.EmailField( verbose_name = u'Email', max_length = 255, @@ -167,29 +174,60 @@ class User(AbstractBaseUser, PermissionsMixin): return True def get_expositions_number(self): - return len(self.exposition_users.all()) + # 1 query + return self.exposition_users.all().count() def get_conferences_number(self): - return len(self.conference_users.all()) + # 1 query + return self.conference_users.all().count() def get_seminars_number(self): - return len(self.seminar_users.all()) + # 1 query + return self.seminar_users.all().count() def get_webinars_number(self): - return len(self.webinar_users.all()) + # 1 query + return self.webinar_users.all().count() def get_events_number(self): + # 4 query n = self.get_expositions_number() + self.get_conferences_number() + self.get_seminars_number() + self.get_webinars_number() return n def get_permanent_url(self): if self.url: - return '/user/'+self.url+'/' - return '/user/'+str(self.id)+'/' + + return self.catalog+self.url+'/' + return self.catalog+str(self.id)+'/' + + def get_expos(self): + """ + return information about expos and them related data by 1 query + + """ + return self.exposition_users.language().select_related('country', 'city', 'place').all() + + def get_confs(self): + """ + return information about confs and them related data by 1 query + + """ + return self.conference_users.language().select_related('country', 'city', 'place').all() + + def get_seminars(self): + """ + return information about seminars and them related data by 1 query + + """ + return self.seminar_users.language().select_related('country', 'city').all() class Profile(models.Model): + """ + stores additional information about users + + """ user = models.OneToOneField(User) country = models.ForeignKey('country.Country', verbose_name='Страна', blank=True, null=True, on_delete=models.PROTECT, related_name='users') @@ -213,19 +251,53 @@ class Profile(models.Model): keywords = models.CharField(max_length=255, blank=True) -from dateutil.relativedelta import relativedelta - class Calendar(models.Model): + """ + Store information about events, which user can add to own calendar + every user has one calendar + """ user = models.OneToOneField(User) expositions = models.ManyToManyField('exposition.Exposition', null=True) conferences = models.ManyToManyField('conference.Conference', null=True) seminars = models.ManyToManyField('seminar.Seminar', null=True) webinars = models.ManyToManyField('webinar.Webinar', null=True) + def get_expos(self): + # 1 query + return list(self.expositions.language().all()) + + def get_confs(self): + # 1 query + return list(self.conferences.language().all()) + + def get_seminars(self): + # 1 query + return list(self.seminars.language().all()) + + def get_webinars(self): + # 1 query + return list(self.webinars.language().all()) + + def get_events(self): - events = list(self.expositions.all()) + list(self.conferences.all()) + list(self.seminars.all()) + list(self.webinars.all()) + # 4 query + events = self.get_expos() + self.get_confs() + self.get_seminars() + self.get_webinars() return events + def check_in_calendar(self, event): + """ + check if event in calendar + 1 query + """ + event_type = event.event_type + if event_type == 'expo': + return event in self.get_expos() + elif event_type == 'conf': + return event in self.get_confs() + elif event_type == 'seminar': + return event in self.get_seminars() + elif event_type == 'webinar': + return event in self.get_webinars() def events_by_month(self, day): exp = list(self.expositions.filter((Q(data_begin__month=day.month) & Q(data_begin__year=day.year))\ @@ -240,12 +312,51 @@ class Calendar(models.Model): return exp+con+sem+web +class EventFilter(models.Model): + user = models.OneToOneField(User) + theme = models.ManyToManyField('theme.Theme', null=True) + tag = models.ManyToManyField('theme.Tag', null=True) + area = models.ManyToManyField('country.Area', null=True) + country = models.ManyToManyField('country.Country', null=True) + city = models.ManyToManyField('city.City', null=True) + fr = models.DateField(blank=True, null=True) + to = models.DateField(blank=True, null=True) + + def get_queryset(self): + Exposition = get_model('exposition', 'Exposition') + qs = Exposition.objects.all() + themes = self.theme.all() + tags = self.tag.all() + countries = self.country.all() + areas = self.area.all() + cities = self.city.all() + + if themes.count(): + qs = qs.filter(theme__in=list(themes)) + + if tags.count(): + qs = qs.filter(tag__in=list(tags)) + + if cities.count(): + qs = qs.filter(city__in=list(cities)) + + if areas.count(): + qs = qs.filter(country__area__in=list(areas)) + + if countries.count(): + qs = qs.filter(country__in=list(countries)) + + return qs.order_by('data_begin') + + + def create_user_inf(sender, instance, created, **kwargs): if created: Calendar.objects.create(user=instance) Profile.objects.create(user=instance) + EventFilter.objects.create(user=instance) post_save.connect(create_user_inf, sender=User) diff --git a/accounts/signals.py b/accounts/signals.py deleted file mode 100644 index 8b137891..00000000 --- a/accounts/signals.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/accounts/urls.py b/accounts/urls.py index 396c93c2..e7842ee5 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -2,8 +2,8 @@ from django.conf.urls import patterns, url from django.contrib.auth.decorators import login_required from views import SettingsView, ProfileView, CalendarView, UserView, UserExpositionsView, UserConferenceView, UserSeminarView -from views import NameView, HomeView, AvatarView, WorkView, AboutCompanyView, PhoneView, EmailView, WebPageView,\ - SocialView, AboutView, ProfileCompanyView +from views import NameView, HomeView, AvatarView, WorkView, AboutCompanyView, PhoneView, WebPageView,\ + SocialView, AboutView, ProfileCompanyView, Feed # @@ -16,6 +16,8 @@ urlpatterns = patterns('', url(r'^profile/company/$', login_required(ProfileCompanyView.as_view())), url(r'^profile/settings/$', login_required(SettingsView.as_view())), url(r'^profile/calendar/$', login_required(CalendarView.as_view())), + url(r'^profile/feed/page/(?P\d+)/$', Feed.as_view()), + url(r'^profile/feed/$', login_required(Feed.as_view())), url(r'^user/(?P.*)/expositions/(?P\d+)/$', UserExpositionsView.as_view()), url(r'^user/(?P.*)/expositions/$', UserExpositionsView.as_view()), url(r'^user/(?P.*)/seminars/(?P\d+)/$', UserSeminarView.as_view()), @@ -29,21 +31,16 @@ urlpatterns = patterns('', #url(r'^profile/messages/(?P.*)/$', login_required(MessagesView.as_view())), #url(r'^profile/messages/$', login_required(MessagesView.as_view())), - # + # ajax url(r'^profile/update/name/$', login_required(NameView.as_view())), url(r'^profile/update/home/$', login_required(HomeView.as_view())), url(r'^profile/update/avatar/$', login_required(AvatarView.as_view())), url(r'^profile/update/work/$', login_required(WorkView.as_view())), url(r'^profile/update/about-company/$', login_required(AboutCompanyView.as_view())), url(r'^profile/update/phone/$', login_required(PhoneView.as_view())), - url(r'^profile/update/email/$', login_required(EmailView.as_view())), url(r'^profile/update/web-page/$', login_required(WebPageView.as_view())), url(r'^profile/update/social/$', login_required(SocialView.as_view())), url(r'^profile/update/about/$', login_required(AboutView.as_view())), - url(r'^profile/change-password/', 'accounts.views.change_password'), - # - url(r'^accounts/get/calendar/(?P\d+)/(?P\d+)/$', 'accounts.views.get_calendar'), - url(r'^accounts/get-tag-users/$', 'accounts.views.user_for_tag'), ) diff --git a/accounts/views.py b/accounts/views.py index bc1ffa41..dddad811 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,23 +1,28 @@ # -*- coding: utf-8 -*- -from django.shortcuts import render_to_response, get_object_or_404 +import json, datetime +import calendar as python_calendar +from django.shortcuts import get_object_or_404 from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.contrib.auth.decorators import login_required from django.utils.translation import ugettext as _, get_language from django.utils import timezone -# forms +from django_messages.forms import SendForm +from django.views.generic import TemplateView, FormView, ListView +from sorl.thumbnail import get_thumbnail from forms import ChangePasswordForm, EmailAnnouncementForm -from company.forms import CompanyFormClient, CreateCompanyForm +from company.forms import CreateCompanyForm +from models import User from edit_forms import AvatarForm, NameForm, HomeForm, WorkForm, AboutCompanyForm, PhoneForm, EmailForm,\ WebPageForm, SocialForm, AboutForm -from models import User -# python -import json, datetime -import calendar as python_calendar -from django.views.generic import TemplateView, FormView, ListView -from sorl.thumbnail import get_thumbnail + class SettingsView(TemplateView): + """ + display template with user settings like: + password, email notifications, social settings, subscription + + """ template_name = 'accounts/settings.html' def get_context_data(self, **kwargs): context = super(SettingsView, self).get_context_data(**kwargs) @@ -26,69 +31,64 @@ class SettingsView(TemplateView): return context class CalendarView(TemplateView): + """ + display template with user calendar(one month) + """ + template_name = 'accounts/calendar.html' def get_context_data(self, **kwargs): + """ + get events by 1 month and return to template + + return additional variables: + - events - events in current months + - days - days in current month + - current_day + + """ context = super(CalendarView, self).get_context_data(**kwargs) now = timezone.now().replace(microsecond=0, second=0, minute=0, hour=0) context['current_day'] = now year = self.request.GET.get('year') month = self.request.GET.get('month') - # cheack if its int if year: year = int(year) if month: month = int(month) if not year or not month: + # events in current months number_of_days = python_calendar.monthrange(now.year, now.month)[1] + # number of days in current month days = [timezone.make_aware(datetime.datetime(now.year, now.month, i+1), timezone.get_default_timezone()) for i in range(number_of_days)] - context['days'] = days - # -------------------- calendar = self.request.user.calendar + # events in current month context['events'] = calendar.events_by_month(now) else: number_of_days = python_calendar.monthrange(year, month)[1] days = [timezone.make_aware(datetime.datetime(year, month, i+1), timezone.get_default_timezone()) for i in range(number_of_days)] + # number of days in current month context['days'] = days calendar = self.request.user.calendar now = now.replace(year=year, month=month, day=1) + # events in current month context['events'] = calendar.events_by_month(now) return context -def events_handeler(obj): - response = {'name': obj.name, 'country': obj.country.name, 'city': obj.city.name} - if obj.place: - response['place'] = obj.place.name - return response - - -@login_required -def get_calendar(request, year, month): - now = timezone.now().replace(microsecond=0, second=0, minute=0, hour=0) - day = timezone.make_aware(datetime.datetime(year=int(year), month=int(month), day=1), timezone.get_default_timezone()) - calendar = request.user.calendar - - number_of_days = python_calendar.monthrange(day.year, day.month)[1] - days = [timezone.make_aware(datetime.datetime(day.year, day.month, i+1), timezone.get_default_timezone()) for i in range(number_of_days)] - args = {} - dthandler = lambda obj: (obj.isoformat() if isinstance(obj, datetime.datetime) or isinstance(obj, datetime.date) else None) - - args['days'] = json.dumps(days, default=dthandler) - args['current_day'] = json.dumps(now, default=dthandler) - events = calendar.events_by_month(day) - - args['events'] = json.dumps(events, default=events_handeler) - - return HttpResponse(json.dumps(args), content_type='application/json') class ProfileView(TemplateView): + """ + display template with user information forms + + in template forms handles dynamically by ajax + """ template_name = 'accounts/new_profile.html' def get_context_data(self, **kwargs): @@ -116,6 +116,10 @@ from company.edit_forms import NameForm as CompNameForm, HomeForm as CompHomeFor FoundationForm as CompFound, SpecializationForm as CompSpec, AddressForm as CompAddress class ProfileCompanyView(TemplateView): + """ + display template with user company information forms + in template forms handles dynamically by ajax + """ template_name = 'accounts/fill_company.html' def get_context_data(self, **kwargs): @@ -147,11 +151,12 @@ class ProfileCompanyView(TemplateView): -class MessagesView(TemplateView): - template_name = 'accounts/messages.html' -from django_messages.forms import SendForm + class UserView(TemplateView): + """ + display user information for another users + """ template_name = 'accounts/user.html' def get_context_data(self, **kwargs): @@ -168,45 +173,9 @@ class UserView(TemplateView): return context -@login_required -def change_password(request): - """ - Change current user password if new password is valid - """ - success = {'success': False} - if request.POST: - form = ChangePasswordForm(request.POST) - if form.is_valid(): - user = request.user - if(user.check_password(form.cleaned_data.get('old_password'))): - user.set_password(form.cleaned_data.get('new_password')) - user.save() - success['success'] = True - success['message'] = _(u'Пароль изменен') - return HttpResponse(json.dumps(success), content_type='application/json') - else: - errors = {'errors': [_(u'Не правильный пароль')]} - success.update(errors) - return HttpResponse(json.dumps(success), content_type='application/json') - else: - errors = [err[0] for err in form.errors.values()] - errors = {'errors': errors} - success.update(errors) - return HttpResponse(json.dumps(success), content_type='application/json') - else: - return HttpResponse(json.dumps(success), content_type='application/json') - - - - -def user_for_tag(request): - - users = [{'id': user.id, 'label': user.get_full_name(), 'value': user.get_full_name() } for user in User.objects.all()] - return HttpResponse(json.dumps(users), content_type='application/json') - class ProfileInvalidView(FormView): """ - abstract view + abstract view. handles form errors. return errors in json """ def form_invalid(self, form): response = {'success': False} @@ -216,7 +185,8 @@ class ProfileInvalidView(FormView): class BaseProfileView(ProfileInvalidView): """ - abstract view + abstract view for ajax calls. handles form with instance profile + return json """ def form_valid(self, form): profile = self.request.user.profile @@ -226,73 +196,87 @@ class BaseProfileView(ProfileInvalidView): return HttpResponse(json.dumps(response), content_type='application/json') class WorkView(ProfileInvalidView): + """ + instance user + """ form_class = WorkForm def form_valid(self, form): user = self.request.user form = self.form_class(self.request.POST, instance=user) - form.save() - response = {'success': True} + user = form.save() + company = user.company + + + response = {'success': True, 'url':company.get_permanent_url()} return HttpResponse(json.dumps(response), content_type='application/json') class AvatarView(BaseProfileView): + """ + instance profile. save user avatar. + + if call is ajax- return json data, else redirect to profile page + """ form_class = AvatarForm def form_valid(self, form): profile = self.request.user.profile - if not self.request.FILES: - response = {'success': False, 'message':'files is empty'} - return HttpResponse(json.dumps(response), content_type='application/json') form = self.form_class(self.request.POST, self.request.FILES, instance=profile) form.save() if self.request.is_ajax(): im = get_thumbnail(profile.avatar, '100x100', crop='center') response = {'success': True, 'url': im.url} - #response = {'success': True} - return HttpResponse(json.dumps(response), content_type='application/json') else: return HttpResponseRedirect('/profile/') class HomeView(BaseProfileView): + """ + instance profile + """ form_class = HomeForm class AboutCompanyView(BaseProfileView): + """ + instance profile + """ form_class = AboutCompanyForm class PhoneView(BaseProfileView): + """ + instance profile + """ form_class = PhoneForm class WebPageView(BaseProfileView): + """ + instance profile + """ form_class = WebPageForm class SocialView(BaseProfileView): + """ + instance profile + """ form_class = SocialForm class AboutView(BaseProfileView): + """ + instance profile + """ form_class = AboutForm - -class EmailView(ProfileInvalidView): - form_class = EmailForm - - def form_valid(self, form): - user = self.request.user - form = self.form_class(self.request.POST, instance=user) - #form.save() - response = {'success': False} - - return HttpResponse(json.dumps(response), content_type='application/json') - - class NameView(ProfileInvalidView): + """ + instance user + """ form_class = NameForm def form_valid(self, form): @@ -303,10 +287,6 @@ class NameView(ProfileInvalidView): return HttpResponse(json.dumps(response), content_type='application/json') -def test(request): - - return HttpResponse('test') - from exposition.models import Exposition @@ -321,7 +301,7 @@ def get_user(url): class UserEventView(ListView): model = Exposition template_name = 'accounts/user_events.html' - paginate_by = 2 + paginate_by = 10 obj = None event_type = None @@ -330,7 +310,7 @@ class UserEventView(ListView): url = self.kwargs.get('url') user = get_user(url) self.obj = user - return user.exposition_users.all() + return user.exposition_users.language().select_related('country').all() def get_context_data(self, **kwargs): context = super(UserEventView, self).get_context_data(**kwargs) @@ -339,28 +319,78 @@ class UserEventView(ListView): return context class UserExpositionsView(UserEventView): + """ + return template with list of expos that user joined + """ event_type = _(u'Выставки') def get_queryset(self): url = self.kwargs.get('url') user = get_user(url) self.obj = user - return user.exposition_users.all() + return user.get_expos() + class UserConferenceView(UserEventView): + """ + return template with list of confs that user joined + """ event_type = _(u'Конференции') def get_queryset(self): url = self.kwargs.get('url') user = get_user(url) self.obj = user - return user.conference_users.all() + return user.get_confs() class UserSeminarView(UserEventView): + """ + return template with list of seminars that user joined + """ event_type = _(u'Семинары') def get_queryset(self): url = self.kwargs.get('url') user = get_user(url) self.obj = user - return user.seminar_users.all() \ No newline at end of file + return user.get_seminars() + +@login_required +def change_password(request): + """ + Change current user password if new password is valid + """ + success = {'success': False} + if request.POST: + form = ChangePasswordForm(request.POST) + if form.is_valid(): + user = request.user + if(user.check_password(form.cleaned_data.get('old_password'))): + user.set_password(form.cleaned_data.get('new_password')) + user.save() + success['success'] = True + success['message'] = _(u'Пароль изменен') + return HttpResponse(json.dumps(success), content_type='application/json') + else: + errors = {'errors': [_(u'Не правильный пароль')]} + success.update(errors) + return HttpResponse(json.dumps(success), content_type='application/json') + else: + errors = [err[0] for err in form.errors.values()] + errors = {'errors': errors} + success.update(errors) + return HttpResponse(json.dumps(success), content_type='application/json') + else: + return HttpResponse(json.dumps(success), content_type='application/json') + + +class Feed(ListView): + template_name = 'client/accounts/feed.html' + paginate_by = 5 + model = Exposition + + def get_queryset(self): + filter = self.request.user.eventfilter + qs = filter.get_queryset() + + return qs diff --git a/city/forms.py b/city/forms.py index b1d5fc9a..d2f8ff62 100644 --- a/city/forms.py +++ b/city/forms.py @@ -94,10 +94,10 @@ class CityForm(forms.Form): #city.country = Country.objects.get(id=data['country'].id)# .id cause select uses queryset # url generate for city: "country_name-city_name" - if data.get('name_en'): - city.url = '%s-'%translit_with_separator(city.country.name) + translit_with_separator(data['name_en']).lower() - else: - city.url = '%s-'%translit_with_separator(city.country.name) + translit_with_separator(data['name_ru']).lower() + #if data.get('name_en'): + #city.url = '%s-'%translit_with_separator(city.country.name) + translit_with_separator(data['name_en']).lower() + #else: + #city.url = '%s-'%translit_with_separator(city.country.name) + translit_with_separator(data['name_ru']).lower() #city.url = '%s'%translit_with_separator(data['name_ru'].strip()).lower() #city.save() @@ -114,7 +114,7 @@ class CityForm(forms.Form): name_ru = self.cleaned_data.get('name_ru') name_en = self.cleaned_data.get('name_en') country = self.cleaned_data.get('country') - + """ city = City.objects.filter( url='%s-%s'%(translit_with_separator(country.name), translit_with_separator(name_en)) ) @@ -126,6 +126,7 @@ class CityForm(forms.Form): msg = 'Город с таким названием уже существует' self._errors['name_ru'] = ErrorList([msg]) del self.cleaned_data['name_ru'] + """ return self.cleaned_data diff --git a/city/models.py b/city/models.py index ae446d6e..f2e312bf 100644 --- a/city/models.py +++ b/city/models.py @@ -85,6 +85,14 @@ class City(TranslatableModel): return len(Exposition.objects.filter(city=self.id)) + def get_parent(self): + parent = {'text' : self.country.name, 'id': self.country.id, 'name': 'co', + 'parent':{'text' : self.country.area.name, 'id': self.country.area.id, 'name': 'area'}} + return parent + + def get_sub_categories(self): + return [] + diff --git a/company/admin.py b/company/admin.py index 97014623..0230c396 100644 --- a/company/admin.py +++ b/company/admin.py @@ -14,7 +14,7 @@ from file.models import FileModel, TmpFile from file.forms import FileModelForm #custom views from functions.custom_views import objects_list, add_object_with_file, delete_object -from functions.admin_views import AdminListView +from functions.admin_views import AdminListView, AdminView def company_all(request): @@ -67,7 +67,7 @@ def company_change(request, url): #fill form with data from database data = {'url':company.url, 'staff_number':company.staff_number, 'address': company.address, 'phone':company.phone, 'fax':company.fax, 'web_page':company.web_page, - 'email':company.email, 'social':company.social, 'foundation': company.foundation, + 'email':company.email, 'foundation': company.foundation, 'company_id':company.id} if company.country: @@ -112,4 +112,48 @@ def company_change(request, url): class CompanyListView(AdminListView): template_name = 'admin/company/company_list.html' form_class = CompanyFilterForm - model = Company \ No newline at end of file + model = Company + +class CompanyView(AdminView): + form_class = CompanyForm + model = Company + template_name = 'admin/company/company.html' + success_url = '/admin/company/all/' + + def get_form(self, form_class): + if self.request.POST: + return super(CompanyView, self).get_form(form_class) + obj = self.set_obj() + if obj: + data = {'url':obj.url, 'staff_number':obj.staff_number, 'address': obj.address, + 'phone':obj.phone, 'fax':obj.fax, 'web_page':obj.web_page, + 'email':obj.email, 'foundation': obj.foundation, + 'company_id':obj.id} + + + if obj.country: + data['country'] = obj.country_id + + if obj.city: + data['city'] = obj.city_id + + data['theme'] = [item.id for item in obj.theme.all()] + data['tag'] = ','.join(['%s:%s'%(item.id, item.name) for item in obj.tag.all()]) + + for code, name in settings.LANGUAGES: + trans_obj = self.model._meta.translations_model.objects.get(language_code = code,master__id=obj.id) #access to translated fields + data['name_%s' % code] = trans_obj.name + data['description_%s' % code] = trans_obj.description + data['specialization_%s' % code] = trans_obj.specialization + data['address_inf_%s' % code] = trans_obj.address_inf + data['representation_%s' % code] = trans_obj.representation + data['title_%s' % code] = trans_obj.title + data['keywords_%s' % code] = trans_obj.keywords + data['descriptions_%s' % code] = trans_obj.descriptions + + form =form_class(initial=data) + form.fields['city'].widget.attrs['data-init-text'] = obj.city.name + form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.filter(theme__in=data['theme'])] + return form + else: + return form_class() \ No newline at end of file diff --git a/company/admin_urls.py b/company/admin_urls.py index 4f3f38ad..5c29249b 100644 --- a/company/admin_urls.py +++ b/company/admin_urls.py @@ -1,11 +1,16 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url -from admin import CompanyListView +from admin import CompanyListView, CompanyView urlpatterns = patterns('company.admin', - url(r'^add.*/$', 'company_add'), - url(r'^delete/(?P.*)/$', 'company_delete'), - url(r'^change/(?P.*).*/$', 'company_change'), - #url(r'^all/$', 'company_all'), url(r'^all/$', CompanyListView.as_view()), + url(r'^$', CompanyView.as_view()), + url(r'^(?P.*)/$', CompanyView.as_view()), + + #url(r'^add.*/$', 'company_add'), + #url(r'^delete/(?P.*)/$', 'company_delete'), + #url(r'^change/(?P.*).*/$', 'company_change'), + #url(r'^all/$', 'company_all'), + #url(r'^all/$', CompanyListView.as_view()), + ) \ No newline at end of file diff --git a/company/edit_forms.py b/company/edit_forms.py index e17eb776..fd4dab69 100644 --- a/company/edit_forms.py +++ b/company/edit_forms.py @@ -19,7 +19,7 @@ class NameForm(BaseForm): class SpecializationForm(BaseForm): translation = True - specialization = forms.CharField(label=_(u'Описание компании'), widget=forms.TextInput(attrs={'style': 'width: 420px;'})) + specialization = forms.CharField(label=_(u'Описание компании'), widget=forms.TextInput()) class Meta: model = Company._meta.translations_model fields = ('specialization',) @@ -114,7 +114,7 @@ class DescriptionForm(BaseForm): class AddressForm(BaseForm): translation = True - address_inf = forms.CharField(label=_(u'Адрес компании'), widget=forms.TextInput(attrs={'style': 'width: 420px;'})) + address_inf = forms.CharField(label=_(u'Адрес компании'), widget=forms.TextInput()) class Meta: model = Company._meta.translations_model fields = ('address_inf',) diff --git a/company/models.py b/company/models.py index 279a1ca2..ee471847 100644 --- a/company/models.py +++ b/company/models.py @@ -2,7 +2,7 @@ from django.db import models from hvad.models import TranslatableModel, TranslatedFields, TranslationManager from django.contrib.contenttypes import generic -# +from django.utils import translation from django.utils.translation import ugettext as _ from functions.custom_fields import LocationField from functions.models_methods import ExpoManager @@ -16,6 +16,9 @@ class Company(TranslatableModel, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ + catalog = '/members/' + catalog_name = _(u'Участники:') + search_name = None objects = ExpoManager() files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id') @@ -62,11 +65,20 @@ class Company(TranslatableModel, ExpoMixin): def __unicode__(self): return self.lazy_translation_getter('name', self.pk) + def get_index_text(self): + translation.activate('ru') + translations = self.translations.all() + names = ' '.join([tr.name for tr in translations]) + specializations = ' '.join([tr.specialization for tr in translations]) + themes = ' '.join([' '.join(theme.get_all_names()) for theme in self.theme.all()]) + tags = ' '.join([' '.join(tag.get_all_names()) for tag in self.tag.all()]) + return names + ' ' + specializations + ' ' + themes + ' ' + tags + def get_catalog_url(self): return '/members/' def get_permanent_url(self): - url = '%smember-%s'%(self.get_catalog_url(), self.url) + url = '%smember-%s'%(self.catalog, self.url) return url def get_expositions_number(self): diff --git a/company/search_indexes.py b/company/search_indexes.py index effe4c55..1d197d9e 100644 --- a/company/search_indexes.py +++ b/company/search_indexes.py @@ -1,46 +1,38 @@ +# -*- coding: utf-8 -*- from haystack import indexes from models import Company -""" -class CompanyIndex(indexes.SearchIndex, indexes.Indexable): +from functions.search_mixin import ExpoSearchMixin + + +class CompanyExpositionIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin): text = indexes.CharField(document=True, use_template=True) where = indexes.MultiValueField() + content_auto = indexes.EdgeNgramField() + area_id = indexes.IntegerField() + country_id = indexes.IntegerField() + city_id = indexes.IntegerField() theme = indexes.MultiValueField() tag = indexes.MultiValueField() - country = indexes.CharField(model_attr='country', null=True) - city = indexes.CharField(model_attr='city', null=True) - - def prepare_country(self, obj): - if obj.country: - return '%s'%obj.country.id - return '' - - def prepare_city(self, obj): - if obj.city: - return '%s'%obj.city.id - return '' + url = indexes.CharField() + form_name = indexes.CharField() + # translated fields + name_en = indexes.CharField() + name_ru = indexes.CharField() + catalog_name_en = indexes.CharField() + catalog_name_ru = indexes.CharField() - def prepare_theme(self, obj): + def prepare_form_name(self, obj): + return None - return [str(th.id) for th in obj.theme.filter()] + def prepare_catalog_name_en(self, obj): + return u'Members' - def prepare_tag(self, obj): - return [str(tag.id) for tag in obj.tag.filter()] - - def prepare_where(self, obj): - country = [] - city = [] - if obj.country: - country = [tr.name for tr in obj.country.translations.all()] - if obj.city: - city = [tr.name for tr in obj.city.translations.all()] - - return country + city + def prepare_catalog_name_ru(self, obj): + return u'Участники' def get_model(self): return Company def index_queryset(self, using=None): - return self.get_model().objects.filter() - -""" \ No newline at end of file + return self.get_model().objects.filter() \ No newline at end of file diff --git a/company/views.py b/company/views.py index 5e7231dd..e5cfb0c0 100644 --- a/company/views.py +++ b/company/views.py @@ -49,7 +49,6 @@ class CompanyView(ExpoListView): def get_context_data(self, **kwargs): context = super(CompanyView, self).get_context_data(**kwargs) - context['search_action'] = '/members/search/' context['type'] = 'members search' return context diff --git a/conference/models.py b/conference/models.py index 44b985dd..52221bd3 100644 --- a/conference/models.py +++ b/conference/models.py @@ -24,6 +24,9 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ + catalog = '/conference/' + # type of event + event_type = 'conf' #set manager of this model objects = ExpoManager() diff --git a/core/views.py b/core/views.py index 7d5859ee..8683d1ab 100644 --- a/core/views.py +++ b/core/views.py @@ -9,7 +9,8 @@ from functions.views_help import split_params from django.utils.translation import ugettext as _ -from forms import PlaceSearchForm +#from forms import PlaceSearchForm +from functions.search_forms import PlaceSearchForm from functions.search_forms import EventSearchForm from haystack.query import EmptySearchQuerySet diff --git a/country/admin.py b/country/admin.py index c15f8d50..ede3a8cf 100644 --- a/country/admin.py +++ b/country/admin.py @@ -11,6 +11,7 @@ from file.models import FileModel from file.forms import FileModelForm #custom views from functions.custom_views import objects_list, add_object_with_file, delete_object, filtered_list +from functions.admin_views import paginate_results from functions.forms import AdminSearchForm from functions.admin_views import AdminListView @@ -111,7 +112,15 @@ def country_change(request, url): return render_to_response('country_add.html', args) + class CountryListView(AdminListView): template_name = 'admin/country/country_list.html' form_class = CountryFilterForm - model = Country \ No newline at end of file + model = Country + + def get_context_data(self, **kwargs): + context = super(AdminListView, self).get_context_data(**kwargs) + qs = self.model.objects.all() + result = paginate_results(qs, page=self.request.GET.get('page')) + context['object_list'] = result + return context \ No newline at end of file diff --git a/country/models.py b/country/models.py index 42ad7358..6e954537 100644 --- a/country/models.py +++ b/country/models.py @@ -72,6 +72,10 @@ class Area(TranslatableModel): objects = [{'text':item.name, 'id':item.id, 'name':'co', 'sub':True} for item in self.countries()] return objects + def get_parent(self): + parent = {} + return parent + @@ -165,6 +169,10 @@ class Country(TranslatableModel): objects = [{'text':item.name, 'id':item.id, 'name':'ci', 'sub': False} for item in self.active_cities()] return objects + def get_parent(self): + parent = {'text' : self.area.name, 'id': self.area.id, 'name': 'area'} + return parent + post_save.connect(post_save_handler, sender=Country) \ No newline at end of file diff --git a/exposition/admin.py b/exposition/admin.py index 98fe8b5d..e5309b23 100644 --- a/exposition/admin.py +++ b/exposition/admin.py @@ -13,7 +13,7 @@ from forms import ExpositionCreateForm, ExpositionDeleteForm, TimeTableForm, Sta from theme.models import Tag from city.models import City from file.models import FileModel, TmpFile -from file.forms import FileModelForm +from file.forms import FileModelForm, FileForm from photologue.forms import PhotoForm # python import random @@ -237,9 +237,28 @@ def exposition_change(request, url): class ExpositionView(AdminView): form_class = ExpositionCreateForm model = Exposition - success_url = 'admin/exposition/all/' + success_url = '/admin/exposition/all/' template_name = 'admin/exposition/exposition.html' + def form_valid(self, form): + StatisticFormSet = formset_factory(StatisticForm) + formset_statistic = StatisticFormSet(self.request.POST) + self.set_obj() + expo = form.save(obj=self.obj) + + # delete old halls + Statistic.objects.filter(exposition=getattr(expo, 'id')).delete() + + for item in formset_statistic.forms: + # saves new statistic if its valid and not empty + if item.is_valid() and item.has_changed(): + statistic = item.save(commit=False) + statistic.exposition = expo + statistic.save() + + + return HttpResponseRedirect(self.success_url) + def get_form(self, form_class): if self.request.POST: return super(ExpositionView, self).get_form(form_class) @@ -256,6 +275,7 @@ class ExpositionView(AdminView): 'min_stand_size':obj.min_stand_size, 'application_deadline':obj.application_deadline, 'min_open_area':obj.min_open_area, 'max_open_area':obj.max_open_area, 'registration_payment':obj.registration_payment, 'exposition_id':obj.id, + 'registration_link': obj.registration_link, 'expohit': obj.expohit, 'discount': obj.discount, 'canceled': obj.canceled, 'moved': obj.moved, 'logo': obj.logo, 'visitors': obj.visitors, 'members': obj.members, @@ -264,6 +284,9 @@ class ExpositionView(AdminView): if obj.place: data['place'] = obj.place.id + if obj.area: + data['area'] = obj.area + data['theme'] = [item.id for item in obj.theme.all()] data['tag'] = ','.join(['%s:%s'%(item.id, item.name) for item in obj.tag.all()]) @@ -280,6 +303,12 @@ class ExpositionView(AdminView): data['main_title_%s' % code] = trans_obj.main_title data['time_%s' % code] = trans_obj.time data['products_%s' % code] = trans_obj.products + + data['price_day_%s' % code] = trans_obj.price_day + data['price_all_%s' % code] = trans_obj.price_all + data['price_day_bar_%s' % code] = trans_obj.price_day_bar + data['price_all_bar_%s' % code] = trans_obj.price_all_bar + data['discount_description_%s' % code] = trans_obj.discount_description data['stat_countries_%s' % code] = trans_obj.stat_countries data['pre_condition_%s' % code] = trans_obj.pre_condition @@ -292,7 +321,7 @@ class ExpositionView(AdminView): form =form_class(initial=data) form.fields['city'].widget.attrs['data-init-text'] = obj.city.name - form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.filter(theme__in=data['theme'])] + form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.language().filter(theme__in=data['theme'])] return form else: return form_class() @@ -301,6 +330,22 @@ class ExpositionView(AdminView): def get_context_data(self, **kwargs): context = super(ExpositionView, self).get_context_data(**kwargs) obj = self.set_obj() + if obj: + StatisticFormSet = modelformset_factory(Statistic, form=StatisticForm, exclude=('exposition',)) + # get existing statistic + statistic = Statistic.objects.filter(exposition=getattr(obj, 'id')) + # fill HallFormSet + formset_statistic = StatisticFormSet(queryset=statistic) + context['file_form'] = FileForm(initial={'model': 'exposition.Exposition'}) + files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) + context['files'] = files + + else: + StatisticFormSet = formset_factory(StatisticForm) + formset_statistic = StatisticFormSet() + + context['formset_statistic'] = formset_statistic + context['photo_form'] = PhotoForm() context['timetable_form'] = TimeTableForm() context['timetables'] = TimeTable.objects.filter(exposition=obj) diff --git a/exposition/admin_urls.py b/exposition/admin_urls.py index 5e1c266b..402dd4ed 100644 --- a/exposition/admin_urls.py +++ b/exposition/admin_urls.py @@ -5,14 +5,14 @@ from admin import ExpositionListView, ExpositionView urlpatterns = patterns('exposition.admin', url(r'^upload-photo/(?P.*)/$', 'upload_exposition_photo'), - url(r'^add.*/$', 'exposition_add'), - url(r'^delete/(?P.*)/$', 'exposition_delete'), - url(r'^change/(?P.*)/$', 'exposition_change'), + #url(r'^add.*/$', 'exposition_add'), + #url(r'^delete/(?P.*)/$', 'exposition_delete'), + #url(r'^change/(?P.*)/$', 'exposition_change'), url(r'^all/$', ExpositionListView.as_view()), url(r'^switch/(?P.*)/(?P.*)$', 'exposition_switch'), - url(r'^copy/(?P.*)$', 'exposition_copy'), - - url(r'^$', ExpositionView.as_view()), + #url(r'^copy/(?P.*)$', 'exposition_copy'), url(r'^(?P.*)/$', ExpositionView.as_view()), + url(r'^$', ExpositionView.as_view()), + ) diff --git a/exposition/forms.py b/exposition/forms.py index 4a4c48dd..cede88a6 100644 --- a/exposition/forms.py +++ b/exposition/forms.py @@ -6,6 +6,7 @@ from tinymce.widgets import TinyMCE from django.core.exceptions import ValidationError from django.forms.util import ErrorList from django.core.validators import validate_email, URLValidator +from django.utils.translation import ugettext as _ #models from models import Exposition, TimeTable, TmpTimeTable, AUDIENCE1, CURRENCY, Statistic, BIT_AUDIENCE from theme.models import Tag @@ -25,7 +26,8 @@ from functions.form_check import translit_with_separator from settings.settings import date_formats from functions.admin_forms import AdminFilterForm - +places = [(item.id, item.name) for item in PlaceExposition.objects.language().all()] +places.insert(0,('', 'Не выбрано')) class ExpositionCreateForm(forms.Form): """ Create Exposition form for creating exposition @@ -41,16 +43,20 @@ class ExpositionCreateForm(forms.Form): public = [(item1, item2) for item1, item2 in BIT_AUDIENCE] currencies = [(item, item) for item in CURRENCY] - data_begin = forms.DateField(label=u'Дата начала') - data_end = forms.DateField(label=u'Дата окночания') + data_begin = forms.DateField(label=u'Дата начала', input_formats=['%Y-%m-%d', '%d.%m.%Y']) + data_end = forms.DateField(label=u'Дата окночания', input_formats=['%Y-%m-%d', '%d.%m.%Y']) logo = forms.ImageField(label='Logo', required=False) - organiser = forms.ModelMultipleChoiceField(label=u'Организаторы', queryset=Organiser.objects.all(), required=False) - company = forms.ModelMultipleChoiceField(label=u'Компании', queryset=Company.objects.all(), required=False) - country = forms.ModelChoiceField(label=u'Страна', queryset=Country.objects.all(), empty_label=None) - theme = forms.ModelMultipleChoiceField(label=u'Тематики', queryset=Theme.objects.all()) - place = forms.ModelChoiceField(label=u'Место проведения', queryset=PlaceExposition.objects.all(), - empty_label='', required=False) + organiser = forms.MultipleChoiceField(label=u'Организаторы', required=False, + choices=[(item.id, item.name) for item in Organiser.objects.language().all()]) + + company = forms.MultipleChoiceField(label=u'Компании', required=False, + choices=[(item.id, item.name) for item in Company.objects.language().all()] ) + country = forms.ChoiceField(label=u'Страна', choices=[(c.id, c.name) for c in Country.objects.all()]) + theme = forms.MultipleChoiceField(label='Тематики', + choices=[(item.id, item.name) for item in Theme.objects.language().all()]) + place = forms.ChoiceField(label=u'Место проведения', required=False, + choices=places) #creates select input with empty choices cause it will be filled with ajax city = forms.CharField(label=u'Город', widget=forms.HiddenInput()) tag = forms.CharField(label=u'Теги', widget=forms.HiddenInput(), required=False) @@ -59,11 +65,13 @@ class ExpositionCreateForm(forms.Form): periodic = forms.ChoiceField(label=u'Периодичность', choices=PERIODIC, required=False) audience = forms.MultipleChoiceField(label=u'Аудитория', choices=public, initial='', required=False) web_page = forms.CharField(label=u'Веб страница', required=False) + registration_link = forms.CharField(label=u'Ссылка на регистрацию', required=False) foundation_year = forms.CharField(label=u'Год основания', required=False) members = forms.CharField(label=u'Участники', required=False) visitors = forms.CharField(label=u'Посетители', required=False) - min_area = forms.CharField(label=u'Минимальная плошадь', required=False) + min_area = forms.CharField(label=u'Минимальная площадь', required=False) discount = forms.CharField(label=u'Cкидка(%)', required=False) + area = forms.CharField(label=u'Площадь', required=False) quality_label = forms.MultipleChoiceField(label=u'Метки', required=False, choices=[('ufi', 'UFI'), ('rsva', 'РСВЯ'), ('exporating', 'ExpoRating')], widget=forms.CheckboxSelectMultiple()) @@ -72,10 +80,10 @@ class ExpositionCreateForm(forms.Form): application_deadline = forms.DateField(label=u'Срок подачи стэнда', required=False) min_stand_size = forms.CharField(label=u'Минимальный размер стэнда', required=False) - price_day = forms.CharField(label=u'Цена за 1 день', required=False) - price_all = forms.CharField(label=u'Цена за все дни', required=False) - price_day_bar = forms.CharField(label=u'Цена на стойке 1 день', required=False) - price_all_bar = forms.CharField(label=u'Цена на стойке все дни', required=False) + #price_day = forms.CharField(label=u'Цена за 1 день', required=False) + #price_all = forms.CharField(label=u'Цена за все дни', required=False) + #price_day_bar = forms.CharField(label=u'Цена на стойке 1 день', required=False) + #price_all_bar = forms.CharField(label=u'Цена на стойке все дни', required=False) price_catalog = forms.CharField(label=u'Цена за каталог', required=False) tax = forms.BooleanField(label=u'Налог включен', initial=True, required=False) min_closed_area = forms.CharField(label=u'Минимальная цена закрытой НЕ оборудованной площади', required=False) @@ -114,6 +122,17 @@ class ExpositionCreateForm(forms.Form): required=False, widget=CKEditorWidget) self.fields['time_%s' % code] = forms.CharField(label=u'Время работы', required=False, widget=CKEditorWidget) + + self.fields['price_day_%s' % code] = forms.CharField(label=u'Стоимость билета 1 день', required=False, + widget=forms.TextInput(attrs={'style':'width: 550px'})) + + self.fields['price_all_%s' % code] = forms.CharField(label=u'Стоимость билета все дни', required=False, + widget=forms.TextInput(attrs={'style':'width: 550px'})) + self.fields['price_day_bar_%s' % code] = forms.CharField(label=u'Стоимость на стойке 1 день', required=False, + widget=forms.TextInput(attrs={'style':'width: 550px'})) + self.fields['price_all_bar_%s' % code] = forms.CharField(label=u'Стоимость на стойке все дни', required=False, + widget=forms.TextInput(attrs={'style':'width: 550px'})) + self.fields['products_%s' % code] = forms.CharField(label=u'Экспонируемые продукты', required=False, widget=CKEditorWidget) self.fields['discount_description_%s' % code] = forms.CharField(label=u'Описание скидки', @@ -136,11 +155,6 @@ class ExpositionCreateForm(forms.Form): widget=forms.TextInput(attrs={'style':'width: 550px'})) self.fields['descriptions_%s' % code] = forms.CharField(label=u'Meta description', required=False, max_length=255, widget=forms.TextInput(attrs={'style':'width: 550px'})) - #creates select inputs ind fill it - #!service has bitfield. uncomment when country data will be filled - #services = [(item.id, item.name) for item in Service.objects.all()] - #self.fields['service'] = forms.MultipleChoiceField(label='Услуги', choices=services, required=False) - def save(self, obj=None): """ @@ -162,24 +176,24 @@ class ExpositionCreateForm(forms.Form): #simple fields exposition.url = translit_with_separator(data['name_ru'].strip()).lower() - exposition.logo = data['logo'] + if data.get('logo'): + exposition.logo = data['logo'] + exposition.data_begin = data['data_begin'] exposition.data_end = data['data_end'] exposition.periodic = data['periodic'] exposition.web_page= data['web_page'] + exposition.registration_link = data['registration_link'] exposition.foundation_year = data['foundation_year'] exposition.members = data['members'] exposition.visitors = data['visitors'] + exposition.area = data['area'] exposition.min_area = data['min_area'] exposition.currency = data['currency'] exposition.application_deadline = data['application_deadline'] exposition.min_stand_size = data['min_stand_size'] - exposition.price_day = data['price_day'] - exposition.price_all = data['price_all'] - exposition.price_all_bar = data['price_all_bar'] - exposition.price_day_bar = data['price_day_bar'] exposition.price_catalog = data['price_catalog'] exposition.tax = data['tax'] exposition.min_closed_area = data['min_closed_area'] @@ -207,36 +221,26 @@ class ExpositionCreateForm(forms.Form): exposition.audience = audience - if data.get('country'): - exposition.country = Country.objects.get(id=data['country'].id)#.id cause select uses queryset + exposition.country = Country.objects.get(id=data['country']) + exposition.city = City.objects.get(id=data['city']) - if data.get('city'): - exposition.city = City.objects.get(id=data['city']) if data.get('place'): - exposition.place = PlaceExposition.objects.get(id=data['place'].id)#.id cause select uses queryset + exposition.place = PlaceExposition.objects.get(id=data['place']) # fill translated fields and save object fill_with_signal(Exposition, exposition, data) #fill manytomany fields - for item in data['theme']: - exposition.theme.add(item.id)#.id cause select uses queryset + + exposition.theme.add(*data['theme']) exposition.tag.add(*Tag.objects.filter(id__in=data['tag'])) - #for item in data['tag']: - # exposition.tag.add(item) - # uses because in the next loop data will be overwritten - for item in data['organiser']: - exposition.organiser.add(item) + exposition.organiser.add(*Organiser.objects.filter(id__in=data.get('organiser', []))) + exposition.company.add(*Company.objects.filter(id__in=data.get('company', []))) - for item in data['company']: - exposition.company.add(item) exposition.save() - # save files - check_tmp_files(exposition, data.get('key')) - check_tmp_timetables(exposition, data.get('key')) return exposition def clean(self): @@ -280,6 +284,30 @@ class ExpositionCreateForm(forms.Form): raise forms.ValidationError(e.messages[0]) return web_page + def clean_registration_link(self): + """ + checking web_page + """ + cleaned_data = super(ExpositionCreateForm, self).clean() + registration_link = cleaned_data.get('registration_link') + if not registration_link: + return '' + + validate = URLValidator() + try: + validate(registration_link) + except(forms.ValidationError),e: + raise forms.ValidationError(e.messages[0]) + return registration_link + + def clean_area(self): + """ + checking foundation_year + """ + cleaned_data = super(ExpositionCreateForm, self).clean() + area = cleaned_data.get('area').strip() + return is_positive_integer(area) + def clean_foundation_year(self): """ checking foundation_year @@ -438,6 +466,7 @@ class StatisticForm(forms.ModelForm): year = forms.CharField(widget=forms.TextInput(attrs={'style': 'width:70px'})) visitors = forms.CharField(widget=forms.TextInput(attrs={'style': 'width:70px'}), required=False) members = forms.CharField(widget=forms.TextInput(attrs={'style': 'width:70px'}), required=False) + area = forms.CharField(widget=forms.TextInput(attrs={'style': 'width:70px'}), required=False) class Meta: model = Statistic exclude = ('exposition') @@ -464,9 +493,8 @@ class TimeTableForm(forms.Form): widget=forms.TextInput(attrs={'style':'width: 150px'})) end = forms.DateTimeField(label='Время окончания', input_formats=date_formats, widget=forms.TextInput(attrs={'style':'width: 150px'})) - timetable_organiser = forms.ModelChoiceField(label='Организатор', queryset=Organiser.objects.all(), empty_label='', required=False) - # uses for comparing with TmpTimetable key - key = forms.CharField(required=False, widget=forms.HiddenInput()) + timetable_organiser = forms.ChoiceField(label='Организатор', required=False, + choices=[(item.id, item.name) for item in Organiser.objects.language().all()]) def __init__(self, *args, **kwargs): """ @@ -484,7 +512,7 @@ class TimeTableForm(forms.Form): self.fields['name_%s' % code] = forms.CharField(label='Название программы', required=required, widget=forms.TextInput(attrs={'style':'width: 550px'})) self.fields['programe_%s' % code] = forms.CharField(label='Программа', required=required, - widget=TinyMCE()) + widget=CKEditorWidget) self.fields['speaker_%s' % code] = forms.CharField(label='Спикеры', required=False, widget=forms.TextInput(attrs={'style':'width: 550px'})) self.fields['place_%s' % code] = forms.CharField(label='Место проведения', required=False, @@ -493,14 +521,13 @@ class TimeTableForm(forms.Form): def save(self,exposition=None): data = self.cleaned_data if not exposition: - timetable = TmpTimeTable() - timetable.key = data.get('key') + return None else: timetable = TimeTable() # simple fields if data.get('timetable_organiser'): - timetable.timetable_organiser = data['timetable_organiser'] + timetable.timetable_organiser_id = data['timetable_organiser'] timetable.exposition = exposition timetable.begin = data.get('begin') timetable.end = data.get('end') @@ -513,5 +540,40 @@ class TimeTableForm(forms.Form): return timetable +monthes = [('', ''), + (1, _(u'Январь')), (2, _(u'Февраль')), (3, _(u'Март')), (4, _(u'Апрель')), + (5, _(u'Май')), (6, _(u'Июнь')), (7, _(u'Июль')), (8, _(u'Август')), + (9, _(u'Сентябрь')), (10, _(u'Октябрь')), (11, _(u'Ноябрь')), (12, _(u'Декабрь'))] + class ExpositionFilterForm(AdminFilterForm): - model = Exposition \ No newline at end of file + + model = Exposition + country = forms.MultipleChoiceField(label=u'Страна', choices=[(c.id, c.name) for c in Country.objects.all()], + required=False) + #city = forms.CharField(label=u'Город', widget=forms.HiddenInput(), required=False) + year = forms.CharField(label=u'Год', required=False) + month = forms.ChoiceField(label=u'Месяц',choices=[(item[0], item[1]) for item in monthes], required=False) + + + def filter(self): + data = self.cleaned_data + qs = super(ExpositionFilterForm, self).filter() + exact_name = data['exact_name'] + if exact_name: + + return self.model.objects.filter(translations__name=exact_name).distinct() + country = data['country'] + # city = data['city'] + year = data['year'] + month = data['month'] + if country: + qs = qs.filter(country__in=country) + # if city: + # qs = qs.filter(city__in=city) + if year: + qs = qs.filter(data_begin__year=year) + if month: + qs = qs.filter(data_begin__month=month) + + return qs + diff --git a/exposition/management/commands/convert_expo_logo.py b/exposition/management/commands/convert_expo_logo.py index ea78109b..1bc8c056 100644 --- a/exposition/management/commands/convert_expo_logo.py +++ b/exposition/management/commands/convert_expo_logo.py @@ -1,10 +1,5 @@ from django.core.management.base import BaseCommand, CommandError from exposition.models import Exposition -from django.contrib.sites.models import Site -from photologue.models import Gallery, Photo -from file.models import FileModel -from django.core.files import File -from django.core.files.temp import NamedTemporaryFile import urllib2 from django.conf import settings from django.utils import translation diff --git a/exposition/management/commands/exposition_load.py b/exposition/management/commands/exposition_load.py index 515b103c..4959d163 100644 --- a/exposition/management/commands/exposition_load.py +++ b/exposition/management/commands/exposition_load.py @@ -1,396 +1,85 @@ # -*- coding: utf-8 -*- -from django.core.management.base import BaseCommand, CommandError -from city.models import City -from country.models import Country -from exposition.models import Exposition -import xlrd, xlwt -#from import_xls.excel_settings import event_sett -from django.conf import settings -from import_xls.import_forms import google_address - -def to_int(val): - """ - Reverse function to get_int - return None if value isnt integer - """ - try: - return int(val) - except ValueError: - return None - -def to_country(value): - try: - #query = get_translation_aware_manager(Country) - #country = query.filter(name=value)[0] - country = Country.objects.filter(translations__name=value.strip())[0] - return country - except IndexError: - return None - -def to_city(value, lang, country): - try: - # get city by name - #objects = get_translation_aware_manager(City) - # except IndexError if no found - city = City.objects.filter(translations__name=value.strip(), country=country)[0] - return city - except IndexError: - return None - -from theme.models import Theme, Tag -def to_theme(obj, value): - if isinstance(value, float) or isinstance(value, int): - if (value - int(value) > 0): - value = str(value) - else: - value = str(int(value)) - theme_ids = value.split('.') - else: - theme_ids = value.split(',') - theme_objects = [] - for id in theme_ids: - try: - theme = Theme.objects.language('ru').get(id=int(id)) - theme_objects.append(theme) - obj.theme.add(theme) - except Theme.DoesNotExist, ValueError: - pass - - - return theme_objects - -from hvad.utils import get_translation_aware_manager -def to_tag(obj,value): - if value == [""]: - return None - - names = value.split(',') - tags = [] - for name in names: - objects = get_translation_aware_manager(Tag) - tag = objects.filter(name=name) - #tag = Tag.objects.language('ru').filter(transations__name=name) - if tag: - tags.append(tag[0]) - obj.tag.add(tag[0]) - else: - continue - return tags - -import time -def to_date(value): - if not value: - return None - - if isinstance(value, unicode) or isinstance(value, str): - - t = time.strptime(value, "%d.%m.%Y") - if isinstance(value, float): - t = xlrd.xldate_as_tuple(value, 0)+(0,0,0) - - return time.strftime("%Y-%m-%d", t) - -def to_currency(value): - if value=='USD': - return value - if value=='EUR': - return value - if value=='RUB': - return 'RUB' - return 'USD' - -from django.core.validators import validate_email, URLValidator - -def to_url(url): - validate = URLValidator() - try: - validate(url) - except: - return '' - return url - -def to_email(email): - try: - validate_email(email) - except: - return '' - return email - -from file.models import FileModel -import urllib2 +import xlrd +from django.core.management.base import BaseCommand from django.conf import settings -from django.contrib.contenttypes.models import ContentType -from functions.files import get_alternative_filename - - -def save_logo(obj, value, purpose): - """ - if not obj.id: - return None - """ - - - urls = value.split(';') - - - for url in urls: - - - - - if url[0]!=('/'): - url = '/'+url - url = 'http://www.expomap.ru'+url - - file_name = url.split('/')[-1] - alt_name = get_alternative_filename(settings.MEDIA_ROOT+'imgs/', file_name) - - download_to = settings.MEDIA_ROOT+'imgs/'+alt_name - - try: - response = urllib2.urlopen(url, timeout=3) - except: - continue - - with open(download_to,'wb') as f: - f.write(response.read()) - f.close() - - file_name ='imgs/'+alt_name - content_type = ContentType.objects.get_for_model(obj) - file = FileModel(file_path=file_name, file_type='JPG', purpose=purpose, - content_type=content_type, object_id=obj.id) - - file.save() - -from place_exposition.models import EXPOSITION_TYPE -def to_type(value): - for t in EXPOSITION_TYPE: - if value == t[1]: - return t[0] - return 'Exposition complex' - -def to_phone(value): - if value: - if isinstance(value, float) or isinstance(value, int): - return value - else: - deduct = ('-','(',')','.',' ', '+') - for elem in deduct: - value = value.replace(elem, '') - - value = to_int(value) - - return value - -from place_exposition.models import PlaceExposition -def to_place(value): - try: - place = PlaceExposition.objects.get(id=value) - return place - except: - - return None -from exposition.models import BIT_AUDIENCE -def to_audience(value, model=Exposition): - if value: - l = value.split(', ') - aud = {'Trade visitors':'experts', 'Trade visitors and Public':'experts and consumers', - 'General public': 'general public'} - if l: - new_list = [] - for value in l: - for item1, item2 in BIT_AUDIENCE: - if aud.get(value) == item2: - new_list.append(item1) - if new_list: - - return reduce(lambda x,y: x|y, (getattr(model.audience, item) for item in new_list)) - return 0 - -def to_periodic(value): - per = {'Оnce a year': 1.0, 'Every 2 years':0.5, 'Twice a year':2.0} - return per.get(value, 0) - -from organiser.models import Organiser -def to_organiser(obj, value): - org = Organiser.objects.filter(translations__name=value) - if org: - obj.organiser.add(org[0]) - else: - org = Organiser() - org.translate('ru') - org.name = value - org.save() - - -event_sett = { - u'ID':{u'field': u'id', u'func': to_int}, - u'Название':{u'field': u'name', u'func': unicode}, - u'Краткое описание':{u'field': u'main_title', u'func': unicode}, - u'Дата начала:(YYYY-MM-DD)':{u'field': u'data_begin', u'func': to_date}, - u'Дата окончания:(YYYY-MM-DD)':{u'field': u'data_end', u'func': to_date}, - u'Страна':{u'field': u'country', u'func': to_country}, - u'Город':{u'field': u'city', u'func': to_city, 'extra_values': 'country'}, - u'Место проведения':{u'field': u'place', u'func': to_place},##### - u'ID Тематики':{u'field': u'theme', u'func': to_theme, u'method': True}, - u'Теги':{u'field': u'tag', u'func': to_tag, u'method': True}, - u'Организатор №1':{u'field': u'organiser', u'func': to_organiser, u'method': True},#### - u'Организатор №2':{u'field': u'organiser', u'func': to_organiser, u'method': True},#### - u'Описание события':{u'field': u'description', u'func': unicode}, - u'Периодичность':{u'field': u'periodic', u'func': to_periodic}, - u'Аудитория':{u'field': u'audience', u'func': to_audience}, - u'Логотип':{u'field': u'logo', u'func': save_logo, u'method': True, u'purpose': 'logo'}, - u'Официальный веб-сайт':{u'field': u'web_page', u'func': to_url}, - u'Экспонируемые продукты':{u'field': u'products', u'func': unicode}, - u'Время работы':{u'field': u'time', u'func': unicode}, - u'Валюта':{u'field': u'currency', u'func': to_currency}, - # - u'Посетители_билет (1 день)':{u'field': u'price_day', u'func': to_int}, - u'Посетители_билет (все дни)':{u'field': u'price_all', u'func': to_int}, - #u'Условия':{u'field': u'periodic', u'func': unicode}, - u'Посетители_билет (1 день)(на стойке)':{u'field': u'price_day_bar', u'func': to_int},##?? - u'Посетители_билет (все дни)(на стойке)':{u'field': u'price_all_bar', u'func': to_int},##?? - #u'Условия':{u'field': u'periodic', u'func': unicode},##?? - #u'Примечание':{u'field': u'periodic', u'func': unicode}, - u'Каталог':{u'field': u'price_catalog', u'func': to_int}, - u'Налог включен':{u'field': u'tax', u'func': bool}, - u'Год основания':{u'field': u'foundation_year', u'func': to_int}, - #u'Данные за год':{u'field': u'periodic', u'func': to_int}, - u'Посетители':{u'field': u'visitors', u'func': to_int}, - u'Участники':{u'field': u'members', u'func': to_int}, - #u'Страны':{u'field': u'periodic', u'func': unicode},##?? - u'Площадь':{u'field': u'periodic', u'func': to_int}, - u'Min_Raw кв.м.':{u'field': u'min_closed_area', u'func': to_int}, - u'Max_Raw кв.м.':{u'field': u'max_closed_area', u'func': to_int}, - u'Min_Pack кв.м.':{u'field': u'min_closed_equipped_area', u'func': to_int}, - u'Max_Pack кв.м.':{u'field': u'max_closed_equipped_area', u'func': to_int}, - u'Открытая площадь':{u'field': u'max_open_area', u'func': to_int}, - u'Мин. Площадь кв.м.':{u'field': u'min_open_area', u'func': to_int}, - u'Регистрационный взнос':{u'field': u'registration_payment', u'func': to_int}, - #u'Примечание':{u'field': u'periodic', u'func': unicode}, - u'Крайний срок подачи заявки':{u'field': u'application_deadline', u'func': to_date}, - u'UFI':{u'field': u'quality_label', u'func': bool, },## - u'РСВЯ':{u'field': u'quality_label', u'func': bool},## - u'EXPORATING':{u'field': u'quality_label', u'func': bool},## - u'Отменена':{u'field': u'canceled', u'func': bool}, - u'ExpoHIT':{u'field': u'expohit', u'func': bool}, - #u'Фото':{u'field': u'photo', u'func': save_photo, u'method': True}, +from exposition.models import Exposition +from import_xls.excel_settings import event_sett -} +CHINA_FILE = settings.MEDIA_ROOT+'/import/expo_china_ru.xlsx' +GERMANY_FILE = settings.MEDIA_ROOT+'/import/expo_germany_ru.xlsx' +# 391 row not imported(same url) +ITALY_FILE = settings.MEDIA_ROOT+'/import/expo_italy_ru.xlsx' +# moscow 3 exps +F = settings.MEDIA_ROOT+'/import/exp.xlsx' class Command(BaseCommand): def handle(self, *args, **options): - f = open(settings.MEDIA_ROOT+'/import/Places Eng Upd.xlsx', 'r') + f = open(F, 'r') book = xlrd.open_workbook(file_contents=f.read()) sheet = book.sheet_by_index(0) row_list = [sheet.row_values(row_number) for row_number in range(sheet.nrows)] labels = [label for label in row_list[0]] - print(123) + for row_number, row in enumerate(row_list[1:]): - - for row_number, row in enumerate(row_list): - # go through all rows in file - if row_number > 0: - # first field is label - if row[0] != '': - # in first column ids - - try: - object = Exposition.objects.language('en').get(id=int(row[0])) - except ValueError: - object = Exposition() - - object.translate('en') - - except Exposition.DoesNotExist: - object = Exposition(id= int(row[0])) - - object.translate('en') - else: - # if id blank - its a new place + if row[0] != '': + # in first column ids + try: + object = Exposition.objects.language('ru').get(id=int(row[0])) + except ValueError: object = Exposition() + object.translate('ru') + + except Exposition.DoesNotExist: + object = Exposition(id= int(row[0])) + object.translate('ru') + else: + # if id blank - its a new place + object = Exposition() + object.translate('ru') + methods = [] + for col_number, cell in enumerate(row): + label = labels[col_number] + setting = event_sett.get(label) + if setting is None: + continue + if setting.get('method'): + if cell != "": + methods.append({'func': setting['func'], 'value': cell, 'purpose': setting.get('purpose')}) + continue + + field_name = setting['field'] + func = setting.get('func') + + if func is not None: + extra_value = setting.get('extra_values') + if extra_value is not None: + # if setting has extra value then + # it is some field like city, theme, tag + # that has relation and can be created + + # in function we add language(need for relation fields) + # and extra value from object (like for city need country) + value = func(cell, 'ru', getattr(object, extra_value)) + elif setting.get('bitfield'): + value = func(object, cell, setting['label']) - object.translate('en') - methods = [] - flag = False - for col_number, cell in enumerate(row): - - # go through row cells - # field name current cell - label = labels[col_number] - setting = event_sett.get(label) - - if setting is None: - continue - - if setting.get('method'): - if cell != "": - methods.append({'func': setting['func'], 'value': cell, 'purpose': setting.get('purpose')}) - continue - - field_name = setting['field'] - - - - func = setting.get('func') - if func is not None: - extra_value = setting.get('extra_values') - if extra_value is not None: - # if setting has extra value then - # it is some field like city, theme, tag - # that has relation and can be created - - # in function we add language(need for relation fields) - # and extra value from object (like for city need country) - value = func(cell, 'en', getattr(object, extra_value)) - else: - value = func(cell) - #if field_name =='adress': - # setattr(object, 'address', google_address(value)) - if field_name=='city' and not value: - print('error city') - flag = True - continue - if not field_name=='quality_label': - setattr(object, field_name, value) - else: - if value: - if setting.get('l') == 'ufi': - object.quality_label.ufi = True - if setting.get('l') == 'rsva': - object.quality_label.rsva = True - if setting.get('l') == 'exporating': - object.quality_label.exporating = True + else: + value = func(cell) + setattr(object, field_name, value) + object.save() + print('post save %s'% str(object)) - if not flag: - object.save() - """ + for method in methods: + func = method['func'] + if method.get('purpose'): try: - print('pre save %s'% str(object)) - object.save() + func(object, method['value'], method['purpose']) except: - print('saving error') continue - """ - print('post save %s'% str(object)) else: - print('bad city') - - for method in methods: - func = method['func'] - if method.get('purpose'): - try: - func(object, method['value'], method['purpose']) - except: - continue - else: - try: - func(object, method['value']) - except: - continue + func(object, method['value']) \ No newline at end of file diff --git a/exposition/manager.py b/exposition/manager.py index 288ff35d..4e8ee528 100644 --- a/exposition/manager.py +++ b/exposition/manager.py @@ -1,9 +1,12 @@ +import datetime from hvad.models import TranslationManager + class ClientManager(TranslationManager): def get_query_set(self): - return super(ClientManager, self).get_query_set().filter(is_published=True) + now = datetime.datetime.now().date() + return super(ClientManager, self).get_query_set().filter(is_published=True, data_begin__gte=now).order_by('data_begin') """ diff --git a/exposition/models.py b/exposition/models.py index 24826302..2ab9ceb9 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -3,22 +3,22 @@ import copy, datetime from django.db import models from django.db.models.signals import post_save, pre_save from django.utils.translation import ugettext as _ +from django.utils import translation from django.conf import settings from hvad.models import TranslatableModel, TranslatedFields, TranslationManager - from django.contrib.contenttypes import generic from bitfield import BitField from service.models import Service from functions.db import db_table_exists from organiser.models import Organiser from manager import ClientManager -# from functions.custom_fields import EnumField from functions.signal_handlers import post_save_handler, pre_save_handler from functions.models_methods import ExpoManager from functions.model_mixin import EventMixin, ExpoMixin from functions.translate import fill_with_signal from photologue.models import Gallery +from import_xls.model_utils import ExpoImportManager AUDIENCE1 = ((None,_(u'Не выбрано')), ('experts', _(u'Специалисты')), @@ -32,7 +32,7 @@ BIT_AUDIENCE = (('experts', _(u'Специалисты')), ('experts and consume ('general public', _(u'Широкая публика'))) -CURRENCY = ('RUB', 'USD', 'EUR') +CURRENCY = ('RUB', 'USD', 'EUR', 'RMB', 'GBP') # check if table exist and create flags if true flags = [str(item.id) for item in Service.objects.all()] if db_table_exists('service_service') else [] @@ -44,11 +44,14 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ - # main + catalog = '/expo/' + catalog_name = _(u'Выставки:') + search_name = None + # type of event + event_type = 'expo' - url = models.SlugField(unique=True) - #logo = fo + url = models.SlugField(unique=True, max_length=255) data_begin = models.DateField(verbose_name='Дата начала') data_end = models.DateField(verbose_name='Дата окончания') services = BitField(flags=flags) @@ -100,11 +103,15 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): discount_description = models.TextField(verbose_name='Описание скидки', blank=True), time = models.TextField(verbose_name='Время работы', blank=True), # visit and particaption data + price_day = models.CharField(verbose_name='Стоимость билета 1 день', max_length=255, blank=True), + price_all = models.CharField(verbose_name='Стоимость билета все дни', max_length=255, blank=True), + price_day_bar = models.CharField(verbose_name='Стоимость на стойке 1 день', max_length=255, blank=True), + price_all_bar = models.CharField(verbose_name='Стоимость на стойке все дни', max_length=255, blank=True), stat_countries = models.TextField(verbose_name='Участвующие страны', blank=True), pre_condition = models.CharField(verbose_name='Условия предварительной регистрации', max_length=255, blank=True), stand_condition = models.CharField(verbose_name='Условия регистрации на стойке', max_length=255, blank=True), visit_note = models.CharField(verbose_name='Примечание по посещению', max_length=255, blank=True), - participation_note = models.CharField(verbose_name='Примечание по участии', max_length=255, blank=True), + participation_note = models.TextField(verbose_name='Примечание по участии', blank=True), #-----meta data @@ -114,25 +121,20 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): ) files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id') + note = generic.GenericRelation('note.Note', content_type_field='content_type', object_id_field='object_id') #about periodic = models.FloatField(verbose_name='Переодичность', blank=True, null=True) audience = BitField(flags=[k for k, v in BIT_AUDIENCE]) web_page = models.CharField(verbose_name='Вебсайт', max_length=255, blank=True) foundation_year = models.PositiveIntegerField(verbose_name='Год основания', blank=True, null=True) + area = models.PositiveIntegerField(verbose_name='Площадь', blank=True, null=True) # conditions of Participation registration_link = models.URLField(verbose_name='Ссылка на регистрацию', max_length=255, blank=True) min_area = models.PositiveIntegerField(verbose_name='Минимальная площадь', blank=True, null=True) currency = EnumField(values=CURRENCY, default='USD') application_deadline = models.DateField(verbose_name='Срок подачи заявки', null=True) min_stand_size = models.PositiveIntegerField(verbose_name='Минимальный размер стэнда', blank=True, null=True) - price_day = models.PositiveIntegerField(verbose_name='Стоимость билета 1 день', blank=True, null=True) - price_all = models.PositiveIntegerField(verbose_name='Стоимость билета все дни', blank=True, null=True) - # Условие - price_day_bar = models.PositiveIntegerField(verbose_name='Стоимость на стойке 1 день', blank=True, null=True) - price_all_bar = models.PositiveIntegerField(verbose_name='Стоимость на стойке все дни', blank=True, null=True) - # условие - # примечание price_catalog = models.PositiveIntegerField(verbose_name='Стоимость каталога', blank=True, null=True) tax = models.BooleanField(verbose_name='Налог', default=1) min_closed_area = models.PositiveIntegerField(verbose_name='Минимальная цена закрытой НЕ оборудованной площади', @@ -148,12 +150,10 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): max_open_area = models.PositiveIntegerField(verbose_name='Максимальная цена открытой площади', blank=True, null=True) registration_payment = models.PositiveIntegerField(verbose_name='Регистрационный взнос', blank=True, null=True) - # примечание - - # statistic enable = ClientManager() + imports = ExpoImportManager() #set manager of this model objects = ExpoManager() @@ -161,6 +161,26 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): def __unicode__(self): return self.lazy_translation_getter('name', unicode(self.pk)) + def get_parent(self): + return {} + + def get_index_text(self): + translation.activate('ru') + translations = self.translations.all() + names = ' '.join([tr.name for tr in translations]) + titles = ' '.join([tr.main_title for tr in translations]) + themes = ' '.join([' '.join(theme.get_all_names()) for theme in self.theme.all()]) + tags = ' '.join([' '.join(tag.get_all_names()) for tag in self.tag.all()]) + return names + ' ' + titles + ' ' + themes + ' ' + tags + + + def get_note_by_user(self, user_id): + note = self.note.filter(user__id=user_id) + try: + return note.get().text + except: + return '' + def upload_photo_url(self): return '/admin/exposition/upload-photo/%s/'%self.id @@ -184,6 +204,12 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): return gallery + def tags(self): + return self.tag.language().all() + + def statistic_exists(self): + return Statistic.objects,filter(exposition=self).exists() + def upload_photo(self, photo ,gallery=None): """ @@ -195,9 +221,9 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): gallery.photos.add(photo) - def get_index_text(self): - names = [tr.name for tr in self.translations.all()] - return names +# def get_index_text(self): +# names = [tr.name for tr in self.translations.all()] +# return names def get_audience(self): checked = [item for item, bool in self.audience if bool==True] @@ -250,6 +276,14 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): return days + def get_currency_html(self): + cur = self.currency + currency_codes = {'EUR':'€', 'USD':'$', 'RUB':'ք'} + code = currency_codes.get(cur) + if code: + return code + return cur + def clone(self): """ Return an identical copy of the instance with a new ID. @@ -298,6 +332,7 @@ class Statistic(models.Model): year = models.PositiveIntegerField(verbose_name='Год') members = models.PositiveIntegerField(verbose_name='Посетители') visitors = models.PositiveIntegerField(verbose_name='Участники') + area = models.PositiveIntegerField(verbose_name='Площадь') from django.core import serializers from functions.models_methods import hvad_to_dict diff --git a/exposition/search_indexes.py b/exposition/search_indexes.py index 670f82bd..906c835e 100644 --- a/exposition/search_indexes.py +++ b/exposition/search_indexes.py @@ -1,10 +1,14 @@ +# -*- coding: utf-8 -*- +from django.utils import translation from haystack import indexes from models import Exposition +from functions.search_mixin import ExpoSearchMixin -class ExpositionIndex(indexes.SearchIndex, indexes.Indexable): +class ExpositionIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin): text = indexes.CharField(document=True, use_template=True) where = indexes.MultiValueField() + url = indexes.CharField() data_begin = indexes.DateField(model_attr='data_begin') data_end = indexes.DateField(model_attr='data_end') theme = indexes.MultiValueField() @@ -12,31 +16,36 @@ class ExpositionIndex(indexes.SearchIndex, indexes.Indexable): country_id = indexes.IntegerField() city_id = indexes.IntegerField() area_id = indexes.IntegerField() + content_auto = indexes.EdgeNgramField() + form_name = indexes.CharField() + # translated fields + name_en = indexes.CharField() + name_ru = indexes.CharField() + catalog_name_en = indexes.CharField() + catalog_name_ru = indexes.CharField() - def prepare_area_id(self, obj): - return obj.country.area.id + def prepare_form_name(self, obj): + return None - def prepare_country_id(self, obj): - return obj.country.id + def prepare_catalog_name_en(self, obj): + return u'Expos' - def prepare_city_id(self, obj): - return obj.city.id - - def prepare_theme(self, obj): - return [th.id for th in obj.theme.filter()] - - def prepare_tag(self, obj): - return [th.id for th in obj.tag.filter()] - - def prepare_where(self, obj): - country = [tr.name for tr in obj.country.translations.all()] - city = [tr.name for tr in obj.city.translations.all()] - - return country + city + def prepare_catalog_name_ru(self, obj): + return u'Выставки' def get_model(self): return Exposition def index_queryset(self, using=None): - return self.get_model().objects.filter(is_published=True) \ No newline at end of file + return self.get_model().objects.filter(is_published=True) + + def get_name(self): + return 123 + lang = translation.get_language() + if lang == 'ru': + return self.name_ru + elif lang=='en': + return self.name_en + else: + return self.name_ru \ No newline at end of file diff --git a/exposition/urls.py b/exposition/urls.py index 39b99d05..934d3ac5 100644 --- a/exposition/urls.py +++ b/exposition/urls.py @@ -1,34 +1,80 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url -from views import ExpositionView, ExpositionVisitors, ExpositionMembers, ExpositionStatistic, ExpositionPrice,\ +from views import ExpositionStatistic, ExpositionPrice,\ ExpositionProgramme, ExpositionSearchView, ExpositionByCountry, ExpositionByTheme, ExpositionByCity -from django.http import HttpResponse +from django.http import HttpResponse from views import ExpositionServiceView +from views import ExpoCountryCatalog, ExpoCityCatalog, ExpoThemeCatalog, ExpoTagCatalog, ExpoList, ExpoDetail,\ + ExpoVisitors, ExpoMembers -def test(request): - return HttpResponse('123') urlpatterns = patterns('', + # search url(r'expo/search/', ExpositionSearchView.as_view()), - url(r'expo/country/', ExpositionByCountry.as_view()), - url(r'expo/city/', ExpositionByCity.as_view()), - url(r'expo/theme/', ExpositionByTheme.as_view()), - - url(r'expo/(?P.*)/(?P\d+)/$', ExpositionView.as_view()), - url(r'expo/(?P\d+)/$', ExpositionView.as_view()), - # - url(r'expo/(?P.*)/service/(?P.*)/$', ExpositionServiceView.as_view()), - url(r'expo/(?P.*)/statistic/$', ExpositionStatistic.as_view()), - url(r'expo/(?P.*)/price/$', ExpositionPrice.as_view()), - url(r'expo/(?P.*)/program/$', ExpositionProgramme.as_view()), - # - url(r'expo/(?P.*)/visitors/$', ExpositionVisitors.as_view()), - url(r'expo/(?P.*)/members/$', ExpositionMembers.as_view()), - url(r'expo/(?P.*)/$', ExpositionView.as_view()), - url(r'expo/$', ExpositionView.as_view()), - # + # country catalog + url(r'expo/country/$', ExpositionByCountry.as_view()), + url(r'expo/country/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoCountryCatalog.as_view()), + url(r'expo/country/(?P.*)/(?P\d+)/page/(?P\d+)/$', ExpoCountryCatalog.as_view()), + url(r'expo/country/(?P.*)/page/(?P\d+)/$', ExpoCountryCatalog.as_view()), + url(r'expo/country/(?P.*)/(?P\d+)/(?P.*)/$', ExpoCountryCatalog.as_view()), + url(r'expo/country/(?P.*)/(?P\d+)/$', ExpoCountryCatalog.as_view()), + url(r'expo/country/(?P.*)/$', ExpoCountryCatalog.as_view()), + # city catalog + url(r'expo/city/$', ExpositionByCity.as_view()), + url(r'expo/city/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoCityCatalog.as_view()), + url(r'expo/city/(?P.*)/(?P\d+)/page/(?P\d+)/$', ExpoCityCatalog.as_view()), + url(r'expo/city/(?P.*)/page/(?P\d+)/$', ExpoCityCatalog.as_view()), + url(r'expo/city/(?P.*)/(?P\d+)/(?P.*)/$', ExpoCityCatalog.as_view()), + url(r'expo/city/(?P.*)/(?P\d+)/$', ExpoCityCatalog.as_view()), + url(r'expo/city/(?P.*)/$', ExpoCityCatalog.as_view()), + # theme catalog + url(r'expo/theme/$', ExpositionByTheme.as_view()), + url(r'expo/theme/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoThemeCatalog.as_view()), + url(r'expo/theme/(?P.*)/(?P\d+)/page/(?P\d+)/$', ExpoThemeCatalog.as_view()), + url(r'expo/theme/(?P.*)/page/(?P\d+)/$', ExpoThemeCatalog.as_view()), + url(r'expo/theme/(?P.*)/(?P\d+)/(?P.*)/$', ExpoThemeCatalog.as_view()), + url(r'expo/theme/(?P.*)/(?P\d+)/$', ExpoThemeCatalog.as_view()), + url(r'expo/theme/(?P.*)/$', ExpoThemeCatalog.as_view()), + # tag catalog + url(r'expo/tag/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoTagCatalog.as_view()), + url(r'expo/tag/(?P.*)/(?P\d+)/page/(?P\d+)/$', ExpoTagCatalog.as_view()), + url(r'expo/tag/(?P.*)/page/(?P\d+)/$', ExpoTagCatalog.as_view()), + url(r'expo/tag/(?P.*)/(?P\d+)/(?P.*)/$', ExpoTagCatalog.as_view()), + url(r'expo/tag/(?P.*)/(?P\d+)/$', ExpoTagCatalog.as_view()), + url(r'expo/tag/(?P.*)/$', ExpoTagCatalog.as_view()), + # expo additional pages + url(r'expo/(?P.*)/statistic/$', ExpositionStatistic.as_view()), + url(r'expo/(?P.*)/price/$', ExpositionPrice.as_view()), + url(r'expo/(?P.*)/program/$', ExpositionProgramme.as_view()), + url(r'expo/(?P.*)/visitors/page/(?P\d+)/$', ExpoVisitors.as_view()), + url(r'expo/(?P.*)/visitors/$', ExpoVisitors.as_view()), + url(r'expo/(?P.*)/members/page/(?P\d+)/$', ExpoMembers.as_view()), + url(r'expo/(?P.*)/members/$', ExpoMembers.as_view()), + url(r'expo/(?P.*)/service/(?P.*)/', ExpositionServiceView.as_view()), + + # expo list + url(r'expo/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoList.as_view()), + url(r'expo/(?P\d+)/page/(?P\d+)/$', ExpoList.as_view()), + url(r'expo/(?P\d+)/(?P.*)/$', ExpoList.as_view()), + url(r'expo/(?P\d+)/$', ExpoList.as_view()), + url(r'expo/page/(?P\d+)/$', ExpoList.as_view()), + # expo page + url(r'expo/(?P.*)/$', ExpoDetail.as_view()),# event + url(r'expo/$', ExpoList.as_view()), + + + url(r'expo/add-note/(?P.*)/$', 'exposition.views.add_note'), + + + + + + #url(r'expo/(?P.*)/service/(?P.*)/$', ExpositionServiceView.as_view()), + + #url(r'expo/(?P.*)/service/(?P.*)/$', ExpositionServiceView.as_view()), + #url(r'expo/(?P.*)/statistic/$', ExpositionStatistic.as_view()), url(r'exposition-add-calendar/(?P\d+)/$', 'exposition.views.exposition_add_calendar'), url(r'exposition-visit/(?P\d+)/$', 'exposition.views.exposition_visit'), diff --git a/exposition/views.py b/exposition/views.py index 999ba1af..4c019d58 100644 --- a/exposition/views.py +++ b/exposition/views.py @@ -1,54 +1,63 @@ # -*- coding: utf-8 -*- +import json +import datetime from django.http import HttpResponseRedirect, HttpResponse from django.contrib import messages -#models -from models import Exposition -from functions.custom_views import ExpoListView, ExpoMixin, EventDetail, single_page_filter -from django.views.generic import ListView, DetailView, FormView -from haystack.query import EmptySearchQuerySet -from functions.search_forms import ExpositionSearchForm -from service.views import order_forms +from django.contrib.contenttypes.models import ContentType +from django.conf import settings +from django.views.generic import ListView, DetailView +from django.utils.translation import ugettext as _ from django.shortcuts import get_object_or_404 from django.http import Http404 from django.utils import translation -# +#models +from models import Exposition +from service.views import order_forms from service.models import Service from country.models import Country from city.models import City -from company.models import Company from theme.models import Theme, Tag -import json -from django.utils.translation import ugettext as _ +from note.models import Note +from functions.custom_views import ExpoSearchView +from functions.search_forms import ExpositionSearchForm +from functions.custom_views import ExpoSearchView -class ExpositionByCountry(ListView): - model = Country - template_name = 'exposition/exposition_by_country.html' - def get_queryset(self): - lang = translation.get_language() - return self.model.objects.select_related('exposition_country')\ - .filter(exposition_country__country__isnull=False, translations__language_code=lang)\ - .order_by('translations__name').distinct() class ExpositionBy(ListView): template_name = 'exposition/exposition_by.html' title1 = '' title2 = '' + """ abstact class """ def get_context_data(self, **kwargs): context = super(ExpositionBy, self).get_context_data(**kwargs) - context.update({'title1': self.title1, 'title2': self.title2}) + context.update({'title1': self.title1, 'title2': self.title2, 'catalog': self.catalog}) return context +class ExpositionByCountry(ExpositionBy): + model = Country + title1 = _(u'По странам') + title2 = _(u'Выставки мира по странам') + catalog = 'country/' + + def get_queryset(self): + lang = translation.get_language() + return self.model.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=lang)\ + .order_by('translations__name').distinct() + + class ExpositionByTheme(ExpositionBy): model = Theme title1 = _(u'По тематикам') title2 = _(u'Выставки мира по тематикам') + catalog = 'theme/' def get_queryset(self): lang = translation.get_language() @@ -57,12 +66,11 @@ class ExpositionByTheme(ExpositionBy): .order_by('translations__name').distinct() - - class ExpositionByCity(ExpositionBy): model = City title1 = _(u'По городам') title2 = _(u'Выставки мира по городам') + catalog = 'city/' def get_queryset(self): lang = translation.get_language() @@ -70,259 +78,346 @@ class ExpositionByCity(ExpositionBy): .filter(exposition_city__city__isnull=False, translations__language_code=lang)\ .order_by('translations__name').distinct() -class ExpositionServiceView(FormView, ExpoMixin): - params = None + +class ExpositionSearchView(ExpoSearchView): + #paginate_by = 10 + template_name = 'exposition/search.html' search_form = ExpositionSearchForm model = Exposition - obj = None - service = None - def get_form_class(self): - url = self.kwargs.get('url') - form = order_forms.get(url) - if not form: - raise Http404 +def exposition_add_calendar(request, id): + args = {'success': False} + user = request.user - service = get_object_or_404(Service, url=url) - self.service = service - self.template_name = service.template - params = self.get_params() - for param in params: + if user.is_authenticated(): + exp = Exposition.objects.safe_get(id=id) + if exp in user.calendar.get_expos(): + user.calendar.expositions.remove(exp) + args['in'] = False + else: + user.calendar.expositions.add(exp) + args['in'] = True + args['success'] = True + else: + args['not_authorized'] = True + args['success'] = True + + return HttpResponse(json.dumps(args), content_type='application/json') - if param.get('type') == 'country': - country = Country.objects.safe_get(url=param.get('url')) - if country: - param['name'] = country.name +def exposition_visit(request, id): + args = {'success': False} + user = request.user + if user.is_authenticated(): + exp = Exposition.objects.safe_get(id=id) + if user in exp.users.all(): + exp.users.remove(user) + args['in'] = False + else: + exp.users.add(user) + args['in'] = True - if param.get('type') == 'city': - city = City.objects.safe_get(url=param.get('url')) - if city: - param['name'] = city.name + args['success'] = True + """ + if exp: + exp.users.add(user) + args['success'] = True + """ - if param.get('type') == 'theme': - theme = Theme.objects.safe_get(url=param.get('url')) - if theme: - param['name'] = theme.name + else: + args['not_authorized'] = True + args['success'] = True - if param.get('type') == 'tag': - tag = Tag.objects.safe_get(url=param.get('url')) - if tag: - param['name'] = tag.name + return HttpResponse(json.dumps(args), content_type='application/json') +#------------------------------------------------------------------------------ - if param.get('type') == 'year': - param['name'] = param.get('url') - if param.get('type') == 'month': - monthes = {'jan': 1, 'feb': 2, 'mar': 3, 'apr': 4, 'may': 5, 'jun': 6, - 'jul': 7, 'aug': 8, 'sep': 9, 'oct': 10, 'nov': 11, 'dec': 12} +class ExpoDetail(DetailView): + model = Exposition + slug_field = 'url' + template_name = 'client/exposition/exposition_detail.html' - param['name'] = param.get('url') +class ExpositionProgramme(DetailView): + model = Exposition + slug_field = 'url' + template_name = 'client/exposition/programm.html' - if param.get('type') == 'member' and self.model != Company: - param['name'] = param.get('url') - company = Company.objects.safe_get(url=param.get('url')) - if company: - param['name'] = company.name - if param.get('type') == single_page_filter.get(self.model): - try: - self.obj = self.model.objects.get(url=param.get('url')) +class ExpositionPrice(DetailView): + model = Exposition + slug_field = 'url' + template_name = 'client/exposition/price.html' - except self.model.DoesNotExist: - raise Http404 - param['name'] = self.obj.name +class ExpositionStatistic(DetailView): + model = Exposition + slug_field = 'url' + template_name = 'client/exposition/statistic.html' - params.append({'type':'service', 'name':service.name}) - self.params = params - return form +from django.views.generic.edit import FormMixin, ModelFormMixin +class ExpositionServiceView(FormMixin, DetailView): + model = Exposition + slug_field = 'url' + service = None + + def post(self, request, *args, **kwargs): + self.object = self.get_object() + service_url = self.kwargs.get('service_url') + service = get_object_or_404(Service, url=service_url) + service_form = order_forms.get(service_url) + self.form_class = service_form + form = self.get_form(service_form) + + if form.is_valid(): + return self.form_valid(form) + else: + return self.form_invalid(form) def get_context_data(self, **kwargs): context = super(ExpositionServiceView, self).get_context_data(**kwargs) - context['search_form'] = ExpositionSearchForm() - context['search_action'] = '/expositions/search/' - context['event'] = self.obj - context['service'] = self.service - context['filter'] = self.params + service_url = self.kwargs.get('service_url') + service = get_object_or_404(Service, url=service_url) + self.service = service + self.template_name = service.template + form = order_forms.get(service_url) + self.form_class = form + if not form: + raise Http404 + context['form'] = self.get_form(self.form_class) + context['service'] = service + context['object'] = self.get_object() return context def form_valid(self, form): - form.save() + order = form.save(commit=False) + order.exposition = self.object + order.save() messages.success(self.request, _(u'Ваш запрос был успешно отправлен')) return HttpResponseRedirect(self.request.path) - #def form_invalid(self, form): - # return HttpResponse(form.errors) + def get_initial(self): + """ + Returns the initial data to use for forms on this view. + """ + if self.request.user.is_authenticated(): + user = self.request.user + initial = {'person_inf': user.get_full_name(), + 'person': user.email, + 'country': user.profile.country.name if user.profile.country else '', + 'city':user.profile.city.name if user.profile.city else '', + 'phone': user.profile.phone if user.profile.phone else ''} -class ExpositionSearchView(ListView): - paginate_by = 10 - template_name = 'exposition/search.html' - search_form = ExpositionSearchForm + return initial + else: + return self.initial.copy() + + +class ExpoList(ListView): model = Exposition + paginate_by = settings.CLIENT_PAGINATION + template_name = 'client/exposition/exposition_list.html' + search_form = ExpositionSearchForm + catalog_url = '/expo/' + year = None + month = None def get_queryset(self): - - if self.request.GET: - form = self.search_form(self.request.GET) - if form.is_valid(): - return form.search() - else: - return EmptySearchQuerySet() + if self.request.user.is_staff: + now = datetime.datetime.now().date() + qs = self.model.objects.filter(data_begin__gte=now).order_by('data_begin') else: - return EmptySearchQuerySet() + qs = self.model.enable.all() - def get_context_data(self, **kwargs): - context = super(ExpositionSearchView, self).get_context_data(**kwargs) + year = self.kwargs.get('year') + if year: + qs = qs.filter(data_begin__year=year) + # info for breadscrumbs + self.year = {'text': year, 'link': '%s%s/'%(self.catalog_url, year)} - context['search_form'] = ExpositionSearchForm(self.request.GET) - queries = self.request.GET.copy() - if queries.has_key('page'): - del queries['page'] - context['queries'] = queries - context['search_action'] = '/expo/search/' + month = self.kwargs.get('month') + if month and MONTHES.get(month): + qs = qs.filter(data_begin__month=MONTHES[month]['value']) + self.month = {'text': MONTHES[month]['name'], 'link': '%s%s/%s/'%(self.catalog_url, year, month)} + return qs + def get_context_data(self, **kwargs): + context = super(ExpoList, self).get_context_data(**kwargs) + context['month'] = self.month + context['catalog_url'] = self.catalog_url + context['search_form'] = self.search_form + context['year'] = self.year + context['month'] = self.month return context +MONTHES = {'jan': {'value': 1, 'name': _(u'Январь')}, 'feb': {'value': 2, 'name': _(u'Февраль')}, + 'mar': {'value': 3, 'name': _(u'Март')}, 'apr': {'value': 4, 'name': _(u'Апрель')}, + 'may': {'value': 5, 'name': _(u'Май')}, 'jun': {'value': 6, 'name': _(u'Июнь')}, + 'jul': {'value': 7, 'name': _(u'Июль')}, 'aug': {'value': 8, 'name': _(u'Август')}, + 'sep': {'value': 9, 'name': _(u'Сентябрь')}, 'oct': {'value': 10, 'name': _(u'Октябрь')}, + 'nov': {'value': 11, 'name': _(u'Ноябрь')}, 'dec': {'value': 12, 'name': _(u'Декабрь')}} -class ExpositionView(ExpoListView): +class ExpoCatalog(ListView): model = Exposition - template_name = 'event_catalog.html' + paginate_by = settings.CLIENT_PAGINATION + template_name = 'exposition/catalog.html' search_form = ExpositionSearchForm - order = 'data_begin' + filter_object = None + year = None + month = None + + def get_filtered_qs(self): + # diferent for views + pass + + def get_queryset(self): + qs = self.get_filtered_qs() + + year = self.kwargs.get('year') + if year: + qs = qs.filter(data_begin__year=year) + # info for breadscrumbs + self.year = {'text': year, 'link': '%s%s/%s/'%(self.catalog_url, self.filter_object.url, year)} + + + month = self.kwargs.get('month') + monthes = {'jan': {'value': 1, 'name': _(u'Январь')}, 'feb': {'value': 2, 'name': _(u'Февраль')}, + 'mar': {'value': 3, 'name': _(u'Март')}, 'apr': {'value': 4, 'name': _(u'Апрель')}, + 'may': {'value': 5, 'name': _(u'Май')}, 'jun': {'value': 6, 'name': _(u'Июнь')}, + 'jul': {'value': 7, 'name': _(u'Июль')}, 'aug': {'value': 8, 'name': _(u'Август')}, + 'sep': {'value': 9, 'name': _(u'Сентябрь')}, 'oct': {'value': 10, 'name': _(u'Октябрь')}, + 'nov': {'value': 11, 'name': _(u'Ноябрь')}, 'dec': {'value': 12, 'name': _(u'Декабрь')}} + if month and monthes.get(month): + qs = qs.filter(data_begin__month=monthes[month]['value']) + self.month = {'text': monthes[month]['name'], 'link': '%s%s/%s/%s/'%(self.catalog_url, self.filter_object.url, year, month)} + + return qs.order_by('data_begin') + def get_context_data(self, **kwargs): - context = super(ExpositionView, self).get_context_data(**kwargs) - context['search_action'] = '/expositions/search/' + context = super(ExpoCatalog, self).get_context_data(**kwargs) + context['search_form'] = self.search_form + context['filter_object'] = self.filter_object + context['year'] = self.year + context['month'] = self.month + context['catalog_url'] = self.catalog_url return context -class ExpositionVisitors(ExpositionView): +class ExpoCountryCatalog(ExpoCatalog): + catalog_url = '/expo/country/' + def get_filtered_qs(self): + #this method used in parent get_queryset + slug = self.kwargs.get('slug') + country = get_object_or_404(Country, url=slug) + self.filter_object = country + qs = self.model.enable.filter(country=country) + return qs + +class ExpoCityCatalog(ExpoCatalog): + catalog_url = '/expo/city/' + def get_filtered_qs(self): + #this method used in parent get_queryset + slug = self.kwargs.get('slug') + city = get_object_or_404(City, url=slug) + qs = self.model.enable.filter(city=city) + self.filter_object = city + return qs + + +class ExpoThemeCatalog(ExpoCatalog): + catalog_url = '/expo/theme/' + def get_filtered_qs(self): + #this method used in parent get_queryset + slug = self.kwargs.get('slug') + theme = get_object_or_404(Theme, url=slug) + qs = self.model.enable.filter(theme=theme) + self.filter_object = theme + return qs + + +class ExpoTagCatalog(ExpoCatalog): + catalog_url = '/expo/tag/' + def get_filtered_qs(self): + #this method used in parent get_queryset + slug = self.kwargs.get('slug') + tag = get_object_or_404(Tag, url=slug) + qs = self.model.enable.filter(tag=tag) + self.filter_object = tag + return qs + + +class ExpoVisitors(ListView): + paginate_by = settings.CLIENT_PAGINATION model = Exposition - template_name = 'event_visitors.html' + #template_name = 'event_visitors.html' - def get_queryset(self): + template_name = 'client/exposition/visitors.html' + + obj = None + search_form = ExpositionSearchForm - params = self.get_params() - for param in params: - if param.get('type') == 'event': - exp = Exposition.objects.safe_get(url=param.get('url')) - #query = exp.users - param['name'] = exp.name - params.append({'type':'visitors', 'name':_(u'Посетители')}) + def get_queryset(self): + slug = self.kwargs.get('slug') + exposition = get_object_or_404(self.model, url=slug) + self.obj = exposition + return exposition.users.all() - self.params = params - return exp.users.all() + def get_context_data(self, **kwargs): + context = super(ExpoVisitors, self).get_context_data(**kwargs) + context['object'] = self.obj + context['search_form'] = self.search_form + return context -class ExpositionMembers(ExpoListView): +class ExpoMembers(ListView): + paginate_by = settings.CLIENT_PAGINATION model = Exposition - template_name = 'event_members.html' + #template_name = 'event_visitors.html' - def get_queryset(self): + template_name = 'client/exposition/members.html' - params = self.get_params() - for param in params: - if param.get('type') == 'event': - exp = Exposition.objects.safe_get(url=param.get('url')) - param['name'] = exp.name - #query = exp.users - params.append({'type':'members', 'name':_(u'Участники')}) - self.params = params - return exp.company.all() - -class ExpositionStatistic(ExpoListView): - model = Exposition - template_name = 'exposition_statistic.html' - def get_queryset(self): - params = self.get_params() - for param in params: - if param.get('type') == 'event': - exp = Exposition.objects.filter(url=param.get('url')) - param['name'] = exp[0].name - #query = exp.users - self.single_page = True - params.append({'type':'statistic', 'name':_(u'Статистика')}) - self.params = params - return exp - -class ExpositionProgramme(ExpoListView): - model = Exposition - template_name = 'exposition_programm.html' - def get_queryset(self): - params = self.get_params() - for param in params: - if param.get('type') == 'event': - exp = Exposition.objects.filter(url=param.get('url')) - param['name'] = exp[0].name - #query = exp.users - self.single_page = True - params.append({'type':'programme', 'name':_(u'Программа')}) - self.params = params - return exp - -class ExpositionPrice(ExpoListView): - model = Exposition - template_name = 'exposition_price.html' - def get_queryset(self): - params = self.get_params() - for param in params: - if param.get('type') == 'event': - exp = Exposition.objects.filter(url=param.get('url')) - param['name'] = exp[0].name - #query = exp.users - self.single_page = True - params.append({'type':'price', 'name':_(u'Стоимость посещения и участия')}) - self.params = params - return exp + obj = None + search_form = ExpositionSearchForm + def get_queryset(self): + slug = self.kwargs.get('slug') + exposition = get_object_or_404(self.model, url=slug) + self.obj = exposition + return exposition.company.all() + def get_context_data(self, **kwargs): + context = super(ExpoMembers, self).get_context_data(**kwargs) + context['object'] = self.obj + context['search_form'] = self.search_form + return context -def exposition_add_calendar(request, id): +def add_note(request, slug): args = {'success': False} - user = request.user - - if user.is_authenticated(): - exp = Exposition.objects.safe_get(id=id) - if exp in user.calendar.expositions.all(): - user.calendar.expositions.remove(exp) - args['in'] = False - else: - user.calendar.expositions.add(exp) - args['in'] = True - args['success'] = True - else: - args['not_authorized'] = True - args['success'] = True - return HttpResponse(json.dumps(args), content_type='application/json') + if request.GET: + text = request.GET['note_text'] + try: + e = Exposition.objects.get(url=slug) + except Exposition.DoesNotExist: + raise Http404 -def exposition_visit(request, id): - args = {'success': False} - user = request.user - if user.is_authenticated(): - exp = Exposition.objects.safe_get(id=id) - if user in exp.users.all(): - exp.users.remove(user) - args['in'] = False + ct = ContentType.objects.get_for_model(e) + object_id = e.id + user = request.user + if Note.objects.filter(user=user, content_type=ct, object_id=object_id).exists(): + Note.objects.filter(user=user, content_type=ct, object_id=object_id).update(text=text) else: - exp.users.add(user) - args['in'] = True + Note.objects.create(content_type=ct, object_id=object_id, user=user, text=text) + + user.calendar.expositions.add(e) - args['success'] = True - """ - if exp: - exp.users.add(user) - args['success'] = True - """ - else: - args['not_authorized'] = True args['success'] = True + args['text'] = text return HttpResponse(json.dumps(args), content_type='application/json') \ No newline at end of file diff --git a/file/forms.py b/file/forms.py index db550935..8816ec37 100644 --- a/file/forms.py +++ b/file/forms.py @@ -12,6 +12,73 @@ from functions.translate import populate, fill_trans_fields_all from PIL import Image import pytils, re + + +class FileForm(forms.Form): + file_path = forms.FileField(label='Выберите файл') + model = forms.CharField(required=False, widget=forms.HiddenInput()) + purposes = [('scheme teritory','Схема територии'),('preview','Превью')] + purpose = forms.ChoiceField(label='Назаначение', choices=purposes) + + def __init__(self, *args, **kwargs): + """ + creates dynamical translated fields + """ + super(FileForm, self).__init__(*args, **kwargs) + # creates translated form fields, example: name_ru, name_en + # len(10) is a hack for detect if settings.LANGUAGES is not configured it return all langs + if len(settings.LANGUAGES) in range(10): + for lid, (code, name) in enumerate(settings.LANGUAGES): + # using enumerate for detect iteration number + # first iteration is a default lang so it required fields + required = True if lid == 0 else False + self.fields['file_name_%s'%code] = forms.CharField(label='Имя файла',required=False, widget=forms.TextInput(attrs={'placeholder': 'Имя'})) + self.fields['description_%s'%code] = forms.CharField(label='Описание', required=False, widget=forms.Textarea()) + + def save(self, request, obj=None): + """ + + """ + data = self.cleaned_data + if not obj: + return None + else: + file_obj = FileModel() + file_obj.content_type = ContentType.objects.get_for_model(obj) + file_obj.object_id = getattr(obj, 'id') + + #change all symbols than are not letter or number to '_'from file name + # and translit name + file_name = u'%s'%request['file_path'].name + file_name = pytils.translit.translify(file_name) + file_name = re.sub('[^\w\-_\.]', '_', file_name) + file_name = re.sub('_+', '_', file_name) + #file_name = re.sub('_+', '_', re.sub('[^\w\-_\. ]', '_', pytils.translit.translify(u'%s'%request['file_path'].name))) + request['file_path'].name = file_name + + #------- + file_obj.file_path = request['file_path'] + + file_obj.purpose = data['purpose'] + #type of file + type = str(data['file_path']).split('.')[-1] + #if type is image save fields with image size + if type.upper() in IMG_TYPES: + f = Image.open(data['file_path']) + file_obj.img_width, file_obj.img_height = f.size + #saves file_type + try: + file_obj.file_type = type + file_obj.save() + except: + file_obj.file_type = 'OTHER' + file_obj.save() + + #fills and saves translated fields + fill_trans_fields_all(FileModel, file_obj, data) + + return file_obj + class FileModelForm(forms.Form): """ Create FileModel form diff --git a/functions/admin_forms.py b/functions/admin_forms.py index 83878772..e1a78da9 100644 --- a/functions/admin_forms.py +++ b/functions/admin_forms.py @@ -23,7 +23,9 @@ class AdminFilterForm(forms.Form): class for filtering lists in admin panel """ model = None # which models work with - name = forms.CharField(label=_(u'Имя'), required=False) + exact_name = forms.CharField(label=_(u'Название'), required=False) + name = forms.CharField(label=_(u'Часть названия'), required=False) + def filter(self): """ @@ -32,11 +34,16 @@ class AdminFilterForm(forms.Form): form must be cleaned before calling this method """ + model = self.model data = self.cleaned_data name = data['name'] - model = self.model + exact_name = data['exact_name'] + if exact_name: + qs = model.objects.filter(translations__name=name).distinct() + return qs + qs = model.objects.all() if name: - qs = qs.filter(translations__name__contains=name) + qs = qs.filter(translations__name__contains=name).distinct() return qs \ No newline at end of file diff --git a/functions/admin_views.py b/functions/admin_views.py index 3cadc997..5a0f1802 100644 --- a/functions/admin_views.py +++ b/functions/admin_views.py @@ -10,11 +10,15 @@ class AdminView(FormView): def set_obj(self): url = self.kwargs.get('url') - - #rewrwe + # if url: - obj = get_object_or_404(self.model, url=url) - self.obj = obj + try: + obj = self.model.objects.get(url=url) + self.obj = obj + except: + raise Http404 + pass + # obj = get_object_or_404(self.model, url=url) return obj slug = self.kwargs.get('slug') if slug: @@ -117,7 +121,7 @@ class AdminListView(FormView): def get_context_data(self, **kwargs): context = super(AdminListView, self).get_context_data(**kwargs) - qs = self.model.objects.all() + qs = self.model.objects.language().all().order_by('name') result = paginate_results(qs, page=self.request.GET.get('page')) context['object_list'] = result return context diff --git a/functions/custom_views.py b/functions/custom_views.py index a9f9ebf2..cce1e3f4 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -221,7 +221,8 @@ single_page_filter = {Exposition:'event', Conference:'event', Seminar:'event', W - +from meta.models import MetaSetting +from meta.views import Meta class ExpoListView(ExpoMixin, ListView): """ """ @@ -299,6 +300,13 @@ class ExpoListView(ExpoMixin, ListView): context['filter'] = self.params context['single_page'] = self.single_page context['search_form'] = self.search_form + if self.single_page: + s = MetaSetting.objects.get(name='expo') + obj = context['object_list'][0] + + params = s.generate_meta(obj) + m = Meta(**params) + context['meta'] = m return context from country.models import Country @@ -306,4 +314,42 @@ from country.models import Country class EventDetail(ExpoMixin, DetailView): def get_object(self, queryset=None): obj = Country.objects.filter()[0] - return obj \ No newline at end of file + return obj + + +from haystack.query import EmptySearchQuerySet + +class ExpoSearchView(ListView): + paginate_by = 10 + template_name = None + search_form = None + model = None + + def get_queryset(self): + + if self.request.GET: + form = self.search_form(self.request.GET) + if form.is_valid(): + + return form.search() + else: + return EmptySearchQuerySet() + else: + return EmptySearchQuerySet() + + + def get_context_data(self, **kwargs): + context = super(ExpoSearchView, self).get_context_data(**kwargs) + form = self.search_form(self.request.GET) + if self.request.GET: + if form.is_valid(): + form.data_with_parents = form.get_form_data() + + + context['search_form'] = form + queries = self.request.GET.copy() + if queries.has_key('page'): + del queries['page'] + context['queries'] = queries + + return context \ No newline at end of file diff --git a/functions/form_check.py b/functions/form_check.py index b815c239..61c7cab3 100644 --- a/functions/form_check.py +++ b/functions/form_check.py @@ -15,7 +15,12 @@ def is_positive_integer(data, else: raise ValidationError(msg) + +from slugify import slugify + def translit_with_separator(string, separator='-'): + + return slugify(string, to_lower=True) """ Trsanslit string and replace "bad" symbols for separator diff --git a/functions/model_mixin.py b/functions/model_mixin.py index 59ced194..7f5950c6 100644 --- a/functions/model_mixin.py +++ b/functions/model_mixin.py @@ -4,9 +4,9 @@ from service.models import Service class ExpoMixin(object): - def get_index_text(self): - names = [tr.name for tr in self.translations.all()] - return names +# def get_index_text(self): +# names = [tr.name for tr in self.translations.all()] +# return names def get_logo(self): @@ -29,9 +29,12 @@ class ExpoMixin(object): class EventMixin(object): def get_permanent_url(self): - url = '%sevent-%s'%(self.get_catalog_url(), self.url) + url = '%s%s/'%(self.get_catalog_url(), self.url) return url + + + def get_logo(self): return self.logo """ @@ -75,9 +78,8 @@ class EventMixin(object): def get_services(self): ids = [item for item, bool in self.country.services if bool==True] - return [Service.objects.get(url=id) for id in ids] - - + ##sasa + return list(Service.objects.language().filter(url__in=ids).order_by('sort')) def duration_days(self, month=None): if not month: diff --git a/functions/search_forms.py b/functions/search_forms.py index e15c6ae2..ed0c58e8 100644 --- a/functions/search_forms.py +++ b/functions/search_forms.py @@ -1,10 +1,14 @@ # -*- coding: utf-8 -*- import pytils +import ast +import json from django import forms from django.db.models import Q +from django.utils import translation from django.utils.translation import ugettext_lazy as _ from haystack.query import EmptySearchQuerySet, SearchQuerySet - +from country.models import Area +from theme.models import Theme from exposition.models import Exposition from conference.models import Conference from seminar.models import Seminar @@ -13,127 +17,86 @@ from company.models import Company from theme.models import Theme, Tag from country.models import Country from city.models import City -import ast +from place_exposition.models import PlaceExposition +from place_conference.models import PlaceConference class AbstactSearchForm(forms.Form): - q = forms.CharField(label=_(u'Поиск'), required=False) + q = forms.CharField(label=_(u'Я ищу'), required=False) w = forms.CharField(label=_(u'Где'), required=False) + models = None + data_with_parents = None + def get_form_data(self): + data = self.cleaned_data + area = data.get('area') + co = data.get('co') + ci = data.get('ci') + th = data.get('th') + tg = data.get('tg') + if area: + ar = Area.objects.filter(id__in=area) + areas = [{'name':'area', 'id':item.id, 'parent':None, 'text':item.name} for item in ar] + else: + areas = [] - -class CompanySearchForm(AbstactSearchForm): - th = forms.MultipleChoiceField(label=_(u'Тематика'), required=False, - choices=[(theme.id, theme.name) for theme in Theme.objects.all()]) - tg = forms.MultipleChoiceField(label=_(u'Теги'), required=False, - choices=[(tag.id, tag.name) for tag in Tag.objects.all()]) - - - c = forms.CharField(label=_(u'Страна'), required=False, widget=forms.SelectMultiple()) - city = forms.CharField(label=_(u'город'), required=False, widget=forms.SelectMultiple()) - - def clean_city(self): - - city = self.cleaned_data.get('city') - if city: - res = ast.literal_eval(city) - return res - return city - - def clean_c(self): - country = self.cleaned_data.get('c') - if country: - res = ast.literal_eval(country) - return res - return country - - - - def search(self): - q = self.cleaned_data.get('q') - w = self.cleaned_data.get('w') - th = self.cleaned_data.get('th') - tg = self.cleaned_data.get('tg') - c = self.cleaned_data.get('c') - city = self.cleaned_data.get('city') - - sqs = SearchQuerySet().models(Company) - - if q: - - sqs = sqs.auto_query(q) - - if w: - sqs = sqs.filter(where__contains=w) if th: + themes = Theme.objects.filter(id__in=th) + ths = [{'name':'th', 'id':item.id, 'parent':None, 'text':item.name} for item in themes] + else: + ths = [] - sqs = sqs.filter(theme__in=th) if tg: - sqs = sqs.filter(tag__in=tg) - if c: - sqs = sqs.filter(country__in=c) - if city: - sqs = sqs.filter(country__in=c) - - - - return sqs - - -from country.models import Area -from theme.models import Theme -from django.utils import translation - -class ExpositionSearchForm(forms.Form): - search_url = '/expo/search/' - q = forms.CharField(label=_(u'Поиск'), required=False) - w = forms.CharField(label=_(u'Где'), required=False) - - th = forms.MultipleChoiceField(label=_(u'Тематика'), choices=[(item.id, item.name) for item in Theme.objects.all()], - required=False, widget=forms.CheckboxSelectMultiple()) - tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.CheckboxSelectMultiple()) - - area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all_sorted()], - required=False, widget=forms.CheckboxSelectMultiple()) - co = forms.MultipleChoiceField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple(), - choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ - .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ - .order_by('translations__name').distinct()] - ) - - ci = forms.MultipleChoiceField(label=_(u'Город'), required=False, widget=forms.CheckboxSelectMultiple(), - choices=[(item.id, item.name) for item in City.objects.select_related('exposition_city')\ - .filter(exposition_city__city__isnull=False, translations__language_code=translation.get_language())\ - .order_by('translations__name').distinct()] - ) - - fr = forms.DateField(required=False, - widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateFrom', - 'placeholder': _(u'дд.мм.гггг')})) - to = forms.DateField(required=False, - widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateTo', - 'placeholder': _(u'дд.мм.гггг')})) - - def __init__(self, *args, **kwargs): - super(ExpositionSearchForm, self).__init__(*args, **kwargs) - self.theme_classes = {item.id:item.generate_search_class() for item in Theme.objects.all()} - """ - theme_with_tags = {} - - for tag in list(Tag.objects.language().filter()): - if tag.theme_id in theme_with_tags: - theme_with_tags[tag.theme_id].append({'name': tag.name, 'id':tag.id}) - else: - theme_with_tags[tag.theme_id] = [{'name': tag.name, 'id':tag.id}] - + tgs = [] + for item in tg: + try: + tag = Tag.objects.language().get(id=item) + tgs.append({'name':'th', 'id':tag.theme_id, 'text': tag.theme.name, 'children':{ + 'id': item, 'name':'tg', 'text': tag.name + } + }) + except: + continue + else: + tgs = [] - #dsds - self.theme_with_tags = theme_with_tags - """ + if co: + cos = [] + for item in co: + try: + country = Country.objects.get(id=item) + cos.append({'name':'area', 'id':country.area_id, 'text': country.area.name, 'children':{ + 'id': item, 'name':'co', 'text': country.name + } + }) + except: + continue + else: + cos = [] + if ci: + cis = [] + for item in ci: + try: + city = City.objects.language().get(id=item) + + cis.append({'name':'area', 'id': city.country.area_id, 'text': city.country.area.name, 'children':{ + 'id': city.country_id, 'name':'co', 'text': city.country.name, 'children':{ + 'name':'ci', 'id':item, 'text':city.name + } + } + }) + except: + continue + else: + cis = [] + finale_list = areas + cos + cis + ths + tgs + result = {'inputs': finale_list} + result = json.dumps(result) + return result def get_places_display(self): @@ -192,13 +155,117 @@ class ExpositionSearchForm(forms.Form): res = ast.literal_eval(tg) return res return tg + """ + def clean_co(self): + + co = self.cleaned_data.get('co') + if co: + res = ast.literal_eval(co) + return res + return co + """ + def search(self): + + if not self.is_valid(): + return EmptySearchQuerySet() + q = self.cleaned_data.get('q') + w = self.cleaned_data.get('w') + fr = self.cleaned_data.get('fr') + to = self.cleaned_data.get('to') + th = self.cleaned_data.get('th') + tg = self.cleaned_data.get('tg') + co = self.cleaned_data.get('co') + ci = self.cleaned_data.get('ci') + area = self.cleaned_data.get('area') + + sqs = SearchQuerySet().models(*self.models).all() + + if q: + sqs = sqs.autocomplete(content_auto=q) + if w: + sqs = sqs.filter(where__contains=w) + if fr: + sqs = sqs.filter(data_begin__gte=fr) + if to: + sqs = sqs.filter(data_begin__lte=to) + if th: + sqs = sqs.filter(theme__in=th) + if tg: + sqs = sqs.filter(tag__in=tg) + + place_filter = None + if area: + if place_filter: + place_filter = place_filter | Q(area_id__in=area) + else: + place_filter = Q(area_id__in=area) + #sqs = sqs.filter(area_id__in=area) + if co: + if place_filter: + place_filter = place_filter | Q(country_id__in=co) + else: + place_filter = Q(country_id__in=co) + + #sqs = sqs.filter(country_id__in=co) + if ci: + if place_filter: + place_filter = place_filter | Q(city_id__in=ci) + else: + place_filter = Q(city_id__in=ci) + + #sqs = sqs.filter(city_id__in=ci) + if place_filter: + sqs = sqs.filter(place_filter) + + return sqs#.order_by('data_begin') + + + + + +class ExpositionSearchForm(AbstactSearchForm): + search_url = '/expo/search/' + autocomplete_url = '/search-form/autosearch/exposition/' + title = _(u'ПОИСК СОБЫТИЙ') + models = [Exposition] + + th = forms.MultipleChoiceField(label=_(u'Тематика'), choices=[(item.id, item.name) for item in Theme.active.all()], + required=False, widget=forms.CheckboxSelectMultiple()) + tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.CheckboxSelectMultiple()) + #co = forms.CharField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple()) + #tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.CheckboxSelectMultiple()) + area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all_sorted()], + required=False, widget=forms.CheckboxSelectMultiple()) + co = forms.MultipleChoiceField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + ci = forms.MultipleChoiceField(label=_(u'Город'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in City.objects.select_related('exposition_city')\ + .filter(exposition_city__city__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + fr = forms.DateField(required=False, + widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateFrom', + 'placeholder': _(u'дд.мм.гггг')})) + to = forms.DateField(required=False, + widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateTo', + 'placeholder': _(u'дд.мм.гггг')})) + + def __init__(self, *args, **kwargs): + super(ExpositionSearchForm, self).__init__(*args, **kwargs) + self.theme_classes = {item.id:item.generate_search_class() for item in Theme.objects.all()} def search(self): if not self.is_valid(): return EmptySearchQuerySet() + data = self.cleaned_data q = self.cleaned_data.get('q') w = self.cleaned_data.get('w') fr = self.cleaned_data.get('fr') @@ -212,7 +279,7 @@ class ExpositionSearchForm(forms.Form): sqs = SearchQuerySet().models(Exposition).all() if q: - sqs = sqs.auto_query(q) + sqs = sqs.autocomplete(content_auto=q) if w: sqs = sqs.filter(where__contains=w) if fr: @@ -226,7 +293,6 @@ class ExpositionSearchForm(forms.Form): place_filter = None - if area: if place_filter: place_filter = place_filter | Q(area_id__in=area) @@ -250,12 +316,94 @@ class ExpositionSearchForm(forms.Form): if place_filter: sqs = sqs.filter(place_filter) + return sqs.order_by('data_begin') + + +class PlaceSearchForm(AbstactSearchForm): + search_url = '/places/search/' + autocomplete_url = '/search-form/autosearch/place/' + title = _(u'ПОИСК МЕСТ') + models = [PlaceExposition, PlaceConference] + # place fields + area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all_sorted()], + required=False, widget=forms.CheckboxSelectMultiple()) + co = forms.MultipleChoiceField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + ci = forms.MultipleChoiceField(label=_(u'Город'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in City.objects.select_related('exposition_city')\ + .filter(exposition_city__city__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + # + place_type = forms.MultipleChoiceField(label=_(u'Тип'), required=False, choices=[]) + def get_place_type_display(self): + return _(u'Не важно') + def search(self): + pass - return sqs.order_by('data_begin') +class CompanySearchForm(AbstactSearchForm): + search_url = '/members/search/' + autocomplete_url = '/search-form/autosearch/company/' + title = _(u'ПОИСК УЧАСТНИКОВ') + models = [Company] + th = forms.MultipleChoiceField(label=_(u'Тематика'), choices=[(item.id, item.name) for item in Theme.objects.all()], + required=False, widget=forms.CheckboxSelectMultiple()) + tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.CheckboxSelectMultiple()) + + area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all_sorted()], + required=False, widget=forms.CheckboxSelectMultiple()) + co = forms.MultipleChoiceField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + ci = forms.MultipleChoiceField(label=_(u'Город'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in City.objects.select_related('exposition_city')\ + .filter(exposition_city__city__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + def __init__(self, *args, **kwargs): + super(CompanySearchForm, self).__init__(*args, **kwargs) + self.theme_classes = {item.id:item.generate_search_class() for item in Theme.objects.all()} + + def search(self): + q = self.cleaned_data.get('q') + w = self.cleaned_data.get('w') + th = self.cleaned_data.get('th') + tg = self.cleaned_data.get('tg') + c = self.cleaned_data.get('c') + city = self.cleaned_data.get('city') + + sqs = SearchQuerySet().models(Company) + + if q: + + sqs = sqs.auto_query(q) + + if w: + sqs = sqs.filter(where__contains=w) + if th: + + sqs = sqs.filter(theme__in=th) + if tg: + sqs = sqs.filter(tag__in=tg) + if c: + sqs = sqs.filter(country__in=c) + if city: + sqs = sqs.filter(country__in=c) + + return sqs + class EventSearchForm(forms.Form): q = forms.CharField(label=_(u'Поиск'), required=False) @@ -283,5 +431,4 @@ class EventSearchForm(forms.Form): if w: sqs = sqs.filter(where__contains=w) - return sqs - + return sqs \ No newline at end of file diff --git a/functions/search_mixin.py b/functions/search_mixin.py new file mode 100644 index 00000000..0e4bcd59 --- /dev/null +++ b/functions/search_mixin.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from haystack import indexes + +class ExpoSearchMixin(object): + """ + + """ + + def prepare_where(self, obj): + if obj.country: + country = [tr.name for tr in obj.country.translations.all()] + else: + country = '' + if obj.city: + city = [tr.name for tr in obj.city.translations.all()] + else: + city = '' + + return country + city + + def prepare_content_auto(self, obj): + """ + object must have get_index_text method which generate text for searching + """ + return obj.get_index_text() + + + def prepare_area_id(self, obj): + if obj.country: + return obj.country.area.id + return None + + def prepare_country_id(self, obj): + if obj.country: + return obj.country.id + return None + + def prepare_city_id(self, obj): + if obj.city: + return obj.city.id + return None + + def prepare_theme(self, obj): + return [th.id for th in obj.theme.filter()] + + def prepare_tag(self, obj): + return [th.id for th in obj.tag.filter()] + + + def prepare_url(self, obj): + return obj.get_permanent_url() + + def prepare_name_en(self, obj): + try: + return obj.translations.get(language_code = 'en').name + except: + return '' + + def prepare_name_ru(self, obj): + try: + return obj.translations.get(language_code = 'ru').name + except: + return '' + + diff --git a/import_xls/admin.py b/import_xls/admin.py index 75a50c13..00ebe370 100644 --- a/import_xls/admin.py +++ b/import_xls/admin.py @@ -80,10 +80,16 @@ class ExportPlaceExposition(ExportView): - -class ImportEvent(ImportView): +from exposition.models import Exposition +class ImportEvent(FormView): form_class = ImportEventForm success_url = '/admin/import-event' + def form_valid(self, form): + result = form.save_file() + Exposition.imports.create_by_dict(result[0]) + messages.success(self.request, 'Success') + + return super(ImportView, self).form_valid(form) class ImportTheme(ImportView): form_class = ImportThemeForm diff --git a/import_xls/excel_settings.py b/import_xls/excel_settings.py index b510049b..a6f19251 100644 --- a/import_xls/excel_settings.py +++ b/import_xls/excel_settings.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -from accounts.models import User -from country.models import Country -from city.models import City -from theme.models import Theme, Tag -from hvad.utils import get_translation_aware_manager +# bad practice of importing, but to many functions must be imported +from .utils import * def get_bool(value): if value: @@ -15,20 +12,6 @@ def get_int(value): return '' return value -from bitfield import BitHandler -from exposition.models import BIT_AUDIENCE -def get_audience(value): - if isinstance(value, BitHandler): - l = [k for k, v in value.iteritems() if v] - if l: - new_list = [] - for value in l: - for item1, item2 in BIT_AUDIENCE: - if value == item1: - new_list.append(item2) - - return ', '.join(new_list) - return def get_theme(value): objects = value.theme.all() @@ -46,7 +29,6 @@ def get_tag(tag, theme): result += '['+','.join(tag_list)+']' return result -from place_exposition.models import EXPOSITION_TYPE def get_place_type(value): for t in EXPOSITION_TYPE: @@ -136,120 +118,6 @@ field_settings = [ - -def to_int(val): - """ - Reverse function to get_int - return None if value isnt integer - """ - try: - return int(val) - except ValueError: - return None - - - -def to_country(value): - try: - query = get_translation_aware_manager(Country) - country = query.filter(name=value)[0] - return country - except IndexError: - return None - - - -def to_city(value, lang, country): - try: - # get city by name - #objects = get_translation_aware_manager(City) - # except IndexError if no found - city = City.objects.filter(translations__name=value, country=country)[0] - return city - except IndexError: - return None - - -from exposition.models import Exposition -def to_audience(value, model=Exposition): - if value: - l = value.split(', ') - if l: - new_list = [] - for value in l: - for item1, item2 in BIT_AUDIENCE: - if value == item2: - new_list.append(item1) - if new_list: - - return reduce(lambda x,y: x|y, (getattr(model.audience, item) for item in new_list)) - return 0 - - - -def to_theme(obj, value): - if isinstance(value, float) or isinstance(value, int): - if (value - int(value) > 0): - value = str(value) - else: - value = str(int(value)) - theme_ids = value.split('.') - else: - theme_ids = value.split(',') - theme_objects = [] - for id in theme_ids: - try: - theme = Theme.objects.language('ru').get(id=int(id)) - theme_objects.append(theme) - obj.theme.add(theme) - except Theme.DoesNotExist, ValueError: - pass - - - return theme_objects -""" -def to_tag(value, lang, themes): - if value == [""]: - return None - - value = value.replace('[', '') - themes = themes.all() - # list tags by themes - value = value.split(']') - - arr = [] - for theme_number, theme in enumerate(themes): - for val in value[theme_number].split(','): - if val: - try: - tag = Tag.objects.language(lang).get(id=int(val), theme=theme) - arr.append(tag) - except Tag.DoesNotExist, ValueError: - pass - - return arr -""" -def to_tag(obj,value): - if value == [""]: - return None - - names = value.split(',') - tags = [] - for name in names: - objects = get_translation_aware_manager(Tag) - tag = objects.filter(name=name) - #tag = Tag.objects.language('ru').filter(transations__name=name) - if tag: - tags.append(tag[0]) - obj.tag.add(tag[0]) - else: - continue - print(tags) - print(names) - return tags - - - def to_theme_type(st): if not st: return 15 @@ -259,19 +127,9 @@ def to_theme_type(st): flag = reduce(lambda x,y: x|y, (getattr(Theme.types, item) for item in types)) return flag -import time, xlrd -def to_date(value): - if not value: - return None - if isinstance(value, unicode) or isinstance(value, str): - t = time.strptime(value, "%d.%m.%Y") - if isinstance(value, float): - t = xlrd.xldate_as_tuple(value, 0)+(0,0,0) - - return time.strftime("%Y-%m-%d", t) def to_currency(value): if value=='USD': @@ -294,6 +152,7 @@ from django.core.validators import validate_email, URLValidator def to_url(url): validate = URLValidator() + try: validate(url) except: @@ -388,7 +247,7 @@ def to_phone(value): value = value.replace(elem, '') value = to_int(value) - + print(value) return value @@ -465,52 +324,43 @@ place_exp_sett = { u'Мобильное приложение':{u'field': u'mobile_application', u'func': bool}, } -from place_exposition.models import PlaceExposition -def to_place(value): - try: - place = PlaceExposition.objects.get(id=value) - return place - except: - - return None - event_sett = { u'ID':{u'field': u'id', u'func': to_int}, + u'Url':{u'field': u'url', u'func': unicode}, u'Название':{u'field': u'name', u'func': unicode}, u'Краткое описание':{u'field': u'main_title', u'func': unicode}, u'Дата начала:(YYYY-MM-DD)':{u'field': u'data_begin', u'func': to_date}, u'Дата окончания:(YYYY-MM-DD)':{u'field': u'data_end', u'func': to_date}, u'Страна':{u'field': u'country', u'func': to_country}, u'Город':{u'field': u'city', u'func': to_city, 'extra_values': 'country'}, - u'Место проведения':{u'field': u'place', u'func': to_place},##### - u'ID Тематики':{u'field': u'theme', u'func': to_theme, u'method': True}, + u'Место проведения':{u'field': u'place', u'func': to_place}, + u'ID Тематики':{u'field': u'theme', u'func': to_theme, u'method': True},### u'Теги':{u'field': u'tag', u'func': to_tag, u'method': True}, #u'Организатор №1':{u'field': u'organiser', u'func': to_tag},#### #u'Организатор №2':{u'field': u'organiser', u'func': to_tag},#### u'Описание события':{u'field': u'description', u'func': unicode}, - u'Периодичность':{u'field': u'periodic', u'func': unicode},### + u'Периодичность':{u'field': u'periodic', u'func': to_periodic},### u'Аудитория':{u'field': u'audience', u'func': to_audience}, - u'Логотип':{u'field': u'logo', u'func': save_file, u'method': True, u'purpose': 'logo'}, u'Официальный веб-сайт':{u'field': u'web_page', u'func': to_url}, u'Экспонируемые продукты':{u'field': u'products', u'func': unicode}, u'Время работы':{u'field': u'time', u'func': unicode}, + u'Логотип':{u'field': u'logo', u'func': save_logo, u'method': True}, u'Валюта':{u'field': u'currency', u'func': unicode}, - # - u'Посетители_билет (1 день)':{u'field': u'price_day', u'func': to_int}, - u'Посетители_билет (все дни)':{u'field': u'price_all', u'func': to_int}, - u'Условия':{u'field': u'periodic', u'func': unicode}, - #u'Посетители_билет (1 день)':{u'field': u'price_day_bar', u'func': to_int},##?? - #u'Посетители_билет (все дни)':{u'field': u'price_all_bar', u'func': to_int},##?? - #u'Условия':{u'field': u'periodic', u'func': unicode},##?? - #u'Примечание':{u'field': u'periodic', u'func': unicode}, + u'Стоимость билета 1 день':{u'field': u'price_day', u'func': unicode}, + u'Стоимость билета все дни':{u'field': u'price_all', u'func': unicode}, + u'Условия предварительной регистрации':{u'field': u'pre_condition', u'func': unicode}, + u'Стоимость на стойке 1 день':{u'field': u'price_day_bar', u'func': unicode}, + u'Стоимость на стойке все дни':{u'field': u'price_all_bar', u'func': unicode}, + u'Условия регистрации на стойке':{u'field': u'stand_condition', u'func': unicode}, + u'Примечание по посещению':{u'field': u'visit_note', u'func': unicode}, u'Каталог':{u'field': u'price_catalog', u'func': to_int}, u'Налог включен':{u'field': u'tax', u'func': bool}, u'Год основания':{u'field': u'foundation_year', u'func': to_int}, - #u'Данные за год':{u'field': u'periodic', u'func': to_int}, + #???u'Данные за год':{u'field': u'periodic', u'func': to_int}, u'Посетители':{u'field': u'visitors', u'func': to_int}, u'Участники':{u'field': u'members', u'func': to_int}, - #u'Страны':{u'field': u'periodic', u'func': unicode},##?? - u'Площадь':{u'field': u'periodic', u'func': to_int}, + u'Страны':{u'field': u'stat_countries', u'func': unicode}, + u'Площадь':{u'field': u'area', u'func': to_int}, u'Min_Raw кв.м.':{u'field': u'min_closed_area', u'func': to_int}, u'Max_Raw кв.м.':{u'field': u'max_closed_area', u'func': to_int}, u'Min_Pack кв.м.':{u'field': u'min_closed_equipped_area', u'func': to_int}, @@ -518,16 +368,13 @@ event_sett = { u'Открытая площадь':{u'field': u'max_open_area', u'func': to_int}, u'Мин. Площадь кв.м.':{u'field': u'min_open_area', u'func': to_int}, u'Регистрационный взнос':{u'field': u'registration_payment', u'func': to_int}, - #u'Примечание':{u'field': u'periodic', u'func': unicode}, + u'Примечание по участии':{u'field': u'participation_note', u'func': unicode}, u'Крайний срок подачи заявки':{u'field': u'application_deadline', u'func': to_date}, - u'UFI':{u'field': u'quality_label', u'func': bool},## - u'РСВЯ':{u'field': u'quality_label', u'func': bool},## - u'EXPORATING':{u'field': u'quality_label', u'func': bool},## + u'UFI':{u'field': u'quality_label', u'func': check_quality_label, u'bitfield':True, u'label': 'ufi'}, + u'РСВЯ':{u'field': u'quality_label', u'func': check_quality_label, u'bitfield':True, u'label': 'rsva'}, + u'EXPORATING':{u'field': u'quality_label', u'func': check_quality_label, u'bitfield':True, u'label': 'exporating'}, u'Отменена':{u'field': u'canceled', u'func': bool}, u'ExpoHIT':{u'field': u'expohit', u'func': bool}, - u'Фото':{u'field': u'photo', u'func': save_photo, u'method': True}, - - } import_settings={ diff --git a/import_xls/import_forms.py b/import_xls/import_forms.py index d815573b..de1a6aa0 100644 --- a/import_xls/import_forms.py +++ b/import_xls/import_forms.py @@ -209,6 +209,9 @@ class ImportPlaceExpositionForm(ImportForm): class ImportPlaceConferenceForm(ImportForm): model = PlaceConference + +from import_xls.excel_settings import event_sett + class ImportEventForm(ImportForm): """ extended form for importing one type of event @@ -230,13 +233,32 @@ class ImportEventForm(ImportForm): sheet = book.sheet_by_index(0) row_list = [sheet.row_values(row_number) for row_number in range(sheet.nrows)] # all field names in excel file (must be in second row) - field_names = [name for name in row_list[1]] + field_names = [name for name in row_list[0]] # model model = get_model(data['event'].split('.')[0], data['event'].split('.')[1]) + list_dicts = [] + + for row_number, row in enumerate(row_list[1:]): + d = {} + for col_number, cell in enumerate(row): + # through row + field_name = field_names[col_number] + setting = event_sett.get(field_name) + if setting: + d[setting['field']] = {'value':cell} + + + d['lang'] = lang + list_dicts.append(d) + + return list_dicts + + + for row_number, row in enumerate(row_list): # go through all rows in file - if row_number > 1: + if row_number > 0: # first two fields are verbose name and name if row[0] != '': # in first column ids @@ -254,15 +276,27 @@ class ImportEventForm(ImportForm): object = model() object.translate(lang) - + d = {} for col_number, cell in enumerate(row): + # through row + + field_name = field_names[col_number] + setting = import_settings.get(field_name) + d[setting] = cell + + list_dicts.append(d) + + + """ # go through row cells # field name current cell field_name = field_names[col_number] if field_name =='theme': # need save object before saving manytomany field - object.save() + #object.save() setting = import_settings.get(field_name) + d[setting] = cell + if setting is not None: # if setting exist for this field func = setting.get('func') @@ -283,8 +317,10 @@ class ImportEventForm(ImportForm): value = func(cell) if value: setattr(object, field_name, value) + """ - object.save() + #object.save() + sadsa diff --git a/import_xls/model_utils.py b/import_xls/model_utils.py new file mode 100644 index 00000000..8b35be8a --- /dev/null +++ b/import_xls/model_utils.py @@ -0,0 +1,22 @@ +from hvad.models import TranslationManager + + +class ExpoImportManager(TranslationManager): + def create_by_dict(self, d): + model = self.model + id = d['id'] + lang = d['lang'] + if id: + expo = self.language(lang).get(id=id) + else: + expo = model() + expo.translate(lang) + + + aaaa + + # save simple values + # save relations + + + diff --git a/import_xls/utils.py b/import_xls/utils.py new file mode 100644 index 00000000..dec07747 --- /dev/null +++ b/import_xls/utils.py @@ -0,0 +1,172 @@ +# -*- coding: utf-8 -*- +import urllib2 +import time, xlrd +from django.conf import settings +from django.utils import translation +from hvad.utils import get_translation_aware_manager +from bitfield import BitHandler +from place_exposition.models import PlaceExposition +from exposition.models import Exposition +from country.models import Country +from city.models import City +from theme.models import Theme, Tag +from functions.files import get_alternative_filename +from exposition.models import BIT_AUDIENCE + + +def to_int(val): + """ + Reverse function to get_int + return None if value isnt integer + """ + try: + return int(val) + except ValueError: + return None + +def to_date(value): + if not value: + return None + + if isinstance(value, unicode) or isinstance(value, str): + + t = time.strptime(value, "%d.%m.%Y") + if isinstance(value, float): + t = xlrd.xldate_as_tuple(value, 0)+(0,0,0) + return time.strftime("%Y-%m-%d", t) + +def to_country(value): + try: + query = get_translation_aware_manager(Country) + country = query.filter(name=value)[0] + return country + except IndexError: + return None + +def to_city(value, lang, country): + try: + # get city by name + #objects = get_translation_aware_manager(City) + # except IndexError if no found + city = City.objects.filter(translations__name=value, country=country)[0] + # print(city) + return city + except IndexError: + # print('---------------------') + # print(value.encode('utf8')) + # print('---------------------') + return None + + +def to_theme(obj, value): + + if isinstance(value, float) or isinstance(value, int): + if (value - int(value) > 0): + value = str(value) + else: + value = str(int(value)) + theme_ids = value.split('.') + else: + theme_ids = value.split(',') + + obj.theme.add(*Theme.objects.filter(id__in=theme_ids)) + +def to_tag(obj,value): + if value == [""]: + return None + names = value.split(',') + translation.activate('en') + if names: + obj.tag.add(*Tag.objects.filter(translations__name__in=names, theme__in=obj.theme.all())) + else: + return + + + +def to_place(value): + try: + place = PlaceExposition.objects.get(url=value) + return place + except PlaceExposition.DoesNotExist: + return None + + +def to_periodic(value): + periodic = {'': 0, u'Ежегодно': 1.0, u'2 раза в год': 2.0, u'3 раза в год': 3.0, + u'4 раза в год': 4.0, u'5 раз в год': 5.0, u'Раз в 2 года': 0.5, + u'Раз в 3 года': 0.33, u'Раз в 4 года': 0.25} + + return periodic.get(value, 0) + + +def to_audience(value, model=Exposition): + if value: + l = value.split(', ') + if l: + new_list = [] + for value in l: + for item1, item2 in BIT_AUDIENCE: + if value == item2: + new_list.append(item1) + if new_list: + return reduce(lambda x,y: x|y, (getattr(model.audience, item) for item in new_list)) + return 0 + +def get_audience(value): + if isinstance(value, BitHandler): + l = [k for k, v in value.iteritems() if v] + if l: + new_list = [] + for value in l: + for item1, item2 in BIT_AUDIENCE: + if value == item1: + new_list.append(item2) + + return ', '.join(new_list) + return + + +def save_logo(obj, path): + if not path: + return None + file_name = path.split('/')[-1] + logo_path = obj.logo.field.upload_to + full_path = settings.MEDIA_ROOT + logo_path + + + alt_name = get_alternative_filename(full_path, file_name) + + download_to = full_path+alt_name + + if path.startswith('http://') or path.startswith('https://'): + + url = path + else: + url = 'http://expomap.ru' + path + + try: + response = urllib2.urlopen(url, timeout=10) + except: + return None + + with open(download_to,'wb') as f: + try: + f.write(response.read()) + f.close() + except: + # can be timeout + return None + + obj.logo = logo_path + alt_name + obj.save() + + +def check_quality_label(obj, value, label): + bit = obj.quality_label + try: + value = int(value) + except: + return bit + if value: + setattr(bit, label, True) + return bit \ No newline at end of file diff --git a/media/imgs/149.jpeg b/media/imgs/149.jpeg deleted file mode 100644 index 3fac9105..00000000 Binary files a/media/imgs/149.jpeg and /dev/null differ diff --git a/media/imgs/27159.gif b/media/imgs/27159.gif deleted file mode 100644 index 51b6920c..00000000 Binary files a/media/imgs/27159.gif and /dev/null differ diff --git a/media/imgs/ALUMINIUM 2012.jpg b/media/imgs/ALUMINIUM 2012.jpg deleted file mode 100644 index 8cfa8622..00000000 Binary files a/media/imgs/ALUMINIUM 2012.jpg and /dev/null differ diff --git a/media/imgs/AMB 2012.jpg b/media/imgs/AMB 2012.jpg deleted file mode 100644 index 72d11b9f..00000000 Binary files a/media/imgs/AMB 2012.jpg and /dev/null differ diff --git a/media/imgs/Automechanika 2012.jpeg b/media/imgs/Automechanika 2012.jpeg deleted file mode 100644 index 5404aaf3..00000000 Binary files a/media/imgs/Automechanika 2012.jpeg and /dev/null differ diff --git a/media/imgs/Bio-Europe.jpg b/media/imgs/Bio-Europe.jpg deleted file mode 100644 index 3ac5e624..00000000 Binary files a/media/imgs/Bio-Europe.jpg and /dev/null differ diff --git a/media/imgs/BioNord 2014.jpg b/media/imgs/BioNord 2014.jpg deleted file mode 100644 index 1b9e0dfe..00000000 Binary files a/media/imgs/BioNord 2014.jpg and /dev/null differ diff --git a/media/imgs/BioSud 2014.jpg b/media/imgs/BioSud 2014.jpg deleted file mode 100644 index bf675aa9..00000000 Binary files a/media/imgs/BioSud 2014.jpg and /dev/null differ diff --git a/media/imgs/CBB-China Brew & China Beverage.jpg b/media/imgs/CBB-China Brew & China Beverage.jpg deleted file mode 100644 index 13ae6ce8..00000000 Binary files a/media/imgs/CBB-China Brew & China Beverage.jpg and /dev/null differ diff --git a/media/imgs/CEF Summer Chengdu 2014.jpeg b/media/imgs/CEF Summer Chengdu 2014.jpeg deleted file mode 100644 index 4f435ac0..00000000 Binary files a/media/imgs/CEF Summer Chengdu 2014.jpeg and /dev/null differ diff --git a/media/imgs/CIMES china.jpg b/media/imgs/CIMES china.jpg deleted file mode 100644 index 905cc9e4..00000000 Binary files a/media/imgs/CIMES china.jpg and /dev/null differ diff --git a/media/imgs/CWIEME Berlin.jpeg b/media/imgs/CWIEME Berlin.jpeg deleted file mode 100644 index 56929a3b..00000000 Binary files a/media/imgs/CWIEME Berlin.jpeg and /dev/null differ diff --git a/media/imgs/CWMEE China expo.jpg b/media/imgs/CWMEE China expo.jpg deleted file mode 100644 index 00b68402..00000000 Binary files a/media/imgs/CWMEE China expo.jpg and /dev/null differ diff --git a/media/imgs/Cersaie_logo.jpg b/media/imgs/Cersaie_logo.jpg deleted file mode 100644 index 0f3dfb26..00000000 Binary files a/media/imgs/Cersaie_logo.jpg and /dev/null differ diff --git a/media/imgs/Cosmetic_Business.jpg b/media/imgs/Cosmetic_Business.jpg deleted file mode 100644 index f04c7bc1..00000000 Binary files a/media/imgs/Cosmetic_Business.jpg and /dev/null differ diff --git a/media/imgs/Eltec Nurnberg 2013 .gif b/media/imgs/Eltec Nurnberg 2013 .gif deleted file mode 100644 index 1d68c941..00000000 Binary files a/media/imgs/Eltec Nurnberg 2013 .gif and /dev/null differ diff --git a/media/imgs/EuroBLECH 2012.jpg b/media/imgs/EuroBLECH 2012.jpg deleted file mode 100644 index 29e82d6e..00000000 Binary files a/media/imgs/EuroBLECH 2012.jpg and /dev/null differ diff --git a/media/imgs/FILExpo China.gif b/media/imgs/FILExpo China.gif deleted file mode 100644 index 9bf97bf6..00000000 Binary files a/media/imgs/FILExpo China.gif and /dev/null differ diff --git a/media/imgs/Fachdental Leipzig 2012.jpg b/media/imgs/Fachdental Leipzig 2012.jpg deleted file mode 100644 index 647aba2f..00000000 Binary files a/media/imgs/Fachdental Leipzig 2012.jpg and /dev/null differ diff --git a/media/imgs/Filtration and Separation Asia 2014.jpg b/media/imgs/Filtration and Separation Asia 2014.jpg deleted file mode 100644 index 00f0d66a..00000000 Binary files a/media/imgs/Filtration and Separation Asia 2014.jpg and /dev/null differ diff --git a/media/imgs/Flomart.jpg b/media/imgs/Flomart.jpg deleted file mode 100644 index 0e898ea6..00000000 Binary files a/media/imgs/Flomart.jpg and /dev/null differ diff --git a/media/imgs/FlowEx China 2014.jpeg b/media/imgs/FlowEx China 2014.jpeg deleted file mode 100644 index 4752963d..00000000 Binary files a/media/imgs/FlowEx China 2014.jpeg and /dev/null differ diff --git a/media/imgs/Furniture China.jpg b/media/imgs/Furniture China.jpg deleted file mode 100644 index 6eec850e..00000000 Binary files a/media/imgs/Furniture China.jpg and /dev/null differ diff --git a/media/imgs/Guangzhou International Lighting Exhibition 2012.jpeg b/media/imgs/Guangzhou International Lighting Exhibition 2012.jpeg deleted file mode 100644 index 40c9055b..00000000 Binary files a/media/imgs/Guangzhou International Lighting Exhibition 2012.jpeg and /dev/null differ diff --git a/media/imgs/HOGA.png b/media/imgs/HOGA.png deleted file mode 100644 index 192a5f1d..00000000 Binary files a/media/imgs/HOGA.png and /dev/null differ diff --git a/media/imgs/Logo_Aquatech_China_NEG.jpg b/media/imgs/Logo_Aquatech_China_NEG.jpg deleted file mode 100644 index edd7a55d..00000000 Binary files a/media/imgs/Logo_Aquatech_China_NEG.jpg and /dev/null differ diff --git a/media/imgs/about-j-13151-1.gif b/media/imgs/about-j-13151-1.gif deleted file mode 100644 index 01a74eaf..00000000 Binary files a/media/imgs/about-j-13151-1.gif and /dev/null differ diff --git a/media/imgs/agrar-unternehmertage-9863-1.jpg b/media/imgs/agrar-unternehmertage-9863-1.jpg deleted file mode 100644 index da808bce..00000000 Binary files a/media/imgs/agrar-unternehmertage-9863-1.jpg and /dev/null differ diff --git a/media/imgs/agrochemex-13588-1.gif b/media/imgs/agrochemex-13588-1.gif deleted file mode 100644 index 1f28123f..00000000 Binary files a/media/imgs/agrochemex-13588-1.gif and /dev/null differ diff --git a/media/imgs/airtec-10923-1.jpg b/media/imgs/airtec-10923-1.jpg deleted file mode 100644 index 153adb93..00000000 Binary files a/media/imgs/airtec-10923-1.jpg and /dev/null differ diff --git a/media/imgs/all-china-shoetch-9997-1.gif b/media/imgs/all-china-shoetch-9997-1.gif deleted file mode 100644 index 3edbb797..00000000 Binary files a/media/imgs/all-china-shoetch-9997-1.gif and /dev/null differ diff --git a/media/imgs/all_in_print_logo_842.jpg b/media/imgs/all_in_print_logo_842.jpg deleted file mode 100644 index 71eba4b8..00000000 Binary files a/media/imgs/all_in_print_logo_842.jpg and /dev/null differ diff --git a/media/imgs/aluminium-china-6392-1.gif b/media/imgs/aluminium-china-6392-1.gif deleted file mode 100644 index 15a7f8a8..00000000 Binary files a/media/imgs/aluminium-china-6392-1.gif and /dev/null differ diff --git a/media/imgs/ambiente-lavoro-2913-1.gif b/media/imgs/ambiente-lavoro-2913-1.gif deleted file mode 100644 index 0629efa6..00000000 Binary files a/media/imgs/ambiente-lavoro-2913-1.gif and /dev/null differ diff --git a/media/imgs/analytica-china-3387-1.gif b/media/imgs/analytica-china-3387-1.gif deleted file mode 100644 index dba756f1..00000000 Binary files a/media/imgs/analytica-china-3387-1.gif and /dev/null differ diff --git a/media/imgs/animal-105-1.gif b/media/imgs/animal-105-1.gif deleted file mode 100644 index bdb659d8..00000000 Binary files a/media/imgs/animal-105-1.gif and /dev/null differ diff --git a/media/imgs/arbeitsschutz-aktuell-9855-1.gif b/media/imgs/arbeitsschutz-aktuell-9855-1.gif deleted file mode 100644 index 5c7c52f3..00000000 Binary files a/media/imgs/arbeitsschutz-aktuell-9855-1.gif and /dev/null differ diff --git a/media/imgs/asia-bike-16381-1.gif b/media/imgs/asia-bike-16381-1.gif deleted file mode 100644 index 20cb0a31..00000000 Binary files a/media/imgs/asia-bike-16381-1.gif and /dev/null differ diff --git a/media/imgs/asia-outdoor-trade-fair-14181-1.gif b/media/imgs/asia-outdoor-trade-fair-14181-1.gif deleted file mode 100644 index 53c29b3a..00000000 Binary files a/media/imgs/asia-outdoor-trade-fair-14181-1.gif and /dev/null differ diff --git a/media/imgs/asiamold-15926-1.gif b/media/imgs/asiamold-15926-1.gif deleted file mode 100644 index 4a02b0ac..00000000 Binary files a/media/imgs/asiamold-15926-1.gif and /dev/null differ diff --git a/media/imgs/asme-turbo-expo-155-1.gif b/media/imgs/asme-turbo-expo-155-1.gif deleted file mode 100644 index 81e41639..00000000 Binary files a/media/imgs/asme-turbo-expo-155-1.gif and /dev/null differ diff --git a/media/imgs/auto-chongqing-14014-1.gif b/media/imgs/auto-chongqing-14014-1.gif deleted file mode 100644 index b6df35fd..00000000 Binary files a/media/imgs/auto-chongqing-14014-1.gif and /dev/null differ diff --git a/media/imgs/auto-e-moto-d-epoca-11715-1.gif b/media/imgs/auto-e-moto-d-epoca-11715-1.gif deleted file mode 100644 index 60642414..00000000 Binary files a/media/imgs/auto-e-moto-d-epoca-11715-1.gif and /dev/null differ diff --git a/media/imgs/auto-guangzhou-7498-1.gif b/media/imgs/auto-guangzhou-7498-1.gif deleted file mode 100644 index a7de68cc..00000000 Binary files a/media/imgs/auto-guangzhou-7498-1.gif and /dev/null differ diff --git a/media/imgs/autochtona-9960-1.gif b/media/imgs/autochtona-9960-1.gif deleted file mode 100644 index 22106816..00000000 Binary files a/media/imgs/autochtona-9960-1.gif and /dev/null differ diff --git a/media/imgs/automechanika-shanghai-4160-1.gif b/media/imgs/automechanika-shanghai-4160-1.gif deleted file mode 100644 index da2f3a01..00000000 Binary files a/media/imgs/automechanika-shanghai-4160-1.gif and /dev/null differ diff --git a/media/imgs/automotive-testing-expo-china-7978-1.gif b/media/imgs/automotive-testing-expo-china-7978-1.gif deleted file mode 100644 index 3f552988..00000000 Binary files a/media/imgs/automotive-testing-expo-china-7978-1.gif and /dev/null differ diff --git a/media/imgs/automotive-testing-expo-europe-2681-1.gif b/media/imgs/automotive-testing-expo-europe-2681-1.gif deleted file mode 100644 index 89a3352e..00000000 Binary files a/media/imgs/automotive-testing-expo-europe-2681-1.gif and /dev/null differ diff --git a/media/imgs/azubi-studientage-chemnitz-9872-1.1.gif b/media/imgs/azubi-studientage-chemnitz-9872-1.1.gif deleted file mode 100644 index 941aa9ae..00000000 Binary files a/media/imgs/azubi-studientage-chemnitz-9872-1.1.gif and /dev/null differ diff --git a/media/imgs/azubi-studientage-chemnitz-9872-1.2.gif b/media/imgs/azubi-studientage-chemnitz-9872-1.2.gif deleted file mode 100644 index 941aa9ae..00000000 Binary files a/media/imgs/azubi-studientage-chemnitz-9872-1.2.gif and /dev/null differ diff --git a/media/imgs/azubi-studientage-chemnitz-9872-1.3.gif b/media/imgs/azubi-studientage-chemnitz-9872-1.3.gif deleted file mode 100644 index 941aa9ae..00000000 Binary files a/media/imgs/azubi-studientage-chemnitz-9872-1.3.gif and /dev/null differ diff --git a/media/imgs/azubi-studientage-chemnitz-9872-1.gif b/media/imgs/azubi-studientage-chemnitz-9872-1.gif deleted file mode 100644 index 941aa9ae..00000000 Binary files a/media/imgs/azubi-studientage-chemnitz-9872-1.gif and /dev/null differ diff --git a/media/imgs/azubi-studientage-leipzig-12049-1.gif b/media/imgs/azubi-studientage-leipzig-12049-1.gif deleted file mode 100644 index 941aa9ae..00000000 Binary files a/media/imgs/azubi-studientage-leipzig-12049-1.gif and /dev/null differ diff --git a/media/imgs/babywelt-munchen-10255-1.gif b/media/imgs/babywelt-munchen-10255-1.gif deleted file mode 100644 index af5affd7..00000000 Binary files a/media/imgs/babywelt-munchen-10255-1.gif and /dev/null differ diff --git a/media/imgs/babywelt-stuttgart-10256-1.1.gif b/media/imgs/babywelt-stuttgart-10256-1.1.gif deleted file mode 100644 index a138d9b7..00000000 Binary files a/media/imgs/babywelt-stuttgart-10256-1.1.gif and /dev/null differ diff --git a/media/imgs/babywelt-stuttgart-10256-1.gif b/media/imgs/babywelt-stuttgart-10256-1.gif deleted file mode 100644 index a138d9b7..00000000 Binary files a/media/imgs/babywelt-stuttgart-10256-1.gif and /dev/null differ diff --git a/media/imgs/bau-253-1.gif b/media/imgs/bau-253-1.gif deleted file mode 100644 index 883434a7..00000000 Binary files a/media/imgs/bau-253-1.gif and /dev/null differ diff --git a/media/imgs/bauma-258-1.gif b/media/imgs/bauma-258-1.gif deleted file mode 100644 index 27bf702c..00000000 Binary files a/media/imgs/bauma-258-1.gif and /dev/null differ diff --git a/media/imgs/bauma-china-5156-1.gif b/media/imgs/bauma-china-5156-1.gif deleted file mode 100644 index 8e19c3dd..00000000 Binary files a/media/imgs/bauma-china-5156-1.gif and /dev/null differ diff --git a/media/imgs/baumesse-bad-kreuznach-17085-1.gif b/media/imgs/baumesse-bad-kreuznach-17085-1.gif deleted file mode 100644 index 35c17f49..00000000 Binary files a/media/imgs/baumesse-bad-kreuznach-17085-1.gif and /dev/null differ diff --git a/media/imgs/baumesse-hofheim-17086-1.gif b/media/imgs/baumesse-hofheim-17086-1.gif deleted file mode 100644 index 35c17f49..00000000 Binary files a/media/imgs/baumesse-hofheim-17086-1.gif and /dev/null differ diff --git a/media/imgs/beijing-essen-welding-cutting-9186-1.gif b/media/imgs/beijing-essen-welding-cutting-9186-1.gif deleted file mode 100644 index 46a72689..00000000 Binary files a/media/imgs/beijing-essen-welding-cutting-9186-1.gif and /dev/null differ diff --git a/media/imgs/bi-mu-277-1.gif b/media/imgs/bi-mu-277-1.gif deleted file mode 100644 index 78b05c51..00000000 Binary files a/media/imgs/bi-mu-277-1.gif and /dev/null differ diff --git a/media/imgs/biennale-di-venezia-archittetura-5634-1.jpg b/media/imgs/biennale-di-venezia-archittetura-5634-1.jpg deleted file mode 100644 index 6d967654..00000000 Binary files a/media/imgs/biennale-di-venezia-archittetura-5634-1.jpg and /dev/null differ diff --git a/media/imgs/brau-beviale-325-1.jpg b/media/imgs/brau-beviale-325-1.jpg deleted file mode 100644 index fc826b1a..00000000 Binary files a/media/imgs/brau-beviale-325-1.jpg and /dev/null differ diff --git a/media/imgs/bread-butter-berlin-13444-1.gif b/media/imgs/bread-butter-berlin-13444-1.gif deleted file mode 100644 index eed18333..00000000 Binary files a/media/imgs/bread-butter-berlin-13444-1.gif and /dev/null differ diff --git a/media/imgs/brille-co-dortmund-8538-1.gif b/media/imgs/brille-co-dortmund-8538-1.gif deleted file mode 100644 index 5fe08d1c..00000000 Binary files a/media/imgs/brille-co-dortmund-8538-1.gif and /dev/null differ diff --git a/media/imgs/cadeaux-leipzig-362-1.gif b/media/imgs/cadeaux-leipzig-362-1.gif deleted file mode 100644 index 5817ad00..00000000 Binary files a/media/imgs/cadeaux-leipzig-362-1.gif and /dev/null differ diff --git a/media/imgs/caravan-bremen-375-1.gif b/media/imgs/caravan-bremen-375-1.gif deleted file mode 100644 index 7ccc59a6..00000000 Binary files a/media/imgs/caravan-bremen-375-1.gif and /dev/null differ diff --git a/media/imgs/caravan_salon_duesseldorf 2012.jpg b/media/imgs/caravan_salon_duesseldorf 2012.jpg deleted file mode 100644 index ccb07a99..00000000 Binary files a/media/imgs/caravan_salon_duesseldorf 2012.jpg and /dev/null differ diff --git a/media/imgs/casa-su-misura-2014.jpg b/media/imgs/casa-su-misura-2014.jpg deleted file mode 100644 index a31115e6..00000000 Binary files a/media/imgs/casa-su-misura-2014.jpg and /dev/null differ diff --git a/media/imgs/cbd-4105-1.gif b/media/imgs/cbd-4105-1.gif deleted file mode 100644 index 31dc54de..00000000 Binary files a/media/imgs/cbd-4105-1.gif and /dev/null differ diff --git a/media/imgs/cebit-389-1.gif b/media/imgs/cebit-389-1.gif deleted file mode 100644 index af180f81..00000000 Binary files a/media/imgs/cebit-389-1.gif and /dev/null differ diff --git a/media/imgs/cef-china-electronic-fair-shanghai-11311-1.gif b/media/imgs/cef-china-electronic-fair-shanghai-11311-1.gif deleted file mode 100644 index 1c29e88b..00000000 Binary files a/media/imgs/cef-china-electronic-fair-shanghai-11311-1.gif and /dev/null differ diff --git a/media/imgs/cemat-asia-398-1.gif b/media/imgs/cemat-asia-398-1.gif deleted file mode 100644 index ed0b0911..00000000 Binary files a/media/imgs/cemat-asia-398-1.gif and /dev/null differ diff --git a/media/imgs/chfe-china-international-housing-and-furnishing-exposition-10986-1.gif b/media/imgs/chfe-china-international-housing-and-furnishing-exposition-10986-1.gif deleted file mode 100644 index 4d55b070..00000000 Binary files a/media/imgs/chfe-china-international-housing-and-furnishing-exposition-10986-1.gif and /dev/null differ diff --git a/media/imgs/china-(shenzhen)-international-gifts-handicrafts-watches-houseware-fair-14179-1.gif b/media/imgs/china-(shenzhen)-international-gifts-handicrafts-watches-houseware-fair-14179-1.gif deleted file mode 100644 index 72241536..00000000 Binary files a/media/imgs/china-(shenzhen)-international-gifts-handicrafts-watches-houseware-fair-14179-1.gif and /dev/null differ diff --git a/media/imgs/china-bevtek-16845-1.gif b/media/imgs/china-bevtek-16845-1.gif deleted file mode 100644 index 5455877e..00000000 Binary files a/media/imgs/china-bevtek-16845-1.gif and /dev/null differ diff --git a/media/imgs/china-education-expo-beijing-6992-1.gif b/media/imgs/china-education-expo-beijing-6992-1.gif deleted file mode 100644 index 68118b1f..00000000 Binary files a/media/imgs/china-education-expo-beijing-6992-1.gif and /dev/null differ diff --git a/media/imgs/china-education-expo-chengdu-11953-1.1.gif b/media/imgs/china-education-expo-chengdu-11953-1.1.gif deleted file mode 100644 index 68118b1f..00000000 Binary files a/media/imgs/china-education-expo-chengdu-11953-1.1.gif and /dev/null differ diff --git a/media/imgs/china-education-expo-chengdu-11953-1.gif b/media/imgs/china-education-expo-chengdu-11953-1.gif deleted file mode 100644 index 68118b1f..00000000 Binary files a/media/imgs/china-education-expo-chengdu-11953-1.gif and /dev/null differ diff --git a/media/imgs/china-education-expo-shanghai-6993-1.gif b/media/imgs/china-education-expo-shanghai-6993-1.gif deleted file mode 100644 index 68118b1f..00000000 Binary files a/media/imgs/china-education-expo-shanghai-6993-1.gif and /dev/null differ diff --git a/media/imgs/china-furniture-woodworks-9158-1.gif b/media/imgs/china-furniture-woodworks-9158-1.gif deleted file mode 100644 index 2e10ce07..00000000 Binary files a/media/imgs/china-furniture-woodworks-9158-1.gif and /dev/null differ diff --git a/media/imgs/china-international-footwear-fair-5069-1.gif b/media/imgs/china-international-footwear-fair-5069-1.gif deleted file mode 100644 index 269eac2e..00000000 Binary files a/media/imgs/china-international-footwear-fair-5069-1.gif and /dev/null differ diff --git a/media/imgs/china-international-hardware-show_logo.jpg b/media/imgs/china-international-hardware-show_logo.jpg deleted file mode 100644 index 151f3189..00000000 Binary files a/media/imgs/china-international-hardware-show_logo.jpg and /dev/null differ diff --git a/media/imgs/china-kids-expo-2926-1.gif b/media/imgs/china-kids-expo-2926-1.gif deleted file mode 100644 index 5b8c6717..00000000 Binary files a/media/imgs/china-kids-expo-2926-1.gif and /dev/null differ diff --git a/media/imgs/china-leather-6869-1.gif b/media/imgs/china-leather-6869-1.gif deleted file mode 100644 index 91d9d488..00000000 Binary files a/media/imgs/china-leather-6869-1.gif and /dev/null differ diff --git a/media/imgs/china-wedding-expo-16645-1.gif b/media/imgs/china-wedding-expo-16645-1.gif deleted file mode 100644 index 9b4b1094..00000000 Binary files a/media/imgs/china-wedding-expo-16645-1.gif and /dev/null differ diff --git a/media/imgs/ciaar-11192-1.gif b/media/imgs/ciaar-11192-1.gif deleted file mode 100644 index db3093a2..00000000 Binary files a/media/imgs/ciaar-11192-1.gif and /dev/null differ diff --git a/media/imgs/cieme-17824-1.gif b/media/imgs/cieme-17824-1.gif deleted file mode 100644 index c96735cf..00000000 Binary files a/media/imgs/cieme-17824-1.gif and /dev/null differ diff --git a/media/imgs/cifit.gif b/media/imgs/cifit.gif deleted file mode 100644 index 4989181c..00000000 Binary files a/media/imgs/cifit.gif and /dev/null differ diff --git a/media/imgs/cimamotor-14015-1.gif b/media/imgs/cimamotor-14015-1.gif deleted file mode 100644 index f05ba271..00000000 Binary files a/media/imgs/cimamotor-14015-1.gif and /dev/null differ diff --git a/media/imgs/cinte-techtextil-china-442-1.gif b/media/imgs/cinte-techtextil-china-442-1.gif deleted file mode 100644 index 2e879679..00000000 Binary files a/media/imgs/cinte-techtextil-china-442-1.gif and /dev/null differ diff --git a/media/imgs/ciof-china-international-optics-fair-7355-1.gif b/media/imgs/ciof-china-international-optics-fair-7355-1.gif deleted file mode 100644 index 3acc49ff..00000000 Binary files a/media/imgs/ciof-china-international-optics-fair-7355-1.gif and /dev/null differ diff --git a/media/imgs/citexpo-7985-1.gif b/media/imgs/citexpo-7985-1.gif deleted file mode 100644 index 6e3aba41..00000000 Binary files a/media/imgs/citexpo-7985-1.gif and /dev/null differ diff --git a/media/imgs/cnibf-16217-1.gif b/media/imgs/cnibf-16217-1.gif deleted file mode 100644 index d4a81b81..00000000 Binary files a/media/imgs/cnibf-16217-1.gif and /dev/null differ diff --git a/media/imgs/coilex-16120-1.gif b/media/imgs/coilex-16120-1.gif deleted file mode 100644 index b621429e..00000000 Binary files a/media/imgs/coilex-16120-1.gif and /dev/null differ diff --git a/media/imgs/coiltech-16870-1.gif b/media/imgs/coiltech-16870-1.gif deleted file mode 100644 index 65534dc3..00000000 Binary files a/media/imgs/coiltech-16870-1.gif and /dev/null differ diff --git a/media/imgs/comfortex-480-1.jpg b/media/imgs/comfortex-480-1.jpg deleted file mode 100644 index 19293dab..00000000 Binary files a/media/imgs/comfortex-480-1.jpg and /dev/null differ diff --git a/media/imgs/compamed-4236-1.gif b/media/imgs/compamed-4236-1.gif deleted file mode 100644 index 68f2e4c5..00000000 Binary files a/media/imgs/compamed-4236-1.gif and /dev/null differ diff --git a/media/imgs/composites-europe-10253-1.gif b/media/imgs/composites-europe-10253-1.gif deleted file mode 100644 index 26fb315b..00000000 Binary files a/media/imgs/composites-europe-10253-1.gif and /dev/null differ diff --git a/media/imgs/control-china-3027-1.gif b/media/imgs/control-china-3027-1.gif deleted file mode 100644 index d37f82ec..00000000 Binary files a/media/imgs/control-china-3027-1.gif and /dev/null differ diff --git a/media/imgs/cosh_logo_858.jpg b/media/imgs/cosh_logo_858.jpg deleted file mode 100644 index 8b13e9ff..00000000 Binary files a/media/imgs/cosh_logo_858.jpg and /dev/null differ diff --git a/media/imgs/cosmetica-berlin-13466-1.gif b/media/imgs/cosmetica-berlin-13466-1.gif deleted file mode 100644 index f67741be..00000000 Binary files a/media/imgs/cosmetica-berlin-13466-1.gif and /dev/null differ diff --git a/media/imgs/coteca-13915-1.gif b/media/imgs/coteca-13915-1.gif deleted file mode 100644 index 1cdb2128..00000000 Binary files a/media/imgs/coteca-13915-1.gif and /dev/null differ diff --git a/media/imgs/cphi-china-535-1.gif b/media/imgs/cphi-china-535-1.gif deleted file mode 100644 index 013bc19c..00000000 Binary files a/media/imgs/cphi-china-535-1.gif and /dev/null differ diff --git a/media/imgs/cremona-mondomusica_logo.jpg b/media/imgs/cremona-mondomusica_logo.jpg deleted file mode 100644 index 114d0ba8..00000000 Binary files a/media/imgs/cremona-mondomusica_logo.jpg and /dev/null differ diff --git a/media/imgs/cxiaf-9478-1.gif b/media/imgs/cxiaf-9478-1.gif deleted file mode 100644 index a867ce55..00000000 Binary files a/media/imgs/cxiaf-9478-1.gif and /dev/null differ diff --git a/media/imgs/denkmal-563-1.gif b/media/imgs/denkmal-563-1.gif deleted file mode 100644 index 4a46e97f..00000000 Binary files a/media/imgs/denkmal-563-1.gif and /dev/null differ diff --git a/media/imgs/deutsche-junggeflugelschau-572-1.1.gif b/media/imgs/deutsche-junggeflugelschau-572-1.1.gif deleted file mode 100644 index 520de0e8..00000000 Binary files a/media/imgs/deutsche-junggeflugelschau-572-1.1.gif and /dev/null differ diff --git a/media/imgs/deutsche-junggeflugelschau-572-1.2.gif b/media/imgs/deutsche-junggeflugelschau-572-1.2.gif deleted file mode 100644 index 520de0e8..00000000 Binary files a/media/imgs/deutsche-junggeflugelschau-572-1.2.gif and /dev/null differ diff --git a/media/imgs/deutsche-junggeflugelschau-572-1.gif b/media/imgs/deutsche-junggeflugelschau-572-1.gif deleted file mode 100644 index 520de0e8..00000000 Binary files a/media/imgs/deutsche-junggeflugelschau-572-1.gif and /dev/null differ diff --git a/media/imgs/die-mould-china-4780-1.gif b/media/imgs/die-mould-china-4780-1.gif deleted file mode 100644 index 00133baf..00000000 Binary files a/media/imgs/die-mould-china-4780-1.gif and /dev/null differ diff --git a/media/imgs/dkm-konzepte-losungen-5420-1.jpg b/media/imgs/dkm-konzepte-losungen-5420-1.jpg deleted file mode 100644 index 0b1cd239..00000000 Binary files a/media/imgs/dkm-konzepte-losungen-5420-1.jpg and /dev/null differ diff --git a/media/imgs/dmp-china-(dongguan)-international-plastics-packaging-rubber-exhibition-15121-1.gif b/media/imgs/dmp-china-(dongguan)-international-plastics-packaging-rubber-exhibition-15121-1.gif deleted file mode 100644 index fbc75cc2..00000000 Binary files a/media/imgs/dmp-china-(dongguan)-international-plastics-packaging-rubber-exhibition-15121-1.gif and /dev/null differ diff --git a/media/imgs/dms_expo_logo_neu_2_190.jpg b/media/imgs/dms_expo_logo_neu_2_190.jpg deleted file mode 100644 index 7534463f..00000000 Binary files a/media/imgs/dms_expo_logo_neu_2_190.jpg and /dev/null differ diff --git a/media/imgs/druck-form-599-1.gif b/media/imgs/druck-form-599-1.gif deleted file mode 100644 index 26fba8eb..00000000 Binary files a/media/imgs/druck-form-599-1.gif and /dev/null differ diff --git a/media/imgs/du-und-deine-welt-6250-1.gif b/media/imgs/du-und-deine-welt-6250-1.gif deleted file mode 100644 index 40b09953..00000000 Binary files a/media/imgs/du-und-deine-welt-6250-1.gif and /dev/null differ diff --git a/media/imgs/e-dpc-expo-16741-1.gif b/media/imgs/e-dpc-expo-16741-1.gif deleted file mode 100644 index daeef838..00000000 Binary files a/media/imgs/e-dpc-expo-16741-1.gif and /dev/null differ diff --git a/media/imgs/ebce 2012.jpg b/media/imgs/ebce 2012.jpg deleted file mode 100644 index fe6b2f8a..00000000 Binary files a/media/imgs/ebce 2012.jpg and /dev/null differ diff --git a/media/imgs/ecomobil-13873-1.gif b/media/imgs/ecomobil-13873-1.gif deleted file mode 100644 index 1dbe17a6..00000000 Binary files a/media/imgs/ecomobil-13873-1.gif and /dev/null differ diff --git a/media/imgs/ecomondo-3183-1.gif b/media/imgs/ecomondo-3183-1.gif deleted file mode 100644 index 51fe1e2b..00000000 Binary files a/media/imgs/ecomondo-3183-1.gif and /dev/null differ diff --git a/media/imgs/eicma-esposizione-internazionale-del-ciclo-e-motociclo-755-1.gif b/media/imgs/eicma-esposizione-internazionale-del-ciclo-e-motociclo-755-1.gif deleted file mode 100644 index 3a6c34d4..00000000 Binary files a/media/imgs/eicma-esposizione-internazionale-del-ciclo-e-motociclo-755-1.gif and /dev/null differ diff --git a/media/imgs/eima-international-652-1.gif b/media/imgs/eima-international-652-1.gif deleted file mode 100644 index 4f357cba..00000000 Binary files a/media/imgs/eima-international-652-1.gif and /dev/null differ diff --git a/media/imgs/electronica-669-1.gif b/media/imgs/electronica-669-1.gif deleted file mode 100644 index 23c4e40a..00000000 Binary files a/media/imgs/electronica-669-1.gif and /dev/null differ diff --git a/media/imgs/enertec-711-1.gif b/media/imgs/enertec-711-1.gif deleted file mode 100644 index 82d55e0c..00000000 Binary files a/media/imgs/enertec-711-1.gif and /dev/null differ diff --git a/media/imgs/engine-expo-713-1.gif b/media/imgs/engine-expo-713-1.gif deleted file mode 100644 index c0b90911..00000000 Binary files a/media/imgs/engine-expo-713-1.gif and /dev/null differ diff --git a/media/imgs/ep_china_logo.jpg b/media/imgs/ep_china_logo.jpg deleted file mode 100644 index f64396c3..00000000 Binary files a/media/imgs/ep_china_logo.jpg and /dev/null differ diff --git a/media/imgs/equitana-745-1.gif b/media/imgs/equitana-745-1.gif deleted file mode 100644 index 97199db1..00000000 Binary files a/media/imgs/equitana-745-1.gif and /dev/null differ diff --git a/media/imgs/esbuild-14189-1.gif b/media/imgs/esbuild-14189-1.gif deleted file mode 100644 index 1198488c..00000000 Binary files a/media/imgs/esbuild-14189-1.gif and /dev/null differ diff --git a/media/imgs/euro-id-17466-1.gif b/media/imgs/euro-id-17466-1.gif deleted file mode 100644 index 61bd035f..00000000 Binary files a/media/imgs/euro-id-17466-1.gif and /dev/null differ diff --git a/media/imgs/eurobike-4997-1.1.gif b/media/imgs/eurobike-4997-1.1.gif deleted file mode 100644 index 95460528..00000000 Binary files a/media/imgs/eurobike-4997-1.1.gif and /dev/null differ diff --git a/media/imgs/eurobike-4997-1.gif b/media/imgs/eurobike-4997-1.gif deleted file mode 100644 index 95460528..00000000 Binary files a/media/imgs/eurobike-4997-1.gif and /dev/null differ diff --git a/media/imgs/eurocheval-13459-1.1.gif b/media/imgs/eurocheval-13459-1.1.gif deleted file mode 100644 index 54de9dad..00000000 Binary files a/media/imgs/eurocheval-13459-1.1.gif and /dev/null differ diff --git a/media/imgs/eurocheval-13459-1.gif b/media/imgs/eurocheval-13459-1.gif deleted file mode 100644 index 54de9dad..00000000 Binary files a/media/imgs/eurocheval-13459-1.gif and /dev/null differ diff --git a/media/imgs/euromineralexpo-5763-1.gif b/media/imgs/euromineralexpo-5763-1.gif deleted file mode 100644 index a0734806..00000000 Binary files a/media/imgs/euromineralexpo-5763-1.gif and /dev/null differ diff --git a/media/imgs/eurotier-hannover-803-1.gif b/media/imgs/eurotier-hannover-803-1.gif deleted file mode 100644 index e6f2912e..00000000 Binary files a/media/imgs/eurotier-hannover-803-1.gif and /dev/null differ diff --git a/media/imgs/expo-casearia-16420-1.gif b/media/imgs/expo-casearia-16420-1.gif deleted file mode 100644 index 2e1465f7..00000000 Binary files a/media/imgs/expo-casearia-16420-1.gif and /dev/null differ diff --git a/media/imgs/expo-real-844-1.gif b/media/imgs/expo-real-844-1.gif deleted file mode 100644 index 29328942..00000000 Binary files a/media/imgs/expo-real-844-1.gif and /dev/null differ diff --git a/media/imgs/expobici_logo.jpg b/media/imgs/expobici_logo.jpg deleted file mode 100644 index df95e9db..00000000 Binary files a/media/imgs/expobici_logo.jpg and /dev/null differ diff --git a/media/imgs/expocentre_logo_rus.jpg b/media/imgs/expocentre_logo_rus.jpg deleted file mode 100644 index 924f9753..00000000 Binary files a/media/imgs/expocentre_logo_rus.jpg and /dev/null differ diff --git a/media/imgs/expopharm-909-1.gif b/media/imgs/expopharm-909-1.gif deleted file mode 100644 index 71163d61..00000000 Binary files a/media/imgs/expopharm-909-1.gif and /dev/null differ diff --git a/media/imgs/f-cell-14512-1.gif b/media/imgs/f-cell-14512-1.gif deleted file mode 100644 index dc84f3f5..00000000 Binary files a/media/imgs/f-cell-14512-1.gif and /dev/null differ diff --git a/media/imgs/fachdental sudwest.jpg b/media/imgs/fachdental sudwest.jpg deleted file mode 100644 index dcb4de59..00000000 Binary files a/media/imgs/fachdental sudwest.jpg and /dev/null differ diff --git a/media/imgs/fachpack-940-1.gif b/media/imgs/fachpack-940-1.gif deleted file mode 100644 index bf903c93..00000000 Binary files a/media/imgs/fachpack-940-1.gif and /dev/null differ diff --git a/media/imgs/fakuma-945-1.gif b/media/imgs/fakuma-945-1.gif deleted file mode 100644 index 5a3145db..00000000 Binary files a/media/imgs/fakuma-945-1.gif and /dev/null differ diff --git a/media/imgs/family-home-5201-1.gif b/media/imgs/family-home-5201-1.gif deleted file mode 100644 index 11718dab..00000000 Binary files a/media/imgs/family-home-5201-1.gif and /dev/null differ diff --git a/media/imgs/famous-furniture-dongguan.jpg b/media/imgs/famous-furniture-dongguan.jpg deleted file mode 100644 index 68c3e88e..00000000 Binary files a/media/imgs/famous-furniture-dongguan.jpg and /dev/null differ diff --git a/media/imgs/fastener-fair-stuttgart-16115-1.gif b/media/imgs/fastener-fair-stuttgart-16115-1.gif deleted file mode 100644 index 6385176a..00000000 Binary files a/media/imgs/fastener-fair-stuttgart-16115-1.gif and /dev/null differ diff --git a/media/imgs/fastener-trade-show-13375-1.1.gif b/media/imgs/fastener-trade-show-13375-1.1.gif deleted file mode 100644 index e62a729d..00000000 Binary files a/media/imgs/fastener-trade-show-13375-1.1.gif and /dev/null differ diff --git a/media/imgs/fastener-trade-show-13375-1.gif b/media/imgs/fastener-trade-show-13375-1.gif deleted file mode 100644 index e62a729d..00000000 Binary files a/media/imgs/fastener-trade-show-13375-1.gif and /dev/null differ diff --git a/media/imgs/faszination-modellbau-friedrichshafen-1913-1.gif b/media/imgs/faszination-modellbau-friedrichshafen-1913-1.gif deleted file mode 100644 index 9cd51b45..00000000 Binary files a/media/imgs/faszination-modellbau-friedrichshafen-1913-1.gif and /dev/null differ diff --git a/media/imgs/fhc-food-drink-1050-1.gif b/media/imgs/fhc-food-drink-1050-1.gif deleted file mode 100644 index 8dbd074a..00000000 Binary files a/media/imgs/fhc-food-drink-1050-1.gif and /dev/null differ diff --git a/media/imgs/fi-asia-china-1057-1.gif b/media/imgs/fi-asia-china-1057-1.gif deleted file mode 100644 index d187bd29..00000000 Binary files a/media/imgs/fi-asia-china-1057-1.gif and /dev/null differ diff --git a/media/imgs/fiera-natale-16436-1.gif b/media/imgs/fiera-natale-16436-1.gif deleted file mode 100644 index 65960bae..00000000 Binary files a/media/imgs/fiera-natale-16436-1.gif and /dev/null differ diff --git a/media/imgs/fieracavalli-988-1.gif b/media/imgs/fieracavalli-988-1.gif deleted file mode 100644 index 034b77e6..00000000 Binary files a/media/imgs/fieracavalli-988-1.gif and /dev/null differ diff --git a/media/imgs/food-ing-international-16137-1.gif b/media/imgs/food-ing-international-16137-1.gif deleted file mode 100644 index 37a924bc..00000000 Binary files a/media/imgs/food-ing-international-16137-1.gif and /dev/null differ diff --git a/media/imgs/forum-vini-5159-1.gif b/media/imgs/forum-vini-5159-1.gif deleted file mode 100644 index 2d882ba4..00000000 Binary files a/media/imgs/forum-vini-5159-1.gif and /dev/null differ diff --git a/media/imgs/fragranze-9993-1.jpg b/media/imgs/fragranze-9993-1.jpg deleted file mode 100644 index 1a8b1e39..00000000 Binary files a/media/imgs/fragranze-9993-1.jpg and /dev/null differ diff --git a/media/imgs/galabau-1110-1.gif b/media/imgs/galabau-1110-1.gif deleted file mode 100644 index 4f947c74..00000000 Binary files a/media/imgs/galabau-1110-1.gif and /dev/null differ diff --git a/media/imgs/gaste-1120-1.gif b/media/imgs/gaste-1120-1.gif deleted file mode 100644 index f4028362..00000000 Binary files a/media/imgs/gaste-1120-1.gif and /dev/null differ diff --git a/media/imgs/gastro-rostock-16668-1.gif b/media/imgs/gastro-rostock-16668-1.gif deleted file mode 100644 index 410f2e09..00000000 Binary files a/media/imgs/gastro-rostock-16668-1.gif and /dev/null differ diff --git a/media/imgs/gds.1.jpg b/media/imgs/gds.1.jpg deleted file mode 100644 index a418a7f3..00000000 Binary files a/media/imgs/gds.1.jpg and /dev/null differ diff --git a/media/imgs/gds.jpg b/media/imgs/gds.jpg deleted file mode 100644 index a418a7f3..00000000 Binary files a/media/imgs/gds.jpg and /dev/null differ diff --git a/media/imgs/gio-sun-3174-1.gif b/media/imgs/gio-sun-3174-1.gif deleted file mode 100644 index d0575662..00000000 Binary files a/media/imgs/gio-sun-3174-1.gif and /dev/null differ diff --git a/media/imgs/glasstec-1153-1.gif b/media/imgs/glasstec-1153-1.gif deleted file mode 100644 index befb56ca..00000000 Binary files a/media/imgs/glasstec-1153-1.gif and /dev/null differ diff --git a/media/imgs/golf-europe-1164-1.gif b/media/imgs/golf-europe-1164-1.gif deleted file mode 100644 index d4e15587..00000000 Binary files a/media/imgs/golf-europe-1164-1.gif and /dev/null differ diff --git a/media/imgs/gpec-4229-1.gif b/media/imgs/gpec-4229-1.gif deleted file mode 100644 index 4375fd3a..00000000 Binary files a/media/imgs/gpec-4229-1.gif and /dev/null differ diff --git a/media/imgs/hanseboot-6249-1.gif b/media/imgs/hanseboot-6249-1.gif deleted file mode 100644 index 55e98bae..00000000 Binary files a/media/imgs/hanseboot-6249-1.gif and /dev/null differ diff --git a/media/imgs/haus-hof-7877-1.gif b/media/imgs/haus-hof-7877-1.gif deleted file mode 100644 index e7d74b91..00000000 Binary files a/media/imgs/haus-hof-7877-1.gif and /dev/null differ diff --git a/media/imgs/hm13_logo_en_col.png b/media/imgs/hm13_logo_en_col.png deleted file mode 100644 index ec23489b..00000000 Binary files a/media/imgs/hm13_logo_en_col.png and /dev/null differ diff --git a/media/imgs/hobby-elektronik-1215-1.gif b/media/imgs/hobby-elektronik-1215-1.gif deleted file mode 100644 index 5ab11a91..00000000 Binary files a/media/imgs/hobby-elektronik-1215-1.gif and /dev/null differ diff --git a/media/imgs/homi_eng.jpg b/media/imgs/homi_eng.jpg deleted file mode 100644 index f9b16ef5..00000000 Binary files a/media/imgs/homi_eng.jpg and /dev/null differ diff --git a/media/imgs/logo-china-paper.jpg b/media/imgs/logo-china-paper.jpg deleted file mode 100644 index 56e55500..00000000 Binary files a/media/imgs/logo-china-paper.jpg and /dev/null differ diff --git a/media/imgs/logo_chillventa.jpg b/media/imgs/logo_chillventa.jpg deleted file mode 100644 index 8a9ea868..00000000 Binary files a/media/imgs/logo_chillventa.jpg and /dev/null differ diff --git a/media/imgs/logo_hoobyshow_network_inde.gif b/media/imgs/logo_hoobyshow_network_inde.gif deleted file mode 100644 index 87ff411c..00000000 Binary files a/media/imgs/logo_hoobyshow_network_inde.gif and /dev/null differ diff --git a/media/imgs/manifestazione_logo_2223.jpg b/media/imgs/manifestazione_logo_2223.jpg deleted file mode 100644 index 83aa79b7..00000000 Binary files a/media/imgs/manifestazione_logo_2223.jpg and /dev/null differ diff --git a/media/imgs/map_print.pdf b/media/imgs/map_print.pdf deleted file mode 100644 index da567f37..00000000 Binary files a/media/imgs/map_print.pdf and /dev/null differ diff --git a/media/imgs/messen_hbe_rot12_h.gif b/media/imgs/messen_hbe_rot12_h.gif deleted file mode 100644 index cf43fe52..00000000 Binary files a/media/imgs/messen_hbe_rot12_h.gif and /dev/null differ diff --git a/meta/__init__.py b/meta/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/meta/models.py b/meta/models.py new file mode 100644 index 00000000..39f32f06 --- /dev/null +++ b/meta/models.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +from django.db import models +from hvad.models import TranslatableModel, TranslatedFields, TranslationManager +from django.utils import translation +from pymorphy.django_conf import default_morph as morph + +class MetaSetting(TranslatableModel): + name = models.CharField(max_length=100, unique=True) + translations = TranslatedFields( + title = models.CharField(max_length=255, blank=True), + description = models.CharField(max_length=255, blank=True), + keywords = models.CharField(max_length=255, blank=True), + h1 = models.CharField(max_length=255, blank=True), + ) + + params = {'EXPONAME':{'name': 'name'}, + 'EXPONAME_YA':{'name': 'name', 'inflect': True}, + 'EXPOCOUNTRY':{'name': 'country'}, + 'EXPOCOUNTRY_YA':{'name': 'country', 'inflect': True}, + 'EXPOPLACE':{'name': 'place'}, + 'EXPOCITY':{'name': 'city'}, + 'EXPOTHEME':{'name': 'theme'}, + 'EXPOTAG':{'name': 'tag'}, + 'EXPOMONTH':{'name': 'month'}, + 'EXPOYEAR':{'name': 'year'}, + } + + def __unicode__(self): + return self.name + + def generate_meta(self, obj): + """ + obj must be in current language + """ + lang = translation.get_language() + params = {'EXPONAME': getattr(obj, 'name', '')} + tr = self.translations.get(language_code=lang) + title = tr.title.format(**params) + description = tr.description.format(**params) + keywords = []#tr.keywords.format(**params) + h1 = tr.h1.format(**params) + return {'title': title, 'description': description, 'keywords': keywords, 'h1': h1} + + def get_param(self, obj, field): + param = self.params.get(field) + if not param: + return '' + s = getattr(obj, param['name'], '') + if param.get('inflected'): + s = morph.inflect_ru(s, u'пр') + return s + + + + + diff --git a/meta/settings.py b/meta/settings.py new file mode 100644 index 00000000..14b40ed4 --- /dev/null +++ b/meta/settings.py @@ -0,0 +1,13 @@ +from django.conf import settings + +SITE_PROTOCOL = getattr(settings, 'META_SITE_PROTOCOL', None) +SITE_DOMAIN = getattr(settings, 'META_SITE_DOMAIN', None) +SITE_TYPE = getattr(settings, 'META_SITE_TYPE', None) +SITE_NAME = getattr(settings, 'META_SITE_NAME', None) +INCLUDE_KEYWORDS = getattr(settings, 'META_INCLUDE_KEYWORDS', []) +DEFAULT_KEYWORDS = getattr(settings, 'META_DEFAULT_KEYWORDS', []) +IMAGE_URL = getattr(settings, 'META_IMAGE_URL', settings.STATIC_URL) +USE_OG_PROPERTIES = getattr(settings, 'META_USE_OG_PROPERTIES', False) +USE_TWITTER_PROPERTIES = getattr(settings, 'META_USE_TWITTER_PROPERTIES', False) +USE_GOOGLEPLUS_PROPERTIES = getattr(settings, 'META_USE_GOOGLEPLUS_PROPERTIES', False) +USE_SITES = getattr(settings, 'META_USE_SITES', False) diff --git a/meta/templatetags/__init__.py b/meta/templatetags/__init__.py new file mode 100644 index 00000000..3ed9fd0f --- /dev/null +++ b/meta/templatetags/__init__.py @@ -0,0 +1 @@ +__author__ = 'root' diff --git a/meta/templatetags/meta.py b/meta/templatetags/meta.py new file mode 100644 index 00000000..85f62339 --- /dev/null +++ b/meta/templatetags/meta.py @@ -0,0 +1,50 @@ +from __future__ import absolute_import, unicode_literals + +from django import template + +register = template.Library() + + +@register.simple_tag +def generic_prop(namespace, name, value): + """ + Generic property setter that allows to create custom namespaced meta + """ + return '' % (namespace, name, value) + + +@register.simple_tag +def og_prop(name, value): + return '' % (name, value) + + +@register.simple_tag +def twitter_prop(name, value): + return '' % (name, value) + + +@register.simple_tag +def googleplus_prop(name, value): + return '' % (name, value) + + +@register.simple_tag +def googleplus_html_scope(value): + """ + This is meant to be used as attribute to html / body or other tags to + define schema.org type + """ + return ' itemscope itemtype="http://schema.org/%s" ' % value + + +@register.simple_tag +def meta(name, value): + return '' % (name, value) + + +@register.simple_tag +def meta_list(name, lst): + try: + return '' % (name, ', '.join(lst)) + except: + return '' diff --git a/meta/tests.py b/meta/tests.py new file mode 100644 index 00000000..501deb77 --- /dev/null +++ b/meta/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/meta/views.py b/meta/views.py new file mode 100644 index 00000000..f362194a --- /dev/null +++ b/meta/views.py @@ -0,0 +1,167 @@ +from __future__ import unicode_literals + +from django.core.exceptions import ImproperlyConfigured + +from . import settings + + +class Meta(object): + """ Helper for building context meta object """ + + _keywords = [] + _url = None + _image = None + + def __init__(self, **kwargs): + self.use_sites = kwargs.get('use_sites', settings.USE_SITES) + self.title = kwargs.get('title') + self.description = kwargs.get('description') + self.keywords = kwargs.get('keywords') + self.h1 = kwargs.get('h1') + self.url = kwargs.get('url') + self.image = kwargs.get('image') + self.object_type = kwargs.get('object_type', settings.SITE_TYPE) + self.site_name = kwargs.get('site_name', settings.SITE_NAME) + self.use_og = kwargs.get('use_og', settings.USE_OG_PROPERTIES) + self.use_twitter = kwargs.get('use_twitter', settings.USE_TWITTER_PROPERTIES) + self.use_googleplus = kwargs.get('use_googleplus', settings.USE_GOOGLEPLUS_PROPERTIES) + + def get_domain(self): + if self.use_sites: + from django.contrib.sites.models import Site + return Site.objects.get_current().domain + if not settings.SITE_DOMAIN: + raise ImproperlyConfigured('META_SITE_DOMAIN is not set') + return settings.SITE_DOMAIN + + def get_protocol(self): + if not settings.SITE_PROTOCOL: + raise ImproperlyConfigured('META_SITE_PROTOCOL is not set') + return settings.SITE_PROTOCOL + + def get_full_url(self, url): + if not url: + return None + if url.startswith('http'): + return url + if url.startswith('/'): + return '%s://%s%s' % ( + self.get_protocol(), + self.get_domain(), + url + ) + return '%s://%s/%s' % ( + self.get_protocol(), + self.get_domain(), + url + ) + + + @property + def keywords(self): + return self._keywords + + @keywords.setter + def keywords(self, keywords): + if keywords is None: + kws = settings.DEFAULT_KEYWORDS + else: + if not hasattr(keywords, '__iter__'): + # Not iterable + raise ValueError('Keywords must be an intrable') + kws = [k for k in keywords] + if settings.INCLUDE_KEYWORDS: + kws += settings.INCLUDE_KEYWORDS + seen = set() + seen_add = seen.add + self._keywords = [k for k in kws if k not in seen and not seen_add(k)] + + @property + def url(self): + return self._url + + @url.setter + def url(self, url): + self._url = self.get_full_url(url) + + @property + def image(self): + return self._image + + @image.setter + def image(self, image): + if image is None: + self._image = None + return + if not image.startswith('http') and not image.startswith('/'): + image = '%s%s' % (settings.IMAGE_URL, image) + self._image = self.get_full_url(image) + + #-------------------------------------------------------------------- + + + +class MetadataMixin(object): + """ Django CBV mixin to prepare metadata for the view context """ + + meta_class = Meta + title = None + description = None + keywords = [] + h1 = None + url = None + image = None + object_type = None + site_name = None + use_sites = settings.USE_SITES + use_og = settings.USE_OG_PROPERTIES + + def get_meta_class(self): + return self.meta_class + + def get_protocol(self): + return settings.SITE_PROTOCOL + + def get_domain(self): + return settings.SITE_DOMAIN + + def get_meta_title(self, context={}): + return self.title + + def get_meta_description(self, context={}): + return self.description + + def get_meta_h1(self, context={}): + return self.h1 + + def get_meta_keywords(self, context={}): + return self.keywords + + def get_meta_url(self, context={}): + return self.url + + def get_meta_image(self, context={}): + return self.image + + def get_meta_object_type(self, context={}): + return self.object_type or settings.SITE_TYPE + + def get_meta_site_name(self, context={}): + return self.site_name or settings.SITE_NAME + + def get_context_data(self, **kwargs): + context = super(MetadataMixin, self).get_context_data(**kwargs) + context['meta'] = self.get_meta_class()( + use_og=self.use_og, + use_sites=self.use_sites, + title=self.get_meta_title(context=context), + h1=self.get_meta_h1(context=context), + + description=self.get_meta_description(context=context), + keywords=self.get_meta_keywords(context=context), + image=self.get_meta_image(context=context), + url=self.get_meta_url(context=context), + object_type=self.get_meta_object_type(context=context), + site_name=self.get_meta_site_name(context=context), + ) + return context diff --git a/note/__init__.py b/note/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/note/models.py b/note/models.py new file mode 100644 index 00000000..53341335 --- /dev/null +++ b/note/models.py @@ -0,0 +1,13 @@ +from django.db import models +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes import generic + + +class Note(models.Model): + content_type = models.ForeignKey(ContentType, null=True) + object_id = models.PositiveIntegerField() + content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk") + user = models.ForeignKey('accounts.User') + text = models.TextField(verbose_name='Note') + + diff --git a/note/tests.py b/note/tests.py new file mode 100644 index 00000000..501deb77 --- /dev/null +++ b/note/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/note/views.py b/note/views.py new file mode 100644 index 00000000..60f00ef0 --- /dev/null +++ b/note/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/organiser/admin.py b/organiser/admin.py index 221e3afe..723342f2 100644 --- a/organiser/admin.py +++ b/organiser/admin.py @@ -1,125 +1,64 @@ # -*- coding: utf-8 -*- -from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse -from django.core.context_processors import csrf from django.conf import settings -from django.contrib.contenttypes.models import ContentType -from django.contrib.auth.decorators import login_required -#models and forms +from photologue.forms import PhotoForm from models import Organiser -from accounts.models import User -from city.models import City from theme.models import Tag from forms import OrganiserForm, OrganiserFilterForm -from file.models import FileModel, TmpFile -from file.forms import FileModelForm -#python -import random -#custom functions -from functions.custom_views import objects_list, add_object_with_file -from functions.admin_views import AdminListView - - -def organiser_all(request): - """ - Return list of all organisers with pagination - """ - return objects_list(request, Organiser, 'organiser_all.html') - - - - -def organiser_add(request): - """ - Return form of organiser and post it on the server. - If form is posted redirect on the page of all organiser. - """ - return add_object_with_file(request, OrganiserForm, 'organiser_add.html', '/admin/organiser/all/', - choices={'city': City, 'tag': Tag}) - - -def organiser_change(request, url): - """ - Return form and fill it with existing Organiser object data. - - If form is posted redirect on the page of all organisers. - """ - organiser = Organiser.objects.safe_get(url=url) - # try get user by id if doesnt work by url - if organiser is None: - organiser = Organiser.objects.safe_get(id=url) - #redirect to list of all organisers if cannot find organiser - if organiser is None: - return HttpResponseRedirect('/admin/organiser/all/') - #get id - organiser_id = getattr(organiser, 'id') - #init FileModelForm - file_form = FileModelForm(initial={'model': 'organiser.Organiser'}) - - if request.POST: - form = OrganiserForm(request.POST) - #set choices filled by ajax - form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.all()] - form.fields['city'].choices = [(item.id, item.name) for item in City.objects.filter(country=request.POST['country'])] - - if form.is_valid(): - form.save(id=organiser_id) - return HttpResponseRedirect('/admin/organiser/all/') - else: - #fill form with data from database - data = {'staff_number':organiser.staff_number, 'address': organiser.address, - 'events_number':organiser.events_number, 'phone':organiser.phone, - 'fax':organiser.fax, 'web_page':organiser.web_page, 'url':organiser.url, - 'email':organiser.email, 'social':organiser.social, 'foundation': organiser.foundation} - - data['user'] = User.objects.safe_get(organiser=organiser) - - if organiser.country: - data['country'] = organiser.country.id - - if organiser.city: - data['city'] = organiser.city.id - - data['theme'] = [item.id for item in organiser.theme.all()] - data['tag'] = [item.id for item in organiser.tag.all()] - data['place_exposition'] = [item.id for item in organiser.place_exposition.all()] - data['place_conference'] = [item.id for item in organiser.place_conference.all()] - #data from translated fields - - for code, name in settings.LANGUAGES: - obj = Organiser._meta.translations_model.objects.get(language_code = code,master__id=organiser_id) #access to translated fields - data['name_%s' % code] = obj.name - data['description_%s' % code] = obj.description - data['specialization_%s' % code] = obj.specialization - data['address_inf_%s' % code] = obj.address_inf - data['representation_%s' % code] = obj.representation - data['title_%s' % code] = obj.title - data['keywords_%s' % code] = obj.keywords - data['descriptions_%s' % code] = obj.descriptions - - #fill form - form = OrganiserForm(initial=data) - form.fields['city'].widget.attrs['data-init-text'] = organiser.city.name - #set choices filled by ajax - #form.fields['city'].choices = [(item.id, item.name) for item in City.objects.filter(country=data.get('country'))] - form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.filter(theme__in=data.get('theme'))] - - args = {} - args.update(csrf(request)) - - args['form'] = form - args['languages'] = settings.LANGUAGES - args['file_form'] = file_form - - #get list of files which connected with specific model object - args['files'] = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(organiser), - object_id=getattr(organiser, 'id')) - args['obj_id'] = organiser_id - - return render_to_response('organiser_add.html', args) +from functions.admin_views import AdminListView, AdminView class OrganiserListView(AdminListView): template_name = 'admin/organiser/organiser_list.html' form_class = OrganiserFilterForm - model = Organiser \ No newline at end of file + model = Organiser + +class OrganiserView(AdminView): + form_class = OrganiserForm + model = Organiser + success_url = '/admin/organiser/all/' + template_name = 'admin/organiser/organiser.html' + + def get_form(self, form_class): + if self.request.POST: + return super(OrganiserView, self).get_form(form_class) + obj = self.set_obj() + if obj: + data = {'staff_number':obj.staff_number, 'address': obj.address, + 'events_number':obj.events_number, 'phone':obj.phone, + 'fax':obj.fax, 'web_page':obj.web_page, 'url':obj.url, + 'email':obj.email, 'foundation': obj.foundation} + + if obj.country: + data['country'] = obj.country_id + + if obj.city: + data['city'] = obj.city_id + + data['theme'] = [item.id for item in obj.theme.all()] + data['tag'] = ','.join(['%s:%s'%(item.id, item.name) for item in obj.tag.all()]) + data['place_exposition'] = [item.id for item in obj.place_exposition.all()] + data['place_conference'] = [item.id for item in obj.place_conference.all()] + + + for code, name in settings.LANGUAGES: + trans_obj = self.model._meta.translations_model.objects.get(language_code = code,master__id=obj.id) #access to translated fields + data['name_%s' % code] = trans_obj.name + data['description_%s' % code] = trans_obj.description + data['specialization_%s' % code] = trans_obj.specialization + data['address_inf_%s' % code] = trans_obj.address_inf + data['representation_%s' % code] = trans_obj.representation + data['title_%s' % code] = trans_obj.title + data['keywords_%s' % code] = trans_obj.keywords + data['descriptions_%s' % code] = trans_obj.descriptions + + form =form_class(initial=data) + form.fields['city'].widget.attrs['data-init-text'] = obj.city.name + form.fields['tag'].choices = [(item.id, item.name) for item in Tag.objects.filter(theme__in=data['theme'])] + return form + else: + return form_class() + + def get_context_data(self, **kwargs): + context = super(OrganiserView, self).get_context_data(**kwargs) + context['photo_form'] = PhotoForm() + return context \ No newline at end of file diff --git a/organiser/admin_urls.py b/organiser/admin_urls.py index e15df584..04262aa9 100644 --- a/organiser/admin_urls.py +++ b/organiser/admin_urls.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url -from admin import OrganiserListView +from admin import OrganiserListView, OrganiserView urlpatterns = patterns('organiser.admin', - url(r'^add.*/$', 'organiser_add'), - url(r'^change/(?P.*).*/$', 'organiser_change'), - #url(r'^all/$', 'organiser_all'), url(r'^all/$', OrganiserListView.as_view()), + url(r'^$', OrganiserView.as_view()), + url(r'^(?P.*)/$', OrganiserView.as_view()), ) diff --git a/organiser/forms.py b/organiser/forms.py index 63d18448..48db9dec 100644 --- a/organiser/forms.py +++ b/organiser/forms.py @@ -8,8 +8,7 @@ from django.core.validators import URLValidator from models import Organiser from country.models import Country from city.models import City -from theme.models import Theme -from accounts.models import User +from theme.models import Theme, Tag from place_exposition.models import PlaceExposition from place_conference.models import PlaceConference #functions @@ -30,14 +29,17 @@ class OrganiserForm(forms.Form): """ url = forms.CharField(label='url', required=False) - user = forms.ModelChoiceField(label='Пользователь', queryset=User.objects.all(), empty_label='',required=False) - country = forms.ModelChoiceField(label='Страна', queryset=Country.objects.all(), empty_label=None) - theme = forms.ModelMultipleChoiceField(label='Тематики', queryset=Theme.objects.all()) - place_exposition = forms.ModelMultipleChoiceField(label='Места проведения выставок', queryset=PlaceExposition.objects.all(), required=False) - place_conference = forms.ModelMultipleChoiceField(label='Места проведения конференций', queryset=PlaceConference.objects.all(), required=False) + #user = forms.ModelChoiceField(label='Пользователь', queryset=User.objects.all(), empty_label='',required=False) + country = forms.ChoiceField(label='Страна', choices=[(item.id, item.name) for item in Country.objects.all()]) + city = forms.CharField(label='Город', widget=forms.HiddenInput()) + theme = forms.MultipleChoiceField(label='Тематики', choices=[(item.id, item.name) for item in Theme.objects.language().all()]) + place_exposition = forms.MultipleChoiceField(label='Места проведения выставок', required=False, + choices=[(item.id, item.name) for item in PlaceExposition.objects.language().all()]) + place_conference = forms.MultipleChoiceField(label='Места проведения конференций', required=False, + choices=[(item.id, item.name) for item in PlaceConference.objects.all()]) #creates select input with empty choices cause it will be filled with ajax - city = forms.ChoiceField(label='Город', choices=[('','')]) - tag = forms.MultipleChoiceField(label='Теги', required=False) + tag = forms.CharField(label='Теги', widget=forms.HiddenInput(), required=False) + logo = forms.ImageField(label='Logo', required=False) staff_number = forms.CharField(label='Количество сотрудников', required=False, widget=forms.TextInput(attrs={'placeholder': 'Количество сотрудников'})) @@ -50,16 +52,12 @@ class OrganiserForm(forms.Form): widget=forms.TextInput(attrs={'placeholder': 'Введите факс'})) web_page = forms.CharField(label='Веб-сайт', required=False, widget=forms.TextInput(attrs={'placeholder': 'Введите адрес сайта'})) - email = forms.CharField(label='Email', required=False, + email = forms.EmailField(label='Email', required=False, widget=forms.TextInput(attrs={'placeholder': 'Введите email'})) - social = forms.CharField(label='Социальные страници', required=False) events_number = forms.CharField(label='Количество мероприятий в год', required=False, widget=forms.TextInput(attrs={'placeholder': 'Количество'})) foundation = forms.CharField(label='Год основания', required=False, widget=forms.TextInput(attrs={'placeholder': 'Год основания'})) - #field for comparing tmp files - key = forms.CharField(required=False, widget=forms.HiddenInput()) - def __init__(self, *args, **kwargs): """ @@ -74,13 +72,13 @@ class OrganiserForm(forms.Form): # first iteration is a default lang so it required fields required = True if lid == 0 else False self.fields['name_%s' % code] = forms.CharField(label='Название', required=required) - self.fields['description_%s' % code] = forms.CharField(label='Описание', - required=False, widget=CKEditorWidget) self.fields['specialization_%s' % code] = forms.CharField(label='Специализация', required=False) - self.fields['address_inf_%s' % code] = forms.CharField(label='Доп инф по адресу', + self.fields['description_%s' % code] = forms.CharField(label='Описание', required=False, widget=CKEditorWidget) self.fields['representation_%s' % code] = forms.CharField(label='Представительства', required=False, max_length=255, widget=forms.TextInput(attrs={'style':'width: 550px'})) + self.fields['address_inf_%s' % code] = forms.CharField(label='Доп инф по адресу', + required=False, widget=CKEditorWidget) #meta data self.fields['title_%s' % code] = forms.CharField(label='Тайтл', required=False, max_length=255, widget=forms.TextInput(attrs={'style':'width: 550px'})) @@ -90,19 +88,19 @@ class OrganiserForm(forms.Form): widget=forms.TextInput(attrs={'style':'width: 550px'})) - def save(self, id=None): + def save(self, obj=None): """ - change organisers object with id = id + change organisers object N/A add new Organiser object usage: form.save(obj) - if change organiser form.save() - if add organiser """ data = self.cleaned_data #create new Organiser object or get exists - if not id: + if not obj: organiser = Organiser() else: - organiser = Organiser.objects.get(id=id) + organiser = obj organiser.theme.clear() organiser.tag.clear() organiser.place_conference.clear() @@ -116,12 +114,11 @@ class OrganiserForm(forms.Form): organiser.web_page = data['web_page'] organiser.email = data['email'] organiser.foundation = data['foundation'] - organiser.social = data['social'] organiser.staff_number = data['staff_number'] organiser.events_number = data['events_number'] if data.get('country'): - organiser.country = Country.objects.get(id=data['country'].id)#.id cause select uses queryset + organiser.country = Country.objects.get(id=data['country'])#.id cause select uses queryset if data.get('city'): organiser.city = City.objects.get(id=data['city']) @@ -129,37 +126,41 @@ class OrganiserForm(forms.Form): fill_with_signal(Organiser, organiser, data) #fill manytomany fields + organiser.theme.add(*Theme.objects.filter(id__in=data['theme'])) + organiser.tag.add(*Tag.objects.filter(id__in=data['tag'])) + organiser.place_exposition.add(*PlaceExposition.objects.filter(id__in=data['place_exposition'])) + organiser.place_conference.add(*PlaceConference.objects.filter(id__in=data['place_conference'])) - for item in data['theme']: - organiser.theme.add(item.id)#.id cause select uses queryset - - for item in data['tag']: - organiser.tag.add(item) - for item in data['place_exposition']: - organiser.place_exposition.add(item.id)#.id cause select uses queryset - - for item in data['place_conference']: - organiser.place_conference.add(item.id)#.id cause select uses queryset - - # uses because in the next loop data will be overwritten organiser.save() - #save files - check_tmp_files(organiser, data['key']) - #bound organiser to user + """ if data.get('user'): user = User.objects.safe_get(id=data['user'].id) if user: user.organiser = organiser user.save() + """ def clean_url(self): cleaned_data = super(OrganiserForm, self).clean() url = cleaned_data.get('url').strip() return url + def clean_tag(self): + tags = self.cleaned_data.get('tag') + if tags: + res = [] + for id in tags.split(','): + try: + res.append(int(id)) + except: + continue + return res + else: + return [] + def clean_foundation(self): """ checking foundation diff --git a/organiser/models.py b/organiser/models.py index 10532826..8d09405b 100644 --- a/organiser/models.py +++ b/organiser/models.py @@ -17,6 +17,10 @@ class OrganiserManager(TranslationManager): except: return None +def logo_name(instance, filename): + url = instance.url + return '/'.join(['organiser', url, url+'_logo.jpg']) + class Organiser(TranslatableModel): """ @@ -38,6 +42,8 @@ class Organiser(TranslatableModel): tag = models.ManyToManyField('theme.Tag', verbose_name='Теги', blank=True, null=True) #address. uses LocationField. saves data in json format address = LocationField(verbose_name='Адресс', blank=True, null=True) + logo = models.ImageField(verbose_name='Logo', upload_to=logo_name, blank=True) + rating = models.IntegerField(default=0) phone = models.BigIntegerField(verbose_name='Телефон', blank=True, null=True) fax = models.BigIntegerField(verbose_name='Факс', blank=True, null=True) diff --git a/password_reset/forms.py b/password_reset/forms.py index 662a101b..fbfd0049 100644 --- a/password_reset/forms.py +++ b/password_reset/forms.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from django import forms from django.core.validators import validate_email from django.db.models import Q @@ -29,7 +30,7 @@ class PasswordRecoveryForm(forms.Form): labels = { 'username': _('Username'), 'email': _('Email'), - 'both': _('Username or Email'), + 'both': _(u'Для восстановления пароля укажите email, который Вы регистрировали'), } User = get_user_model() # noqa if getattr(User, 'USERNAME_FIELD', 'username') == 'email': diff --git a/password_reset/templates/password_reset/recovery_form.html b/password_reset/templates/password_reset/recovery_form.html index bb84ac27..5046a9d6 100644 --- a/password_reset/templates/password_reset/recovery_form.html +++ b/password_reset/templates/password_reset/recovery_form.html @@ -5,8 +5,7 @@ {% block title %}{% trans "Password recovery" %}{% endblock %} {% block content %} -
- {% csrf_token %} + {% csrf_token %} {{ form.as_p }}

diff --git a/photologue/forms.py b/photologue/forms.py index 630fbec7..788b94a8 100644 --- a/photologue/forms.py +++ b/photologue/forms.py @@ -48,8 +48,8 @@ class PhotoForm(forms.Form): # uses enumerate for detect iteration number # first iteration is a default lang so it required fields required = True if lid == 0 else False - self.fields['title_%s' % code] = forms.CharField(label='Описание', required=required) - self.fields['caption_%s' % code] = forms.CharField(label='Заголовок', required=False) + self.fields['title_%s' % code] = forms.CharField(label='Описание', required=False) + self.fields['caption_%s' % code] = forms.CharField(label='Заголовок', required=required) def save(self, obj=None): data = self.cleaned_data diff --git a/photologue/models.py b/photologue/models.py index cd7a1904..eddf4de7 100644 --- a/photologue/models.py +++ b/photologue/models.py @@ -189,7 +189,10 @@ class Gallery(TranslatableModel): related_name='galleries', verbose_name=_('photos'), null=True, - blank=True) + blank=True, + #sorted=True, + #sort_value_field_name='sort_value' + ) tags = TagField(help_text=tagfield_help_text, verbose_name=_('tags')) sites = models.ManyToManyField(Site, verbose_name=_(u'sites'), blank=True, null=True) diff --git a/place_conference/models.py b/place_conference/models.py index b4cbdcab..170a8806 100644 --- a/place_conference/models.py +++ b/place_conference/models.py @@ -105,10 +105,10 @@ class PlaceConference(TranslatableModel, ExpoMixin): return PlaceConference.objects.filter(city=self.city).exclude(id=self.id)[:6] def get_catalog_url(self): - return '/places/' + return self.catalog def get_permanent_url(self): - url = '%splace-%s'%(self.get_catalog_url(), self.url) + url = '%s%s/'%(self.get_catalog_url(), self.url) return url diff --git a/place_exposition/admin.py b/place_exposition/admin.py index 9a09397b..ce467f5a 100644 --- a/place_exposition/admin.py +++ b/place_exposition/admin.py @@ -4,18 +4,16 @@ from django.shortcuts import render_to_response, get_object_or_404, HttpRespons from django.http import HttpResponseRedirect from django.core.context_processors import csrf from django.conf import settings -from django.forms.formsets import formset_factory -from django.forms.models import modelformset_factory from django.contrib.contenttypes.models import ContentType from django.contrib.auth.decorators import login_required -from django.forms.formsets import BaseFormSet, formset_factory +from django.forms.formsets import formset_factory from django.forms.models import modelformset_factory #models and forms from forms import ExpositionForm, PlaceExpositionFormDelete, HallForm, PlaceExpositionFilter from models import PlaceExposition, Hall from city.models import City from file.models import FileModel, TmpFile -from file.forms import FileModelForm +from file.forms import FileModelForm, FileForm from photologue.forms import PhotoForm #python import random @@ -194,14 +192,13 @@ def exposition_change(request, url): return render_to_response('place_exposition_add.html', args) -#test---------------------- - +#new---------------------- class PlaceExpositionView(AdminView): form_class = ExpositionForm model = PlaceExposition - success_url = 'admin/place_exposition/all/' + success_url = '/admin/place_exposition/all/' template_name = 'admin/place_exposition/place_exposition.html' def get_form(self, form_class): @@ -245,9 +242,15 @@ class PlaceExpositionView(AdminView): def get_context_data(self, **kwargs): context = super(PlaceExpositionView, self).get_context_data(**kwargs) obj = self.set_obj() + if obj: + context['file_form'] = FileForm(initial={'model': 'place_exposition.PlaceExposition'}) + files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) + context['files'] = files + context['halls'] = list(Hall.objects.language().filter(place_exposition=self.obj)) context['hall_form'] = HallForm() context['photo_form'] = PhotoForm() + return context def add_hall(request, place_id): diff --git a/place_exposition/admin_urls.py b/place_exposition/admin_urls.py index 53d1782b..47ab735d 100644 --- a/place_exposition/admin_urls.py +++ b/place_exposition/admin_urls.py @@ -9,13 +9,13 @@ urlpatterns = patterns('place_exposition.admin', url(r'^upload-photo/(?P.*)/$', 'upload_place_photo'), url(r'^all/$', PlaceExpositionListView.as_view()), - url(r'^add.*/$', 'exposition_add'), - url(r'^delete/(?P.*)/$', 'exposition_delete'), - url(r'^change/(?P.*)/$', 'exposition_change'), - url(r'^copy/(?P.*)/$', 'place_exposition_copy'), - - url(r'^$', PlaceExpositionView.as_view()), + #url(r'^add.*/$', 'exposition_add'), + #url(r'^delete/(?P.*)/$', 'exposition_delete'), + #url(r'^change/(?P.*)/$', 'exposition_change'), + #url(r'^copy/(?P.*)/$', 'place_exposition_copy'), url(r'^(?P.*)/$', PlaceExpositionView.as_view()), + url(r'^$', PlaceExpositionView.as_view()), + diff --git a/place_exposition/forms.py b/place_exposition/forms.py index 669ccbf6..d8a4a818 100644 --- a/place_exposition/forms.py +++ b/place_exposition/forms.py @@ -29,7 +29,7 @@ class ExpositionForm(forms.Form): type = forms.ChoiceField(required=False, choices=types) logo = forms.ImageField(label='Logo', required=False) - country = forms.ModelChoiceField(label='Страна', queryset=Country.objects.all(), empty_label=None) + country = forms.ChoiceField(label='Страна', choices=[(c.id, c.name) for c in Country.objects.all()]) # creates select input with empty choices cause it will be filled with ajax city = forms.CharField(label='Город', widget=forms.HiddenInput()) @@ -69,10 +69,6 @@ class ExpositionForm(forms.Form): parking = forms.BooleanField(label='Парковка', required=False) press_centre = forms.BooleanField(label='Пресс-центр', required=False) mobile_application = forms.BooleanField(label='Мобильное приложение', required=False) - # - key = forms.CharField(required=False, widget=forms.HiddenInput()) - # - place_exposition_id = forms.CharField(required=False, widget=forms.HiddenInput()) def __init__(self, *args, **kwargs): """ @@ -121,8 +117,8 @@ class ExpositionForm(forms.Form): place_exposition.url = translit_with_separator(data['name_en'].strip()).lower() else: place_exposition.url = translit_with_separator(data['name_ru'].strip()).lower() - - place_exposition.logo = data['logo'] + if data.get('logo'): + place_exposition.logo = data['logo'] place_exposition.type = data['type'] place_exposition.address = data['address'] place_exposition.phone = data['phone'] @@ -149,29 +145,14 @@ class ExpositionForm(forms.Form): place_exposition.mobile_application = data['mobile_application'] if data.get('country'): - place_exposition.country = Country.objects.get(id=data['country'].id)#.id cause select uses queryset + place_exposition.country = Country.objects.get(id=data['country']) if data.get('city'): place_exposition.city = City.objects.get(id=data['city']) fill_with_signal(PlaceExposition, place_exposition, data) place_exposition.save() - #save files - check_tmp_files(place_exposition, data['key']) - - return PlaceExposition.objects.get(id=place_exposition.id) - - def clean(self): - id = self.cleaned_data.get('place_exposition_id') - name_ru = self.cleaned_data.get('name_ru') - - place_exposition = PlaceExposition.objects.filter(url=translit_with_separator(name_ru)) - if place_exposition and str(place_exposition[0].id) != id: - msg = 'Место проведения с таким названием уже существует' - self._errors['name_ru'] = ErrorList([msg]) - del self.cleaned_data['name_ru'] - - return self.cleaned_data + return place_exposition def clean_phone(self): diff --git a/place_exposition/management/commands/place_exposition_load.py b/place_exposition/management/commands/place_exposition_load.py index c880b5c6..b47945e8 100644 --- a/place_exposition/management/commands/place_exposition_load.py +++ b/place_exposition/management/commands/place_exposition_load.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- from django.core.management.base import BaseCommand, CommandError -from city.models import City -from country.models import Country from place_exposition.models import PlaceExposition import xlrd, xlwt from import_xls.excel_settings import import_settings, place_exp_sett diff --git a/place_exposition/models.py b/place_exposition/models.py index 361cf358..5d90d64b 100644 --- a/place_exposition/models.py +++ b/place_exposition/models.py @@ -26,6 +26,11 @@ EXPOSITION_TYPE = (('Exposition complex', u'Выставочный компле dist=lambda s,d: (s[0]-d[0])**2+(s[1]-d[1])**2 +def logo_name(instance, filename): + url = instance.url + return '/'.join(['place_exposition', url, url+'_logo.jpg']) + + class PlaceExposition(TranslatableModel, ExpoMixin): """ Create PlaceConference model @@ -33,9 +38,11 @@ class PlaceExposition(TranslatableModel, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ + catalog = '/places/' + catalog_name = _(u'Места:') + search_name = None #set manager of this model objects = ExpoManager() - catalog = '/places/' url = models.SlugField(unique=True, max_length=255) country = models.ForeignKey('country.Country', on_delete=models.PROTECT) @@ -71,16 +78,12 @@ class PlaceExposition(TranslatableModel, ExpoMixin): press_centre = models.NullBooleanField() mobile_application = models.NullBooleanField() # - logo = models.ImageField(verbose_name='Logo', upload_to='place_exposition/logo/', blank=True) + logo = models.ImageField(verbose_name='Logo', upload_to=logo_name, blank=True) rating = models.IntegerField(default=0) - # - - #logo - #scheme # delete after profiling files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id') - photos = generic.GenericRelation('file.Photo', content_type_field='content_type', object_id_field='object_id') + #photos = generic.GenericRelation('file.Photo', content_type_field='content_type', object_id_field='object_id') #translations is translated fields translations = TranslatedFields( @@ -104,7 +107,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin): views = models.PositiveIntegerField(default=0) is_published = models.BooleanField(default=1) class Meta: - ordering = ['translations__name'] + ordering = ['-rating', 'id'] def get_gallery(self): if self.photogallery: @@ -141,8 +144,10 @@ class PlaceExposition(TranslatableModel, ExpoMixin): def get_index_text(self): - names = [tr.name for tr in self.translations.all()] - return names + translations = self.translations.all() + names = ' '.join([tr.name for tr in translations]) + titles = ' '.join([tr.main_title for tr in translations]) + return names + ' ' + titles def __unicode__(self): @@ -152,10 +157,10 @@ class PlaceExposition(TranslatableModel, ExpoMixin): return _(u'Места') def get_catalog_url(self): - return '/places/' + return self.catalog def get_permanent_url(self): - url = '%splace-%s'%(self.get_catalog_url(), self.url) + url = '%s%s/'%(self.catalog, self.url) return url def get_logo(self): @@ -199,7 +204,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin): return qs_hotels_all.filter(res) def get_type(self): - type = {'Convention centre': _(u'Конгессо-выставочный центр'), 'Exposition centre': _(u'Выставочный центр'), + type = {'Convention centre': _(u'Конгрессно-выставочный центр'), 'Exposition centre': _(u'Выставочный центр'), 'Exposition complex': _(u'Выставочный комплекс')} return type.get(self.type) diff --git a/place_exposition/search_indexes.py b/place_exposition/search_indexes.py index 6dc54a7e..da84b3e4 100644 --- a/place_exposition/search_indexes.py +++ b/place_exposition/search_indexes.py @@ -1,28 +1,35 @@ +# -*- coding: utf-8 -*- from haystack import indexes from models import PlaceExposition +from functions.search_mixin import ExpoSearchMixin -class PlaceExpositionIndex(indexes.SearchIndex, indexes.Indexable): +class PlaceExpositionIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin): text = indexes.CharField(document=True, use_template=True) + where = indexes.MultiValueField() - country = indexes.CharField(model_attr='country', null=True) - #city = indexes.CharField(model_attr='city', null=True) + content_auto = indexes.EdgeNgramField() + area_id = indexes.IntegerField() + country_id = indexes.IntegerField() + city_id = indexes.IntegerField() + url = indexes.CharField() + form_name = indexes.CharField() + # translated fields + name_en = indexes.CharField() + name_ru = indexes.CharField() + catalog_name_en = indexes.CharField() + catalog_name_ru = indexes.CharField() + - def prepare_country(self, obj): - if obj.country: - return '%s'%obj.country.id - return '' - def prepare_city(self, obj): - if obj.city: - return '%s'%obj.country.city - return '' + def prepare_form_name(self, obj): + return None - def prepare_where(self, obj): - country = [tr.name for tr in obj.country.translations.all()] - city = [tr.name for tr in obj.city.translations.all()] + def prepare_catalog_name_en(self, obj): + return u'Places' - return country + city + def prepare_catalog_name_ru(self, obj): + return u'Места' def get_model(self): return PlaceExposition diff --git a/place_exposition/urls.py b/place_exposition/urls.py new file mode 100644 index 00000000..af64dd62 --- /dev/null +++ b/place_exposition/urls.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from django.conf.urls import patterns, include, url +from views import PlaceSearchView, PlaceDetail, PlaceList, PlaceCityCatalog, PlaceCountryCatalog, PlacePhoto + + + +urlpatterns = patterns('', + # correct + url(r'search/', PlaceSearchView.as_view()), + # correct + #url(r'country/$', PlaceCountryCatalog.as_view()), + url(r'country/(?P.*)/page/(?P\d+)/$', PlaceCountryCatalog.as_view()), + url(r'country/(?P.*)/$', PlaceCountryCatalog.as_view()), + # correct + #url(r'expo/city/$', ExpositionByCity.as_view()), + url(r'city/(?P.*)/page/(?P\d+)/$', PlaceCityCatalog.as_view()), + url(r'city/(?P.*)/$', PlaceCityCatalog.as_view()), + + #!!! + url(r'(?P.*)/photo/page/(?P\d+)/$', PlacePhoto.as_view()), + url(r'(?P.*)/photo/$', PlacePhoto.as_view()), + #url(r'expo/(?P.*)/service/(?P.*)/$', ExpositionServiceView.as_view()), + url(r'(?P.*)/$', PlaceDetail.as_view()), + url(r'page/(?P\d+)/$', PlaceList.as_view()), + url(r'$', PlaceList.as_view()), + ) diff --git a/place_exposition/views.py b/place_exposition/views.py index bce56c6d..aac4d1dc 100644 --- a/place_exposition/views.py +++ b/place_exposition/views.py @@ -1,13 +1,17 @@ # -*- coding: utf-8 -*- from django.shortcuts import render_to_response +from django.views.generic import ListView, DetailView, FormView +from django.utils import translation from django.http import HttpResponseRedirect, HttpResponse from django.template import RequestContext from django.core.context_processors import csrf from django.http import Http404 from django.shortcuts import get_object_or_404 +from django.utils.translation import ugettext as _ #models from place_conference.models import PlaceConference - +from country.models import Country +from city.models import City from models import PlaceExposition def catalog(request): @@ -32,4 +36,145 @@ def place(request, url, photo=None): if photo: args['object'] = place return render_to_response('photoreport.html', args, context_instance=RequestContext(request)) - return render_to_response('place.html', args, context_instance=RequestContext(request)) \ No newline at end of file + return render_to_response('place.html', args, context_instance=RequestContext(request)) + +from functions.custom_views import ExpoSearchView +from functions.search_forms import PlaceSearchForm + +class PlaceSearchView(ExpoSearchView): + #paginate_by = 10 + template_name = 'place/search.html' + search_form = PlaceSearchForm + model = PlaceExposition + +class PlaceDetail(DetailView): + model = PlaceExposition + search_form = PlaceSearchForm + slug_field = 'url' + template_name = 'client/place/place_detail.html' + + def get_object(self, queryset=None): + """ + Returns the object the view is displaying. + By default this requires `self.queryset` and a `pk` or `slug` argument + in the URLconf, but subclasses can override this to return any object. + """ + # Use a custom queryset if provided; this is required for subclasses + # like DateDetailView + if queryset is None: + queryset = self.get_queryset() + # Next, try looking up by primary key. + pk = self.kwargs.get(self.pk_url_kwarg, None) + slug = self.kwargs.get(self.slug_url_kwarg, None) + if pk is not None: + queryset = queryset.filter(pk=pk) + # Next, try looking up by slug. + elif slug is not None: + slug_field = self.get_slug_field() + queryset = queryset.filter(**{slug_field: slug}) + # If none of those are defined, it's an error. + else: + raise AttributeError("Generic detail view %s must be called with " + "either an object pk or a slug." + % self.__class__.__name__) + try: + # Get the single item from the filtered queryset + obj = queryset.get() + except queryset.model.DoesNotExist: + try: + PlaceConference.objects.get(url=slug) + except PlaceConference.DoesNotExist: + + raise Http404(_("No %(verbose_name)s found matching the query") % + {'verbose_name': queryset.model._meta.verbose_name}) + return obj + + def get_context_data(self, **kwargs): + context = super(PlaceDetail, self).get_context_data(**kwargs) + context['search_form'] = self.search_form + return context + +class PlacePhoto(ListView): + template_name = 'client/place/photo.html' + obj = None + search_form = PlaceSearchForm + + def get_queryset(self): + slug = self.kwargs.get('slug') + try: + place = PlaceExposition.objects.get(url=slug) + except PlaceExposition.DoesNotExist: + try: + place = PlaceConference.objects.get(url=slug) + except PlaceConference.DoesNotExist: + raise Http404(_("No %(verbose_name)s found matching the query") % + {'verbose_name': PlaceExposition._meta.verbose_name}) + self.obj = place + return place.photogallery.photos.all() + + def get_context_data(self, **kwargs): + context = super(PlacePhoto, self).get_context_data(**kwargs) + context['object'] = self.obj + context['search_form'] = self.search_form + return context + + +class PlaceList(ListView): + model = PlaceExposition + paginate_by = 10 + template_name = 'client/place/place_list.html' + search_form = PlaceSearchForm + + + def get_queryset(self): + lang = translation.get_language() + qs = super(PlaceList, self).get_queryset().filter(language_code=lang) + conf_qs = PlaceConference.objects.language().all() + return list(qs)+list(conf_qs) + + def get_context_data(self, **kwargs): + context = super(PlaceList, self).get_context_data(**kwargs) + context['search_form'] = self.search_form + return context + + +class PlaceCatalog(ListView): + model = PlaceExposition + paginate_by = 10 + template_name = 'place/catalog.html' + search_form = PlaceSearchForm + filter_object = None + + + def get_context_data(self, **kwargs): + context = super(PlaceCatalog, self).get_context_data(**kwargs) + context['search_form'] = self.search_form + context['filter_object'] = self.filter_object + + context['catalog_url'] = self.catalog_url + return context + + +class PlaceCountryCatalog(PlaceCatalog): + catalog_url = '/places/' + + def get_queryset(self): + slug = self.kwargs.get('slug') + country = get_object_or_404(Country, url=slug) + self.filter_object = country + qs = self.model.objects.language().filter(country=country).order_by('-rating') + conf_qs = PlaceConference.objects.language().filter(country=country) + + return list(qs) + list(conf_qs) + + +class PlaceCityCatalog(PlaceCatalog): + catalog_url = '/places/' + + def get_queryset(self): + slug = self.kwargs.get('slug') + city = get_object_or_404(City, url=slug) + self.filter_object = city + qs = self.model.objects.language().filter(city=city).order_by('-rating') + conf_qs = PlaceConference.objects.language().filter(city=city) + return list(qs) + list(conf_qs) \ No newline at end of file diff --git a/proj/admin.py b/proj/admin.py index 3dfed6e6..1d2114b2 100644 --- a/proj/admin.py +++ b/proj/admin.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse +from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.contrib.contenttypes.models import ContentType from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.admin.views.decorators import staff_member_required from file.models import TmpFile, FileModel -from file.forms import FileModelForm +from file.forms import FileModelForm, FileForm from city.models import City from theme.models import Tag from django.db.models.loading import get_model @@ -39,7 +39,7 @@ def ajax_tag(request): else: #request empty - send empty array return HttpResponse('[]', content_type='application/json') - +''' def ajax_post_file(request, obj_id=None): """ Takes file and file data and save it @@ -71,6 +71,42 @@ def ajax_post_file(request, obj_id=None): args['languages'] = settings.LANGUAGES args['file_form'] = file_form return render_to_response('ajax_error_form.html', args) +''' +from django.core.context_processors import csrf +def ajax_post_file(request, obj_id=None): + """ + Takes file and file data and save it + + Returns 'file_list.html' template with existing files if id != None. + + """ + if request.POST: + if not obj_id: + raise Http404 + file_form = FileForm(request.POST, request.FILES) + if file_form.is_valid(): + #takes data from hidden input "model" and initial Model + Model = get_model(request.POST['model'].split('.')[0], request.POST['model'].split('.')[1]) + #initial model object + obj = Model.objects.get(id=obj_id) + file = file_form.save(request.FILES, obj) + + files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) + + + return render_to_response('file_list.html', {'files' : files}) + else: + args = {} + + args['languages'] = settings.LANGUAGES + args['file_form'] = file_form + args['obj_id'] = obj_id + args.update(csrf(request)) + return render_to_response('ajax_error_form.html', args) + else: + raise Http404 + + from file.forms import PhotoForm from file.models import Photo diff --git a/proj/settings.py b/proj/settings.py index a120e2d0..f9d61c5c 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -161,6 +161,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( MIDDLEWARE_CLASSES = ( # 'django.middleware.cache.UpdateCacheMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', @@ -171,8 +172,8 @@ MIDDLEWARE_CLASSES = ( # 'django.middleware.cache.FetchFromCacheMiddleware', # Uncomment the next line for simple clickjacking protection: 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware',#должно быть последним полем + #'debug_toolbar.middleware.DebugToolbarMiddleware', ) @@ -227,7 +228,7 @@ EMAIL_HOST = 'smtp.gmail.com' #EMAIL_HOST = 'localhost' #EMAIL_HOST_USER = 'kotzilla' EMAIL_HOST_USER = 'kotzillla@gmail.com' -EMAIL_HOST_PASSWORD = 'fitter2006' +EMAIL_HOST_PASSWORD = 'fitteR2006!' EMAIL_PORT = 587 @@ -315,6 +316,7 @@ INSTALLED_APPS = ( 'exposition', 'file', 'news', + 'note', 'organiser', 'place_conference', 'place_exposition', @@ -327,6 +329,7 @@ INSTALLED_APPS = ( 'theme', 'translator', 'webinar', + 'meta', #django modules 'sorl.thumbnail', 'photologue', @@ -338,15 +341,22 @@ INSTALLED_APPS = ( 'bitfield', 'djutils', 'pytils', + 'pymorphy', 'password_reset', #'social_auth', 'social.apps.django_app.default', # 'south', -# 'debug_toolbar', + #'debug_toolbar', ) -#INTERNAL_IPS = ('176.121.5.82',) -#DEBUG_TOOLBAR_PATCH_SETTINGS = False - +INTERNAL_IPS = ('176.121.5.82',) +DEBUG_TOOLBAR_PATCH_SETTINGS = False +#DEBUG_TOOLBAR_PANELS = ( + + # 'debug_toolbar.panels.profiling.ProfilingPanel', +#) +PYMORPHY_DICTS = { + 'ru': { 'dir': '/home/www/proj/settings/russian_dicts' }, +} # search backend HAYSTACK_CONNECTIONS = { @@ -401,4 +411,5 @@ except ImportError, e: from production import * """ ADMIN_PAGINATION = 20 +CLIENT_PAGINATION = 15 TEMPLATE_DEBUG = DEBUG \ No newline at end of file diff --git a/proj/urls.py b/proj/urls.py index cd85dcda..4ab41738 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -1,18 +1,21 @@ # -*- coding: utf-8 -*- from django.conf import settings from django.conf.urls import patterns, include, url -from core.views import PlaceListView, PlacePhotoView, PlaceSearchView, EventSearchView +from core.views import PlaceListView, PlacePhotoView, EventSearchView from core.simple_index_view import AdvertisingView, AboutView -from views import MainPageView +from views import MainPageView, MainPageViewTest +from place_exposition.views import PlaceSearchView from django.http import HttpResponse -def check_forward(request, *args, **kwargs): - return HttpResponse(request.META.get('HTTP_X_FORWARDED_FOR', None)) + urlpatterns = patterns('', - url(r'^bla/$', check_forward), + url(r'^admin/', include('proj.admin_urls')), url(r'^$', MainPageView.as_view()), + url(r'^main_page/$', MainPageViewTest.as_view()), url(r'^theme/', include('theme.urls')), + url(r'^places/', include('place_exposition.urls')), + url(r'^', include('accounts.urls')), url(r'^', include('exposition.urls')), url(r'^', include('conference.urls')), @@ -35,14 +38,14 @@ urlpatterns = patterns('', url(r'^about/$', AboutView.as_view()), url(r'^partners/$', AboutView.as_view()), url(r'^contacts/$', AboutView.as_view()), - url(r'^events/search/$', EventSearchView.as_view()), - url(r'^places/search/$', PlaceSearchView.as_view()), - url(r'^places/(?P.*)/photo/(?P\d+)/$', PlacePhotoView.as_view()), - url(r'^places/(?P.*)/photo/$', PlacePhotoView.as_view()), - url(r'^places/(?P.*)/(?P\d+)/$', PlaceListView.as_view()), - url(r'^places/(?P\d+)/$', PlaceListView.as_view()), - url(r'^places/(?P.*)/$', PlaceListView.as_view()), - url(r'^places/$', PlaceListView.as_view()), + #url(r'^events/search/$', EventSearchView.as_view()), + #url(r'^places/search/$', PlaceSearchView.as_view()), + #url(r'^places/(?P.*)/photo/(?P\d+)/$', PlacePhotoView.as_view()), + #url(r'^places/(?P.*)/photo/$', PlacePhotoView.as_view()), + #url(r'^places/(?P.*)/(?P\d+)/$', PlaceListView.as_view()), + #url(r'^places/(?P\d+)/$', PlaceListView.as_view()), + #url(r'^places/(?P.*)/$', PlaceListView.as_view()), + #url(r'^places/$', PlaceListView.as_view()), url(r'^social/', include('social.apps.django_app.urls', namespace='social')), url(r'^login/', 'registration.backends.default.views.LoginView'), url(r'^logout/', 'registration.backends.default.views.LogoutView'), @@ -59,7 +62,7 @@ urlpatterns = patterns('', # admin part url(r'^search/', include('haystack.urls')), - url(r'^admin/', include('proj.admin_urls')), + url(r'^', include('service.urls')), ) @@ -69,15 +72,22 @@ urlpatterns += patterns('', url(r'^register/', 'registration.backends.default.views.RegisterAjaxView'), url(r'^register-complete/', 'registration.backends.default.views.complete_registration'), url(r'^callback/', 'core.simple_index_view.callback'), - url(r'^search-form/', 'settings.views.sub_category'), + url(r'^search-form/get-parent/$', 'settings.views.search_parent'), + url(r'^search-form/autocomplete/$', 'settings.views.search_autocomplete'), + url(r'^search-form/$', 'settings.views.sub_category'), + url(r'^search-form/autosearch/exposition/$', 'settings.views.expo_autosearch'), + url(r'^search-form/autosearch/place/$', 'settings.views.place_autosearch'), + url(r'^search-form/autosearch/company/$', 'settings.views.company_autosearch'), + + # url(r'^profile/change-password/', 'accounts.views.change_password'), ) - +""" if settings.DEBUG: import debug_toolbar urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)), ) - +""" \ No newline at end of file diff --git a/proj/views.py b/proj/views.py index 87dca9d8..bbc0adc0 100644 --- a/proj/views.py +++ b/proj/views.py @@ -10,12 +10,13 @@ from news.models import News from article.models import Article from functions.forms import ThemeSearch, PlaceSearch -from functions.search_forms import EventSearchForm + +from functions.search_forms import EventSearchForm, ExpositionSearchForm from functions.custom_views import ExpoListView from accounts.forms import RegistrationCompleteForm def expo_context(request): - cont = {'theme_search_form': ThemeSearch(), 'place_search_form': PlaceSearch(), 'expo_catalog': Exposition.catalog, + cont = {'theme_search_form': ThemeSearch(), 'search_form': ExpositionSearchForm(), 'expo_catalog': Exposition.catalog, 'book_aid': settings.BOOKING_AID} user = request.user @@ -48,27 +49,27 @@ class MainPageView(TemplateView): return context +class MainPageViewTest(TemplateView): + template_name = 'client/main_page.html' -def home(request): - #reg_form = RegistrationFormUniqueEmail() - #login_form = LoginForm() - #args = {'reg_form': reg_form, 'login_form': login_form} - events = Exposition.objects.all().order_by('-main_page')[:5] - exposition_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.exposition)[:6] - conference_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.conference)[:6] - seminar_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.seminar)[:6] - news_list = News.objects.order_by('-main_page').all()[:3] - articles = Article.objects.order_by('-main_page').all()[:2] - args = {'events': events, 'exposition_themes': exposition_themes, + def get_context_data(self, **kwargs): + context = super(MainPageViewTest, self).get_context_data(**kwargs) + events = Exposition.objects.all().order_by('-main_page')[:5] + exposition_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.exposition)[:6] + conference_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.conference)[:6] + seminar_themes = Theme.objects.order_by('-main_page').filter(types=Theme.types.seminar)[:6] + news_list = News.objects.order_by('-main_page').all()[:3] + articles = Article.objects.order_by('-main_page').all()[:2] + + args = {'events': events, 'exposition_themes': exposition_themes, 'conference_themes': conference_themes, 'seminar_themes': seminar_themes, 'news_list': news_list, 'articles': articles} - args.update(csrf(request)) - return render_to_response('index.html', args, context_instance=RequestContext(request)) + context.update(args) + + return context -class Test(ExpoListView): - model = Exposition diff --git a/registration/backends/default/views.py b/registration/backends/default/views.py index 416f5df5..06e3ac06 100644 --- a/registration/backends/default/views.py +++ b/registration/backends/default/views.py @@ -157,7 +157,7 @@ from django.views.decorators.cache import never_cache @sensitive_post_parameters('password1', 'password2') @never_cache def RegisterAjaxView(request): - if request.is_ajax(): + #if request.is_ajax(): data = {'success': False} if request.POST: form = RegistrationFormUniqueEmail(request.POST) @@ -183,9 +183,9 @@ def RegisterAjaxView(request): else: # 404 return HttpResponse('not post') - else: + #else: # 404 - return HttpResponse('not ajax') + # return HttpResponse('not ajax') from django.contrib.auth.forms import AuthenticationForm from registration.forms import LoginForm @@ -205,7 +205,9 @@ def LoginView(request): if form.is_valid(): login(request, form.get_user()) - return HttpResponseRedirect(request.META.get('HTTP_REFERER','/')) + response= {'success':True} + return HttpResponse(json.dumps(response), content_type='application/json') + #return HttpResponseRedirect(request.META.get('HTTP_REFERER','/')) else: response={'success':False, 'errors': form.errors} diff --git a/seminar/models.py b/seminar/models.py index c5e9eaa0..f25ac9d5 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -24,6 +24,9 @@ class Seminar(TranslatableModel, EventMixin, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ + catalog = '/seminar/' + # type of event + event_type = 'seminar' #set manager of this model objects = ExpoManager() services = BitField(flags=flags) diff --git a/service/models.py b/service/models.py index ae3d2d19..377f4578 100644 --- a/service/models.py +++ b/service/models.py @@ -1,13 +1,18 @@ # -*- coding: utf-8 -*- from django.db import models -from hvad.models import TranslatableModel, TranslatedFields +from hvad.models import TranslatableModel, TranslatedFields, TranslationManager from functions.custom_fields import EnumField CURENCIES = ('USD', 'RUB', 'EUR') + + + + class Service(TranslatableModel): + url = models.SlugField(unique=True) currency = EnumField(values=CURENCIES, blank=True, default='USD') price = models.PositiveIntegerField(blank=True, null=True) @@ -24,9 +29,10 @@ class Service(TranslatableModel): descriptions = models.CharField(max_length=255, blank=True), keywords = models.CharField(max_length=255, blank=True), ) - + sort = models.PositiveIntegerField(default=0, db_index=True) main_page = models.PositiveIntegerField(default=0, db_index=True) + def __unicode__(self): return self.lazy_translation_getter('name', self.pk) @@ -36,6 +42,12 @@ class Service(TranslatableModel): def get_permanent_url(self): return '/service/%s/'%self.url + def get_price(self): + pr = self.price + + + + from django.db.models.signals import post_save from functions.signal_handlers import post_save_handler diff --git a/settings/russian_dicts/endings.sqlite b/settings/russian_dicts/endings.sqlite new file mode 100644 index 00000000..7bd4ae08 Binary files /dev/null and b/settings/russian_dicts/endings.sqlite differ diff --git a/settings/russian_dicts/freq.sqlite b/settings/russian_dicts/freq.sqlite new file mode 100644 index 00000000..2cc494e4 Binary files /dev/null and b/settings/russian_dicts/freq.sqlite differ diff --git a/settings/russian_dicts/lemmas.sqlite b/settings/russian_dicts/lemmas.sqlite new file mode 100644 index 00000000..de52d309 Binary files /dev/null and b/settings/russian_dicts/lemmas.sqlite differ diff --git a/settings/russian_dicts/misc.sqlite b/settings/russian_dicts/misc.sqlite new file mode 100644 index 00000000..f0e01dec Binary files /dev/null and b/settings/russian_dicts/misc.sqlite differ diff --git a/settings/russian_dicts/rules.sqlite b/settings/russian_dicts/rules.sqlite new file mode 100644 index 00000000..c2a1092a Binary files /dev/null and b/settings/russian_dicts/rules.sqlite differ diff --git a/settings/templatetags/tempalte_tags.py b/settings/templatetags/tempalte_tags.py new file mode 100644 index 00000000..7c23ccc5 --- /dev/null +++ b/settings/templatetags/tempalte_tags.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +import datetime +from django import template +from django.utils.translation import ugettext as _ + +register = template.Library() + + + + + +class Date(template.Node): + + def __init__(self): + self.now = datetime.datetime.today() + + + def render(self, context): + monthes = {1: {'url':'jan', 'name': _(u'Январь')}, 2: {'url':'feb', 'name': _(u'Февраль')}, + 3: {'url': 'mar', 'name':_(u'Март')}, 4: {'url':'apr', 'name': _(u'Апрель')}, + 5: {'url':'may', 'name': _(u'Май')}, 6: {'url':'jun', 'name': _(u'Июнь')}, + 7: {'url':'jul', 'name': _(u'Июль')}, 8: {'url':'aug', 'name': _(u'Август')}, + 9: {'url':'sep', 'name': _(u'Сентябрь')}, 10: {'url':'oct', 'name': _(u'Октябрь')}, + 11: {'url':'nov', 'name': _(u'Ноябрь')}, 12: {'url':'dec', 'name': _(u'Декабрь')} + } + date = self.now + month = monthes[date.month] + month_period =[{'month_url': month['url'], 'name':month['name'], 'date':date}] + for i in range(5): + try: + date = date.replace(month=date.month+1) + except ValueError: + if date.month == 12: + date = date.replace(year=date.year+1, month=1) + else: + raise + month = monthes.get(date.month) + month_period.append({'month_url': month['url'], 'name':month['name'], 'date':date}) + + context['monthes_period'] = month_period + return u"" + +def get_date(parser, token): + """ + {% set = %} + """ + + return Date() + + +register.tag('get_date', get_date) + diff --git a/settings/templatetags/template_filters.py b/settings/templatetags/template_filters.py index e87345da..a0e67d61 100644 --- a/settings/templatetags/template_filters.py +++ b/settings/templatetags/template_filters.py @@ -115,11 +115,18 @@ def add_month(date, month=1): @register.filter def in_calendar(event, user): - calendar = user.calendar + if event: + calendar = user.calendar + return calendar.check_in_calendar(event) + else: + return False + """ + types = {'expo':'', 'conf':'', 'seminar':'', 'webinar':''} if event in calendar.get_events(): return True return False + """ @register.filter @@ -193,4 +200,28 @@ def set_var(parser, token): raise template.TemplateSyntaxError("'set' tag must be of the form: {% set = %}") return SetVarNode(parts[1], parts[3]) -register.tag('set', set_var) \ No newline at end of file +register.tag('set', set_var) + +@register.filter +def without_page(value): + l = value.split('/') + if not 'page' in l: + return value + else: + result = '/'.join(l[:l.index('page')])+'/' + return result + +@register.filter +def note_by_user(obj, user): + + return obj.get_note_by_user(user.id) + +@register.filter +def isdigit(value): + return value.isdigit() + +@register.filter +def next_monthes(value): + a = value + return value + diff --git a/settings/views.py b/settings/views.py index c46e1a0a..3b56d8a6 100644 --- a/settings/views.py +++ b/settings/views.py @@ -1,18 +1,26 @@ +# -*- coding: utf-8 -*- import json from django.shortcuts import HttpResponse, get_object_or_404 from django.http import Http404 -from country.models import Country, Area +from django.utils import translation +from haystack.query import SearchQuerySet +from exposition.models import Exposition +from country.models import Country, Area, City from theme.models import Tag, Theme +from place_exposition.models import PlaceExposition +from place_conference.models import PlaceConference +from company.models import Company # every this model must have method get_subcategories categories = {'area':{'sub':True, 'model':Area, 'sub_categorie_name':'co'}, - 'co':{'sub':False, 'model':Country, 'sub_categorie_name':'co'}, - 'th':{'sub':False, 'model':Theme, 'sub_categorie_name':'tg'}} + 'co':{'sub':False, 'model':Country, 'sub_categorie_name':'ci'}, + 'th':{'sub':False, 'model':Theme, 'sub_categorie_name':'tg'}, + 'ci':{'sub':False, 'model':City, 'sub_categorie_name':None}, + 'tg':{'sub':False, 'model':Tag, 'sub_categorie_name':None}} def sub_category(request): if request.GET: - name = request.GET['name'] categorie = categories.get(name) if not categorie: @@ -27,5 +35,90 @@ def sub_category(request): else: raise Http404 +search_forms = {'theme':'', 'place':''} +# сделать с помощью haystack!!! +def search_autocomplete(request): + if request.GET: + lang = translation.get_language() + term = request.GET['term'] + form = request.GET['form'] + if form == 'place': + areas = [{'text':item.name, 'id':item.id, 'name':'area'} for item in Area.objects.filter(translations__name__contains=term)] + countries = [{'text':item.name, 'id':item.id, 'name':'co'} for item in Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=lang, translations__name__contains=term).distinct()] + cities = [{'text':item.name, 'id':item.id, 'name':'ci'} for item in City.objects.select_related('exposition_city')\ + .filter(exposition_city__city__isnull=False, translations__language_code=lang, translations__name__contains=term).distinct()] + + objects = areas + countries + cities + return HttpResponse(json.dumps(objects), content_type='application/json') + if form == 'subj': + objects = [{'text': get_by_lang(item, 'name', lang), 'id':item.pk, 'name': item.form_name} for item in SearchQuerySet().models(Theme, Tag).autocomplete(content_auto=term)] + #themes = [{'text':item.name, 'id':item.id, 'name':'th'} for item in Theme.objects.filter(translations__name__contains=term)] + #tags = [{'text':item.name, 'id':item.id, 'name':'tg'} for item in Tag.objects.filter(translations__name__contains=term)] + #objects = themes + tags + return HttpResponse(json.dumps(objects), content_type='application/json') + else: + return HttpResponse("Don't implemented yet") + + else: + raise Http404 + +def search_parent(request): + if request.GET: + name = request.GET['name'] + categorie = categories.get(name) + if not categorie: + raise Http404 + categorie_id = request.GET['id'] + model = categorie['model'] + obj = get_object_or_404(model, id=long(categorie_id)) + result = obj.get_parent() + return HttpResponse(json.dumps(result), content_type='application/json') + else: + raise Http404 + + + +def get_by_lang(item, field, lang='en'): + """ + + :param item: searchresult object + field: translated field + :return: + """ + return getattr(item, field+'_'+lang) + +def expo_autosearch(request): + if request.GET: + lang = translation.get_language() + term = request.GET['term'] + qs = SearchQuerySet().models(Exposition, Theme, Tag).autocomplete(content_auto=term).order_by('text') + result = [{'cat': get_by_lang(item, 'catalog_name', lang), 'text': get_by_lang(item, 'name', lang), 'url':item.url, + 'id':item.pk, 'name': item.form_name} for item in qs] + result = sorted(result, key=lambda x:x['cat'], reverse=True) + return HttpResponse(json.dumps(result), content_type='application/json') + else: + raise Http404 + +def place_autosearch(request): + if request.GET: + lang = translation.get_language() + qs = SearchQuerySet().models(PlaceExposition, PlaceConference).autocomplete(content_auto=request.GET['term']) + result = [{'cat': get_by_lang(item, 'catalog_name', lang), 'text': get_by_lang(item, 'name', lang), 'url':item.url, + 'id':item.pk, 'name': item.form_name} for item in qs].sort(key=lambda x:x['cat']) + result = sorted(result, key=lambda x:x['cat']) + return HttpResponse(json.dumps(result), content_type='application/json') + else: + raise Http404 + +def company_autosearch(request): + if request.GET: + qs = SearchQuerySet().models(Company, Theme, Tag).autocomplete(content_auto=request.GET['term']) + result = [{'cat': item.object.catalog_name, 'text': item.object.name, 'url':item.url, + 'id':item.object.id, 'name': item.object.search_name} for item in qs].sort(key=lambda x:x['cat']) + result = sorted(result, key=lambda x:x['cat']) + return HttpResponse(json.dumps(result), content_type='application/json') + else: + raise Http404 \ No newline at end of file diff --git a/static/custom_js/main.js b/static/custom_js/main.js index 256dade8..b9989d43 100644 --- a/static/custom_js/main.js +++ b/static/custom_js/main.js @@ -36,7 +36,7 @@ function deletePhoto(data){ } function postSuccess(data, textStatus, jqXHR){ - //console.log(data); + console.log(data); //$('#close').click(); if (data.indexOf("
{{ form.user_id }} + {{ form.errors }} {# email #}
- +
- {{ form.email }} Сбросить пароль + {{ object.email }} {{ form.email.errors }}
diff --git a/templates/admin/ajax_error_form.html b/templates/admin/ajax_error_form.html index 53653fa0..bdfc0172 100644 --- a/templates/admin/ajax_error_form.html +++ b/templates/admin/ajax_error_form.html @@ -1,9 +1,8 @@ -
-
{% csrf_token %} + {% csrf_token %} +
+ {{ file_form.model }} - {# hidden inputs uses for comparing with Country form key#} - {{ file_form.key }} - + {# file_path #}
@@ -27,12 +26,14 @@ {% include 'admin/forms/multilang.html' %} {% endwith %} -
+
- +
+ + diff --git a/templates/admin/company/company.html b/templates/admin/company/company.html new file mode 100644 index 00000000..cc917ddf --- /dev/null +++ b/templates/admin/company/company.html @@ -0,0 +1,212 @@ +{% extends 'base.html' %} +{% load static %} +{# Displays country form and file form in modal window #} + + + {% block scripts %} + + + {# google map не забыть скачать скрипты на локал #} + + + + + {# selects #} + + + + {% endblock %} + +{% block body %} + +{# Uses multilang.html template for translated fields #} +
{% csrf_token %} +
+ {% if object %} Изменить {% else %} Добавить {% endif %}компанию + +
+
+

Основная информация

+
+
+ + {# name #} + {% with field='name' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# specialization #} + {% with field='specialization' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# country #} +
+ +
{{ form.country }} + {{ form.country.errors }} +
+
+ {# city #} +
+ +
{{ form.city }} + {{ form.city.errors }} +
+
+ {# theme #} +
+ +
{{ form.theme }} + {{ form.theme.errors }} +
+
+ {# tag #} +
+ +
{{ form.tag }} + {{ form.tag.errors }} +
+
+ {# staff_number #} +
+ +
{{ form.staff_number }} + {{ form.staff_number.errors }} +
+
+ {# address #} +
+ +
{{ form.address }} + {{ form.address.errors }} +
+
+ {# address_inf #} + {% with field='address_inf' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# phone #} +
+ +
{{ form.phone }} + {{ form.phone.errors }} +
+
+ {# fax #} +
+ +
{{ form.fax }} + {{ form.fax.errors }} +
+
+ {# web_page #} +
+ +
{{ form.web_page }} + {{ form.web_page.errors }} +
+
+ {# foundation #} +
+ +
{{ form.foundation }} + {{ form.foundation.errors }} +
+
+ {# social #} +
+ +
{{ form.social }} + {{ form.social.errors }} +
+
+ {# url #} +
+ +
{{ form.url }} + {{ form.url.errors }} +
+
+ {# description #} + {% with field='description' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + +
+
+ +
+
+

Файлы

+
+
+ {# button that shows modal window with file form #} + Добавить файл + {# this div shows list of files and refreshes when new file added #} +
+ + + + + + + + + + + + + {% for file in files %} + + + + + + + + + + {% endfor %} + +
idФайлИмяНазначение
{{ file.id }}{{ file.file_name }}{{ file.purpose }} + +
+
+ +
+
+ + +
+
+

Мета данные

+
+
+ {# keywords #} + {% with field='keywords' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# title #} + {% with field='title' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# descriptions #} + {% with field='descriptions' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} +
+
+ +
+ + +
+ +
+
+ +{% endblock %} + + + diff --git a/templates/admin/exposition/exposition.html b/templates/admin/exposition/exposition.html index 02808d30..1babf44a 100644 --- a/templates/admin/exposition/exposition.html +++ b/templates/admin/exposition/exposition.html @@ -27,9 +27,10 @@ - {% endblock %} @@ -35,17 +35,13 @@
{% csrf_token %}
- {% if object %} Изменить {% else %} Добавить {% endif %}выставочный центр + {% if object %} Изменить {% else %} Добавить {% endif %}выставочный центр{% if object %}(на сайте){% endif %}

Основная информация

- {# Hidden input uses for comparing with TmpFile objects #} - {{ form.key }} - {# Hidden input uses in clean method for checking url #} - {{ form.place_exposition_id }} {# name #} {% with field='name' form=form languages=languages %} @@ -338,35 +334,21 @@ {% endif %} {# this div shows list of files and refreshes when new file added #}
- - - - - - - - - - - - - {% for file in files %} - - - - - - - - - - {% endfor %} - -
idФайлИмяНазначение
{{ file.id }}{{ file.file_name }}{{ file.purpose }} - -
+ + + + + + + + + + + + + {% include 'file_list.html' with files=files %} + +
idФайлИмяНазначение
@@ -405,59 +387,11 @@
- {# modal window #} - {% include 'admin/includes/hall_form.html' with form=hall_form object=object %} {% include 'admin/includes/photo_form.html' with form=photo_form object=object %} +{% include 'admin/includes/file_form.html' with file_form=file_form object=object %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/place_exposition/place_exposition_list.html b/templates/admin/place_exposition/place_exposition_list.html index 161dd84d..1ceea95f 100644 --- a/templates/admin/place_exposition/place_exposition_list.html +++ b/templates/admin/place_exposition/place_exposition_list.html @@ -42,8 +42,8 @@ - - Копировать + + на сайте diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html new file mode 100644 index 00000000..3df24acb --- /dev/null +++ b/templates/client/accounts/feed.html @@ -0,0 +1,165 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} +{% load static %} +{% block bread_scrumbs %} +
+ {% trans 'Главная страница' %} + {% trans 'Моя лента событий' %} +
+{% endblock %} + + +{% block page_title %} +
+

{% trans 'Моя лента событий' %}

+
+{% endblock %} + +{% block page_body %} +
+
+ Фильтрация ленты + + +
+
+

Тематические фильтры не выбраны: (Изменить):

+
+
+
+
~~text~~
+ x +
+ +
+
+
+
+

Географические фильтры не выбраны: (Изменить):

+ +
+
+
+
~~text~~
+ x +
+ +
+
+
+
+
+
+
+
+
+ + {% if search_form.th %} + {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" %} + {% endif %} + + {% if search_form.area %} + {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" %} + {% endif %} + + +
+
 
+
+
+ +
+ +
+
+ + {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} + + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} +{% block scripts %} + + + + +{% endblock %} diff --git a/templates/client/accounts/fill_company.html b/templates/client/accounts/fill_company.html index 8d0d35c9..d4a37e68 100644 --- a/templates/client/accounts/fill_company.html +++ b/templates/client/accounts/fill_company.html @@ -153,7 +153,7 @@
{% csrf_token %}
-
+
{{ spec_form.specialization }} @@ -199,12 +199,12 @@
-
- + +
+ {{ address_form.address_inf }}
-
@@ -452,7 +452,7 @@
Дополнительная информация
-
+

Год основания: {{ found_form.foundation.value }}

@@ -487,7 +487,7 @@
-
+

к-во сотрудников: {{ staff_form.staff_number.value }}

@@ -573,13 +573,13 @@ {% endblock %} {% block scripts %} - + - + - + + + + + + {% if not request.user.is_anonymous %} @@ -95,16 +95,20 @@ This template include basic anf main styles and js files, {% endif %} - {% include 'client/popups/theme.html' %} - {% if search_form.area %} - {% include 'client/popups/place.html' with search_form=search_form search_action=search_action %} - {% endif %} + + {% comment "Убрал т.к. функционал диалоговых окон расширенного поиска переносится в catalog_search.html" %} + {% include 'client/popups/theme.html' %} + {% if search_form.area %} + {% include 'client/popups/place.html' with search_form=search_form search_action=search_action %} + {% endif %} + {% if search_form.fr %} + {% with search_form=search_form search_action=search_action type=type%} + {% include 'client/popups/period.html' %} + {% endwith %} + {% endif %} + {% endcomment %} {% include 'client/popups/callback.html' %} - {% if search_form.fr %} - {% with search_form=search_form search_action=search_action type=type%} - {% include 'client/popups/period.html' %} - {% endwith %} - {% endif %} + {# if user doesnt have url- show form #} {% if not request.user.is_anonymous %} @@ -121,12 +125,10 @@ This template include basic anf main styles and js files, {% endblock %} - - + - + {% if not request.user.is_anonymous %} {% if not request.user.url %} @@ -139,13 +141,12 @@ This template include basic anf main styles and js files, - + - {% block pre_scripts %} {% endblock %} @@ -157,9 +158,7 @@ This template include basic anf main styles and js files, {% endif %} - - {% block scripts %} {% endblock %} {% comment %} diff --git a/templates/client/buttons/booking_button.html b/templates/client/buttons/booking_button.html new file mode 100644 index 00000000..7f22da2f --- /dev/null +++ b/templates/client/buttons/booking_button.html @@ -0,0 +1,3 @@ +{% load i18n %} + +{% trans 'Лучшие цены на отели на' %} Booking.com \ No newline at end of file diff --git a/templates/client/event_catalog.html b/templates/client/event_catalog.html index b7da14f6..437e2f0c 100644 --- a/templates/client/event_catalog.html +++ b/templates/client/event_catalog.html @@ -1,28 +1,27 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - -{% if single_page %} - {% block title %} {{ object_list.0.name|safe }} {% endblock %} - {% block keywords %} {{ object_list.0.keywords }} {% endblock %} - {% block descriptions %} {{ object_list.0.descriptions }} {% endblock %} -{% endif %} - - -{% block content_list %} - {% if object_list %} - {% if single_page %} - {% with exposition=object_list.0 %} - {% include 'includes/event_object.html' %} - {% endwith %} - {% else %} - {% with object_list=object_list %} - {% include 'includes/event_list.html' %} - {% endwith %} - {% endif %} - {% else %} -

Ничего не найдено

- {% endif %} - +{% extends 'base_catalog.html' %} +{% load static %} +{% load i18n %} +{% load template_filters %} + + +{% if single_page %} + +{% endif %} + + +{% block content_list %} + {% if object_list %} + {% if single_page %} + {% with exposition=object_list.0 %} + {% include 'includes/event_object.html' %} + {% endwith %} + {% else %} + {% with object_list=object_list %} + {% include 'includes/event_list.html' %} + {% endwith %} + {% endif %} + {% else %} +

Ничего не найдено

+ {% endif %} + {% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/catalog.html b/templates/client/exposition/catalog.html new file mode 100644 index 00000000..74117eb3 --- /dev/null +++ b/templates/client/exposition/catalog.html @@ -0,0 +1,40 @@ +{% extends 'base_catalog.html' %} +{% load template_filters %} +{% load i18n %} + +{% block bread_scrumbs %} +
+ {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {% if month %} + {{ filter_object.name }} + {{ year.text }} + {{ month.text }} + {% else %} + {% if year %} + {{ filter_object.name }} + {{ year.text }} + {% else %} + {{ filter_object.name }} + {% endif %} + {% endif %} +
+{% endblock %} + + +{% block page_title %} +
+

{% trans 'Выставки' %}: {{ filter_object.name }}

+
+ + {% include 'includes/exposition/catalog_filter_period.html' %} + +{% endblock %} + +{% block content_list %} + {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/exposition_by.html b/templates/client/exposition/exposition_by.html index ce7f1dac..6d321a58 100644 --- a/templates/client/exposition/exposition_by.html +++ b/templates/client/exposition/exposition_by.html @@ -1,42 +1,42 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - -{% block style %} - -{% endblock %} - - -{% block bread_scrumbs %} -
- {% trans 'Главная страница' %} - {% trans 'Выставки' %} - {{ title1 }} -
-{% endblock %} - -{% block page_title %} -
-

{{ title2 }}:

-
-{% endblock %} - -{% block content_list %} - {% for obj in object_list %} - {% set cur_word = obj.name %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} - - {% endif %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} -
    -
    {{ cur_word|slice:":1"|upper }}
    - {% endif %} -
  • - {{ obj.name }} ({{ obj.expositions_number }}) -
    • - {% set prev_word = obj.name %} - {% endfor %} - -{% endblock %} - +{% extends 'base_catalog.html' %} +{% load static %} +{% load i18n %} +{% load template_filters %} + +{% block style %} + +{% endblock %} + + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ title1 }} +
    +{% endblock %} + +{% block page_title %} +
    +

    {{ title2 }}:

    +
    +{% endblock %} + +{% block content_list %} + {% for obj in object_list %} + {% set cur_word = obj.name %} + {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} +
+ {% endif %} + {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} +
    +
    {{ cur_word|slice:":1"|upper }}
    + {% endif %} +
  • + {{ obj.name }} ({{ obj.expositions_number }}) +
    • + {% set prev_word = obj.name %} + {% endfor %} + +{% endblock %} + diff --git a/templates/client/exposition/exposition_by_city.html b/templates/client/exposition/exposition_by_city.html deleted file mode 100644 index 7c4cf739..00000000 --- a/templates/client/exposition/exposition_by_city.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - -{% block style %} - -{% endblock %} - - -{% block bread_scrumbs %} -
    - {% trans 'Главная страница' %} - {% trans 'Выставки' %} - {% trans 'По городам' %} -
    -{% endblock %} - -{% block page_title %} -
    -

    {% trans 'Выставки мира по городам' %}:

    -
    -{% endblock %} - -{% block content_list %} - {% for obj in object_list %} - {% set cur_word = obj.name %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} -
- {% endif %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} -
    -
    {{ cur_word|slice:":1"|upper }}
    - {% endif %} -
  • - {{ obj.name }} ({{ obj.expositions_number }}) -
    • - {% set prev_word = obj.name %} - {% endfor %} - -{% endblock %} - diff --git a/templates/client/exposition/exposition_by_country.html b/templates/client/exposition/exposition_by_country.html deleted file mode 100644 index cd40efd2..00000000 --- a/templates/client/exposition/exposition_by_country.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - -{% block style %} - -{% endblock %} - - -{% block bread_scrumbs %} -
    - {% trans 'Главная страница' %} - {% trans 'Выставки' %} - {% trans 'По странам' %} -
    -{% endblock %} - -{% block page_title %} -
    -

    {% trans 'Выставки мира по странам' %}:

    -
    -{% endblock %} - -{% block content_list %} - - {% for obj in object_list %} - {% set cur_word = obj.name %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} -
- {% endif %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} -
    -
    {{ cur_word|slice:":1"|upper }}
    - {% endif %} -
  • - {{ obj.name }} ({{ obj.expositions_number }}) -
    • - {% set prev_word = obj.name %} - {% endfor %} - - -{% endblock %} diff --git a/templates/client/exposition/exposition_by_theme.html b/templates/client/exposition/exposition_by_theme.html deleted file mode 100644 index d39f7134..00000000 --- a/templates/client/exposition/exposition_by_theme.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - -{% block style %} - -{% endblock %} - -{% block bread_scrumbs %} -
    - {% trans 'Главная страница' %} - {% trans 'Выставки' %} - {% trans 'По тематикам' %} -
    -{% endblock %} - -{% block page_title %} -
    -

    {% trans 'Выставки мира по тематикам' %}:

    -
    -{% endblock %} - -{% block content_list %} - - {% for obj in object_list %} - - {% set cur_word = obj.name %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower and forloop.counter != 1 %} -
- {% endif %} - {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} -
    -
    {{ cur_word|slice:":1"|upper }}
    - {% endif %} - -
  • - {{ obj.name }} ({{ obj.expositions_number }}) -
    • - {% set prev_word = obj.name %} - {% endfor %} - -{% endblock %} diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html new file mode 100644 index 00000000..01491031 --- /dev/null +++ b/templates/client/exposition/exposition_detail.html @@ -0,0 +1,24 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/exposition/exposition_object.html' with exposition=object %} +{% endblock %} + +{% block paginator %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/exposition_list.html b/templates/client/exposition/exposition_list.html index 5dde9c69..75b744b7 100644 --- a/templates/client/exposition/exposition_list.html +++ b/templates/client/exposition/exposition_list.html @@ -1,15 +1,38 @@ - - - - - - - -
      - {% for exposition in object_list %} -
    • {{ exposition.name }}
      • - {% endfor %} -
    - - - \ No newline at end of file +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% if month %} + {% trans 'Выставки' %} + {{ year.text }} + {{ month.text }} + {% else %} + {% if year %} + {% trans 'Выставки' %} + {{ year.text }} + {% else %} + {% trans 'Выставки' %} + {% endif %} + {% endif %} + +
    +{% endblock %} + + +{% block page_title %} +
    +

    {% trans 'Выставки' %}

    +
    + {% include 'includes/exposition/catalog_filter_period.html' %} + +{% endblock %} + +{% block content_list %} + {% include 'includes/exposition/exposition_list.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/exposition_price.html b/templates/client/exposition/exposition_price.html index 1512271e..ee0b25cb 100644 --- a/templates/client/exposition/exposition_price.html +++ b/templates/client/exposition/exposition_price.html @@ -1,219 +1,220 @@ -{% extends 'base_catalog.html' %} -{% load static %} -{% load i18n %} -{% load template_filters %} - - -{% block content_list %} - - {% block content_text %} - {% block page_body %} -
    -
    - - -
    -
    -
    - {% if object_list.0.main_title %} - {{ object_list.0.main_title|safe }} - {% else %} - {{ object_list.0.name|safe }} - {% endif %} -
    -
    - -
    - {% with obj=object_list.0 %} - {% include 'client/includes/show_date_block.html' %} - {% endwith %} -
    - {% if object_list.0.place %} -
    -
    -
    - {{ object_list.0.place.address.address }} -
    -
    {% trans 'Раскрыть карту' %}
    -
    - -
    -
    {% trans 'Скрыть карту' %} -
    -
    -
    -
    - {% endif %} - - -
    -
    -
    -
    {% trans 'Стоимость посещения и участия' %}
    -
    - -
    -
    - -
    -
    {% trans 'Для посещения' %}
    - -
    {% trans 'Стоимость билетов' %}
    - -
    - -
      - {% if object_list.0.price_day %} -
    • -
      {{ object_list.0.price_day }} €
      -
      {% trans 'на 1 день' %}
      -
      • - {% endif %} - {% if object_list.0.price_all %} -
    • -
      {{ object_list.0.price_all }} €
      -
      {% trans 'на все дни' %}
      -
      • - {% endif %} - -
    - -
    {% trans 'Предварительная регистрация' %}
    - -
    - -
    - -
      - {% if object_list.0.price_day_bar %} -
    • -
      {{ object_list.0.price_day_bar }} €
      - -
      на 1 день
      -
      • - {% endif %} - {% if object_list.0.price_all_bar %} -
    • -
      {{ object_list.0.price_all_bar }} €
      -
      {% trans 'на все дни' %}
      -
      • - {% endif %} - -
    - -
    {% trans 'Регистрация на' %} {% trans 'стойке' %}
    - -
    - -
    -
    - {% trans 'Заказать билет' %} -
    -
    -
    {% trans 'Выставка открыта для' %}:
    -
      - {{ object_list.0.get_audience }} - -
    -
    -
    - -
    - -
    -
    {% trans 'Для участия' %}
    - -
    {% trans 'Стоимость аренды 1м²' %}
    - -
      - {% if object_list.0.max_closed_equipped_area %} -
    • - -
      {{ object_list.0.max_closed_equipped_area }} €
      -
      {% trans 'оборудованная площадь' %}
      -
      • - {% endif %} - - {% if object_list.0.max_closed_area %} -
    • -
      {{ object_list.0.max_closed_area }} €
      -
      {% trans 'необорудованная площадь' %}
      -
      • - {% endif %} - - {% if object_list.0.max_open_area %} -
    • -
      {{ object_list.0.max_open_area }} €
      -
      {% trans 'открытая площадь' %}
      -
      • - {% endif %} - -
    - - {% trans 'Заявка на участие' %} - -
    - {% if object_list.0.min_stand_size %} -

    {% trans 'Минимальный размер стенда' %} — {{ object_list.0.min_stand_size }}м²

    - {% endif %} - {% if object_list.0.registration_payment %} -

    {% trans 'Регистрационный взнос' %} — {{ object_list.0.registration_payment }}€

    - {% endif %} - {% if object_list.0.application_deadline %} -

    {% trans 'Крайний срок подачи заявки' %} — {{ object_list.0.application_deadline }}

    - {% endif %} - -
    - -
    -
    -
    - -
    -
    - -
    -
    - {{ object_list.0.name|safe }} -
    - -
    - -
    - {% endblock %} - {% endblock %} -{% endblock %} +{% extends 'base_catalog.html' %} +{% load static %} +{% load i18n %} +{% load template_filters %} + + +{% block content_list %} + + {% block content_text %} + {% block page_body %} +
    +
    + + +
    +
    +
    + {% if object_list.0.main_title %} + {{ object_list.0.main_title|safe }} + {% else %} + {{ object_list.0.name|safe }} + {% endif %} +
    +
    + +
    + {% with obj=object_list.0 %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if object_list.0.place %} +
    +
    +
    + {{ object_list.0.place.address.address }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} + + +
    +
    +
    +
    {% trans 'Стоимость посещения и участия' %}
    +
    + +
    +
    + +
    +
    {% trans 'Для посещения' %}
    + +
    {% trans 'Стоимость билетов' %}
    + +
    + +
      + {% if object_list.0.price_day %} +
    • +
      {{ object_list.0.price_day }} €
      +
      {% trans 'на 1 день' %}
      +
      • + {% endif %} + {% if object_list.0.price_all %} +
    • +
      {{ object_list.0.price_all }} €
      +
      {% trans 'на все дни' %}
      +
      • + {% endif %} + +
    + +
    {% trans 'Предварительная регистрация' %}
    + +
    + +
    + +
      + {% if object_list.0.price_day_bar %} +
    • +
      {{ object_list.0.price_day_bar }} €
      + +
      на 1 день
      +
      • + {% endif %} + {% if object_list.0.price_all_bar %} +
    • +
      {{ object_list.0.price_all_bar }} €
      +
      {% trans 'на все дни' %}
      +
      • + {% endif %} + +
    + +
    {% trans 'Регистрация на' %} {% trans 'стойке' %}
    + +
    + +
    +
    + {% trans 'Заказать билет' %} +
    +
    +
    {% trans 'Выставка открыта для' %}:
    +
      + {{ object_list.0.get_audience }} + +
    +
    +
    + +
    + +
    +
    {% trans 'Для участия' %}
    + +
    {% trans 'Стоимость аренды 1м²' %}
    + +
      + {% if object_list.0.max_closed_equipped_area %} +
    • + +
      {{ object_list.0.max_closed_equipped_area }} €
      +
      {% trans 'оборудованная площадь' %}
      +
      • + {% endif %} + + {% if object_list.0.max_closed_area %} +
    • +
      {{ object_list.0.max_closed_area }} €
      +
      {% trans 'необорудованная площадь' %}
      +
      • + {% endif %} + + {% if object_list.0.max_open_area %} +
    • +
      {{ object_list.0.max_open_area }} €
      +
      {% trans 'открытая площадь' %}
      +
      • + {% endif %} + +
    + + {% trans 'Заявка на участие' %} + +
    + {% if object_list.0.min_stand_size %} +

    {% trans 'Минимальный размер стенда' %} — {{ object_list.0.min_stand_size }}м²

    + {% endif %} + {% if object_list.0.registration_payment %} +

    {% trans 'Регистрационный взнос' %} — {{ object_list.0.registration_payment }}€

    + {% endif %} + {% if object_list.0.application_deadline %} +

    {% trans 'Крайний срок подачи заявки' %} — {{ object_list.0.application_deadline }}

    + {% endif %} + +
    + +
    +
    +
    + +
    +
    + +
    +
    + {{ object_list.0.name|safe }} +
    + +
    + +
    + {% endblock %} + {% endblock %} +{% endblock %} diff --git a/templates/client/exposition/members.html b/templates/client/exposition/members.html new file mode 100644 index 00000000..f5539937 --- /dev/null +++ b/templates/client/exposition/members.html @@ -0,0 +1,25 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Участники' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'includes/exposition/members.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/price.html b/templates/client/exposition/price.html new file mode 100644 index 00000000..b3fc1ce5 --- /dev/null +++ b/templates/client/exposition/price.html @@ -0,0 +1,25 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Условия участия' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/exposition/price.html' with exposition=object %} +{% endblock %} + +{% block paginator %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/programm.html b/templates/client/exposition/programm.html new file mode 100644 index 00000000..f7704321 --- /dev/null +++ b/templates/client/exposition/programm.html @@ -0,0 +1,26 @@ +{% extends 'base_catalog.html' %} +{% load template_filters %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Деловая программа' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/exposition/programm.html' with exposition=object %} +{% endblock %} + +{% block paginator %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/statistic.html b/templates/client/exposition/statistic.html new file mode 100644 index 00000000..5edbd479 --- /dev/null +++ b/templates/client/exposition/statistic.html @@ -0,0 +1,26 @@ +{% extends 'base_catalog.html' %} +{% load template_filters %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Статистика' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/exposition/statistic.html' with exposition=object %} +{% endblock %} + +{% block paginator %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/exposition/visitors.html b/templates/client/exposition/visitors.html new file mode 100644 index 00000000..8eea4324 --- /dev/null +++ b/templates/client/exposition/visitors.html @@ -0,0 +1,25 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Посетители' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'includes/exposition/visitors.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/includes/booking_block.html b/templates/client/includes/booking_block.html index 2b8b07ce..a03bc7e0 100644 --- a/templates/client/includes/booking_block.html +++ b/templates/client/includes/booking_block.html @@ -1,54 +1,54 @@ -{% load i18n %} -{% load thumbnail %} -{% comment %} - - -{% endcomment %} - -
    -
    -
    - {% trans 'Отели рядом с выставкой от' %} Booking.com -
    - {% trans 'Все отели поблизости' %} -
    - - +{% load i18n %} +{% load thumbnail %} +{% comment %} + + +{% endcomment %} + +
    +
    +
    + {% trans 'Отели рядом с выставкой от' %} Booking.com +
    + {% trans 'Все отели поблизости' %} +
    + +
    \ No newline at end of file diff --git a/templates/client/includes/calendar_button.html b/templates/client/includes/calendar_button.html index 7c2bc0b7..0ce88dc0 100644 --- a/templates/client/includes/calendar_button.html +++ b/templates/client/includes/calendar_button.html @@ -1,15 +1,15 @@ -{% load i18n %} -{% load template_filters %} -{% if user.is_authenticated %} - {% if event|in_calendar:user %} - - {% trans 'из расписание' %} - {% else %} - {% trans 'в расписание' %} - - {% endif %} -{% else %} - {% trans 'в расписание' %} - -{% endif %} - +{% load i18n %} +{% load template_filters %} +{% if user.is_authenticated %} + {% if event|in_calendar:user %} + + {% trans 'из расписания' %} + {% else %} + {% trans 'в расписание' %} + + {% endif %} +{% else %} + {% trans 'в расписание' %} + +{% endif %} + diff --git a/templates/client/includes/catalog_paginator.html b/templates/client/includes/catalog_paginator.html new file mode 100644 index 00000000..0426ea3a --- /dev/null +++ b/templates/client/includes/catalog_paginator.html @@ -0,0 +1,50 @@ +{% load template_filters %} +{% load i18n %} + + +{% if page_obj.paginator.num_pages > 1 %} + {% with path=request.path|without_page %} + + {% endwith %} + {% endif %} diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html index 1b70f4cc..d2e1013e 100644 --- a/templates/client/includes/catalog_search.html +++ b/templates/client/includes/catalog_search.html @@ -2,8 +2,8 @@ {% load i18n %}
    - -
    {% if type %}{{ type }}{% else %}{% trans 'поиск событий' %}{% endif %}
    + +
    {{ search_form.title }}
    @@ -11,32 +11,56 @@
    {{ search_form.q }}
    +
    +
    + +
    +
    +
    {{ search_form.w }}
    +
    +
    + +
    +
    - {% ifnotequal type 'places search' %} -
    {% trans 'Тематика: ' %} - {{ search_form.get_themes_display }} + {% if search_form.th %} +
    {% trans 'Тематика: ' %} + + {{ search_form.get_themes_display }} + +  
    - {% endifnotequal %} - -
    {% trans 'Место: ' %} - + {% endif %} + {% if search_form.place_type %} +
    {% trans 'Тип: ' %} + + bla + +
    + {% endif %} + {% if search_form.area %} +
    {% trans 'Место: ' %} + {{ search_form.get_places_display }} -
    + +   +
    + {% endif %} - {% ifnotequal type 'places search' %} -
    {% trans 'Период: ' %} - + {% if search_form.fr %} +
    {% trans 'Период: ' %} + {% if search_form.fr.value or search_form.to.value %} {% if search_form.fr.value %} c {{ search_form.fr.value }} @@ -48,9 +72,119 @@ Не важно {% endif %} +  
    - {% endifnotequal %} + {% endif %}
    +
    +
    +
    +
    {% if search_form.th %} + {% include 'client/popups/theme.html' with search_form=search_form formId="pwSubj" selectedItemTemplate="csb-subj-selected" autoCompleteId="subj-filter-complete-block" filterInputId="subj-fliter-input" selectedItemsContainer="csb-subj-selected-items" subjectTriggerWrapId="subj-checks" exhibitionCheck="exhibition-check" conferenceCheck="conference-check" hasDate="true" %} + {% endif %} + {% if search_form.place_type %} + {% include 'client/popups/place_type.html' with search_form=search_form formId="pwPlace" %} + {% endif %} + {% if search_form.area %} + {% include 'client/popups/place.html' with search_form=search_form formId="pwPlace" selectedItemTemplate="csb-selected" autoCompleteId="filter-complete-block" filterInputId="place-filter-input" selectedItemsContainer="csb-selected-items" hasDate="true" %} + {% endif %} + {% if search_form.fr %} + {% include 'client/popups/period.html' with search_form=search_form %} + {% endif %} +
    +
     
    +
    +
    + +
    + + {% block scripts %} + + + + + {% endblock %}
    diff --git a/templates/client/includes/catalog_search_main.html b/templates/client/includes/catalog_search_main.html new file mode 100644 index 00000000..bf1637a9 --- /dev/null +++ b/templates/client/includes/catalog_search_main.html @@ -0,0 +1,197 @@ +{% load static %} +{% load i18n %} + +
    +
    + + + +
    +
    +
    +
    +
    +
    + +
    {{ search_form.q }}
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    {{ search_form.w }}
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + {% if search_form.th %} +
    {% trans 'Тематика: ' %} + + {{ search_form.get_themes_display }} + +   +
    + {% endif %} + {% if search_form.place_type %} +
    {% trans 'Тип: ' %} + + bla + +
    + {% endif %} + {% if search_form.area %} +
    {% trans 'Место: ' %} + + {{ search_form.get_places_display }} + +   +
    + {% endif %} + + {% if search_form.fr %} +
    {% trans 'Период: ' %} + + {% if search_form.fr.value or search_form.to.value %} + {% if search_form.fr.value %} + c {{ search_form.fr.value }} + {% endif %} + {% if search_form.to.value %} + по {{ search_form.to.value }} + {% endif %} + {% else %} + Не важно + {% endif %} + +   +
    + {% endif %} +
    +
    +
    +
    +
    +
    {% if search_form.th %} + {% include 'client/popups/theme.html' with search_form=search_form formId="pwSubj" selectedItemTemplate="csb-subj-selected" autoCompleteId="subj-filter-complete-block" filterInputId="subj-fliter-input" selectedItemsContainer="csb-subj-selected-items" subjectTriggerWrapId="subj-checks" exhibitionCheck="exhibition-check" conferenceCheck="conference-check" hasDate="true" %} + {% endif %} + {% if search_form.place_type %} + {% include 'client/popups/place_type.html' with search_form=search_form %} + {% endif %} + {% if search_form.area %} + {% include 'client/popups/place.html' with search_form=search_form formId="pwPlace" selectedItemTemplate="csb-selected" autoCompleteId="filter-complete-block" filterInputId="place-filter-input" selectedItemsContainer="csb-selected-items" hasDate="true" %} + {% endif %} + {% if search_form.fr %} + {% include 'client/popups/period.html' with search_form=search_form %} + {% endif %} +
    +
     
    +
    +
    + +
    +
    +
    + +
    + {% block scripts %} + + + + + {% endblock %} +
    diff --git a/templates/client/includes/event_object.html b/templates/client/includes/event_object.html index fc06f421..5bfcfd1d 100644 --- a/templates/client/includes/event_object.html +++ b/templates/client/includes/event_object.html @@ -1,319 +1,319 @@ -{% load static %} -{% load i18n %} -{% load thumbnail %} -{% load template_filters %} - -{% block page_body %} -
    -
    - - -
    -
    -
    - {% if exposition.main_title %} - {{ exposition.main_title|safe }} {{ exposition.name|safe }} - {% else %} - {{ exposition.name|safe }} - {% endif %} -
    -
    - -
    - {% with obj=exposition %} - {% include 'client/includes/show_date_block.html' %} - {% endwith %} -
    - {% if exposition.place %} -
    -
    -
    - {{ exposition.place.adress }} -
    -
    {% trans 'Раскрыть карту' %}
    -
    - -
    -
    {% trans 'Скрыть карту' %} -
    -
    -
    -
    - {% endif %} -
    -
    -
    - {% with event=exposition user=user %} - {% include 'client/includes/visit_button.html' %} - {% endwith %} - - {% with event=exposition user=user %} - {% include 'client/includes/calendar_button.html' %} - {% endwith %} - {% trans 'заметка' %} -
    - -
    -
    -
    -
    - -
    - -
    - {% for tag in exposition.tag.all %} - {{ tag }}, - {% endfor %} -
    -
    -
    -
    - -
    - -
    - - {% include 'includes/event_steps.html' with event=exposition filter=filter %} - - {% if exposition.get_photos %} - {% with photos=exposition.get_photos|slice:"5" %} -
    - -
    -
    {% trans 'Фотографии с прошлой выставки' %}
    - -
    - {% endwith %} - {% endif %} - {% if exposition.description %} -
    - -
    {% trans 'О выставке' %} {{ exposition.name|safe }}
    -
    {{ exposition.description|safe|linebreaks }}
    -
    -
    - {% endif %} -
    -
    {% trans 'Дополнительная информация' %}
    - -
    -
    {% trans 'Организатор' %}:
    -
    - {% for organiser in exposition.organiser.all %} - {{ organiser.name }}
    - {{ organiser.web_page }}
    - {{ organiser.email }} - {% endfor %} -
    - {% if exposition.web_page %} -
    {% trans 'Веб-сайт' %}:
    -
    - {{ exposition.web_page }} -
    - {% endif %} - - {% if exposition.get_audience %} -
    {% trans 'Аудитория' %}:
    -
    - {{ exposition.get_audience }} -
    - {% endif %} - - {% if exposition.get_periodic %} -
    {% trans 'Периодичность' %}:
    -
    {{ exposition.get_periodic }}
    - {% endif %} - - {% if exposition.products %} -
    {% trans 'Экспонируемые продукты' %}:
    -
    {{ exposition.products|safe|linebreaks }}
    - {% endif %} - -
    - -
    -
    -
    -
    -
    -
    {% trans 'Участники' %}
    - {% trans 'Все участники' %} -
    - -
    - -
    -
    -
    {% trans 'Посетители' %}
    -
    - - {% trans 'Все посетители' %} -
    -
    - - {% if exposition.place %} -
    -
    - {% if exposition.place %} -
    -
    {% trans 'Общая выставочная площадь' %}
    -
    - {% if exposition.place.total_area %} - {{ exposition.place.total_area }} {% trans 'м²' %} - {% endif %} -
    -
    - {% endif %} - -
    - {% if exposition.visitors %} -
    {{ exposition.visitors }} {% trans 'учасников' %}
    - {% endif %} - {% if exposition.members %} -
    {{ exposition.members }} {% trans 'посетителей' %}
    - {% endif %} - {% if exposition.foundation_year %} -
    {% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
    - {% endif %} -
    -
    - {% endif %} - -
    - - {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %} - -
    - {% if exposition.get_nearest_events|slice:":6" %} -
    -
    {% trans 'Ближайшие выставки по тематике' %} «{{ exposition.theme.all.0 }}»
    - -
    - {% endif %} - - -{% endblock %} -{% block content_text %} +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load template_filters %} + +{% block page_body %} +
    +
    + + +
    +
    +
    + {% if exposition.main_title %} + {{ exposition.main_title|safe }} {{ exposition.name|safe }} + {% else %} + {{ exposition.name|safe }} + {% endif %} +
    +
    + +
    + {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if exposition.place %} +
    +
    +
    + {{ exposition.place.adress }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} +
    +
    +
    + {% with event=exposition user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} + + {% with event=exposition user=user %} + {% include 'client/includes/calendar_button.html' %} + {% endwith %} + {% trans 'заметка' %} +
    + +
    +
    +
    +
    + +
    + +
    + {% for tag in exposition.tag.all %} + {{ tag }}, + {% endfor %} +
    +
    +
    +
    + +
    + +
    + + {% include 'includes/event_steps.html' with event=exposition filter=filter %} + + {% if exposition.get_photos %} + {% with photos=exposition.get_photos|slice:"5" %} +
    + +
    +
    {% trans 'Фотографии с прошлой выставки' %}
    + +
    + {% endwith %} + {% endif %} + {% if exposition.description %} +
    + +
    {% trans 'О выставке' %} {{ exposition.name|safe }}
    +
    {{ exposition.description|safe|linebreaks }}
    +
    +
    + {% endif %} +
    +
    {% trans 'Дополнительная информация' %}
    + +
    +
    {% trans 'Организатор' %}:
    +
    + {% for organiser in exposition.organiser.all %} + {{ organiser.name }}
    + {{ organiser.web_page }}
    + {{ organiser.email }} + {% endfor %} +
    + {% if exposition.web_page %} +
    {% trans 'Веб-сайт' %}:
    +
    + {{ exposition.web_page }} +
    + {% endif %} + + {% if exposition.get_audience %} +
    {% trans 'Аудитория' %}:
    +
    + {{ exposition.get_audience }} +
    + {% endif %} + + {% if exposition.get_periodic %} +
    {% trans 'Периодичность' %}:
    +
    {{ exposition.get_periodic }}
    + {% endif %} + + {% if exposition.products %} +
    {% trans 'Экспонируемые продукты' %}:
    +
    {{ exposition.products|safe|linebreaks }}
    + {% endif %} + +
    + +
    +
    +
    +
    +
    +
    {% trans 'Участники' %}
    + {% trans 'Все участники' %} +
    + +
    + +
    +
    +
    {% trans 'Посетители' %}
    +
    + + {% trans 'Все посетители' %} +
    +
    + + {% if exposition.place %} +
    +
    + {% if exposition.place %} +
    +
    {% trans 'Общая выставочная площадь' %}
    +
    + {% if exposition.place.total_area %} + {{ exposition.place.total_area }} {% trans 'м²' %} + {% endif %} +
    +
    + {% endif %} + +
    + {% if exposition.visitors %} +
    {{ exposition.visitors }} {% trans 'учасников' %}
    + {% endif %} + {% if exposition.members %} +
    {{ exposition.members }} {% trans 'посетителей' %}
    + {% endif %} + {% if exposition.foundation_year %} +
    {% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
    + {% endif %} +
    +
    + {% endif %} + +
    + + {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %} + +
    + {% if exposition.get_nearest_events|slice:":6" %} +
    +
    {% trans 'Ближайшие выставки по тематике' %} «{{ exposition.theme.all.0 }}»
    + +
    + {% endif %} + + +{% endblock %} +{% block content_text %} {% endblock %} \ No newline at end of file diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index 2f2d4ad6..fb222c11 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -1,6 +1,4 @@ {% load i18n %} -{% load template_filters %} -
    {% trans 'Посетить выставку' %}
    @@ -8,7 +6,7 @@
  • 1. {% trans 'Зарегистрируйтесь на событие' %}
    {% trans 'Билеты на выставку' %} @@ -16,7 +14,7 @@
  • 2. {% trans 'Забронируйте отель по лучшей цене' %}
    - booking.com + booking.com
  • diff --git a/templates/client/includes/exposition/catalog_filter_period.html b/templates/client/includes/exposition/catalog_filter_period.html new file mode 100644 index 00000000..5eb0825f --- /dev/null +++ b/templates/client/includes/exposition/catalog_filter_period.html @@ -0,0 +1,23 @@ +{% load i18n %} +{% load template_filters %} +{% load tempalte_tags %} + + +{% if month or year %} +{% else %} + {% get_date %} +
    +
    +
    Период:
    + {% with path=request.path|without_page now=now %} + {% for month in monthes_period %} + {{ month.name|lower }} {{ month.date|date:'Y' }}{% if month != monthes_period|last %},{% endif %} + {% endfor %} + {% endwith %} +
    + +
    + Указать диапазон дат +
    +
    +{% endif %} diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index 6be8c10e..b40f58f6 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -1,118 +1,125 @@ -{% load static %} -{% load i18n %} -{% load template_filters %} - - \ No newline at end of file +{% load static %} +{% load i18n %} +{% load template_filters %} + + +{% block scripts %} + + +{% endblock %} \ No newline at end of file diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index e69de29b..495cb7c8 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -0,0 +1,386 @@ +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load template_filters %} + +{% block page_body %} +
    +
    + + +
    +
    +
    + {% if exposition.main_title %} + {{ exposition.main_title|safe }} {{ exposition.name|safe }} + {% else %} + {{ exposition.name|safe }} + {% endif %} +
    +
    + +
    + {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if exposition.place %} +
    +
    +
    + {{ exposition.place.adress }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} +
    +
    +
    + {% with event=exposition user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} + + {% with event=exposition user=user %} + {% include 'client/includes/calendar_button.html' %} + {% endwith %} + {% trans 'заметка' %} + {% if request.user.is_admin %} + {% trans 'изменить' %} + {% endif %} + +
    + +
    {% trans 'Найти отель' %}
    + +
    +
    +
    +
    + +
    + +
    + {% with tags=exposition.tag.all %} + {% for tag in tags %} + {{ tag.name }}, + {% endfor %} + {% endwith %} + +
    +
    +
    +
    + {% include 'client/includes/exposition/exposition_services.html' %} + + {% include 'includes/event_steps.html' with event=exposition %} + + {% if exposition.get_photos %} + {% with photos=exposition.get_photos|slice:"5" %} +
    + +
    +
    {% trans 'Фотографии с прошлой выставки' %}
    + +
    + {% endwith %} + {% endif %} + {% if exposition.description %} +
    + +
    {% trans 'О выставке' %} {{ exposition.name|safe }}
    +
    {{ exposition.description|safe|linebreaks }}
    +
    +
    + {% endif %} +
    +
    {% trans 'Дополнительная информация' %}
    + +
    +
    {% trans 'Организатор' %}:
    +
    + {% for organiser in exposition.organiser.all %} + {{ organiser.name }}
    + {{ organiser.web_page }}
    + {{ organiser.email }} + {% endfor %} +
    + {% if exposition.web_page %} +
    {% trans 'Веб-сайт' %}:
    +
    + {{ exposition.web_page }} +
    + {% endif %} + + {% if exposition.get_audience %} +
    {% trans 'Аудитория' %}:
    +
    + {{ exposition.get_audience }} +
    + {% endif %} + + {% if exposition.get_periodic %} +
    {% trans 'Периодичность' %}:
    +
    {{ exposition.get_periodic }}
    + {% endif %} + + {% if exposition.products %} +
    {% trans 'Экспонируемые продукты' %}:
    +
    {{ exposition.products|safe }}
    + {% endif %} + + {% if exposition.time %} +
    {% trans 'Время работы' %}:
    +
    {{ exposition.time|safe }}
    + {% endif %} + +
    + +
    +
    +
    +
    + {% with companies=exposition.company.all|slice:":6" %} + {% if companies %} + {# есть участники #} +
    +
    {% trans 'Участники' %}
    + + {% trans 'Все участники' %} +
    + + {% else %} + {# нет участников #} +
    +
    {% trans 'Участники' %}
    +

    {% trans 'Привлекайте целевых посетителей на стенд' %}

    + +

    Рекламировать участника

    +
    + {% endif %} + {% endwith %} +
    + +
    + {% with visitors=exposition.users.all|slice:":17" %} +
    +
    {% trans 'Посетители' %}
    +
    + + {% if visitors %} + {% trans 'Все посетители' %} + + {% endif %} + {% endwith %} + + + + + + {% with event=exposition user=user %} + {% include 'client/includes/visit_button.html' %} + {% endwith %} +
    +
    + + +
    +
    + + {% if exposition.area %} +
    +
    {% trans 'Общая выставочная площадь' %}
    +
    + {{ exposition.area }} {% trans 'м²' %} + +
    +
    + {% endif %} + +
    + + {% if exposition.members %} +
    {{ exposition.members }} {% trans 'участников' %}
    + {% endif %} + {% if exposition.visitors %} +
    {{ exposition.visitors }} {% trans 'посетителей' %}
    + {% endif %} + {% if exposition.foundation_year %} +
    {% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
    + {% endif %} +
    +
    + + +
    + + {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %} + +
    + {% if exposition.get_nearest_events|slice:":6" %} +
    +
    {% trans 'Ближайшие выставки по тематике' %} «{{ exposition.theme.all.0 }}»
    + +
    + {% endif %} + + +{% endblock %} +{% block content_text %} +{% endblock %} +{% block scripts %} + + +{% endblock %} \ No newline at end of file diff --git a/templates/client/includes/exposition/exposition_services.html b/templates/client/includes/exposition/exposition_services.html new file mode 100644 index 00000000..fb4f7b67 --- /dev/null +++ b/templates/client/includes/exposition/exposition_services.html @@ -0,0 +1,19 @@ +{% load i18n %} + +
    + +
    \ No newline at end of file diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html new file mode 100644 index 00000000..71d6a1c8 --- /dev/null +++ b/templates/client/includes/exposition/price.html @@ -0,0 +1,235 @@ +{% load i18n %} +{% load template_filters %} + +
    +
    + + +
    +
    +
    + {% if exposition.main_title %} + {{ exposition.main_title|safe }} + {% else %} + {{ exposition.name|safe }} + {% endif %} +
    +
    + +
    + {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if exposition.place %} +
    +
    +
    + {{ exposition.place.address.address }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} + + +
    +
    +
    +
    {% trans 'Стоимость посещения и участия' %}
    +
    + +
    +
    + +
    + +
    {% trans 'Для посещения' %}
    + +
    {% trans 'Стоимость билетов' %}
    + + {% if exposition.price_all or exposition.price_day %} +
    + +
      + + {% if exposition.price_day %} +
    • +
      {{ exposition.price_day }} {{ exposition.get_currency_html }}
      +
      {% trans 'на 1 день' %}
      +
      • + {% endif %} + {% if exposition.price_all %} +
    • +
      {{ exposition.price_all }} {{ exposition.get_currency_html }}
      +
      {% trans 'на все дни' %}
      +
      • + {% endif %} + +
    + +
    {% trans 'Предварительная регистрация' %}
    + +
    + {% endif %} + {% if exposition.price_day_bar or exposition.price_all_bar %} + + +
    + +
      + {% if exposition.price_day_bar %} +
    • +
      {{ exposition.price_day_bar }} {{ exposition.get_currency_html }}
      + +
      на 1 день
      +
      • + {% endif %} + {% if exposition.price_all_bar %} +
    • + + {# {% if exposition.price_all_bar|isdigit %} #} +
      {{ exposition.price_all_bar }} {{ exposition.get_currency_html }}
      +
      {% trans 'на все дни' %}
      + +
      • + {% endif %} + +
    + +
    {% trans 'Регистрация на' %} {% trans 'стойке' %}
    + +
    + {% endif %} + +
    +
    + {% trans 'Заказать билет' %} +
    +
    +
    {% trans 'Выставка открыта для' %}:
    +
      + {{ exposition.get_audience }} +
    +
    +
    + +
    + +
    +
    {% trans 'Для участия' %}
    + +
    {% trans 'Стоимость аренды 1м²' %}
    + +
      + {% if exposition.max_closed_equipped_area %} +
    • + +
      + {% if exposition.min_closed_equipped_area %} + {{ exposition.min_closed_equipped_area }}-{{ exposition.max_closed_equipped_area }} {{ exposition.get_currency_html }} + {% else %} + {{ exposition.max_closed_equipped_area }} {{ exposition.get_currency_html }} + {% endif %} +
      +
      {% trans 'оборудованная площадь' %}
      +
      • + {% endif %} + + {% if exposition.max_closed_area %} +
    • +
      + {% if exposition.min_closed_area %} + {{ exposition.min_closed_area }}-{{ exposition.max_closed_area }} {{ exposition.get_currency_html }} + {% else %} + {{ exposition.max_closed_area }} {{ exposition.get_currency_html }} + {% endif %} +
      +
      {% trans 'необорудованная площадь' %}
      +
      • + {% endif %} + + {% if exposition.max_open_area %} +
    • +
      + {% if exposition.min_open_area %} + {{ exposition.min_open_area }}-{{ exposition.max_closed_area }} {{ exposition.get_currency_html }} + {% else %} + {{ exposition.max_open_area }} {{ exposition.get_currency_html }} + {% endif %} +
      +
      {% trans 'открытая площадь' %}
      +
      • + {% endif %} + +
    + + {% trans 'Заявка на участие' %} + +
    + {% if exposition.min_area %} +

    {% trans 'Минимальный размер стенда' %} — {{ exposition.min_area }}м²

    + {% endif %} + {% if exposition.registration_payment %} +

    {% trans 'Регистрационный взнос' %} — {{ exposition.registration_payment }}{{ exposition.get_currency_html }}

    + {% endif %} + {% if exposition.application_deadline %} +

    {% trans 'Крайний срок подачи заявки' %} — {{ exposition.application_deadline }}

    + {% endif %} + +
    + +
    +
    +
    + +
    +
    + +
    +
    + {{ exposition.name|safe }} +
    + +
    +
      + {% with services=exposition.get_services %} + {% for service in services %} +
    • {{ service.name }}
      • + {% endfor %} + {% endwith %} +
    +
    \ No newline at end of file diff --git a/templates/client/includes/exposition/programm.html b/templates/client/includes/exposition/programm.html new file mode 100644 index 00000000..4aa2e4fa --- /dev/null +++ b/templates/client/includes/exposition/programm.html @@ -0,0 +1,138 @@ +{% load i18n %} +{% load template_filters %} +{% load pytils_dt %} + + + + +
    +
    + + +
    +
    +
    + {{ exposition.main_title|safe }} +
    +
    + +
    + {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if exposition.place %} +
    +
    +
    + {{ exposition.place.address.address }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} + + +
    +
    +
    +{% with days=exposition.get_timetables_days %} +{% if days %} +
    +
    Деловая программа
    +
    + + + {% for day in days %} +
    +
    + + {% ifequal LANGUAGE_CODE 'ru' %} + {{ day|ru_strftime_preposition:"%d %B" }} + {% else %} + {{ day|date:"j F" }} + {% endifequal %} + +
    +
    +
      + {% with programs=exposition.business_program.all|timetable_by_day:day %} + {% for pr in programs %} +
    • +
      +
      +
      {{ pr.begin|date:"G:i" }} – {{ pr.end|date:"G:i" }}
      +
      {{ pr.name }}
      +
      +
      + {{ pr.programe|safe }}Организатор: {{ pr.speaker }} +
      +
      +
      {{ pr.place }}
      +
      +
      +
      • + {% endfor %} + {% endwith %} +
    +
    +
    + {% endfor %} + + +
    +
    +{% endif %} +{% endwith %} +{% with event=exposition filter=filter %} + {% include 'includes/event_steps.html' %} +{% endwith %} + + +
    +
    +{{ exposition.name|safe }} +
    + +
    +
      +{% with services=exposition.get_services %} +{% for service in services %} +
    • {{ service.name }}
      • +{% endfor %} +{% endwith %} +
    +
    diff --git a/templates/client/includes/exposition/services.html b/templates/client/includes/exposition/services.html new file mode 100644 index 00000000..62bfeb81 --- /dev/null +++ b/templates/client/includes/exposition/services.html @@ -0,0 +1,14 @@ +{% load i18n %} + +
    + {% trans 'услуги' %} +
    +
      + {% with services=obj.get_services %} + {% for service in services %} +
    • {{ service.name }}
      • + {% endfor %} + {% endwith %} +
    +
    +
    \ No newline at end of file diff --git a/templates/client/includes/exposition/statistic.html b/templates/client/includes/exposition/statistic.html new file mode 100644 index 00000000..633830e1 --- /dev/null +++ b/templates/client/includes/exposition/statistic.html @@ -0,0 +1,163 @@ +{% load i18n %} + +
    +
    + + +
    +
    +
    + {% if exposition.main_title %} + {{ exposition.main_title|safe }} + {% else %} + {{ exposition.name|safe }} + {% endif %} +
    +
    + +
    + {% with obj=exposition %} + {% include 'client/includes/show_date_block.html' %} + {% endwith %} +
    + {% if exposition.place %} +
    +
    +
    + {{ exposition.place.address.address }} +
    +
    {% trans 'Раскрыть карту' %}
    +
    + +
    +
    {% trans 'Скрыть карту' %} +
    +
    +
    +
    + {% endif %} + + +
    +
    +
    +
    +
    {% trans 'Статистика' %}
    +
    + {% with statistics=exposition.statistic.all %} + {% for st in statistics %} +
    +
    {{ st.year }}
    + +
    + +
    +
    + {{ st.visitors }} +
    {% trans 'посетителей' %}
    +
    +
    + {{ st.members }} +
    {% trans 'учасников' %}
    +
    +
    + +
    + {% if exposition.place %} +
    +
    {% trans 'Общая выставочная площадь' %}
    + +
    {{ st.area }} {% trans 'м' %}2
    + +
    + {% endif %} + +
    {{ exposition.foundation_year }} год основания
    +
    + + +
    + +
    + {% endfor %} + {% endwith %} +
    +
    + {% with event=exposition %} + {% include 'includes/event_steps.html' %} + {% endwith %} +
    + +
    + {{ exposition.name|safe }} +
    + +
    +
      + {% with services=exposition.get_services %} + {% for service in services %} +
    • {{ service.name }}
      • + {% endfor %} + {% endwith %} +
    +
    + diff --git a/templates/client/includes/exposition/tags.html b/templates/client/includes/exposition/tags.html new file mode 100644 index 00000000..3b52fa9c --- /dev/null +++ b/templates/client/includes/exposition/tags.html @@ -0,0 +1,5 @@ +{% with tags=obj.tags %} + {% for tag in tags %} + {{ tag.name }}, + {% endfor %} +{% endwith %} \ No newline at end of file diff --git a/templates/client/includes/header.html b/templates/client/includes/header.html index d96c6c88..1dfcf1d1 100644 --- a/templates/client/includes/header.html +++ b/templates/client/includes/header.html @@ -1,107 +1,107 @@ -{% load static %} -{% load i18n %} -{% load inbox %} - -
    -
    - - -
    - -
    - -
    - {% if user.is_authenticated %} - {% if user.organiser %} -
    {% trans 'добавить событие' %}
    - {% endif %} - {% endif %} - -
      - {% for lang in LANGUAGES %} - -
      {% csrf_token %} -
    • - - {% ifequal LANGUAGE_CODE lang.0 %} - {{ lang.0 }} - {% else %} - {{ lang.0 }} - {% endifequal %} -
      • -
      - - {% endfor %} - {% if user.is_staff %} -
    • admin
      • - {% endif %} -
    -
    - -
    -
      -
    • RSS
      • -
    • Facebook' %}
      • -
    • LinkedIn' %}
      • -
    • В контакте' %}
      • -
    • Twitter' %}
      • -
    - {% if user.is_authenticated %} -
    -
    -
    {% trans 'личный кабинет' %}
    - -
    {% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}
    -
    - {% trans 'настройки' %} -
    -
    - {% trans 'календарь' %} - {% trans 'документы' %} -
    - -
    -
    {% trans 'Выход' %}
    - -
    - {% else %} -
    - {% trans 'Регистрация' %} - -
    - {% endif %} -
    - -
    - -
    - -
    - - - - - -
    - -
    - {% block header_banner %} - - {% endblock %} -
    - -
    - -
    -
    +{% load static %} +{% load i18n %} +{% load inbox %} + +
    +
    + + +
    + +
    + +
    + {% if user.is_authenticated %} + {% if user.organiser %} +
    {% trans 'добавить событие' %}
    + {% endif %} + {% endif %} + +
      + {% for lang in LANGUAGES %} + +
      {% csrf_token %} +
    • + + {% ifequal LANGUAGE_CODE lang.0 %} + {{ lang.0 }} + {% else %} + {{ lang.0 }} + {% endifequal %} +
      • +
      + + {% endfor %} + {% if user.is_admin %} +
    • admin
      • + {% endif %} +
    +
    + +
    +
      +
    • RSS
      • +
    • Facebook' %}
      • +
    • LinkedIn' %}
      • +
    • В контакте' %}
      • +
    • Twitter' %}
      • +
    + {% if user.is_authenticated %} +
    +
    +
    {% trans 'личный кабинет' %}
    + +
    {% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}
    +
    + {% trans 'настройки' %} +
    +
    + {% trans 'календарь' %} + {% trans 'документы' %} +
    + +
    +
    {% trans 'Выход' %}
    + +
    + {% else %} +
    + {% trans 'Регистрация' %} + +
    + {% endif %} +
    + +
    + +
    + +
    + + + + + +
    + +
    + {% block header_banner %} + + {% endblock %} +
    + +
    + +
    +
    \ No newline at end of file diff --git a/templates/client/includes/meta.html b/templates/client/includes/meta.html new file mode 100644 index 00000000..3dc23a1a --- /dev/null +++ b/templates/client/includes/meta.html @@ -0,0 +1,34 @@ +{% load meta %} +{% load i18n %} + + +{% if meta %} + {% if meta.description %}{% meta 'description' meta.description %}{% endif %} + {% if meta.keywords %}{% meta_list 'keywords' meta.keywords %}{% endif %} + {% if meta.title %}{{ meta.title }}{% endif %} + {% if meta.use_og %} + {% if meta.title %}{% og_prop 'title' meta.title %}{% endif %} + {% if meta.url %}{% og_prop 'url' meta.url %}{% endif %} + {% if meta.description %}{% og_prop 'description' meta.description %}{% endif %} + {% if meta.image %}{% og_prop 'image' meta.image %}{% endif %} + {% if meta.object_type %}{% og_prop 'type' meta.object_type %}{% endif %} + {% if meta.site_name %}{% og_prop 'site_name' meta.site_name %}{% endif %} + {% endif %} + {% if meta.use_twitter %} + {% if meta.title %}{% twitter_prop 'title' meta.title %}{% endif %} + {% if meta.url %}{% twitter_prop 'url' meta.url %}{% endif %} + {% if meta.description %}{% twitter_prop 'description' meta.description %}{% endif %} + {% if meta.image %}{% twitter_prop 'image' meta.image %}{% endif %} + {% endif %} + {% if meta.use_googleplus %} + {% if meta.title %}{% googleplus_prop 'name' meta.title %}{% endif %} + {% if meta.url %}{% googleplus_prop 'url' meta.url %}{% endif %} + {% if meta.description %}{% googleplus_prop 'description' meta.description %}{% endif %} + {% if meta.image %}{% googleplus_prop 'image' meta.image %}{% endif %} + {% endif %} +{% else %} + {% trans 'Expomap — выставки, конференции, семинары' %} + + +{% endif %} + diff --git a/templates/client/includes/paginator.html b/templates/client/includes/paginator.html index 6547118a..15029e55 100644 --- a/templates/client/includes/paginator.html +++ b/templates/client/includes/paginator.html @@ -1,47 +1,47 @@ -{% load i18n %} -{% load template_filters %} - -{% if page_obj.paginator.num_pages > 1 %} - - {% endif %} \ No newline at end of file +{% load i18n %} +{% load template_filters %} + +{% if page_obj.paginator.num_pages > 1 %} + + {% endif %} \ No newline at end of file diff --git a/templates/client/includes/place/photo.html b/templates/client/includes/place/photo.html new file mode 100644 index 00000000..993d2751 --- /dev/null +++ b/templates/client/includes/place/photo.html @@ -0,0 +1,86 @@ +{% load static %} +{% load i18n %} +{% load template_filters %} + + +{% block page_body %} +
    +
    +
    +
    + + {% with obj=object %} + {% include 'client/includes/show_logo.html' %} + {% endwith %} + +
    +
    +
    +
    +
    + {{ object.name }} +
    +
    +
    + {{ object.get_type }} +
    +
    +
    + {% if object.country %} +
    + {{ object.country }}, {{ object.city }} +
    + {% endif %} +
    +
    +
    +
    + +
    + {{ object.description|safe }} +
    + + +
    + {% block paginator %} + + {% with page_obj=page_obj queries=queries %} + {% include 'includes/paginator.html' %} + {% endwith %} + + {% endblock %} +{% endblock %} + +{% block photogallery %} + {% include 'client/popups/photo.html' %} +{% endblock %} +{% block scripts %} + + +{% endblock %} diff --git a/templates/client/includes/place/place_list.html b/templates/client/includes/place/place_list.html index 3ad8c553..f0fb76b6 100644 --- a/templates/client/includes/place/place_list.html +++ b/templates/client/includes/place/place_list.html @@ -1,12 +1,12 @@ {% load static %} {% load i18n %} -{% load template_filters %} +
      {% for object in object_list %} -
    • +
    • - +
      {% with obj=object %} {% include 'client/includes/show_logo.html' %} @@ -17,8 +17,8 @@
      -
      {{ object.name|safe }}
      -
      {{ object.rating }}
      +
      {{ object.name|safe }}
      +
      {{ object.get_type }}
      @@ -35,15 +35,14 @@
      - {% trans 'описание' %} + {% trans 'описание' %} {% if object.get_events_number %} {% trans 'события' %} ({{ object.get_events_number }}) {% endif %} {% if object.photogallery %} - {% trans 'фото' %} + {% trans 'фото' %} {% endif %}
      -
      {% trans 'Найти отели поблизости' %} diff --git a/templates/client/includes/place/place_object.html b/templates/client/includes/place/place_object.html index 3f8482d3..4e256032 100644 --- a/templates/client/includes/place/place_object.html +++ b/templates/client/includes/place/place_object.html @@ -10,17 +10,21 @@
      {% include 'client/includes/show_logo.html' with obj=place %}
      -
      {{ place.rating }}
      +
      -
      +
      {{ place.name|safe }}
      -
      +
      {{ place.description|safe|linebreaks }}
      + {% trans 'Далее...' %} + {% if place.address %}
      @@ -38,7 +42,7 @@ {% else %}
      {% endif %} -
      +
      @@ -215,7 +219,7 @@ {% for event in place.events %}
    • - + {% if event.expohit %} {% endif %} @@ -229,7 +233,7 @@
      -
      {{ event.name|safe }}
      +
      {{ event.name|safe }}
      @@ -313,9 +317,10 @@
      {{ pl.name|safe }}
      -
      {{ pl.rating }}
      +
      • {{ pl.get_type }}
      +
      {% if pl.total_area %} @@ -333,4 +338,19 @@
    • {% endif %} + +{% endblock %} +{% block scripts %} + + {% endblock %} \ No newline at end of file diff --git a/templates/client/includes/show_avatar.html b/templates/client/includes/show_avatar.html new file mode 100644 index 00000000..c5842625 --- /dev/null +++ b/templates/client/includes/show_avatar.html @@ -0,0 +1,10 @@ +{% load thumbnail %} +{% load static %} + +{% if user.profile.avatar %} + {% thumbnail user.profile.avatar "100x100" crop="center" as im %} + + {% endthumbnail %} +{% else %} + +{% endif %} \ No newline at end of file diff --git a/templates/client/includes/show_logo.html b/templates/client/includes/show_logo.html index 900fa744..54a6323a 100644 --- a/templates/client/includes/show_logo.html +++ b/templates/client/includes/show_logo.html @@ -1,12 +1,12 @@ -{% load static %} - -{% if obj.get_logo %} - {# delete after changing all logos #} - {% if obj.get_logo.url %} - - {% else %} - - {% endif %} -{% else %} - +{% load static %} + +{% if obj.get_logo %} + {# delete after changing all logos #} + {% if obj.get_logo.url %} + + {% else %} + + {% endif %} +{% else %} + {% endif %} \ No newline at end of file diff --git a/templates/client/includes/show_tags.html b/templates/client/includes/show_tags.html index 90e01f2f..d21f14fc 100644 --- a/templates/client/includes/show_tags.html +++ b/templates/client/includes/show_tags.html @@ -1,5 +1,6 @@ -{% load template_filters %} - -{% for tag in obj.tag.all %} - {{ tag }}, -{% endfor %} \ No newline at end of file +{% load template_filters %} +{% with tags=obj.tags %} + {% for tag in tags %} + {{ tag }}, + {% endfor %} +{% endwith %} \ No newline at end of file diff --git a/templates/client/index.html b/templates/client/index.html index 39e1968a..87c13196 100644 --- a/templates/client/index.html +++ b/templates/client/index.html @@ -1,292 +1,265 @@ -{% extends "blank.html" %} -{% load static %} -{% load i18n %} - -{% block body_class %} class="main-page" {% endblock %} - -{% block top %} - -
    -
    - - - -
    -
    - -
    - - -
    -
    -
    - -
    -
    -{% endblock %} - -{% block search %} -
    -
    - - - -
    -
    -
    -
    -
    -
    - -
    {{ search_form.q }}
    -
    -
    -
    -
    - -
    {{ search_form.w }}
    -
    -
    -
    - -
    -
    -
    -
    {% trans 'Тематика' %}: {% trans 'Не важно' %}
    -
    {% trans 'Место' %}: {% trans 'Не важно' %}
    -
    {% trans 'Период' %}: {% trans 'Не важно' %}
    -
    -
    -
    -
    - -
    -
    -{% endblock %} - -{% block catalog %} -
    -
    - - - -
    -
    - -
    -
    {% trans 'Выставки' %}
    - - -
    - -
    -
    {% trans 'конференции' %}
    - - -
    - -
    -
    {% trans 'семинары' %}
    - - -
    - -
    - -
    - {% block menu_banner %} - - - - {% endblock %} -
    -
    - -
    -
    -{% endblock %} - -{% block announces %} -
    -
    - - -
    -
    -
    -
    {% trans 'Фоторепортажи:' %}
    -

    Edinburgh International Festival 2013

    -
    - -
    -
    - -
    -
    -{% endblock %} - -{% block partners %} -
    -
    -
    {% trans 'Наши партнеры:' %}
    -
      -
      • -
      • -
      • -
      • -
      • -
    -
    -
    -{% endblock %} - -{% block services %} -
    -
    - - - -
    -
    -
    -
    -
    {% trans 'Обзоры и аналитика' %}
    -
    {% trans 'Все обзоры' %}
    -
    - - -
    - -
    -
    -
    -
    -
    - -
    -
    -{% endblock %} +{% extends "blank.html" %} +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load template_filters %} + +{% block body_class %} class="main-page" {% endblock %} + +{% block top %} + +
    +
    + + + +
    + +
    + +
    +
    +{% endblock %} + +{% block search %} + {% include 'includes/catalog_search_main.html' with search_form=search_form %} +{% endblock %} + +{% block catalog %} +
    +
    + + + +
    +
    + +
    +
    {% trans 'Выставки' %}
    + + +
    + +
    +
    {% trans 'конференции' %}
    + + +
    + +
    +
    {% trans 'семинары' %}
    + + +
    + +
    + +
    + {% block menu_banner %} + + + + {% endblock %} +
    +
    + +
    +
    +{% endblock %} + +{% block announces %} +
    +
    + + +
    +
    +
    +
    {% trans 'Фоторепортажи:' %}
    +

    Edinburgh International Festival 2013

    +
    + +
    +
    + +
    +
    +{% endblock %} + +{% block partners %} +
    +
    +
    {% trans 'Наши партнеры:' %}
    +
      +
      • +
      • +
      • +
      • +
      • +
    +
    +
    +{% endblock %} + +{% block services %} +
    +
    + + + +
    +
    +
    +
    +
    {% trans 'Обзоры и аналитика' %}
    +
    {% trans 'Все обзоры' %}
    +
    + + +
    + +
    +
    +
    +
    +
    + +
    +
    +{% endblock %} diff --git a/templates/client/main_page.html b/templates/client/main_page.html new file mode 100644 index 00000000..a46d7a5f --- /dev/null +++ b/templates/client/main_page.html @@ -0,0 +1,261 @@ +{% extends "blank.html" %} +{% load static %} +{% load i18n %} +{% load thumbnail %} + +{% block body_class %} class="main-page" {% endblock %} + +{% block top %} + +
    +
    + + + +
    + +
    + +
    +
    +{% endblock %} + +{% block search %} + {% include 'includes/catalog_search_main.html' with search_form=search_form %} +{% endblock %} + +{% block catalog %} +
    +
    + + + +
    +
    + +
    +
    {% trans 'Выставки' %}
    + + +
    + +
    +
    {% trans 'конференции' %}
    + + +
    + +
    +
    {% trans 'семинары' %}
    + + +
    + +
    + +
    + {% block menu_banner %} + + + + {% endblock %} +
    +
    + +
    +
    +{% endblock %} + +{% block announces %} +
    +
    + + +
    +
    +
    +
    {% trans 'Фоторепортажи:' %}
    +

    Edinburgh International Festival 2013

    +
    + +
    +
    + +
    +
    +{% endblock %} + +{% block partners %} +
    +
    +
    {% trans 'Наши партнеры:' %}
    +
      +
      • +
      • +
      • +
      • +
      • +
    +
    +
    +{% endblock %} + +{% block services %} +
    +
    + + + +
    +
    +
    +
    +
    {% trans 'Обзоры и аналитика' %}
    +
    {% trans 'Все обзоры' %}
    +
    + + +
    + +
    +
    +
    +
    +
    + +
    +
    +{% endblock %} diff --git a/templates/client/password_reset/base.html b/templates/client/password_reset/base.html index 647e2bba..e1f0c073 100644 --- a/templates/client/password_reset/base.html +++ b/templates/client/password_reset/base.html @@ -1,34 +1,42 @@ -{% extends "base_catalog.html" %} -{% load i18n %} -{% load url from future %} - -{% block title %}{% trans "Password recovery" %}{% endblock %} -{% block bread_scrumbs %} -{% endblock %} - -{% block page_title %} -
    -

    {% trans "Password recovery" %}

    -
    -{% endblock %} - -{% block content_list %} -
    -
    -
    - {% csrf_token %} -
    -
    - {{ form.username_or_email }} -
    - -
    -
    - -
    - - -
    -
    -
    +{% extends "base_catalog.html" %} +{% load i18n %} +{% load url from future %} + +{% block title %}{% trans "Password recovery" %}{% endblock %} +{% block bread_scrumbs %} +{% endblock %} + +{% block page_title %} +
    +

    {% trans "Password recovery" %}

    +
    +{% endblock %} + +{% block content_list %} +
    + +
    {% csrf_token %} + +

    {{ form.username_or_email.label }}

    + + + + + {% if form.errors %} + {# если есть ошибка #} +
    + {{ form.username_or_email }} +
    + {{ form.errors.username_or_email.0 }}{# текст ошибки #} + {% else %} + {# ошибки нет #} +
    + {{ form.username_or_email }} +
    + {% endif %} + + +
    + +
    {% endblock %} \ No newline at end of file diff --git a/templates/client/password_reset/reset.html b/templates/client/password_reset/reset.html index 7d2cf1d5..df4d40fa 100644 --- a/templates/client/password_reset/reset.html +++ b/templates/client/password_reset/reset.html @@ -1,46 +1,52 @@ -{% extends "base_catalog.html" %} -{% load i18n %} -{% load url from future %} - -{% block title %}{% trans "Password recovery" %}{% endblock %} -{% block bread_scrumbs %} -{% endblock %} - -{% block page_title %} -
    -

    {% trans "Password recovery" %}

    -
    -{% endblock %} - -{% block content_list %} -
    -
    - {% if invalid %}{% url "password_reset_recover" as recovery_url %} -

    {% blocktrans %}Sorry, this password reset link is invalid. You can still request a new one.{% endblocktrans %}

    - {% else %} -

    {% blocktrans %}Hi, {{ username }}. Please choose your new password.{% endblocktrans %}

    -
    - {% csrf_token %} -
    -
    - {{ form.password1 }} -
    - -
    -
    -
    - {{ form.password2 }} -
    - -
    -
    - -
    - - -
    - {% endif %} -
    -
    -{% endblock %} - +{% extends "base_catalog.html" %} +{% load i18n %} +{% load url from future %} + +{% block title %}{% trans "Password recovery" %}{% endblock %} +{% block bread_scrumbs %} +{% endblock %} + +{% block page_title %} +
    +

    {% trans "Password recovery" %}

    +
    +{% endblock %} + +{% block content_list %} +
    +
    + {% if invalid %}{% url "password_reset_recover" as recovery_url %} +

    {% blocktrans %}Sorry, this password reset link is invalid. You can still request a new one.{% endblocktrans %}

    + {% else %} +

    {% blocktrans %}Hi, {{ username }}. Please choose your new password.{% endblocktrans %}

    +
    + {% csrf_token %} + {% if form.errors %} + {# вывести ошибку #} + {{ form.errors.password2.0 }}{# текст ошибки #} + + {% else %} + {% endif %} +
    +
    + {{ form.password1.label }}{{ form.password1 }} +
    + +
    +
    +
    + {{ form.password2.label }}{{ form.password2 }} +
    + +
    +
    + +
    + + +
    + {% endif %} +
    +
    +{% endblock %} + diff --git a/templates/client/place/catalog.html b/templates/client/place/catalog.html new file mode 100644 index 00000000..a8b6d39f --- /dev/null +++ b/templates/client/place/catalog.html @@ -0,0 +1,26 @@ +{% extends 'base_catalog.html' %} +{% load template_filters %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Места' %} + {{ filter_object.name }} +
    +{% endblock %} + + +{% block page_title %} +
    +

    {% trans 'Места' %}: {{ filter_object.name }}

    +
    +{% endblock %} + +{% block content_list %} + {% include 'includes/place/place_list.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/place/photo.html b/templates/client/place/photo.html new file mode 100644 index 00000000..5e43d427 --- /dev/null +++ b/templates/client/place/photo.html @@ -0,0 +1,25 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Выставки' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} + {% trans 'Фото' %} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/place/photo.html' with object=object %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/place/place_detail.html b/templates/client/place/place_detail.html new file mode 100644 index 00000000..7107a9b4 --- /dev/null +++ b/templates/client/place/place_detail.html @@ -0,0 +1,24 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Места' %} + {{ object.country }} + {{ object.city }} + {{ object.name }} +
    +{% endblock %} + + +{% block page_title %} +{% endblock %} + +{% block content_list %} + {% include 'client/includes/place/place_object.html' with place=object %} +{% endblock %} + +{% block paginator %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/place/place_list.html b/templates/client/place/place_list.html new file mode 100644 index 00000000..99f4bcd9 --- /dev/null +++ b/templates/client/place/place_list.html @@ -0,0 +1,24 @@ +{% extends 'base_catalog.html' %} +{% load i18n %} + +{% block bread_scrumbs %} +
    + {% trans 'Главная страница' %} + {% trans 'Места' %} +
    +{% endblock %} + + +{% block page_title %} +
    +

    {% trans 'Места' %}

    +
    +{% endblock %} + +{% block content_list %} + {% include 'includes/place/place_list.html' with object_list=object_list %} +{% endblock %} + +{% block paginator %} + {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} \ No newline at end of file diff --git a/templates/client/place/place_photo.html b/templates/client/place/place_photo.html index a3a54901..5da492dd 100644 --- a/templates/client/place/place_photo.html +++ b/templates/client/place/place_photo.html @@ -70,7 +70,7 @@ {% include 'client/popups/photo.html' %} {% endblock %} {% block scripts %} - + + + + + + + + + + + + + + +
    + + +
    +
    + + +
    + +
    + +
    + + +
      + + +
      +
    • + + + ru + +
      • +
      + + +
      + +
    • + + + en + +
      • +
      + + +
    +
    + +
    +
      +
    • RSS +
      • +
    • Facebook
      • +
    • LinkedIn
      • +
    • В контакте
      • +
    • Twitter
      • +
    + +
    + Регистрация + +
    + +
    + +
    + +
    + +
    + + + + + +
    + +
    + + + +
    + +
    + +
    +
    +
    + + +
    +
    + + +
    + + +
    +
    +
    ПОИСК СОБЫТИЙ
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    Тематика: + + Не важно + +
    + + +
    Место: + + Не важно + +
    + + +
    Период: + + + Не важно + + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + +
    +
     
    +
    +
    + +
    + +
    + + + + + + +
    + + +
    + Главная страница + + + Моя лента событий + + +
    + + +
    + + +
    +

    Моя лента событий:

    +
    + + +
    + + +
    +
    + Фильтрация ленты + + +
    +
    +

    Тематика: (Изменить):

    +
    +
    +
    +
    Авиакосмическая + промышленность
    + x +
    +
    +
    Анализ, измерение и + контроль
    + x +
    +
    +
    Вино, алкоголь, + табак
    + x +
    +
    +
    +
    +
    +

    Место проведения: (Изменить):

    + +
    +
    +
    +
    Северная Америка
    + x +
    +
    +
    Азия
    + x +
    +
    +
    Карибы
    + x +
    +
    +
    Европа
    + x +
    +
    +
    Африка
    + x +
    +
    +
    +
    +
    +
    + + + + + + + + + +
    + + +
    +

    Выставки 2013-2014

    + +

    Выставки - один из наиболее популярных инструментов среди маркетологов. Это + объясняется тем, что специализированные выставки предоставляют отличную + возможность быстро и в одном месте найти новых партнеров и клиентов, узнать о новых трендах + своей отрасли, послушать насыщенную деловую программу. Поэтому мы создали + Expomap.Ru именно в помощь специалистам отделов маркетинга и собственникам + бизнеса, предоставляя легкий и удобный поиск выставок, практические кейсы о + том, как правильно выбрать выставку, как организовать ее посещение за рубежом + или участие со стендом. Вы легко можете связаться с нашими + онлайн-консультантами через Skype или позвонив по тел. +7 499 999 12 07, и + получить бесплатную информацию об интересующей Вас выставке или рекомендации по + тем или иным вопросам.

    + +

    Сейчас в нашем каталоге представлены международные + выставки 2013 года, а также уже прошедшие мероприятия, начиная с 2008 года – со + всех стран и уголков мира. С помощью рубрикатора (левый блок "Каталог выставок") + или панели поиска (строка для ввода или расширенный поиск) Вы всегда сможете найти календарь выставок по интересующим Вас тематикам: строительные выставки, медицинские выставки, выставки недвижимости и другие. + Кроме тематик, рубрикатор дает возможность сортировать события: по алфавиту, по странам, по + городам, по датам. Объединить все эти критерии Вы можете, используя расширенный поиск. Итоговое + расписание выставок по Вашим критериям будет построено удобным + образом, начиная с ближайших событий.

    + +
    + + +
    +
    +
    + + + + +
    +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/client/static_client/html-cut/mail.html b/templates/client/static_client/html-cut/mail.html new file mode 100644 index 00000000..5f35c917 --- /dev/null +++ b/templates/client/static_client/html-cut/mail.html @@ -0,0 +1,311 @@ + + + + + + + + + + + +
    + + + + + + +
    + + + + +
      +
    • RSS
      • +
    • Facebook
      • +
    • LinkedIn
      • +
    • В контакте
      • +
    • Twitter
      • +
    +
    + + + + + + + + + +
    Выставки в Москве по тематике: Мебель, Дизайн интерьеров
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + +
    +     		+

    Foire de Pau 2013

    +

    Международная ярмарка потребительских товаров

    + добавить в расписание +
    Россия, Москва, ЦВК «Экспоцентр»
    +     		+ с 5 по 20 октября +
    + + + + +
    +     		+

    Foire de Pau 2013

    +

    Международная ярмарка потребительских товаров

    + добавить в расписание +
    Россия, Москва, ЦВК «Экспоцентр»
    +     		+ с 5 по 20 октября +
    + + + + +
    +     		+

    Foire de Pau 2013

    +

    Международная ярмарка потребительских товаров

    + добавить в расписание +
    Россия, Москва, ЦВК «Экспоцентр»
    +     		+ с 5 по 20 октября +
    + +
    + посмотреть все события +
    + +
    + + + + + + + + + + +
    Новости событий
    + + + + + + + + + + + + + + + + + + +
    + + + + +
    +     		+ + + + + +

    Foire de Pau 2013

    		05.10.2013
    + +

    VII Международный форум «АтомЭко 2013» пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим ...

    + +
    + + + + +
    +     		+ + + + + +

    Foire de Pau 2013

    		05.10.2013
    + +

    VII Международный форум «АтомЭко 2013» пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим ...

    + +
    + + + + +
    +     		+ + + + + +

    Foire de Pau 2013

    		05.10.2013
    + +

    VII Международный форум «АтомЭко 2013» пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим ...

    + +
    + +
    + посмотреть все новости +
    + +
    + + + + + + + + + +
    Фоторепортаж: Международный форум «АтомЭко 2013»
    + + + + + + + +
    + + + + + + + + + +
    + +

    Идея Russian Affiliate Congress and Expo возникла в ответ на необходимость развития бизнеса России и стран СНГ в соответствии с мировыми тенденциями. Партнерские программы — один из наиболее эффективных и широко применяемых на западе инструментов интернет маркетинга, доля которого на рынке интернет продвижения развитых стран около 40 %, для сравнения в России и странах СНГ на этот сегмент приходится около 10%. Разница очевидна.

    + +
    + +
    + посмотреть все фотрепортажи +
    + +
    + + + + + +
    + + + + + + + + +
    Аналитика для профессионалов
    + + + + + + + + +
    + + + + +
    +     		+ +

    Древние славянские практики для оздоровления души и тела презентуют на красноярской Ярмарке здоровья

    +

    VII Международный форум «АтомЭко 2013» пройдет 30-31 октября в Москве под знаком нулевого ущерба для экологии. Главная тема VIIМеждународного Форума «АтомЭко 2013»: «Атомная энергетика – стратегия нулевого ущерба», где будут обсуждаться вопросы по обращению с радиоактивными отходами (РАО) и отработавшим ...

    + +
    + +
    + + + + + + +
    + + + +
    + + + + + + +
    + Чтобы отписаться от этой рассылки, перейдите по ссылке + + © 2018 — 2013 Expomap.ru +
    + +
    + + \ No newline at end of file diff --git a/templates/client/static_client/html-cut/password_recovery.html b/templates/client/static_client/html-cut/password_recovery.html new file mode 100644 index 00000000..6bf125cd --- /dev/null +++ b/templates/client/static_client/html-cut/password_recovery.html @@ -0,0 +1,117 @@ + + + + + + + + + + + +
    + + + + + + +
    + + + + +
      +
    • RSS
      • +
    • Facebook
      • +
    • LinkedIn
      • +
    • В контакте
      • +
    • Twitter
      • +
    +
    + + + + + + + + +

    Ваша регистрация на портале Expomap

    + + + + + + + + + + + + + + + + + + + +
    +

    Добрый день, Михаил!

    +
    + Вы или кто-то еще сделал запрос на сброс пароля на сайте expomap.ru +
    + Вы можете восстановить доступ, нажав на кнопку ниже и указав новый пароль: +
    + подтвердить регистрацию +
    + Если вы не хотите сбрасывать пароль, просто проигнорируйте это сообщение +
    + + + +
    + + + + + + +
    + + + +
    + + + + + +
    + Чтобы отписаться от этой рассылки, перейдите по ссылке + + © 2018 — 2013 Expomap.ru +
    + +
    + + \ No newline at end of file diff --git a/templates/client/static_client/img/approved-logo.png b/templates/client/static_client/img/approved-logo.png index 7adc4e2c..6f28d68d 100644 Binary files a/templates/client/static_client/img/approved-logo.png and b/templates/client/static_client/img/approved-logo.png differ diff --git a/templates/client/static_client/img/mail/cl-logo-1.png b/templates/client/static_client/img/mail/cl-logo-1.png new file mode 100644 index 00000000..7eaaab33 Binary files /dev/null and b/templates/client/static_client/img/mail/cl-logo-1.png differ diff --git a/templates/client/static_client/img/mail/cl-logo-2.png b/templates/client/static_client/img/mail/cl-logo-2.png new file mode 100644 index 00000000..4a64c4dc Binary files /dev/null and b/templates/client/static_client/img/mail/cl-logo-2.png differ diff --git a/templates/client/static_client/img/mail/cl-logo-3.png b/templates/client/static_client/img/mail/cl-logo-3.png new file mode 100644 index 00000000..3783a0d7 Binary files /dev/null and b/templates/client/static_client/img/mail/cl-logo-3.png differ diff --git a/templates/client/static_client/img/mail/mail-banner.jpg b/templates/client/static_client/img/mail/mail-banner.jpg new file mode 100644 index 00000000..2d7edc22 Binary files /dev/null and b/templates/client/static_client/img/mail/mail-banner.jpg differ diff --git a/templates/client/static_client/img/mail/news-1.jpg b/templates/client/static_client/img/mail/news-1.jpg new file mode 100644 index 00000000..4535c4cb Binary files /dev/null and b/templates/client/static_client/img/mail/news-1.jpg differ diff --git a/templates/client/static_client/img/mail/phr-1.jpg b/templates/client/static_client/img/mail/phr-1.jpg new file mode 100644 index 00000000..9cd9fb1b Binary files /dev/null and b/templates/client/static_client/img/mail/phr-1.jpg differ diff --git a/templates/client/static_client/img/mail/phr-2.jpg b/templates/client/static_client/img/mail/phr-2.jpg new file mode 100644 index 00000000..671b6f26 Binary files /dev/null and b/templates/client/static_client/img/mail/phr-2.jpg differ diff --git a/templates/client/static_client/img/mail/phr-3.jpg b/templates/client/static_client/img/mail/phr-3.jpg new file mode 100644 index 00000000..cd6ba7ee Binary files /dev/null and b/templates/client/static_client/img/mail/phr-3.jpg differ diff --git a/templates/client/static_client/img/mail/phr-4.jpg b/templates/client/static_client/img/mail/phr-4.jpg new file mode 100644 index 00000000..42458c20 Binary files /dev/null and b/templates/client/static_client/img/mail/phr-4.jpg differ diff --git a/templates/client/static_client/img/map.png b/templates/client/static_client/img/map.png index 04891050..e006e14c 100644 Binary files a/templates/client/static_client/img/map.png and b/templates/client/static_client/img/map.png differ diff --git a/templates/client/static_client/img/no-logo.png b/templates/client/static_client/img/no-logo.png index 6149ef4c..a29836ad 100644 Binary files a/templates/client/static_client/img/no-logo.png and b/templates/client/static_client/img/no-logo.png differ diff --git a/templates/client/static_client/img/pic12.png b/templates/client/static_client/img/pic12.png index 5a5a1ffd..6fe246bb 100644 Binary files a/templates/client/static_client/img/pic12.png and b/templates/client/static_client/img/pic12.png differ diff --git a/templates/client/static_client/img/select2/select2-spinner.gif b/templates/client/static_client/img/select2/select2-spinner.gif new file mode 100644 index 00000000..5b33f7e5 Binary files /dev/null and b/templates/client/static_client/img/select2/select2-spinner.gif differ diff --git a/templates/client/static_client/img/select2/select2.png b/templates/client/static_client/img/select2/select2.png new file mode 100644 index 00000000..1d804ffb Binary files /dev/null and b/templates/client/static_client/img/select2/select2.png differ diff --git a/templates/client/static_client/img/select2/select2x2.png b/templates/client/static_client/img/select2/select2x2.png new file mode 100644 index 00000000..4bdd5c96 Binary files /dev/null and b/templates/client/static_client/img/select2/select2x2.png differ diff --git a/templates/client/static_client/img/signature.png b/templates/client/static_client/img/signature.png index 2eeb0522..60c78cb6 100644 Binary files a/templates/client/static_client/img/signature.png and b/templates/client/static_client/img/signature.png differ diff --git a/templates/client/static_client/img/soc.png b/templates/client/static_client/img/soc.png index 275bfd7a..59fc664b 100644 Binary files a/templates/client/static_client/img/soc.png and b/templates/client/static_client/img/soc.png differ diff --git a/templates/client/static_client/img/sprites.png b/templates/client/static_client/img/sprites.png index 53172223..805bb799 100644 Binary files a/templates/client/static_client/img/sprites.png and b/templates/client/static_client/img/sprites.png differ diff --git a/templates/client/static_client/img/wether.png b/templates/client/static_client/img/wether.png index 463b42f9..3737c197 100644 Binary files a/templates/client/static_client/img/wether.png and b/templates/client/static_client/img/wether.png differ diff --git a/templates/client/static_client/js/_modules/block.common.js b/templates/client/static_client/js/_modules/block.common.js new file mode 100644 index 00000000..afd4892b --- /dev/null +++ b/templates/client/static_client/js/_modules/block.common.js @@ -0,0 +1,375 @@ +var EXPO = EXPO || {}; //isolated namespace +//общий для всех страниц модуль Функционал общий для всех страниц +if (EXPO.common){ + console.warn('WARNING: EXPO.common is already defined!'); +}else { + + EXPO.common = (function () { +// variables + var that = {}; + var matches = function(el, selector) { + return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector); + }; + that.settings = {}; //свойства по умолчанию + // Валидация форм, каждый объект содержит поля объектов формы и методы работы с формой + var Validation = function(obj){ + //поля над которыми проводится валидация + this.fields = []; + //флаг которые опдвтерждает отправку формы. если true то ошибок нет + this.allIsClear = false; + this.ajaxUrl = obj.getAttribute('action'); + this.DOM = obj; + this._initFields(); + this._eventController(); + + + }; + Validation.prototype = { + //связывает данные объекта с html кодом + _eventController: function () { + var self = this; + if(this.DOM.addEventListener){ + this.DOM.addEventListener("submit", function (event) { + self.validate(); + event.preventDefault(); + return false; + }, false); //Modern browsers + }else if(this.DOM.attachEvent){ + this.DOM.attachEvent('onsubmit', function (event) { + self.validate(); + event.preventDefault(); + return false; + }); //Old IE + } + }, + //берет все поля с классом required + _initFields: function () { + //this.fields = this.DOM.querySelectorAll('.required input'); + + }, + //проводит валидацию, выводит сообщение об ошибках + validate: function () { + var self = this, + formData = $(self.DOM).serialize(), + responseData, + inputObj ={}, + errBoxClass = 'err-message-box', + DOMerrBox = self.DOM.querySelector('.'+errBoxClass), + errBoxText = DOMerrBox.innerHTML, + handler = function (data){ + responseData = data; + self.unHighlightFields(); + if(responseData.success){ + if(DOMerrBox){ + EXPO.common.removeClass(DOMerrBox, 'active'); + } + window.location.reload(); + }else{ + EXPO.common.removeClass(DOMerrBox, 'active'); + inputObj ={}; + self.fields = []; + for(var prop in responseData.errors) { + if (!responseData.errors.hasOwnProperty(prop)) continue; + if(prop != '__all__'){ + inputObj ={'name':prop, 'id':'id_'+prop, 'errorText':responseData.errors[prop]}; + //inputObj.name = prop; + //inputObj.id = 'id_'+prop; + //inputObj.errorText = responseData.errors[prop]; + self.fields.push(inputObj); + }else{ + if(DOMerrBox){ + EXPO.common.addClass(DOMerrBox, 'active'); + if(errBoxText.indexOf(responseData.errors[prop]) < 0) { + DOMerrBox.insertAdjacentHTML('beforeend', responseData.errors[prop]+' '); + + } + + } + + } + + + } + self.highliteFields(); + } + + + }; + self.unHighlightFields(); + EXPO.common.postRequest(formData, self.ajaxUrl,handler); + + }, + //подсвечивает неправильно введенные поля, + highliteFields: function () { + var DOMfield, + DOMfieldWrap; + for(var i = 0; i < this.fields.length; i++){ + DOMfield = this.DOM.querySelector('#'+ this.fields[i].id); + DOMfieldWrap = DOMfield.parentNode; + EXPO.common.addClass(DOMfieldWrap,'required'); + EXPO.common.addClass(DOMfieldWrap,'err'); + + } + + }, + unHighlightFields: function () { + var DOMfield, + DOMfieldWrap; + for(var i = 0; i < this.fields.length; i++){ + DOMfield = this.DOM.querySelector('#'+ this.fields[i].id); + DOMfieldWrap = DOMfield.parentNode; + EXPO.common.removeClass(DOMfieldWrap,'required'); + EXPO.common.removeClass(DOMfieldWrap,'err'); + } + }, + submit: function () { + + } + + }; +//dependences + that.forms = []; + $(function () { + $('form.validate').each(function () { + that.forms.push(new Validation(this)); + }); + + }); +//private + $(function () { + /* Нестандартное оформление для поля checkbox */ + $.fn.customRadioCheck = function () { + return $(this).each(function () { + var $el = $(this); + var type = $el.attr("type"); + var $label = $el.closest("label"); + var $customCheckbox = $el.wrap("").parent(); + $label.addClass("custom-radio-check"); + function setState () { + if (type == 'radio') { + var name = $el.attr('name'); + var $radios = $('input[type="radio"]').filter('[name="' + name + '"]'); + $radios.each(function () { + var $container = $(this).closest('.custom-radio'); + $container.removeClass('checked'); + if ($(this).is(':checked')) { + $container.addClass('checked'); + } + }); + } else { + if ($el.prop("checked")) { + $customCheckbox.addClass("checked"); + } else { + $customCheckbox.removeClass("checked"); + } + } + $el.trigger('blur'); + } + setState(); + $el.on("change", setState); + }); + }; + + + $("input[type='checkbox'], input[type='radio']").customRadioCheck(); + // add to calendar button click event functional + $('.addcalendar, .removecalendar').on('click', function(event){ + event.preventDefault(); + var $this = $(this); + var url = $this.attr('href'); + $.get(url, function(data){ + if (data.not_authorized){ + $.fancybox.open('#pw-login'); + } + else{ + if(data.success){ + if(data.in){ + if($this.hasClass('addcalendar')){ + $this.hide(); + $this.siblings('.removecalendar').show() + } + } + else{ + if($this.hasClass('removecalendar')){ + $this.hide(); + $this.siblings('.addcalendar').show() + } + } + } + } + }); + + }); + }); + +// methods + //инициализация общих свойств + that.init = function (options) { + $.extend(this.settings, options); + var self = this; + + + + + }; + that.hasClass = function (DOM, className) { + if (DOM.classList) + return DOM.classList.contains(className); + else + return new RegExp('(^| )' + className + '( |$)', 'gi').test(el.className); + }; + that.addClass = function (DOM, className) { + if (!that.hasClass(DOM, className)) { + if (DOM.classList) + DOM.classList.add(className); + else + DOM.className += ' ' + className; + } + return DOM; + }; + that.removeClass = function (DOM, className) { + var newClass = ' ' + DOM.className.replace(/[\t\r\n]/g, ' ') + ' '; + if (that.hasClass(DOM, className)) { + if (DOM.classList){ + DOM.classList.remove(className); + }else{ + while (newClass.indexOf( ' ' + className + ' ') >= 0) { + newClass = newClass.replace(' ' + className + ' ', ' '); + } + DOM.className = newClass.replace(/^\s+|\s+$/g, ' '); + } + } + return DOM; + }; + //Jquery .closest analog for pure js + that.closest = function(el, className) { + var fn = function(className){ + return that.hasClass(el, className); + }; + while (el) { + if (fn(className)) return el; + el = el.parentNode; + } + }; + //JQUERY .children alternative ie 9+ + that.children = function (elm, sel){ + var ret = [], i = 0, l = elm.childNodes.length; + for (var i; i < l; ++i){ + if (matches(elm.childNodes[i], sel)){ + ret.push(elm.childNodes[i]); + } + } + return ret; + }; + // MEtHOD for make ajax GET Jquery.ajax.request and launch handler if exist or return data + that.postRequest = function (dataToSend,url,handler) { + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'POST', + url: url, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + console.log('data recieved:'); + console.log(data); + console.log(JSON.stringify(data)); + + handler(data); + } else{ + return data; + } + } + }); + + }; + that.getRequest = function (dataToSend,url,handler) { + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: url, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + console.log('data recieved:'); + console.log(data); + console.log(JSON.stringify(data)); + + handler(data); + } else{ + return data; + } + } + }); + + }; + /** + * prototype of a modal window - general for all + * @param options + * @constructor + */ + that.Modal = function (options) { + var self = this; + this.id; + this.opt = options; + this.DOMwrap = document.getElementById(options.id); + this.DOM = this.DOMwrap.querySelector('.'+ options.wrapClass); + + $('.modal-close',this.DOM).on('click', function () { + self.close(); + }); + $('.modals > *').on('click', function (ev) { + if($(ev.target.parentNode).find(self.DOMwrap).length){ + self.close(); + + } + }); + + }; + + that.Modal.prototype = { + /** + * @param {string} selector + * @public + */ + pullData: function (selector) { + this.id = selector.substr(1); + $(selector).show().siblings().hide(); + this.refresh(); + + }, + /** + * open and show modal + * @public + */ + open: function () { + $(this.DOMwrap).fadeIn(); + + that.addClass(document.body, 'ov-hidden'); + }, + /** + * close and hide modal window + * @public + */ + close: function () { + $(this.DOMwrap).fadeOut(); + that.removeClass(document.body, 'ov-hidden'); + }, + /** + * initialize modal window + * @public + */ + refresh: function () { + var self = this; + self.DOM.style.width = self.opt.size[self.id].width +'px'; + self.DOM.style.minHeight = self.opt.size[self.id].height +'px'; + self.DOM.style.marginLeft = -(self.opt.size[self.id].width/2)+'px'; + self.DOM.style.marginTop = -(self.opt.size[self.id].height/2)+'px'; + } + } + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/block.exposition.list.js b/templates/client/static_client/js/_modules/block.exposition.list.js new file mode 100644 index 00000000..8eb9cfcd --- /dev/null +++ b/templates/client/static_client/js/_modules/block.exposition.list.js @@ -0,0 +1,71 @@ +var EXPO = EXPO || {}; //isolated namespace +EXPO.exposition = EXPO.exposition || {}; +if (EXPO.exposition.list){ + console.warn('WARNING: EXPO.place.object is already defined!'); +}else { + + EXPO.exposition.list = (function () { +// dependencies + 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, + handler = function (data) { + if (data.success){ + console.log('ok'); + }else{ + console.log('data not send'); + } + + }; + data[this.inputName] = this.DOMinput.value; + response = com.getRequest(data,this.url,handler); + } + }; + + that.opt = {}; //свойства по умолчанию +//private + $(function () { + }); + +// methods + //инициализация общих свойств + 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); + }); + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/block.search.js b/templates/client/static_client/js/_modules/block.search.js new file mode 100644 index 00000000..46188a05 --- /dev/null +++ b/templates/client/static_client/js/_modules/block.search.js @@ -0,0 +1,2114 @@ +var EXPO = EXPO || {}; //isolated namespace + +// module requires JQuery library, dna.js template engine (http://dnajs.org/) +// protection against duplication of a module code +if (EXPO.searchBlock){ + console.warn('WARNING: EXPO.searchBlock is already defined!'); +}else{ + + EXPO.searchBlock = (function() { + + // variables + + var that = {}; + /** + * default module setting + * @type {{place: {id: string, selectedItemTemplate: string, ajaxUrl: string}, subject: {id: string, ajaxUrl: string}}} + */ + that.settings = { + place:{ + id:'pw-place', + selectedItemTemplate:'csb-selected', + ajaxUrl:'http://hit.expomap.ru/search-form/' + }, + subject:{ + id:'pw-subj', + ajaxUrl:'http://hit.expomap.ru/search-form/' + } + }; + that.lang ={}; + //dependence's + // module require dna.js tiny templating engine + var common = EXPO.common; + //private + + var Json2URI = function (jsonObj) { + var str = Object.keys(jsonObj).map(function(key){ + return encodeURIComponent(key) + '=' + encodeURIComponent(jsonObj[key]); + }).join('&'); + return ('?'+str); + }, + /** + * make ajax GET request and launch handler if exist or return data + * @param {Object|string} dataToSend + * @param {string} url + * @param {function} handler - function to execute when task is ready + */ + getRequest = function (dataToSend,url,handler) { + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: url, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + handler(data); + } else{ + return data; + } + } + }); + }, + /** + * rename name of property of an object/ Check for the old property name to avoid a ReferenceError in strict mode. + * @param {Object} obj object to rename its properties + * @param {string} oldName + * @param {string} newName + * @returns {renameProperty} + */ + renameProperty = function (obj,oldName, newName) { + if (obj.hasOwnProperty(oldName)) { + obj[newName] = obj[oldName]; + + } + return this; + }, + /** + * analogue of Array.length but for object + * @param {Object} obj - Object to count its method + * @returns {number} + */ + getObjectLength = function (obj) { + var size = 0, key; + for (key in obj) { + if (obj.hasOwnProperty(key)) size++; + } + return size; + }, + /** + * getSelectedToString returns string that contains selected values in both modal windows. values separated by ',' + * @param {string} container + * @param {number} cutLength - length to cut off string + * @returns {string} string that is cutted off + */ + getSelectedToString = function(container, cutLength){ + var $container = $('#'+container), + index = 0, + stringToReturn = '', + closingSymbol = '...', + closerText = EXPO.searchBlock.settings.closerText, + closerTextSingle = EXPO.searchBlock.settings.closerTextSingle, + dividerSymbol = ''; + $element = $container.find('.csbs-text'); + if($element.length > 2){ + if($element.eq(0).text().length < cutLength){ + dividerSymbol = ','; + stringToReturn += $element.eq(0).text() + dividerSymbol + $element.eq(1).text() + closerText.replace('_',$element.length-2); + }else{ + stringToReturn += $element.eq(0).text() + closerText.replace('_',$element.length-1); + } + + } else if($element.length == 2){ + if(($element.eq(0).text().length+$element.eq(1).text().length) < cutLength){ + dividerSymbol = ','; + stringToReturn += $element.eq(0).text() + dividerSymbol + $element.eq(1).text(); + + } else if($element.eq(0).text().length < cutLength){ + dividerSymbol = ','; + stringToReturn += $element.eq(0).text() + dividerSymbol + $element.eq(1).text() + closerTextSingle.replace('_',$element.length-2); + }else{ + stringToReturn += $element.eq(0).text() + closerTextSingle.replace('_',$element.length-1); + } + }else if($element.length){ + stringToReturn += $element.eq(0).text(); + }else{ + stringToReturn = false; + } + return stringToReturn; + }, + /** + * ajax pending process indicator + * @type {*|jQuery|HTMLElement} индикатор загрузки диалоговых окон + */ + $waiter = $('.wait-ajax.absolute'); + + /** + * Constructor for modal window 'select subject' + * @param {Object} options + * @constructor + */ + var SubjectModal = function(options){ + /** + * options init + * @type {Object} + */ + this.opt = options; + var self = this, index = 0, + $subjWrap = $('#'+self.opt.subjectTriggerWrapId), + $topicBox, + modalId = self.opt.id, + $modal = $('#'+modalId), + $checkBox = $('.csb-menu-input', $modal), + $selectedItemsWrap = $('.csb-selected-items',$modal), + setDefault = self.opt.defaultOn, + applyBtnClass = self.opt.applyBtnClass, + $modalTrigger = $('#'+self.opt.modalTrigger), + /** + * executed after render of modal Window + * @function + */ + afterRenderHandler = function () { + $waiter.hide(); + + }, + /** + * fill text beneth search field + * @function triggerSetText + */ + triggerSetText = function () { + var selectedString, + cutLength = 16; + + selectedString = getSelectedToString(self.opt.selectedItemsContainer,cutLength); + if(selectedString && selectedString != '~~text~~' && selectedString != '~~text~~...'){ + $modalTrigger.text(selectedString); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + }else{ + $modalTrigger.text($modalTrigger.data('default')); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + } + }; + + /** + * this modal window DOM Instance + * @type {*|jQuery|HTMLElement} + */ + this.$modalInst = $('#'+modalId); + + /** + * clones of tags for selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + * @type {Object} + */ + this.itemsSelected = {}; + /** + * clones of sublist of selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + * @type {Object} + */ + this.sublist= {}; + /** + * Jquery object of filtering input (autocomplete input) + * @type {*|jQuery|HTMLElement} + */ + this.$inputFilter = $('#'+self.opt.filterInputId); + this.$selectedItemsWrap = $selectedItemsWrap; + + $(function () { + // topic checkbox selected event + $('.topicChecks', $subjWrap).on('change', function () { + + if($(this).prop('checked')){ + self._setVisible($(this).val()); + + }else{ + self._setUnvisible($(this).val()); + } + }); + // selected topic by default self.opt.defaultOn[] + for(index = 0; index < setDefault.length; index++){ + $topicBox = $('#'+setDefault[index]) + $topicBox.prop('checked',true); + $topicBox.trigger('change'); + + + } + //modal list and sublist behavior + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'); + // no more than once execution + if($(this).attr('data-sub') == 'true'){ + if($(this).parent().hasClass('level1')){ + + if(!$sublist.children().length){ + $waiter.show(); + self._renderSublist({name:name,id:id}, tmplId, afterRenderHandler); + $(this).parent().addClass('active'); + }else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + // modal theme checkbox change behavior + $checkBox.on('change', function (event, param) { + var checkboxId = $(this).attr('id'), + $label = $(this).closest('.custom-radio-check'), + $parent = $(this).closest('.level'), + $parentCheckBox = $parent.parent().closest('.level').children('.custom-radio-check').find('.csb-menu-input'), + $sublist = $parent.children('.sublist'); + if(!param){ + + if($label.hasClass('active')){ + $label.removeClass('active'); + }else{ + $label.addClass('active'); + } + if(this.checked){ + var text = $(this).closest('.level').find('.trigger').first().text(), + tplObj = {'text':text,'id':checkboxId}; + + //tags field logic + if(!$selectedItemsWrap.hasClass('visible')){ + $selectedItemsWrap.addClass('visible'); + } + self._addTag(checkboxId, tplObj); + + // proper selection and selection group logic + if($sublist.length){ + $('.csb-menu-input',$sublist).each(function () { + var thisId = this.getAttribute('id'), + tagText = $(this).closest('.level').find('.trigger').first().text(), + DOMlabel = common.closest(this,'custom-radio-check'); + + this.checked = true; + self._destroyTag(thisId); + common.addClass(DOMlabel,'active'); + }); + + }else{ + $parent = $parent.parent().closest('.level') + // if checked items count equals all items count then parent item is checked and tags for children - deleted + if ( $('.csb-menu-input',$parent.find('.sublist')).length == $('.csb-menu-input:checked',$parent.find('.sublist')).length){ + var parentId = $parentCheckBox[0].getAttribute('id'), + parentText = $parentCheckBox.closest('.level').find('.trigger').first().text(), + DOMlabel =common.closest(this,'custom-radio-check'), + DOMParentLabel = common.closest(DOMlabel.parentNode.parentNode,'level'), + parentObj = {'text':parentText,'id':parentId}; + $('.csb-menu-input:checked',$parent.find('.sublist')).each(function () { + + self._destroyTag(this.getAttribute('id')); + }); + $parentCheckBox.prop('checked', true); + common.addClass($(DOMParentLabel).find('.custom-radio-check')[0],'active'); + + //$parentCheckBox.trigger('change',['true']); + self._addTag(parentId,parentObj); + } + } + + //!uncheck event + }else { + self._destroyTag(checkboxId); + if(!$selectedItemsWrap.children('.dna-clone').length){ + $selectedItemsWrap.removeClass('visible'); + + } + //uncheck all sublist items while parent item is unchecked + if($sublist.length){ + //destroy all tags for sublist items + $('.csb-menu-input',$sublist).each(function () { + var thisId = $(this).attr('id'), + DOMlabel = common.closest(this,'custom-radio-check'); + this.checked = false; + + common.removeClass(DOMlabel, 'active'); + self._destroyTag(thisId); + }); + }else{ + // parent item is unchecked and tags for every children item are made + if($parentCheckBox.length && $parentCheckBox[0].checked){ + var DOMlabel = common.closest($parentCheckBox[0],'custom-radio-check'), + DOMParentItem = common.closest(DOMlabel,'level'), + DOMSublist = DOMParentItem.querySelector('.sublist'); + $parentCheckBox.prop('checked', false); + common.removeClass(DOMlabel, 'active'); + self._destroyTag($parentCheckBox.attr('id')); + // checks children items + + $('.csb-menu-input:checked',DOMSublist).each(function () { + var id = this.getAttribute('id'), + tagText = common.closest(this, 'level').querySelector('.trigger').textContent, + tagObj = {'text':tagText,'id':id}; + self._addTag(id,tagObj); + }); + } + } + + } + triggerSetText(); + } + }); + //delete tag behavior + $('.csbs-del', $selectedItemsWrap).on('click', function () { + var checkboxId = $(this).attr('data-checkbox-id'), + $uncheckBoxes = $('#'+checkboxId); + $uncheckBoxes.prop('checked', false); + $uncheckBoxes.trigger('change'); + dna.destroy(self.itemsSelected[checkboxId]); + if(!$selectedItemsWrap.children('.dna-clone').length){ + $selectedItemsWrap.removeClass('visible'); + } + return false; + }); + $('.clear', $modal).on('click', function () { + self.resetList(); + return false; + }); + self._autocompleteInit(); + $('.'+applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + // кнопка "очистить параметры" + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).on('click', function () { + self.resetList(); + }); + }); + }; + /** + * methods + * @type {{_getAjax: Function, _setVisible: Function, _setUnvisible: Function, _checkCheckBox: Function, check: Function, _autocompleteInit: Function, _renderSublist: Function, _loadParentTree: Function, _destroyTag: Function, _addTag: Function, _slideToggle: Function, resetList: Function, applyHandler: Function}} + */ + SubjectModal.prototype = { + /** + * get ajax response when want sublists + * @param {Object|sting} dataToSend + * @param {function} handler - fires after request is complete + * @private + */ + _getAjax: function (dataToSend, handler) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $waiter.css({display:'block'}); + $.ajax({ + type: 'GET', + url: self.opt.ajaxUrl, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + $waiter.hide(); + handler(data); + } else{ + return data; + + } + } + }); + }, + /** + * filter list accordingly to checked checkbox in 'select type' part of modal + * @param {string} type + * @private + */ + _setVisible:function(type){ + var self = this; + $('.'+type, self.$modalInst).addClass('visible'); + }, + /** + * filter list accordingly to checked checkbox in 'select type' part of modal + * @param {string} type + * @private + */ + _setUnvisible: function (type) { + var self = this, + $li = $('.'+type, self.$modalInst); + $li.find('input[type="checkbox"]').each(function () { + var $this = $(this); + if($this.prop('checked')){ + $this.prop('checked', false); + $this.trigger('change'); + } + }); + $li.find('.dna-container').each(function () { + if($(this).children().length){ + $(this).addClass('hidden'); + } + }); + $li.removeClass('visible'); + + }, + /** + * check particular checkbox input + * @param {string} id + * @param {string} name + * @private + */ + _checkCheckBox: function (id,name) { + var self = this, + $chckBox; + if(name == 'th'){ + $chckBox = $('#tid_'+id, self.$modalInst); + }else if(name == 'tg'){ + $chckBox = $('#tgid_'+id, self.$modalInst); + } + if($chckBox.length && !$chckBox.prop('checked')){ + $chckBox.prop('checked',true); + $chckBox.trigger('change'); + } + + }, + /** + * check particular checkbox input + * @param {string} id + * @param {string} name + * @public + */ + check: function (id,name) { + var self = this, + $chckBox; + if(name == 'th'){ + $chckBox = $('#tid_'+id, self.$modalInst); + }else if(name == 'tg'){ + $chckBox = $('#tgid_'+id, self.$modalInst); + } + if($chckBox.length){ + $chckBox.prop('checked',true); + $chckBox.trigger('change'); + $chckBox.parent().addClass('active'); + } + + }, + /** + * initiliazing and setup autocomplete field for subject list + * @private + */ + _autocompleteInit : function () { + var self = this, dataObj, text , form = self.$inputFilter.attr('data-form'),index, + $completeWrap = $('#'+self.opt.autoCompleteId), + firstComplete = true, + selectTag = function (event, ui) { + //check of repeating execution + $waiter.show(); + var firstTime = true; + for (var prop in self.sublist) { + for (var prop2 in self.sublist[prop]) { + if (prop2 == ui.item.value){ + firstTime = false; + } + + } + } + if($('#tid_'+ui.item.value+'[name="'+ui.item.name+'"]:checked').length){ + firstTime = false; + } + // ban of repeating execution + if (firstTime) { // konec + var $checkbox = $('#tid_' + ui.item.value+'[name="'+ui.item.name+'"]'), + requestObj, requestName, + treeLoadHandler = function (data) { + // make checkboxes selected after loading + if(getObjectLength(data)){ + self._loadParentTree(data, function () { + self._checkCheckBox(ui.item.value,'tg'); + $waiter.hide(); + }); + }else{ + $waiter.hide(); + console.warn() + } + + }; + // load tree related to selected item + if (!$checkbox.length) { + + requestObj = { + id: ui.item.value, + name: ui.item.name + }; + getRequest(requestObj, self.opt.getParentUrl, treeLoadHandler); + } else{ + $waiter.hide(); + $checkbox.prop('checked', true); + $checkbox.trigger('change'); + } + + } + }, + requestHandler = function(data){ + dataObj = data; + for(index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index],'text','label'); + } + for(index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index],'id','value'); + } + if(!self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete({ + source:dataObj, + minLength: 0, + appendTo:$completeWrap, + select:function(event, ui){ + self.$inputFilter.val(''); + self.$inputFilter.trigger('keyup'); + selectTag(event, ui); + event.preventDefault(); + // return ui.label; + } + }); + self.$inputFilter.autocomplete('search',""); + firstComplete = false; + }else{ + + self.$inputFilter.autocomplete('search',""); + } + + }; + // var newData = ['banan','banan2','banan3','banan4','banan5']; + self.$inputFilter.attr('autocomplete', 'on'); + + self.$inputFilter.on('keyup', function (event) { + text = $(this).val(); + event.stopImmediatePropagation(); + + + if (text.length > 2 && firstComplete){ + getRequest({'term':text, 'form':form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete( "destroy" ); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + // + /** + * render first level sublist + * @param {Object} dataObj + * @param {number|string} tmplId + * @param {function} handler + * @private + */ + _renderSublist: function (dataObj, tmplId, handler) { + var self = this, + index = 0, + template = tmplId + '-sub', + ajaxHandler = function (data) { + if(data.length){ + + self.sublist[template] = {}; + + // for dna.clone definition see dnajs.org + for (index ; index < data.length; index++) { + self.sublist[template][data[index].id] = dna.clone(tmplId, data[index]); + + } + handler(data.length); + }else{ + $waiter.hide(); + } + }; + self._getAjax(dataObj, ajaxHandler); + }, + /** + * if there is no children element in list, loads list that is parent to children element + * @param {Object} data + * @param {number|string} handler + * @param {function} counter + * @private + */ + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj,nestedSublistTemplateId, + /** + * makes request in order to recieve children list information fires after request for parent list + * @param {number} length + * @function + */ + handlerParent = function (){ + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.show(); + + + optObj = { + name:dataObj.name, + id:dataObj.id + }; + sublistTemplateId = $('#tid_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerParent); + + + }, + /** + * destroy tag and clear tags block.for dna.clone definition see dnajs.org + * @param {string} checkboxId + * @private + */ + _destroyTag:function(checkboxId){ + var self = this; + if(self.itemsSelected[checkboxId]){ + dna.destroy(self.itemsSelected[checkboxId]); + + } + }, + /** + * for dna.clone definition see dnajs.org + * @param {number} checkboxId + * @param {Object} tplObj + * @private + */ + _addTag: function (checkboxId, tplObj) { + var self = this; + self.itemsSelected[checkboxId] = dna.clone(self.opt.selectedItemTemplate,tplObj); + }, + /** + * hide or show sublists according active selected link + * @param {*|jQuery|HTMLElement} $sublist + * @param {*|jQuery|HTMLElement} $this + * @private + */ + _slideToggle:function ($sublist, $this){ + if($sublist.hasClass('hidden')){ + $sublist.removeClass('hidden'); + $this.addClass('active'); + }else{ + $sublist.addClass('hidden').find('ul').addClass('hidden'); + $this.removeClass('active'); + } + + }, + /** + * reset all selected items, uncheck all selected checkboxes + * @public + */ + resetList: function () { + var self = this; + for (var key in self.itemsSelected) { + if (self.itemsSelected.hasOwnProperty(key)) { + $('#'+key, self.$selfContainer).prop('checked', false).trigger('change'); + + dna.destroy(self.itemsSelected[key]); + } + } + self.$selectedItemsWrap.removeClass('visible'); + }, + // кнопка применить + applyHandler: function (it) { + + } + + + }; + + /** + * Constructor for modal window 'select place' + * @param {Object} options + * @constructor + */ + var PlacesModal = function(options){ + /** + * object properties + * @type {Object} + */ + this.opt = options; + var self = this, + $modal = $('#'+self.opt.id), + $checkBox = $('input[type="checkbox"]', $modal), + $selectedItemsWrap = $('.csb-selected-items',$modal), + DOMTagsWrapper = $('.csb-selected-items',$modal)[0], + $modalTrigger = $('#'+self.opt.modalTrigger), + applyBtnClass = self.opt.applyBtnClass, + idPrefix = 'id_', + /** + * set trigger link text under the search field + * @function + */ + triggerSetText = function () { + var selectedString, + cutLength = 16; + selectedString = getSelectedToString(self.opt.selectedItemsContainer,cutLength); + if(selectedString && selectedString != '~~text~~' && selectedString != '~~text~~...'){ + $modalTrigger.text(selectedString); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + + }else{ + $modalTrigger.text($modalTrigger.data('default')); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + + } + }; + /** + * current template instances + * @type {Object} + */ + this.curDNA = {}; + /** + * place modal list items that had selected + * @type {Object} + */ + this.itemsSelected = {}; + this.selectedWrap = $selectedItemsWrap; + this.$selfContainer = $modal; + this.$modal = $modal; + this.idPrefix = idPrefix; + /** + * flag for management of turn of asynchronous requests + * @type {boolean} + */ + this.isReceived = true; + + /** + * Jquery object of filtering input (autocomplete input) + * @type {*|jQuery|HTMLElement} + */ + this.$inputFilter = $('#'+self.opt.filterInputId); + $(function () { + self._autocompleteInit(); + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + that = this, + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'), + afterRenderHandler = function (elem, data) { + var DOMParent = common.closest(that,'level'), + DOMParentCheckbox = DOMParent.querySelector('.csb-menu-input'); + $('.csb-menu-input', $sublist).each(function () { + var DOMCheckboxWrap = common.closest(this,'custom-radio-check'); + if(!this.selected){ + + if(DOMParentCheckbox.checked){ + this.checked = true; + common.addClass(DOMCheckboxWrap,'active'); + } + } + }); + $waiter.hide(); + + }; + // no more than once execution + if($(this).attr('data-sub') == 'true'){ + if($(this).parent().hasClass('level1')){ + + if(!$sublist.children().length){ + $waiter.show(); + self._renderSublist({name:name,id:id}, tmplId, afterRenderHandler); + }else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + }else if($(this).parent().hasClass('level2')){ + if(!$sublist.children().length){ + self._renderNested({name:name,id:id}, afterRenderHandler, tmplId, id); + $(this).parent().addClass('active'); + } + else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + + $checkBox.on('change', function (event, param) { + + var id = this.getAttribute('id'), + fakeCheckboxClass = 'custom-radio-check', + fakeCheckbox = common.closest(this, fakeCheckboxClass), + itemClass = 'level', + activeClass = 'active', + sublistClass = 'sublist', + checkboxClass = 'csb-menu-input', + highestItemClass = 'level1', + tagClass = 'csb-selected', + tagButtonClass = 'csbs-del', + triggerClass = 'trigger', + tagIdAttribute = 'data-checkbox-id', + + DOMParentRow = common.closest(this, itemClass), + + DOMParentItem = common.hasClass(DOMParentRow, highestItemClass) == false?common.closest(DOMParentRow.parentNode, itemClass):DOMParentRow, + DOMParentCheckbox = DOMParentItem.querySelector('.'+checkboxClass), + DOMSublist = DOMParentItem.querySelector('.'+sublistClass), + DOMSublistInner = DOMParentRow.querySelector('.'+sublistClass), + DOMHighestItem = common.closest(this, highestItemClass), + DOMHighestCheckbox = DOMHighestItem.querySelector('.'+checkboxClass), + selectSublist = function (it) { + var DOMParentItem = common.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.'+sublistClass); + $('.'+checkboxClass, DOMSublist).each(function () { + selectItem(this); + }); + + }, + unSelectSublist = function (it) { + var DOMParentItem = common.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.'+sublistClass); + $('.'+checkboxClass, DOMSublist).each(function () { + unSelectItem(this); + }); + + }, + selectParent = function (it) { + var DOMParentRow = common.closest(it, itemClass), + DOMParentItem; + if(common.hasClass(DOMParentRow,'level1')){ + DOMParentItem = DOMParentRow; + }else{ + DOMParentItem = common.closest(DOMParentRow.parentNode, itemClass); + } + + common.addClass(DOMParentItem.querySelector('.'+fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.'+checkboxClass).checked = true; + + //it.selected = true; + + }, + unSelectParent = function (it) { + var DOMParentRow = common.closest(it, itemClass), + DOMParentItem = common.closest(DOMParentRow.parentNode, itemClass) || DOMParentRow; + + common.removeClass(DOMParentItem.querySelector('.'+fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.'+checkboxClass).checked = false; + //it.checked = false; + + }, + selectItem = function (it) { + var itFakeCheckbox = common.closest(it, fakeCheckboxClass); + common.addClass(itFakeCheckbox, activeClass); + it.checked = true; + + }, + unSelectItem = function (it) { + var itFakeCheckbox = common.closest(it, fakeCheckboxClass); + common.removeClass(itFakeCheckbox, activeClass); + it.checked = false; + }, + allChildrenSelected = function () { + //var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'), + var DOMSublistParent = common.closest(DOMSublist,sublistClass), + $selected = $(DOMSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked'), + selectedCount = $selected.length, + //allCount = DOMSublist.querySelectorAll('.'+checkboxClass).length; + allCount = $(DOMSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass).length; + + if(allCount == selectedCount && selectedCount != 0){ + return true; + } else{ + return false; + } + }, + parentSelected = function () { + var parentCheckbox = DOMParentItem.querySelector('.'+checkboxClass); + if(parentCheckbox.checked){ + return true; + }else{ + return false; + } + + }, + // Функционал добавления тегов: если есть в панели выбранный элемент либо его дочерние то удалить эти эдементы и разместить выбранный; иначе разместить выбранные. + refreshTags = function (it) { + var DOMSublist = common.closest(it,sublistClass); + var DOMItem = common.closest(it,itemClass); + var DOMSublistInner = DOMItem.querySelector('.'+sublistClass); + var DOMAllTags = DOMTagsWrapper.querySelectorAll('.'+tagClass); + var ARRsublist; + var ARRsublistChildren = DOMSublist.querySelector('.'+sublistClass)?$('.'+checkboxClass+':checked',DOMSublist.querySelector('.'+sublistClass)):null; + var ARRsublistChildrenLength = ARRsublistChildren?ARRsublistChildren.length:null; + var ARRSublistIds = []; + var ARRAllTagsIds = []; + var allTagsLength = 0; + var sublistIdsLength = 0; + var itId = it.getAttribute('id'); + var i = 0, j= 0, t= 0, tmp, k = 0; + var tagId; + var tagText = DOMParentRow.querySelector('.'+triggerClass).innerHTML; + + // если есть дочерние элементы + if(DOMSublistInner){ + ARRsublist = $(DOMSublistInner).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked') + //получаем массив id жлементовЮ для которых есть тег + for(k; k < ARRsublist.length; k++){ + tmp = ARRsublist[k].getAttribute('id'); + ARRSublistIds.push(tmp); + } + //очистк + for(t; t 2 && firstComplete){ + getRequest({'term':text, 'form':form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete( "destroy" ); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + /** + * loads and shows list tree related to selected id + * @param {Object} data - is JSON object with information about parent elements. + * @param {function} handler - callback function + * @param {number} counter + * @private + */ + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj,nestedSublistTemplateId, + $midleLevelCheckbox = $('#id_'+dataObj.id), + /** + * makes request in order to recieve children list information fires after request for parent list + * @param {number} length + * @function + */ + handlerNested = function (length) { + var $checkbox = $('#id_'+dataObj.id), + afterAll = function () { + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.hide(); + if($checkbox.length && getObjectLength(self.curDNA[sublistTemplateId+'-sub']) == length){ + + nestedObj = { + name:dataObj.name, + id:dataObj.id + }; + $waiter.show(); + nestedSublistTemplateId = $('#id_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, afterAll, nestedSublistTemplateId, dataObj.id); + } + + }, + /** + * @function + */ + handlerParent = function (){ + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.show(); + //if element has parent element + if(dataObj.hasOwnProperty('parent')){ + //if checbox is existed + if($midleLevelCheckbox.length){ + nestedObj = { + name:dataObj.name, + id:dataObj.id + }; + nestedSublistTemplateId = $midleLevelCheckbox.closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, function(){$waiter.hide();handler();}, nestedSublistTemplateId, dataObj.id); + }else{ + + optObj = { + name:dataObj.parent.name, + id:dataObj.parent.id + }; + sublistTemplateId = $('#id_'+dataObj.parent.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerNested); + } + + + }else{ + optObj = { + name:dataObj.name, + id:dataObj.id + }; + sublistTemplateId = $('#id_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerParent); + } + + }, + /** + * @param it + * @public + */ + applyHandler: function (it) { + } + }; + + /** + * period selector modal window + * @param {Object} options + * @constructor + */ + var PeriodModal = function (options) { + this.opt = options; + var self = this, + $dateFrom = $('#'+self.opt.dateFrom), + $dateTo = $('#'+self.opt.dateTo), + $modal = $('#'+self.opt.id), + $modalTrigger = $('#'+self.opt.modalTrigger), + applyBtnClass = self.opt.applyBtnClass, + /** + * make string from input:text values + * @returns {string} + * @function + */ + inputsTostring = function(){ + var self = this, + stringToReturn = '', + toChar = $modalTrigger.data('lng-to'), + fromChar = $modalTrigger.data('lng-from'), + toVal = $.trim($dateTo.val()), + fromVal = $.trim($dateFrom.val()); + if(toVal != ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+' '+toChar+': '+toVal+'.'; + } else if (toVal != ''&& fromVal == ''){ + stringToReturn = toChar+': '+toVal+'.'; + } else if (toVal == ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+'.'; + } + return stringToReturn; + + }, + /** + * set trigger link text + * @param {string} selectedString + * @function + */ + triggerSetText = function (selectedString) { + var cutLength = 24; + + if(selectedString != ''){ + $modalTrigger.text(selectedString).siblings('.trigger-label').addClass('hidden'); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + + + }else{ + $modalTrigger.text($modalTrigger.data('default')).siblings('.trigger-label').removeClass('hidden'); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + } + }, + /** + * checks and corrects value of fields of a modal and corrects values so that in the field from always there was a date "to" (less) date in the field "on" + * @param it + * @function + */ + checkInterval = function (it) { + var itId = it.getAttribute('id'), + itVal = it.value, + itValInt = Date.parse(itVal), + thatId, + thatVal, + thatValInt, + bfr; + if(itId == self.opt.dateFrom){ + thatId = $dateTo[0].getAttribute('id'); + thatVal = $dateTo[0].value; + }else { + thatId = $dateFrom[0].getAttribute('id'); + thatVal = $dateFrom[0].value; + } + thatValInt = Date.parse(thatVal); + if(thatValInt > itValInt && thatValInt != 0 && thatValInt){ + bfr = document.getElementById(itId).value; + document.getElementById(itId).value = document.getElementById(thatId).value; + document.getElementById(thatId).value = bfr; + }else if(thatValInt < itValInt && thatValInt != 0 && thatValInt){ + bfr = document.getElementById(thatId).value; + document.getElementById(thatId).value = document.getElementById(itId).value; + document.getElementById(itId).value = bfr; + } + + + }; + this.$dateFrom = $dateFrom; + this.$dateTo = $dateTo; + this.$modalTrigger = $modalTrigger; + + $(function () { + $.datepicker.setDefaults($.datepicker.regional["ru"]); + + $dateFrom.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateTo.datepicker( "option", "minDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + 'oncomplete': function () { + checkInterval(this); + } + }); + $dateTo.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateFrom.datepicker( "option", "maxDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + 'oncomplete': function () { + checkInterval(this); + } + }); + $('input[type="text"]',$modal).on('change', function () { + var stringToset = inputsTostring(); + triggerSetText(stringToset); + + }); + $('.'+applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).on('click', function () { + $(this).removeClass('active'); + self.resetList(); + }); + }); + + }; + /** + * methods + * @type {{resetList: Function, applyHandler: Function}} + */ + PeriodModal.prototype = { + /** + * clear all input fields of modal window + * @public + */ + resetList: function () { + this.$dateFrom.val(''); + this.$dateTo.val(''); + this.$modalTrigger.text(this.$modalTrigger.attr('data-default')); + + }, + applyHandler: function (it) { + } + }; + /** + * constructor for main searchfield + * @param {Object} options + * @constructor + */ + var MainField = function (options) { + this.opt = options; + this.opt.anyChar = false; + var self = this, + firstComplete = true; + this.$field = $('#'+self.opt.id); + /** + * much faster than JQuery + * @type {HTMLElement} + */ + this.DOMcompleteWrap = document.getElementById(self.opt.autoCompleteWrapId); + this.afterClear; + /** + * data from ajax response + * @type {{items: Array, set: Function, get: Function, _rawDataChange: Function}} + */ + this.rawData = { + items:[], + /** + * setter + * @param data + * @public + */ + set:function (data) { + this.items = data; + this._rawDataChange(); + }, + /** + * get data + * @returns {*} + * @public + */ + get: function () { + return this.items; + }, + /** + * executes when this.rawData changes + * @param {Object} e + * @private + */ + _rawDataChange: function (e) { + var self = this, index; + for(index = 0; index < self.items.length; index++) { + renameProperty(self.items[index],'text','label') + renameProperty(self.items[index],'id','value') + } + } + }; + this.completeName = 'autocomplete', + this.firstComplete = true; + this.$field.attr('autocomplete','off'); + //autocomplete behaviour + self.$field.on('keyup', function (event) { + var reqObj; + text = $(this).val(); + event.stopImmediatePropagation(); + if(self.dataForm){ + reqObj = { + 'term':text, + 'form':self.dataForm + } + }else{ + reqObj = { + 'term':text + } + } + if(self.opt.anyChar){ + if (text.length > 2){ + getRequest(reqObj, self.opt.autoCompleteUrl, function (data) { + if(self.$field.hasClass('ui-autocomplete-input')){ + self.$field[self.completeName]( "destroy" ); + + } + self.rawData.set(data); + self._initAutoComplete(); + self.showList(''); + }); + } else if(text.length === 0){ + if(self.$field.hasClass('ui-autocomplete-input')){ + self.$field[self.completeName]( "destroy" ); + common.removeClass(self.DOMcompleteWrap,'full-visible'); + self._resetmodals(self.afterClear); + } + } + }else{ + if (text.length > 2 && firstComplete){ + getRequest(reqObj, self.opt.autoCompleteUrl, function (data) { + + self.rawData.set(data); + self._initAutoComplete(); + self.showList(''); + // self.DOMcompleteWrap.addClass('full-visible'); + }); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$field.hasClass('ui-autocomplete-input')){ + + self.$field[self.completeName]( "destroy" ); + common.removeClass(self.DOMcompleteWrap,'full-visible'); + self._resetmodals(self.afterClear); + firstComplete = true; + } + }else{ + if(self.$field.hasClass('ui-autocomplete-input')){ + self.showList(text); + + } + } + + } + //for autocomplete on each keypress + //for normal flow autocomplete + return false; + }).click(function () { + return false; + }); + + + + }; + /** + * methods + * @type {{_initAutoComplete: Function, _afterSelect: Function, _resetmodals: Function, selectHandler: Function, newRender: Function, selectCheckBoxes: Function, showList: Function, pullData: Function}} + */ + MainField.prototype = { + /** + * Jquery autocomplete initialization and autocomplete functionality on this.$field + * @private + */ + _initAutoComplete: function () { + var self = this; + self.$field[self.completeName]({ + source:self.rawData.get(), + minLength: 0, + appendTo:self.DOMcompleteWrap, + select:function(event, ui){ + self._afterSelect(event, ui); + }, + close: function () { + common.removeClass(self.DOMcompleteWrap,'full-visible'); + + + }, + open: function () { + common.addClass(self.DOMcompleteWrap,'full-visible'); + } + }); + + }, + /** + * functionality of selected object in autocomplete list + * @param {Object} event + * @param {Object} ui + * @private + */ + _afterSelect: function (event, ui) { + var self = this; + event.preventDefault(); + // much faster than jquery + if(ui.item.url){ + window.location = ui.item.url; + } else if(ui.item.label.length){ + self.$field[0].value = ui.item.label; + self.selectCheckBoxes(ui.item.id, ui.item.name); + } + + }, + /** + * method fires callback when field is cleared + * @param {function} callback + * @returns {number} + * @private + */ + _resetmodals: function (callback) { + if(callback){ + callback(); + }else{ + return 0; + } + + }, + /** + * public property for redefine _afterSelect + * @public + */ + selectHandler: function () { + + }, + /** + * select checkboxes if there is coincidence with search result and modal subject modal window + * @param {number} id + * @param {string} name + * @public + */ + selectCheckBoxes: function (id, name) { + + }, + /** + * simple shows out autocomplete list + * @param {string} text + */ + showList: function (text) { + self = this; + this.$field[self.completeName]('search',text); + + }, + /** + * brings data from server and transfer it to handler function + * @param {function} handler + */ + pullData: function (handler) { + + } + + }; + + /** + * whole module initialization + * @param {Object} options + * @public + */ + that.init = function(options) { + // settings extending + $.extend(this.lang, options.lang); + options.lang = null; + $.extend(this.settings, options); + // begin of initialization + var self = this, + submitHandler = function () { + $(self.DOMform).find('input[name="~~name~~"]').remove(); + }; + if(this.settings.searchData != 'None' && this.settings.searchData){ + this.previousSearch = JSON.parse(this.settings.searchData) + + } + this.DOMform = document.getElementById(this.settings.formId); + + $(this.DOMform).on('submit', function () { + submitHandler(); + }); + + // custom autocomplete realization for exibition input + $.widget( "custom.exibitionComplete", $.ui.autocomplete,{ + _renderMenu: function( ul, items ) { + var that = this, + currentCategory = ""; + $.each( items, function( index, item ) { + if ( item.cat != currentCategory && item.cat) { + ul.append( "
  • " + item.cat + "
    • " ); + currentCategory = item.cat; + }/*else if(item.url){ + ul.append( "
  • " + item.label + "
    • " ); + + }*/ + that._renderItemData( ul, item ); + }); + } + }); + this.exhibitionField = new MainField(self.settings.firstField); + this.exhibitionField.completeName = 'exibitionComplete'; + + this.exhibitionField.opt.anyChar = true; + + + //modal windows + this.placesModal = new PlacesModal(self.settings.place); + this.subjModal = new SubjectModal(self.settings.subject); + this.periodModal = new PeriodModal(self.settings.period); + this.exhibitionField.selectCheckBoxes = function (id, name) { + var self = this, + DOMCheckboxes, + nestedObj, + iName = name; + if(name == 'th'){ + DOMCheckboxes = document.getElementById(self.opt.prefix+id); + + }else if(name == 'tg'){ + DOMCheckboxes = document.getElementById(self.opt.prefixInner+id); + iName = 'th'; + + } + $waiter.show(); + // load tree related to selected item + if (!DOMCheckboxes) { + nestedObj = { + name:name, + id:id + }; + getRequest(nestedObj, EXPO.searchBlock.subjModal.opt.getParentUrl, function (data) { + + EXPO.searchBlock.subjModal._loadParentTree(data, function(){ + + EXPO.searchBlock.subjModal._checkCheckBox(id, name); + }); + }); + } else{ + $waiter.hide(); + $(DOMCheckboxes).prop('checked', true); + $(DOMCheckboxes).trigger('change'); + } + }; + + this.placesField = new MainField(self.settings.placeField); + this.placesField.dataForm = EXPO.searchBlock.placesModal.$inputFilter.attr('data-form'); + this.placesField.selectCheckBoxes = function(id,name){ + var self = this, + DOMCheckboxes, + nestedObj; + DOMCheckboxes = document.getElementById(self.opt.prefix+id); + if (!DOMCheckboxes) { + nestedObj = { + name:name, + id:id + }; + getRequest(nestedObj, EXPO.searchBlock.placesModal.opt.getParentUrl, function (data) { + + EXPO.searchBlock.placesModal._loadParentTree(data, function(){ + + EXPO.searchBlock.placesModal._checkCheckBox(id, name); + }); + }); + } else{ + $waiter.hide(); + $(DOMCheckboxes).prop('checked', true); + $(DOMCheckboxes).trigger('change'); + } + }; + + // uncheck all checboxes in modal and clear label beneath searchfield + this.exhibitionField.afterClear = function () { + self.subjModal.resetList(); + }; + this.placesField.afterClear = function () { + self.placesModal.resetList(); + }; + //модальное окно + this.modalWindow = new common.Modal(self.settings.modal); + + this.periodModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + this.placesModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + this.subjModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + + // + // modal window calling + $('.'+self.settings.modalTriggerClass).on('click', function (event) { + event.preventDefault(); + self.modalWindow.pullData(this.getAttribute('href')); + self.modalWindow.open(); + return false; + }); + // заполнение полей предыдущими значениями + $(function () { + if(self.previousSearch){ + for (var i = 0; i < self.previousSearch.inputs.length; i++) { + // окно выбора тематики + if (self.previousSearch.inputs[i].name == 'th'){ + self.subjModal._loadParentTree(self.previousSearch.inputs[i], function (innerI) { + if(self.previousSearch.inputs[innerI].children){ + + self.subjModal.check(self.previousSearch.inputs[innerI].children.id, self.previousSearch.inputs[innerI].children.name); + }else{ + self.subjModal.check(self.previousSearch.inputs[innerI].id, self.previousSearch.inputs[innerI].name); + + } + }, i); + // окно выбора мест + } else if (self.previousSearch.inputs[i].name == 'area'){ + + if(self.previousSearch.inputs[i].children && self.previousSearch.inputs[i].children.children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children.children); + + }else if (self.previousSearch.inputs[i].children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children); + + + } else if(self.previousSearch.inputs[i]){ + self.placesModal.selectTag(self.previousSearch.inputs[i]); + + + } + } + } + + } + }); + + + }; + + return that; + }()); +} \ No newline at end of file diff --git a/templates/client/static_client/js/_modules/page.company.js b/templates/client/static_client/js/_modules/page.company.js new file mode 100644 index 00000000..23ab8117 --- /dev/null +++ b/templates/client/static_client/js/_modules/page.company.js @@ -0,0 +1,460 @@ +var EXPO = EXPO || {}; //isolated namespace +//общий для всех страниц модуль Функционал общий для всех страниц +// module requires JQuery library +// protection against duplication of a module code +if (EXPO.company){ + console.warn('WARNING: EXPO.company is already defined!'); +}else{ + + EXPO.company = (function() { + // variables + var that = {}; + that.settings = { + updateFormClass:'update-profile-form' + }; //default module setting + that.lang ={}; + //dependences + + //private + // factory for on page form objects + function Forms(){} + // methods to perform ajax responses to send and receive data from the server + Forms.prototype = { + // ajax request realization + getajax: function (dataToSend) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'POST', + url: self.ajaxPath, + data:dataToSend, + success: function(data) { + self.pullHandler(data); + $('#wait-ajax').fadeOut(); + } + }); + + }, + // check if there exists custom data manipulation handler and evaluate it + pushData: function (data, formName) { + var handler = this.pushHandler, + formDataString, + formData = data; + if(typeof handler == 'function'){ + // if particular data change required + $('#wait-ajax').show(); + handler(data); + } else{ + $('#wait-ajax').show(); + this.getajax(data); + } + formDataString = decodeURI(formData).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"').replace(/\//ig, '\\/').replace(/\\n/g, '\\n'); + this.formData = JSON.parse('{"' + formDataString + '"}'); + this.formId = formName; + + }, + pullData: function (data) { + var handler = this.pullHandler; + if(typeof handler == 'function'){ + handler(data); + } else{ + throw{ + name: 'Error', + message: " handler function for processing response after form submit not defined, please define it!" + }; + } + + } + }; + Forms.factory = function (type, ajaxpath) { + var constr = type, + newForm; + if (typeof Forms[constr] !== 'function'){ + throw{ + name: 'Error', + message: constr + "doesen't exist" + }; + } + if(typeof Forms[constr].prototype.pushData !== "function"){ + Forms[constr].prototype = new Forms(); + } + newForm = new Forms[constr](ajaxpath); + return newForm; + }; + + + Forms.name_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + $('#static-name-value').text($('#id_name').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.spec_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + $('#static-spec-value').text($('#id_specialization').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.address_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + $('#static-address-value').text($('#id_address_inf').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.address_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + $('#static-address-value').text($('#id_address_inf').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.social_form = function (path) { + var self = this, + $img, imgSrc, $input, inputValue,item; + this.pullHandler = function (data) { + if (data.success){ + for (item in self.formData) { + $input = $('#id_'+item); + if($.trim(self.formData[item]) != '' && $input.length){ + $img = $('#img-'+item); + if($img.length){ + inputValue = $.trim($input.val()); + if ($img.parent('a').length){ + $img.parent('a').attr('href',inputValue); + imgSrc = $img.attr('src').replace('_hover',''); + $img.attr('src',imgSrc); + }else { + imgSrc = $img.attr('src').replace('_hover',''); + $img.attr('src',imgSrc); + $img.wrap(''); + } + } + }else if($input.length){ + $img = $('#img-'+item); + if ($img.parent('a').length){ + imgSrc = $img.attr('src').replace('.png','_hover.png'); + $img.attr('src',imgSrc); + $img.unwrap(); + } + + } + + } + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.phone_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + $('#static-phone-value').text($('#id_phone')[0].value); + + $('.p-editable').removeClass('pe-current'); + + } + }; + this.ajaxPath = path; + + }; + Forms.email_form = function (path) { + var mailValue; + this.pullHandler = function (data) { + if (data.success){ + mailValue = $('#id_email').val(); + $('#static-email-value').attr('href', 'mailto:'+mailValue).text(mailValue); + + $('.p-editable').removeClass('pe-current'); + + } + }; + this.ajaxPath = path; + + }; + Forms.web_page_form = function (path) { + var userLink; + this.pullHandler = function (data) { + if (data.success){ + userLink = $('#id_web_page').val(); + $('#static-web-page-value').attr('href',userLink).text(userLink); + $('.p-editable').removeClass('pe-current'); + } + }; + + this.ajaxPath = path; + + }; + Forms.home_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + var country = $('#s2id_id_country').find('.select2-chosen').text(), + city = $('#s2id_id_city').find('.select2-chosen').text(); + $('#static-home-country').text(country); + $('#static-home-city').text(city); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.found_form = function (path) { + var currValue, + $input, + $container, + $staticValue, + $staticBox, + $editButton; + this.pullHandler = function (data) { + if (data.success){ + $input = $('#id_foundation'); + currValue = $.trim($input.val()); + $container = $input.parents('.p-editable'); + $editButton = $input.parents('.edit-wrap').children('e-btn'); + $staticValue = $('#static-found-value'); + $staticBox = $('#static-foundation'); + if(currValue == ''){ + $container.removeClass('ic-tel').addClass('add_link_text add_link_text_medium'); + $staticValue.hide().children('span').text(''); + $staticBox.show(); + }else{ + $container.removeClass('add_link_text add_link_text_medium').addClass('ic-tel'); + $staticValue.show().children('span').text(currValue); + $staticBox.hide(); + } + $('.p-editable').removeClass('pe-current'); + } + }; + + this.ajaxPath = path; + + }; + Forms.staff_form = function (path) { + var currValue, + $input, + $container, + $staticValue, + $staticBox, + $editButton; + this.pullHandler = function (data) { + if (data.success){ + $input = $('#id_staff_number'); + currValue = $.trim($input.val()); + $container = $input.parents('.p-editable'); + $editButton = $input.parents('.edit-wrap').children('e-btn'); + $staticValue = $('#static-staff_number-value'); + $staticBox = $('#static-staff_number'); + if(currValue == ''){ + $container.removeClass('ic-tel').addClass('add_link_text add_link_text_medium'); + $staticValue.hide().children('span').text(''); + $staticBox.show(); + }else{ + $container.removeClass('add_link_text add_link_text_medium').addClass('ic-tel'); + $staticValue.show().children('span').text(currValue); + $staticBox.hide(); + } + $('.p-editable').removeClass('pe-current'); + } + }; + + this.ajaxPath = path; + + }; + Forms.description_form = function (path) { + var currValue, + $input = $('#id_description'), + $container, + $staticValue, + $staticBox, + $editButton; + this.pullHandler = function (data) { + if (data.success){ + currValue = $.trim($input.val()); + $container = $input.parents('.p-editable'); + $editButton = $input.parents('.edit-wrap').children('e-btn'); + $staticValue = $('#static-description-value'); + $staticBox = $('#static-description'); + if(currValue == ''){ + $container.removeClass('ic-tel').addClass('add_link_text add_link_text_medium'); + $staticValue.hide().children('span').text(''); + $staticBox.show(); + }else{ + $container.removeClass('add_link_text add_link_text_medium').addClass('ic-tel'); + $staticValue.show().text(currValue); + $staticBox.hide(); + } + $('.p-editable').removeClass('pe-current'); + } + }; + $input.on('keypress', function (e) { + var keycode = (e.keyCode ? e.keyCode : e.which); + if(keycode == '13'){ + return false; + } + + }); + + this.ajaxPath = path; + + }; + + + // methods + //инициализация общих свойств + that.init = function(options) { + $.extend(this.lang, options.lang); + options.lang = null; + $.extend(this.settings, options); + var self = this, + initMaskedInput = function (inputId) { + var maskList = $.masksSort($.masksLoad("/static/client/js/plugins/inputmask/phone-codes.json"), ['#'], /[0-9]|#/, "mask"), + maskOpts = { + inputmask: { + definitions: { + '#': { + validator: "[0-9]", + cardinality: 1 + } + }, + //clearIncomplete: true, + showMaskOnHover: false, + autoUnmask: true + }, + match: /[0-9]/, + replace: '#', + list: maskList, + listKey: "mask", + onMaskChange: function() { + $(this).attr("placeholder", $(this).inputmask("getemptymask")); + } + }, + selector = '#'+inputId; + + $(selector).attr('placeholder', '+_(___)___-__-__'); + $(selector).inputmasks(maskOpts); + + }; + this.forms = {}; + $(function () { + //start of document.ready + + + $('#'+self.settings.selectBox[0].id).select2({ + width: 'element' + }); + $('#'+self.settings.selectBox[1].id).select2({ + placeholder: self.settings.selectBox[1].placeHolder, + width: 'element', + ajax: { + + url: self.settings.selectBox[1].path, + dataType: "json", + quietMillis: 200, + + data: function(term, page, country){ + var country = $('#'+self.settings.selectBox[0].id).val() + return {term: term, + page: page, + country: country}; + }, + + results: function (data) { + var results = []; + $.each(data, function(index, item){ + results.push({ + id: item.id, + text: item.label + }); + }); + return {results: results}; + } + }, + initSelection : function(element, callback) { + var id= $(element).val(); + var text = $(element).attr('data-init-text'); + callback({id: id, text:text}); + + } + + }); + + $('#'+self.settings.selectBox[2].id).select2({ + placeholder: self.settings.selectBox[2].placeholder, + width: '368px', + multiple: true, + maximumSelectionSize: 5, + ajax: { + + url: self.settings.selectBox[2].path, + dataType: "json", + quietMillis: 200, + + data: function(term, page, country){ + var themes = $('#theme-inf').attr('data-theme'); + themes = themes.split(','); + themes.pop(); + + return {term: term, + page: page, + themes: themes}; + }, + + results: function (data) { + var results = []; + $.each(data, function(index, item){ + results.push({ + id: item.id, + text: item.label + }); + }); + return {results: results}; + } + }, + initSelection : function(element, callback) { + } + + }); + + // make mask on phone field input + initMaskedInput(self.settings.phoneBox); + //forms init + $('.'+self.settings.updateFormClass).each(function () { + var formName = $(this).attr('id'), + path = $(this).attr('action'); + + //make and initialize form objects + self.forms[formName] = Forms.factory(formName,path); + + // submit events handler + $(this).off('submit'); + $(this).on('submit', function () { + var serialized = $(this).serialize(); + // each form post definitin function + self.forms[formName].pushData(serialized, formName); + return false; + }); + + }); + }); + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/page.events.feed.js b/templates/client/static_client/js/_modules/page.events.feed.js new file mode 100644 index 00000000..263fc96d --- /dev/null +++ b/templates/client/static_client/js/_modules/page.events.feed.js @@ -0,0 +1,1676 @@ +var EXPO = EXPO || {}; //isolated namespace +EXPO.events = EXPO.events || {}; +if (EXPO.events.feed) { + console.warn('WARNING: EXPO.eventsFeed is already defined!'); +} else { + EXPO.events.feed = (function () { + // variables + var that = {}; + + //default module setting + that.opt = {}; + //dependence's + var com = EXPO.common; + //private + //todo: кнопки Искать в мобальных окнах сделать "ПРименить" и инициировать фильтрацию + //todo: сделать после загрузки восстановление ранее выбранных параметров + var Filter = function (opt) { + this.opt = opt; + this.DOMbody = document.getElementById(opt.bodyId); + + }, + /** + * make ajax GET request and launch handler if exist or return data + * @param {Object|string} dataToSend + * @param {string} url + * @param {function} handler - function to execute when task is ready + */ + getRequest = function (dataToSend,url,handler) { + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: url, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + handler(data); + } else{ + return data; + } + } + }); + }, + /** + * rename name of property of an object/ Check for the old property name to avoid a ReferenceError in strict mode. + * @param {Object} obj object to rename its properties + * @param {string} oldName + * @param {string} newName + * @returns {renameProperty} + */ + renameProperty = function (obj,oldName, newName) { + if (obj.hasOwnProperty(oldName)) { + obj[newName] = obj[oldName]; + + } + return this; + }, + /** + * analogue of Array.length but for object + * @param {Object} obj - Object to count its method + * @returns {number} + */ + getObjectLength = function (obj) { + var size = 0, key; + for (key in obj) { + if (obj.hasOwnProperty(key)) size++; + } + return size; + }, + $waiter = $('.wait-ajax.absolute'), + Json2URI = function (jsonObj) { + var str = Object.keys(jsonObj).map(function(key){ + return encodeURIComponent(key) + '=' + encodeURIComponent(jsonObj[key]); + }).join('&'); + return ('?'+str); + }; + + // methods + Filter.prototype = { + show: function () { + //$(this.DOMbody).show(); + $(this.DOMbody).slideDown(); + }, + hide: function () { + $(this.DOMbody).hide(); + //$(this.DOMbody).slideUp(); + + } + }; + + // places and subject modals + /** + * Constructor for modal window 'select subject' + * @param {Object} options + * @constructor + */ + var SubjectModal = function (options) { + /** + * options init + * @type {Object} + */ + this.opt = options; + var self = this, index = 0, + $subjWrap = $('#' + self.opt.subjectTriggerWrapId), + $topicBox, + modalId = self.opt.id, + $modal = $('#' + modalId), + $checkBox = $('.csb-menu-input', $modal), + $selectedItemsWrap = $('#'+this.opt.selectedItemsContainer, $modal), + setDefault = self.opt.defaultOn, + applyBtnClass = self.opt.applyBtnClass, + $modalTrigger = $('#' + self.opt.modalTrigger), + DOMfilterBox = document.getElementById(self.opt.bodyId), + /** + * executed after render of modal Window + * @function + */ + afterRenderHandler = function () { + $waiter.hide(); + + }, + $waiter = $('.wait-ajax.absolute'); + + /** + * this modal window DOM Instance + * @type {*|jQuery|HTMLElement} + */ + this.$modalInst = $('#' + modalId); + + /** + * clones of tags for selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + * in modal window + * @type {Object} + */ + this.itemsSelected = {}; + /** + * clones of tags for selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + * on the page itself + * @type {Object} + */ + this.tagsBoxItems = {}; + /** + * clones of sublist of selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + * @type {Object} + */ + this.sublist = {}; + /** + * Jquery object of filtering input (autocomplete input) + * @type {*|jQuery|HTMLElement} + */ + this.$inputFilter = $('#' + self.opt.filterInputId); + /** + * label span element that contain short description for active filter + * @type {*|jQuery|HTMLElement} + */ + this.$label = $(document.getElementById(this.opt.labelId)); + + this.$selectedItemsWrap = $selectedItemsWrap; + + $(function () { + // topic checkbox selected event + $('.topicChecks', $subjWrap).on('change', function () { + + if ($(this).prop('checked')) { + self._setVisible($(this).val()); + + } else { + self._setUnvisible($(this).val()); + } + }); + // selected topic by default self.opt.defaultOn[] + for (index = 0; index < setDefault.length; index++) { + $topicBox = $('#' + setDefault[index]) + $topicBox.prop('checked', true); + $topicBox.trigger('change'); + + + } + //modal list and sublist behavior + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'); + // no more than once execution + if ($(this).attr('data-sub') == 'true') { + if ($(this).parent().hasClass('level1')) { + + if (!$sublist.children().length) { + $waiter.show(); + self._renderSublist({name: name, id: id}, tmplId, afterRenderHandler); + $(this).parent().addClass('active'); + } else { + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + // modal theme checkbox change behavior + $checkBox.on('change', function (event, param) { + var checkboxId = $(this).attr('id'), + $label = $(this).closest('.custom-radio-check'), + $parent = $(this).closest('.level'), + $parentCheckBox = $parent.parent().closest('.level').children('.custom-radio-check').find('.csb-menu-input'), + $sublist = $parent.children('.sublist'); + if (!param) { + + if ($label.hasClass('active')) { + $label.removeClass('active'); + } else { + $label.addClass('active'); + } + if (this.checked) { + var text = $(this).closest('.level').find('.trigger').first().text(), + tplObj = {'text': text, 'id': checkboxId}; + + //tags field logic + if (!$selectedItemsWrap.hasClass('visible')) { + $selectedItemsWrap.addClass('visible'); + } + self._addTag(checkboxId, tplObj); + + // proper selection and selection group logic + if ($sublist.length) { + $('.csb-menu-input', $sublist).each(function () { + var thisId = this.getAttribute('id'), + tagText = $(this).closest('.level').find('.trigger').first().text(), + DOMlabel = com.closest(this, 'custom-radio-check'); + + this.checked = true; + self._destroyTag(thisId); + com.addClass(DOMlabel, 'active'); + }); + + } else { + $parent = $parent.parent().closest('.level') + // if checked items count equals all items count then parent item is checked and tags for children - deleted + if ($('.csb-menu-input', $parent.find('.sublist')).length == $('.csb-menu-input:checked', $parent.find('.sublist')).length) { + var parentId = $parentCheckBox[0].getAttribute('id'), + parentText = $parentCheckBox.closest('.level').find('.trigger').first().text(), + DOMlabel = com.closest(this, 'custom-radio-check'), + DOMParentLabel = com.closest(DOMlabel.parentNode.parentNode, 'level'), + parentObj = {'text': parentText, 'id': parentId}; + $('.csb-menu-input:checked', $parent.find('.sublist')).each(function () { + + self._destroyTag(this.getAttribute('id')); + }); + $parentCheckBox.prop('checked', true); + com.addClass($(DOMParentLabel).find('.custom-radio-check')[0], 'active'); + + //$parentCheckBox.trigger('change',['true']); + self._addTag(parentId, parentObj); + } + } + + //!uncheck event + } else { + self._destroyTag(checkboxId); + if (!$selectedItemsWrap.children('.dna-clone').length) { + $selectedItemsWrap.removeClass('visible'); + + } + //uncheck all sublist items while parent item is unchecked + if ($sublist.length) { + //destroy all tags for sublist items + $('.csb-menu-input', $sublist).each(function () { + var thisId = $(this).attr('id'), + DOMlabel = com.closest(this, 'custom-radio-check'); + this.checked = false; + + com.removeClass(DOMlabel, 'active'); + self._destroyTag(thisId); + }); + $sublist.addClass('hidden'); + $parent.removeClass('active'); + } else { + // parent item is unchecked and tags for every children item are made + if ($parentCheckBox.length && $parentCheckBox[0].checked) { + var DOMlabel = com.closest($parentCheckBox[0], 'custom-radio-check'), + DOMParentItem = com.closest(DOMlabel, 'level'), + DOMSublist = DOMParentItem.querySelector('.sublist'); + $parentCheckBox.prop('checked', false); + com.removeClass(DOMlabel, 'active'); + self._destroyTag($parentCheckBox.attr('id')); + // checks children items + + $('.csb-menu-input:checked', DOMSublist).each(function () { + var id = this.getAttribute('id'), + tagText = com.closest(this, 'level').querySelector('.trigger').textContent, + tagObj = {'text': tagText, 'id': id}; + self._addTag(id, tagObj); + }); + } + } + + } + } + }); + //delete tag behavior + $('.' + self.opt.deleteTagClass, $modal).on('click', function (e) { + e.stopPropagation(); + var checkboxId = $(this).attr('data-checkbox-id'), + $uncheckBoxes = $('#' + checkboxId); + $uncheckBoxes.prop('checked', false); + $uncheckBoxes.trigger('change'); + self._refreshLabel(); + if (!$selectedItemsWrap.children('.dna-clone').length) { + $selectedItemsWrap.removeClass('visible'); + } + return false; + }); + $('#'+self.opt.deleteId).on('click',function () { + $('.' + self.opt.deleteTagClass, $modal).trigger('click'); + }); + $('.clear', $modal).on('click', function () { + self.resetList(); + return false; + }); + self._autocompleteInit(); + $('.' + applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + // кнопка "очистить параметры" + + $modalTrigger.siblings('.' + self.opt.clearAllButtonClass).on('click', function () { + self.resetList(); + }); + }); + }; + /** + * methods + * @type {{_getAjax: Function, _setVisible: Function, _setUnvisible: Function, _checkCheckBox: Function, check: Function, _autocompleteInit: Function, _renderSublist: Function, _loadParentTree: Function, _destroyTag: Function, _addTag: Function, _slideToggle: Function, resetList: Function, applyHandler: Function}} + */ + SubjectModal.prototype = { + /** + * get ajax response when want sublists + * @param {Object|sting} dataToSend + * @param {function} handler - fires after request is complete + * @private + */ + _getAjax: function (dataToSend, handler) { + var self = this; + if (!dataToSend) { + dataToSend = ''; + } + $waiter.css({display: 'block'}); + $.ajax({ + type: 'GET', + url: self.opt.ajaxUrl, + data: dataToSend, + success: function (data) { + if (typeof handler == 'function') { + $waiter.hide(); + handler(data); + } else { + return data; + + } + } + }); + }, + /** + * filter list accordingly to checked checkbox in 'select type' part of modal + * @param {string} type + * @private + */ + _setVisible: function (type) { + var self = this; + $('.' + type, self.$modalInst).addClass('visible'); + }, + /** + * filter list accordingly to checked checkbox in 'select type' part of modal + * @param {string} type + * @private + */ + _setUnvisible: function (type) { + var self = this, + $li = $('.' + type, self.$modalInst); + $li.find('input[type="checkbox"]').each(function () { + var $this = $(this); + if ($this.prop('checked')) { + $this.prop('checked', false); + $this.trigger('change'); + } + }); + $li.find('.dna-container').each(function () { + if ($(this).children().length) { + $(this).addClass('hidden'); + } + }); + $li.removeClass('visible'); + + }, + /** + * check particular checkbox input + * @param {string} id + * @param {string} name + * @private + */ + _checkCheckBox: function (id, name) { + var self = this, + $chckBox; + if (name == 'th') { + $chckBox = $('#tid_' + self.opt.prefix + id, self.$modalInst); + } else if (name == 'tg') { + $chckBox = $('#tgid_' + self.opt.prefix + id, self.$modalInst); + } + if ($chckBox.length && !$chckBox.prop('checked')) { + $chckBox.prop('checked', true); + $chckBox.trigger('change'); + } + + }, + /** + * check particular checkbox input + * @param {string} id + * @param {string} name + * @public + */ + check: function (id, name) { + var self = this, + $chckBox; + if (name == 'th') { + + $chckBox = $('#tid_' + self.opt.prefix + id, self.$modalInst); + } else if (name == 'tg') { + $chckBox = $('#tgid_' + self.opt.prefix + id, self.$modalInst); + } + if ($chckBox.length) { + $chckBox.prop('checked', true); + $chckBox.trigger('change'); + $chckBox.parent().addClass('active'); + } + + }, + /** + * initiliazing and setup autocomplete field for subject list + * @private + */ + _autocompleteInit: function () { + var self = this, dataObj, text, form = self.$inputFilter.attr('data-form'), index, + $completeWrap = $('#' + self.opt.autoCompleteId), + firstComplete = true, + selectTag = function (event, ui) { + //check of repeating execution + $waiter.show(); + var firstTime = true; + for (var prop in self.sublist) { + for (var prop2 in self.sublist[prop]) { + if (prop2 == ui.item.value) { + firstTime = false; + } + + + } + } + if ($('#tid_' + self.opt.prefix + ui.item.value + '[name="' + ui.item.name + '"]:checked').length) { + firstTime = false; + } + // ban of repeating execution + if (firstTime) { // konec + var $checkbox = $('#tid_' + self.opt.prefix + ui.item.value + '[name="' + ui.item.name + '"]'), + requestObj, requestName, + treeLoadHandler = function (data) { + // make checkboxes selected after loading + if (getObjectLength(data)) { + self._loadParentTree(data, function () { + self._checkCheckBox(ui.item.value, 'tg'); + $waiter.hide(); + }); + } else { + $waiter.hide(); + console.warn() + } + + }; + // load tree related to selected item + if (!$checkbox.length) { + + requestObj = { + id: ui.item.value, + name: ui.item.name + }; + getRequest(requestObj, self.opt.getParentUrl, treeLoadHandler); + } else { + $waiter.hide(); + $checkbox.prop('checked', true); + $checkbox.trigger('change'); + } + + } + }, + requestHandler = function (data) { + dataObj = data; + for (index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index], 'text', 'label'); + } + for (index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index], 'id', 'value'); + } + if (!self.$inputFilter.hasClass('ui-autocomplete-input')) { + + self.$inputFilter.autocomplete({ + source: dataObj, + minLength: 0, + appendTo: $completeWrap, + select: function (event, ui) { + self.$inputFilter.val(''); + self.$inputFilter.trigger('keyup'); + selectTag(event, ui); + event.preventDefault(); + // return ui.label; + } + }); + self.$inputFilter.autocomplete('search', ""); + firstComplete = false; + } else { + + self.$inputFilter.autocomplete('search', ""); + } + + }; + // var newData = ['banan','banan2','banan3','banan4','banan5']; + self.$inputFilter.attr('autocomplete', 'on'); + + self.$inputFilter.on('keyup', function (event) { + text = $(this).val(); + event.stopImmediatePropagation(); + + + if (text.length > 2 && firstComplete) { + getRequest({'term': text, 'form': form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + } else if (text.length == 0 && !firstComplete) { + if (self.$inputFilter.hasClass('ui-autocomplete-input')) { + + self.$inputFilter.autocomplete("destroy"); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + // + /** + * render first level sublist + * @param {Object} dataObj + * @param {number|string} tmplId + * @param {function} handler + * @private + */ + _renderSublist: function (dataObj, tmplId, handler) { + var self = this, + index = 0, + template = tmplId + '-sub', + ajaxHandler = function (data) { + if (data.length) { + + self.sublist[template] = {}; + + // for dna.clone definition see dnajs.org + for (index; index < data.length; index++) { + self.sublist[template][data[index].id] = dna.clone(tmplId, data[index]); + + } + handler(data.length); + } else { + $waiter.hide(); + } + }; + self._getAjax(dataObj, ajaxHandler); + }, + /** + * if there is no children element in list, loads list that is parent to children element + * @param {Object} data + * @param {number|string} handler + * @param {function} counter + * @private + */ + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj, nestedSublistTemplateId, + /** + * makes request in order to recieve children list information fires after request for parent list + * @param {number} length + * @function + */ + handlerParent = function () { + $waiter.hide(); + counter || counter === 0 ? handler(counter) : handler(); + }; + $waiter.show(); + + + optObj = { + name: dataObj.name, + id: dataObj.id + }; + sublistTemplateId = $('#tid_' + self.opt.prefix + dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj, sublistTemplateId, handlerParent); + + + }, + /** + * destroy tag and clear tags block.for dna.clone definition see dnajs.org + * @param {string} checkboxId + * @private + */ + _destroyTag: function (checkboxId, outer) { + var self = this; + if (self.itemsSelected[checkboxId]) { + dna.destroy(self.itemsSelected[checkboxId]); + + } + if (self.tagsBoxItems[checkboxId]) { + dna.destroy(self.tagsBoxItems[checkboxId]); + + } + }, + /** + * for dna.clone definition see dnajs.org + * @param {number} checkboxId + * @param {Object} tplObj + * @private + */ + _addTag: function (checkboxId, tplObj) { + var self = this; + self.itemsSelected[checkboxId] = dna.clone(self.opt.selectedItemTemplate, tplObj); + self.tagsBoxItems[checkboxId] = dna.clone(self.opt.tagsBoxId, tplObj); + self._refreshLabel(); + }, + /** + * hide or show sublists according active selected link + * @param {*|jQuery|HTMLElement} $sublist + * @param {*|jQuery|HTMLElement} $this + * @private + */ + _slideToggle: function ($sublist, $this) { + if ($sublist.hasClass('hidden')) { + $sublist.removeClass('hidden'); + $this.addClass('active'); + } else { + $sublist.addClass('hidden').find('ul').addClass('hidden'); + $this.removeClass('active'); + } + + }, + /** + * reset all selected items, uncheck all selected checkboxes + * @public + */ + resetList: function () { + var self = this; + for (var key in self.itemsSelected) { + if (self.itemsSelected.hasOwnProperty(key)) { + $('#' + key, self.$selfContainer).prop('checked', false).trigger('change'); + + dna.destroy(self.itemsSelected[key]); + } + } + $('.sublist', self.$modalInst).addClass('hidden'); + $('.level', self.$modalInst).removeClass('active'); + self.$selectedItemsWrap.removeClass('visible'); + }, + /** + * render label text, if there is no selected element then text will be default + * @private + */ + _refreshLabel: function () { + var oLength = this.$selectedItemsWrap.children().length; + if (oLength){ + this.$label.text(this.$label.attr('data-selected')); + }else{ + this.$label.text(this.$label.attr('data-default')); + + } + }, + // кнопка применить + applyHandler: function (it) { + + } + + + }; + + /** + * Constructor for modal window 'select place' + * @param {Object} options + * @constructor + */ + var PlacesModal = function (options) { + /** + * object properties + * @type {Object} + */ + this.opt = options; + var self = this, + $modal = $('#' + self.opt.id), + $checkBox = $('input[type="checkbox"]', $modal), + $selectedItemsWrap = $('#'+this.opt.selectedItemsContainer, $modal), + DOMTagsWrapper = $('#'+this.opt.selectedItemsContainer, $modal)[0], + $modalTrigger = $('#' + self.opt.modalTrigger), + applyBtnClass = self.opt.applyBtnClass, + idPrefix = 'id_', + DOMfilterBox = document.getElementById(self.opt.bodyId), + + /** + * set trigger link text under the search field + * @function + */ + triggerSetText = function () { + var selectedString, + cutLength = 16; + }; + /** + * current template instances + * @type {Object} + */ + this.curDNA = {}; + /** + * place modal list items that had selected + * in modal window + * @type {Object} + */ + this.itemsSelected = {}; + /** + * place modal list items that had selected + * on page itself + * @type {Object} + */ + this.tagsBoxItems = {}; + this.selectedWrap = $selectedItemsWrap; + this.$selfContainer = $modal; + this.$modal = $modal; + this.idPrefix = idPrefix; + /** + * flag for management of turn of asynchronous requests + * @type {boolean} + */ + this.isReceived = true; + /** + * label span element that contain short description for active filter + * @type {*|jQuery|HTMLElement} + */ + this.$label = $(document.getElementById(this.opt.labelId)); + + /** + * Jquery object of filtering input (autocomplete input) + * @type {*|jQuery|HTMLElement} + */ + this.$inputFilter = $('#' + self.opt.filterInputId); + $(function () { + self._autocompleteInit(); + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + that = this, + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'), + afterRenderHandler = function (elem, data) { + var DOMParent = com.closest(that, 'level'), + DOMParentCheckbox = DOMParent.querySelector('.csb-menu-input'); + $('.csb-menu-input', $sublist).each(function () { + var DOMCheckboxWrap = com.closest(this, 'custom-radio-check'); + if (!this.selected) { + + if (DOMParentCheckbox.checked) { + this.checked = true; + com.addClass(DOMCheckboxWrap, 'active'); + } + } + }); + $waiter.hide(); + + }; + // no more than once execution + if ($(this).attr('data-sub') == 'true') { + if ($(this).parent().hasClass('level1')) { + + if (!$sublist.children().length) { + $waiter.show(); + self._renderSublist({name: name, id: id}, tmplId, afterRenderHandler); + } else { + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } else if ($(this).parent().hasClass('level2')) { + if (!$sublist.children().length) { + self._renderNested({name: name, id: id}, afterRenderHandler, tmplId, id); + $(this).parent().addClass('active'); + } + else { + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + + $checkBox.on('change', function (event, param) { + + var id = this.getAttribute('id'), + fakeCheckboxClass = 'custom-radio-check', + fakeCheckbox = com.closest(this, fakeCheckboxClass), + itemClass = 'level', + activeClass = 'active', + sublistClass = 'sublist', + checkboxClass = 'csb-menu-input', + highestItemClass = 'level1', + tagClass = 'csb-selected', + tagButtonClass = 'csbs-del', + triggerClass = 'trigger', + tagIdAttribute = 'data-checkbox-id', + + DOMParentRow = com.closest(this, itemClass), + + DOMParentItem = com.hasClass(DOMParentRow, highestItemClass) == false ? com.closest(DOMParentRow.parentNode, itemClass) : DOMParentRow, + DOMParentCheckbox = DOMParentItem.querySelector('.' + checkboxClass), + DOMSublist = DOMParentItem.querySelector('.' + sublistClass), + DOMSublistInner = DOMParentRow.querySelector('.' + sublistClass), + DOMHighestItem = com.closest(this, highestItemClass), + DOMHighestCheckbox = DOMHighestItem.querySelector('.' + checkboxClass), + selectSublist = function (it) { + var DOMParentItem = com.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.' + sublistClass); + $('.' + checkboxClass, DOMSublist).each(function () { + selectItem(this); + }); + + }, + unSelectSublist = function (it) { + var DOMParentItem = com.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.' + sublistClass); + $('.' + checkboxClass, DOMSublist).each(function () { + unSelectItem(this); + }); + + }, + selectParent = function (it) { + var DOMParentRow = com.closest(it, itemClass), + DOMParentItem; + if (com.hasClass(DOMParentRow, 'level1')) { + DOMParentItem = DOMParentRow; + } else { + DOMParentItem = com.closest(DOMParentRow.parentNode, itemClass); + } + + com.addClass(DOMParentItem.querySelector('.' + fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.' + checkboxClass).checked = true; + + //it.selected = true; + + }, + unSelectParent = function (it) { + var DOMParentRow = com.closest(it, itemClass), + DOMParentItem = com.closest(DOMParentRow.parentNode, itemClass) || DOMParentRow; + + com.removeClass(DOMParentItem.querySelector('.' + fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.' + checkboxClass).checked = false; + //it.checked = false; + + }, + selectItem = function (it) { + var itFakeCheckbox = com.closest(it, fakeCheckboxClass); + com.addClass(itFakeCheckbox, activeClass); + it.checked = true; + + }, + unSelectItem = function (it) { + var itFakeCheckbox = com.closest(it, fakeCheckboxClass); + com.removeClass(itFakeCheckbox, activeClass); + it.checked = false; + }, + allChildrenSelected = function () { + //var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'), + var DOMSublistParent = com.closest(DOMSublist, sublistClass), + $selected = $(DOMSublist).children('li').children('.' + fakeCheckboxClass).find('.' + checkboxClass + ':checked'), + selectedCount = $selected.length, + //allCount = DOMSublist.querySelectorAll('.'+checkboxClass).length; + allCount = $(DOMSublist).children('li').children('.' + fakeCheckboxClass).find('.' + checkboxClass).length; + + if (allCount == selectedCount && selectedCount != 0) { + return true; + } else { + return false; + } + }, + parentSelected = function () { + var parentCheckbox = DOMParentItem.querySelector('.' + checkboxClass); + if (parentCheckbox.checked) { + return true; + } else { + return false; + } + + }, + // Функционал добавления тегов: если есть в панели выбранный элемент либо его дочерние то удалить эти эдементы и разместить выбранный; иначе разместить выбранные. + refreshTags = function (it) { + var DOMSublist = com.closest(it, sublistClass); + var DOMItem = com.closest(it, itemClass); + var DOMSublistInner = DOMItem.querySelector('.' + sublistClass); + var DOMAllTags = DOMTagsWrapper.querySelectorAll('.' + tagClass); + var ARRsublist; + var ARRsublistChildren = DOMSublist.querySelector('.' + sublistClass) ? $('.' + checkboxClass + ':checked', DOMSublist.querySelector('.' + sublistClass)) : null; + var ARRsublistChildrenLength = ARRsublistChildren ? ARRsublistChildren.length : null; + var ARRSublistIds = []; + var ARRAllTagsIds = []; + var allTagsLength = 0; + var sublistIdsLength = 0; + var itId = it.getAttribute('id'); + var i = 0, j = 0, t = 0, tmp, k = 0; + var tagId; + var tagText = DOMParentRow.querySelector('.' + triggerClass).innerHTML; + + // если есть дочерние элементы + if (DOMSublistInner) { + ARRsublist = $(DOMSublistInner).children('li').children('.' + fakeCheckboxClass).find('.' + checkboxClass + ':checked') + //получаем массив id жлементовЮ для которых есть тег + for (k; k < ARRsublist.length; k++) { + tmp = ARRsublist[k].getAttribute('id'); + ARRSublistIds.push(tmp); + } + //очистк + for (t; t < DOMAllTags.length; t++) { + tmp = DOMAllTags[t].querySelector('.' + tagButtonClass).getAttribute(tagIdAttribute); + if (tmp != '~~id~~') { + ARRAllTagsIds.push(tmp); + } + } + allTagsLength = ARRAllTagsIds.length; + sublistIdsLength = ARRSublistIds.length; + // добавить текущий тег + + //если найден дочерний тег то он будет удален, либо текущий тег + for (i = 0; i < allTagsLength; i++) { + tagId = ARRAllTagsIds[i]; + for (j = 0; j < sublistIdsLength; j++) { + if (tagId == ARRSublistIds[j]) { + deleteTag(ARRsublist[j]); + } + } + } + // удаление дубликатов текущего элемента + for (i = 0; i < allTagsLength; i++) { + tagId = ARRAllTagsIds[i]; + if (tagId == itId) { + deleteTag(it); + } + } + } else { + // удаление дубликатов текущего элемента + for (i = 0; i < allTagsLength; i++) { + tagId = ARRAllTagsIds[i]; + if (tagId == itId) { + deleteTag(itId); + } + } + } + + + }, + deleteTag = function (it) { + var id = it.getAttribute('id'); + self._destroyTag(id); + tagsPanelToggle(); + }, + createTag = function (it) { + var item = com.closest(it, itemClass), + tagTrigger = item.querySelector('.' + triggerClass), + tagText = tagTrigger.innerHTML, + id = it.getAttribute('id'), + tagObj = {'id': id, 'text': tagText}; + self._addTag(id, tagObj); + tagsPanelToggle(); + }, + tagsPanelToggle = function () { + if ($selectedItemsWrap.children('.' + tagClass).length && $selectedItemsWrap.children('.' + tagClass)[0].getAttribute(tagIdAttribute) != "~~id~~") { + $selectedItemsWrap.addClass('visible'); + } else { + $selectedItemsWrap.removeClass('visible'); + } + }, + createTagList = function (sublist) { + var $selected = $(DOMSublist).children('li').children('.' + fakeCheckboxClass).find('.' + checkboxClass + ':checked'); + $selected.each(function () { + createTag(this); + }); + + }, + deleteTagList = function () { + var $selected = $(DOMSublist).children('li').children('.' + fakeCheckboxClass).find('.' + checkboxClass + ':checked'); + $selected.each(function () { + deleteTag(this); + }); + }; + + + //make fake checkbox active\passive + if (this.checked) { + + //если выбраны все дочерние + if (allChildrenSelected()) { + selectParent(this); + selectItem(this); + refreshTags(DOMParentCheckbox); + createTag(DOMParentCheckbox); + deleteTagList(DOMSublist); + if (DOMParentCheckbox.getAttribute('id') == DOMHighestCheckbox.getAttribute('id') && !DOMHighestCheckbox.checked) { + selectItem(DOMHighestCheckbox); + refreshTags(DOMHighestCheckbox); + createTag(DOMHighestCheckbox); + } + } else { + selectItem(this); + refreshTags(this); + createTag(this); + } + //выбрать все дочерние + if (DOMSublistInner) { + selectSublist(this); + } + } else { + + //Если выбран родитель + if (parentSelected()) { + unSelectParent(this); + unSelectItem(this); + refreshTags(DOMParentCheckbox); + deleteTag(DOMParentCheckbox); + createTagList(DOMSublist); + if (DOMHighestCheckbox.checked) { + unSelectItem(DOMHighestCheckbox); + refreshTags(DOMHighestCheckbox); + deleteTag(DOMHighestCheckbox); + } + } else { + unSelectItem(this); + refreshTags(this); + deleteTag(this); + } + //убрать все дочерние + if (DOMSublistInner) { + unSelectSublist(this); + } + + } + triggerSetText(); + }); + /** + * delete tag button behavior + */ + $('.' + self.opt.deleteTagClass, $modal).on('click', function () { + var checkboxId = $(this).attr('data-checkbox-id'), + $uncheckBoxes = $('#' + checkboxId); + $uncheckBoxes.prop('checked', false); + $uncheckBoxes.trigger('change'); + //dna.destroy(self.itemsSelected[checkboxId]); + //self._destroyTag(checkboxId); + self._refreshLabel(); + if (!$selectedItemsWrap.children('.dna-clone').length) { + $selectedItemsWrap.removeClass('visible'); + } + return false; + }); + $('#'+self.opt.deleteId).on('click',function () { + $('.' + self.opt.deleteTagClass, $modal).trigger('click'); + }); + /** + * clear all button behavior + */ + $('.clear', $modal).on('click', function () { + self.resetList(); + return false; + }); + /** + * sublist behaivor + */ + $('.q-sel a', $modal).on('click', function () { + var $this = $(this), + name = $this.attr('data-name'), + id = $this.attr('data-id'), + ajaxObj = {name: name, id: id}, + ajaxHandler = function (data) { + self._loadParentTree(data, function () { + self._checkCheckBox(id); + }); + + }; + getRequest(ajaxObj, self.opt.getParentUrl, ajaxHandler); + return false; + }); + $('.' + applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + $modalTrigger.siblings('.' + self.opt.clearAllButtonClass).on('click', function () { + self.resetList(); + }); + + }); + + + }; + /** + * methods for modal window object + * @type {{_getAjax: Function, _renderSublist: Function, _renderNested: Function, _checkCheckBox: Function, selectTag: Function, wait: Function, check: Function, _slideToggle: Function, _destroyTag: Function, _addTag: Function, resetList: Function, _autocompleteInit: Function, _loadParentTree: Function, applyHandler: Function, isSelected: Function}} + */ + PlacesModal.prototype = { + /** + * some kind of wrapper in top of jquery.AJAx + * @param {Object|string} dataToSend + * @param {function} handler + * @private + */ + _getAjax: function (dataToSend, handler) { + var self = this; + if (!dataToSend) { + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: self.opt.ajaxUrl, + data: dataToSend, + success: function (data) { + if (typeof handler == 'function') { + self.rawData = data; + handler(data); + } else { + self.rawData = data; + return data; + + } + } + }); + }, + /** + * render first level sublist (require dna.js template engine) + * @param {Object} dataObj + * @param {string} tmplId + * @param {function} handler + * @private + */ + _renderSublist: function (dataObj, tmplId, handler) { + var self = this, + index = 0, + template = tmplId + '-sub', + ajaxHandler = function (data) { + if (data.length) { + + self.curDNA[template] = {}; + + // for dna.clone definition see dnajs.org + for (index; index < data.length; index++) { + self.curDNA[template][data[index].id] = dna.clone(tmplId, data[index]); + + } + $('.' + tmplId).parents('.level1').addClass('active'); + handler(data.length); + } else { + $waiter.hide(); + } + }; + self._getAjax(dataObj, ajaxHandler); + }, + /** + * render second level sublist + * @param {Object} dataObj + * @param {function} handler + * @param {string} template + * @param {number} item + * @private + */ + _renderNested: function (dataObj, handler, template, item) { + var self = this, + Uri = Json2URI(dataObj); + dna.load(template, (self.opt.ajaxUrl + Uri), { + callback: handler, + container: self.curDNA[template][item] + }); + + }, + /** + * check particular checkbox input + * @param {number} id + * @private + */ + _checkCheckBox: function (id) { + var self = this, + $chckBox = $('#id_'+self.opt.prefix + id, self.$selfContainer); + if ($chckBox.length && !$chckBox.prop('checked')) { + $chckBox.prop('checked', true); + $chckBox.trigger('change'); + } + + }, + /** + * select particular item and render its tag and check checkbox + * @param {Object} item + * @public + */ + selectTag: function (item) { + //check of repeating execution + var firstTime = true, + self = this, + waitHandler = function () { + for (var prop in self.curDNA) { + for (var prop2 in self.curDNA[prop]) { + if (prop2 == item.id) { + firstTime = false; + } + + } + } + if ($('#id_' + item.id + ':checked').length) { + firstTime = false; + $('#id_' + item.id + ':checked').trigger('change'); + } + // ban of repeating execution + if (firstTime) { // konec + self.isReceived = false; + var $checkbox = $('#id_' + item.id), + requestObj, requestName, + treeLoadHandler = function (data) { + // make checkboxes selected after loading + + self._loadParentTree(data, function () { + self._checkCheckBox(item.id); + self.isReceived = true; + }); + $checkbox = $('#id_' + item.id); + }; + // load tree related to selected item + if (!$checkbox.length) { + + requestObj = { + id: item.id, + name: item.name + }; + + getRequest(requestObj, self.opt.getParentUrl, treeLoadHandler); + + + } else { + $checkbox.prop('checked', true); + $checkbox.trigger('change'); + self.isReceived = true; + } + + } else { + $('#id_' + item.id).prop('checked', true); + $('#id_' + item.id).trigger('change'); + } + }; + this.wait(waitHandler); + }, + /** + * waits so far the previous request will be executed and execute a method + * @param {function} method + * @param {Object|Array} args + * @public + */ + wait: function (method, args) { + var self = this, + waitImages, + waitHandler = function (self, method, args) { + if (self.isReceived) { + if (args) { + method(args); + } + else { + method(); + } + clearInterval(waitImages); + } + }; + waitImages = setInterval(function () { + waitHandler(self, method, args) + }, 100); + }, + /** + * check particular checkbox input + * @param {number} id + * @param {string} tagText + * @public + */ + check: function (id, tagText) { + var self = this, + $chckBox = $('#id_' + id, self.$selfContainer), + tagObj = {}; + if ($chckBox.length && !$chckBox.prop('checked')) { + + $chckBox.prop('checked', true); + $chckBox.trigger('change'); + } + + }, + /** + * hide or show sublists according active selected link + * @param $sublist + * @param $this + * @private + */ + _slideToggle: function ($sublist, $this) { + if ($sublist.hasClass('hidden')) { + $this.addClass('active'); + $sublist.removeClass('hidden'); + } else { + $this.removeClass('active'); + //$sublist.addClass('hidden').find('ul').addClass('hidden'); + $sublist.addClass('hidden').find('ul'); + } + + }, + /** + * for dna.clone definition see dnajs.org + * @param {string} checkboxId + * @private + */ + _destroyTag: function (checkboxId) { + var self = this; + if (self.itemsSelected[checkboxId]) { + dna.destroy(self.itemsSelected[checkboxId]); + + } + if (self.tagsBoxItems[checkboxId]) { + dna.destroy(self.tagsBoxItems[checkboxId]); + + } + //this._refreshLabel(); + }, + /** + * for dna.clone definition see dnajs.org + * @param {string} checkboxId + * @param tplObj + * @private + */ + _addTag: function (checkboxId, tplObj) { + var self = this; + self.itemsSelected[checkboxId] = dna.clone(self.opt.selectedItemTemplate, tplObj); + self.tagsBoxItems[checkboxId] = dna.clone(self.opt.tagsBoxId, tplObj); + this._refreshLabel(); + + }, + /** + * reset all checkboxes and clean tag wrapper + * @public + */ + resetList: function () { + var self = this; + for (var key in self.itemsSelected) { + if (self.itemsSelected.hasOwnProperty(key)) { + $('#' + key, self.$selfContainer).prop('checked', false).trigger('change'); + + dna.destroy(self.itemsSelected[key]); + } + } + $('.sublist:not(.parent)', self.$modal).addClass('hidden'); + $('.level', self.$modal).removeClass('active'); + self.selectedWrap.removeClass('visible'); + }, + /** + * initiliazing and setup autocomplete field for places list + * @private + */ + _autocompleteInit: function () { + var self = this, dataObj, text, form = self.$inputFilter.attr('data-form'), index, + $completeWrap = $('#' + self.opt.autoCompleteId), + firstComplete = true, + /** + * after tag is select + * @param {Object} event Jquery event object + * @param {Object} ui selected item object + */ + selectTag = function (event, ui) { + //check of repeating execution + $waiter.show(); + var firstTime = true; + for (var prop in self.curDNA) { + for (var prop2 in self.curDNA[prop]) { + if (prop2 == ui.item.value) { + firstTime = false; + } + + } + } + // if item is alreday selected + if ($('#id_' + self.opt.prefix + ui.item.value + ':checked').length) { + firstTime = false; + } + // ban of repeating execution + if (firstTime) { // konec + var $checkbox = $('#id_' + self.opt.prefix + ui.item.value), + requestObj, requestName, + treeLoadHandler = function (data) { + // make checkboxes selected after loading + self._loadParentTree(data, function () { + self._checkCheckBox(ui.item.value); + }); + $checkbox = $('#id_' + self.opt.prefix + ui.item.value); + }; + // load tree related to selected item + if (!$checkbox.length) { + + requestObj = { + id: ui.item.value, + name: ui.item.name + }; + getRequest(requestObj, self.opt.getParentUrl, treeLoadHandler); + } else { + $checkbox.prop('checked', true); + $checkbox.trigger('change'); + } + + self.$inputFilter.val(ui.item.label); + } + }, + /** + * autocomplete execute after recieving data + * @param {Object} data recieved from ajax response + */ + requestHandler = function (data) { + dataObj = data; + for (index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index], 'text', 'label'); + } + for (index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index], 'id', 'value'); + } + if (!self.$inputFilter.hasClass('ui-autocomplete-input')) { + + self.$inputFilter.autocomplete({ + source: dataObj, + minLength: 0, + appendTo: $completeWrap, + /** + * autocomplete item is selected + * @param {Object} event jquery event object + * @param {Object} ui selected item object + */ + select: function (event, ui) { + selectTag(event, ui); + self.$inputFilter.val(''); + self.$inputFilter.trigger('keyup'); + event.preventDefault(); + } + }); + self.$inputFilter.autocomplete('search', ""); + firstComplete = false; + } else { + + self.$inputFilter.autocomplete('search', ""); + } + $waiter.hide(); + + }; + // var newData = ['banan','banan2','banan3','banan4','banan5']; + self.$inputFilter.attr('autocomplete', 'on'); + + self.$inputFilter.on('keyup', function (event) { + text = $(this).val(); + event.stopImmediatePropagation(); + + + if (text.length > 2 && firstComplete) { + $waiter.show(); + getRequest({'term': text, 'form': form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + } else if (text.length == 0 && !firstComplete) { + if (self.$inputFilter.hasClass('ui-autocomplete-input')) { + + self.$inputFilter.autocomplete("destroy"); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + /** + * loads and shows list tree related to selected id + * @param {Object} data - is JSON object with information about parent elements. + * @param {function} handler - callback function + * @param {number} counter + * @private + */ + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj, nestedSublistTemplateId, + $midleLevelCheckbox = $('#id_' + self.opt.prefix + dataObj.id), + /** + * makes request in order to recieve children list information fires after request for parent list + * @param {number} length + * @function + */ + handlerNested = function (length) { + var $checkbox = $('#id_' + self.opt.prefix + dataObj.id), + afterAll = function () { + $waiter.hide(); + counter || counter === 0 ? handler(counter) : handler(); + }; + $waiter.hide(); + if ($checkbox.length && getObjectLength(self.curDNA[sublistTemplateId + '-sub']) == length) { + + nestedObj = { + name: dataObj.name, + id: dataObj.id + }; + $waiter.show(); + nestedSublistTemplateId = $('#id_' + self.opt.prefix + dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, afterAll, nestedSublistTemplateId, dataObj.id); + } + + }, + /** + * @function + */ + handlerParent = function () { + $waiter.hide(); + counter || counter === 0 ? handler(counter) : handler(); + }; + $waiter.show(); + //if element has parent element + if (dataObj.hasOwnProperty('parent')) { + //if checbox is existed + if ($midleLevelCheckbox.length) { + nestedObj = { + name: dataObj.name, + id: dataObj.id + }; + nestedSublistTemplateId = $midleLevelCheckbox.closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, function () { + $waiter.hide(); + handler(); + }, nestedSublistTemplateId, dataObj.id); + } else { + + optObj = { + name: dataObj.parent.name, + id: dataObj.parent.id + }; + sublistTemplateId = $('#id_' + self.opt.prefix + dataObj.parent.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj, sublistTemplateId, handlerNested); + } + + + } else { + optObj = { + name: dataObj.name, + id: dataObj.id + }; + sublistTemplateId = $('#id_' + self.opt.prefix + dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj, sublistTemplateId, handlerParent); + } + + }, + applyHandler: function (it) { + }, + /** + * render label text, if there is no selected element then text will be default + * @private + */ + _refreshLabel: function () { + var oLength = this.selectedWrap.children().length; + + if (oLength){ + this.$label.text(this.$label.attr('data-selected')); + }else{ + this.$label.text(this.$label.attr('data-default')); + + } + } + }; + + /////////////////////////// + //инициализация общих свойств + that.init = function (options) { + // settings extending + $.extend(this.opt, options); + // begin of initialization + var self = this, + submitHandler = function () { + $(self.DOMform).find('input[name="~~name~~"]').remove(); + }; + if(this.opt.searchData != 'None' && this.opt.searchData){ + this.previousSearch = JSON.parse(this.opt.searchData) + + } + this.DOMform = document.getElementById(this.opt.formId); + $(this.DOMform).on('submit', function () { + submitHandler(); + }); + this.DOMfilterButton = document.getElementById(this.opt.filter.buttonId); + this.filterPane = new Filter(this.opt.filter); + $('#' + this.opt.filter.buttonId).on('click', function () { + if (com.hasClass(this, self.opt.activeClass)) { + com.removeClass(this, self.opt.activeClass); + self.filterPane.hide(); + } else { + com.addClass(this, self.opt.activeClass); + self.filterPane.show(); + } + return false; + }); + $('#'+self.opt.bodyId+' .' + self.opt.modalTriggerClass).on('click', function (event) { + event.preventDefault(); + self.modalWindow.pullData(this.getAttribute('href')); + self.modalWindow.open(); + return false; + }); + //modal + //модальное окно + this.modalWindow = new com.Modal(self.opt.modal); + //modal windows + this.placesModal = new PlacesModal(self.opt.place); + this.subjModal = new SubjectModal(self.opt.subject); + + this.placesModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + this.subjModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + // заполнение полей предыдущими значениями + $(function () { + if(self.previousSearch){ + for (var i = 0; i < self.previousSearch.inputs.length; i++) { + // окно выбора тематики + if (self.previousSearch.inputs[i].name == 'th'){ + self.subjModal._loadParentTree(self.previousSearch.inputs[i], function (innerI) { + if(self.previousSearch.inputs[innerI].children){ + + self.subjModal.check(self.previousSearch.inputs[innerI].children.id, self.previousSearch.inputs[innerI].children.name); + }else{ + self.subjModal.check(self.previousSearch.inputs[innerI].id, self.previousSearch.inputs[innerI].name); + + } + }, i); + // окно выбора мест + } else if (self.previousSearch.inputs[i].name == 'area'){ + + if(self.previousSearch.inputs[i].children && self.previousSearch.inputs[i].children.children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children.children); + + }else if (self.previousSearch.inputs[i].children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children); + + + } else if(self.previousSearch.inputs[i]){ + self.placesModal.selectTag(self.previousSearch.inputs[i]); + + + } + } + } + + } + }); + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/page.exposition.object.js b/templates/client/static_client/js/_modules/page.exposition.object.js new file mode 100644 index 00000000..f553c5d7 --- /dev/null +++ b/templates/client/static_client/js/_modules/page.exposition.object.js @@ -0,0 +1,92 @@ +var EXPO = EXPO || {}; //isolated namespace +EXPO.exposition = EXPO.exposition || {}; +if (EXPO.exposition.object){ + console.warn('WARNING: EXPO.exposition.object is already defined!'); +}else { + + EXPO.exposition.object = (function () { +// variables + var that = {}, + VisitButtons = function ( opt) { + this.opt = opt; + this.isActive = false; + this.$visitorsList = $(document.getElementById(opt.visitorsListId)); + this.$secondary = $(document.getElementById(opt.wrapId)); + this._controller(); + + }, + UnVisitButtons = function (opt) { + this.opt = opt; + this.$visitorsList = $(document.getElementById(opt.visitorsListId)); + this.$secondary = $(document.getElementById(opt.wrapId)); + this._controller(); + }; + VisitButtons.prototype = { + _controller: function () { + var self = this; + $('.'+this.opt.class).on('click',function(){ + self._setName(); + $('.'+self.opt.class).hide().siblings('.button').show(); + + + }); + }, + _setName: function () { + $('
  • ').html(this.opt.template).prependTo(this.$visitorsList); + this.$secondary.hide(); + isActive = true; + } + }; + UnVisitButtons.prototype = { + _controller: function () { + var self = this; + $('.'+this.opt.class).on('click',function(){ + self._unSetName(); + $('.'+self.opt.class).hide().siblings('.button').show(); + + + }); + }, + _unSetName: function () { + var self = this; + this.$visitorsList.children().each(function () { + if($(this).html() == self.opt.template){ + $(this).detach(); + + } + }); + if(!this.$visitorsList.children().length){ + this.$secondary.show(); + }else{ + this.$secondary.hide(); + + } + isActive = true; + } + }; + that.opt = {}; //свойства по умолчанию +//private + $(function () { + //$('.visit').on('click', function () { + // console.log('!!!! visit button is clicked!'); + //}); + }); + +// methods + //инициализация общих свойств + that.init = function (options) { + $.extend(this.opt, options); + var self = this, + $visitorsWrap = $(document.getElementById(self.opt.visitButton.visitorsListId)), + $secondaryList = $(document.getElementById(self.opt.visitButton.wrapId)); + + if(!$visitorsWrap.children().length){ + $secondaryList.show(); + } + this.visitButtons = new VisitButtons(self.opt.visitButton); + this.unVisitButtons = new UnVisitButtons(self.opt.unvisitButton); + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/page.place.object.js b/templates/client/static_client/js/_modules/page.place.object.js new file mode 100644 index 00000000..1e8bdbfd --- /dev/null +++ b/templates/client/static_client/js/_modules/page.place.object.js @@ -0,0 +1,65 @@ +var EXPO = EXPO || {}; //isolated namespace +EXPO.place = EXPO.place || {}; +if (EXPO.place.object){ + console.warn('WARNING: EXPO.place.object is already defined!'); +}else { + + EXPO.place.object = (function () { +// variables + var that = {}, + Article = function (opt, it) { + this.$annotation = $('.'+opt.annotationClass, it); + this.$fullPart = $('.'+opt.fullPartClass, it); + this.$readMore = $('.'+opt.readMoreClass, it); + this.cutLength = opt.cutLength; + this.fullText; + this.init(); + + }; + Article.prototype = { + init: function () { + var self = this, + anText = this.$annotation.html().slice(0,self.cutLength); + this.fullText = this.$annotation.html(); + this.$annotation.html(anText+'...'); + this.$fullPart.html(this.fullText); + + + + }, + showMore: function () { + this.$readMore.hide(); + this.$annotation.hide(); + this.$fullPart.removeClass('hidden'); + + }, + _cutAnnotation: function () { + } + }; + that.opt = {}; //свойства по умолчанию +//private + $(function () { + }); + +// methods + //инициализация общих свойств + that.init = function (options) { + $.extend(this.opt, options); + var self = this; + this.articles = []; + //readmore on Articles + $('.'+self.opt.article.class).each(function () { + var article = new Article(self.opt.article, this); + + article.$readMore.on('click', function () { + article.showMore(); + }); + self.articles.push(article); + + }); + + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/page.place.photo.js b/templates/client/static_client/js/_modules/page.place.photo.js new file mode 100644 index 00000000..97955301 --- /dev/null +++ b/templates/client/static_client/js/_modules/page.place.photo.js @@ -0,0 +1,204 @@ +var EXPO = EXPO || {}; //isolated namespace + +// module requires JQuery library, dna.js template engine (http://dnajs.org/) +// protection against duplication of a module code +if (EXPO.placePhoto){ + console.warn('WARNING: EXPO.placePhoto is already defined!'); +}else{ + + EXPO.placePhoto = (function() { + // variables + var that = {}; + that.settings = { + + }; //default module setting + that.lang ={}; + //dependence's + + //private + // constructor for popup window on gallery page + var ModalBox = function(modalId, containerId, modalTrigger, ajaxUrl, nextButtonId, prevButtonId, closeModalButtonId, modalContainerId){ + // object properties + var self = this; + this.currentId = undefined; + this.ajaxUrl = ajaxUrl; + //modal Window options + this.opt = { + gContainerId:containerId, + mId:modalId, + mTrigger:modalTrigger, + nBtn: nextButtonId, + pBtn: prevButtonId, + cBtn: closeModalButtonId, + mcId: modalContainerId + }; + this.$mWindow = undefined; + + $(function () { + self.$mWindow = $('#'+self.opt.mId); + self.$mtrigger = $('.'+self.opt.mTrigger); + self.$nBtn = $('#'+self.opt.nBtn); + self.$pBtn = $('#'+self.opt.pBtn); + self.$cBtn = $('#'+self.opt.cBtn); + self.$mtrigger.on('click', function () { + var curId; + + try { + curId = $(this).children('img').data('image-id'); + self.currentId = curId; + } + catch(err) { + console.log(err.message); + } + self.show(); + return false; + }); + // next button + self.$nBtn.off('click'); + self.$nBtn.on('click', function () { + self.nextSlide(); + return false; + + }); + // previous button + self.$pBtn.off('click'); + self.$pBtn.on('click', function () { + self.prevSlide(); + return false; + }); + //close modal window + self.$cBtn.off('click'); + self.$cBtn.on('click', function () { + self.close(); + return false; + }); + self.$mWindow .off('click'); + self.$mWindow .on('click', function (event) { + var targetObj = $(event.target); + if (targetObj.parents().filter('#'+self.opt.mcId).length < 1) { + self.close(); + } + return false; + }); + }); + + }; + //methods for ModalBox object + ModalBox.prototype = { + //some kin + _getAjax: function (dataToSend, handler) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: self.ajaxUrl, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + self.rawData = data; + handler(); + } else{ + self.rawData = data; + } + } + }); + }, + // require dna.js template engine + _renderSlide: function (idToRender, handler) { + var self = this; + if(idToRender){ + self.currentId = idToRender; + } + if(handler){ + dna.empty(self.opt.mcId); + dna.load(self.opt.mcId, (self.ajaxUrl + self.currentId),{ callback:handler()}); + }else{ + + dna.empty(self.opt.mcId); + dna.load(self.opt.mcId, (self.ajaxUrl + self.currentId),{empty:true}); + } + + }, + _getId: function (parameter) { + var self = this, + nextSlide = function () { + var curId = $('.'+self.opt.mTrigger+' [data-image-id="'+self.currentId+'"]').parents('li').next().find('img').data('image-id'); + if(curId){ + self.currentId = curId; + }else{ + console.log('there is not next slides'); + + } + }, + prevSlide = function () { + var curId = $('.'+self.opt.mTrigger+' [data-image-id="'+self.currentId+'"]').parents('li').prev().find('img').data('image-id'); + if(curId){ + self.currentId = curId; + }else{ + console.log('there is not previous slides'); + + } + }, + defaultAction = function () { + console.log('_getId('+parameter+') RESULTS:'); + console.log(self.currentId); + + }; + switch(parameter) { + case '>': + nextSlide(); + break; + case '<': + prevSlide(); + break; + default: + defaultAction(); + } + }, + //public methods + close: function () { + $('body').removeClass('no-scroll'); + this.$mWindow.hide(); + }, + open: function () { + $('body').addClass('no-scroll'); + this.$mWindow.show(); + }, + nextSlide:function () { + var pastSlide = this.currentId; + this._getId('>'); + + if(pastSlide != this.currentId){ + this._renderSlide(); + } + }, + prevSlide: function () { + var pastSlide = this.currentId; + this._getId('<'); + if(pastSlide != this.currentId){ + this._renderSlide(); + } + }, + // method to get sliderPopup visible and pass to modalBox first initial id and make some init routine + show: function (idToShow) { + var self = this; + this._renderSlide(idToShow, function () {self.open()}); + } + }; + // methods + //инициализация общих свойств + that.init = function(options) { + // settings extending + $.extend(this.lang, options.lang); + options.lang = null; + $.extend(this.settings, options); + // begin of initialization + var self = this; + + this.modal = new ModalBox(self.settings.modalId, self.settings.containerId, self.settings.modalTrigger, self.settings.ajaxUrl, self.settings.nextButtonId, self.settings.prevButtonId, self.settings.closeModalButtonId, self.settings.modalContainerId); + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/_modules/page.profile.js b/templates/client/static_client/js/_modules/page.profile.js new file mode 100644 index 00000000..305e2cb0 --- /dev/null +++ b/templates/client/static_client/js/_modules/page.profile.js @@ -0,0 +1,459 @@ +var EXPO = EXPO || {}; //isolated namespace +//общий для всех страниц модуль Функционал общий для всех страниц +// module requires JQuery library +// protection against duplication of a module code +if (EXPO.profile){ + console.warn('WARNING: EXPO.profile is already defined!'); +}else{ + + EXPO.profile = (function() { + // variables + var that = {}; + that.settings = { + updateFormClass:'update-profile-form' + }; //default module setting + //language object + that.lang ={}; + //dependences + + //private + // factory for on page form objects + function Forms(){}; + // methods to perform ajax responses to send and receive data from the server + Forms.prototype = { + // ajax request realization + getajax: function (dataToSend) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'POST', + // dataType: "json", + url: self.ajaxPath, + data:dataToSend, + processData: false, + contentType: false, + success: function(data) { + self.pullHandler(data); + $('#wait-ajax').fadeOut(); + } + }); + + }, + // check if there exists custom data manipulation handler and evaluate it + pushData: function (data, formName) { + var handler = this.pushHandler, + formData = data; + if(typeof formData != "string"){ + this.formData =formData; + }else{ + this.formData = JSON.parse('{"' + decodeURI(formData).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}'); + } + this.formId = formName; + + if(typeof handler == 'function'){ + // if particular data change required + handler(data); + $('#wait-ajax').show(); + } else{ + this.getajax(data); + $('#wait-ajax').show(); + } + console.log('formData type'); + console.log(typeof formData); + + + + }, + pullData: function (data) { + var handler = this.pullHandler; + if(typeof handler == 'function'){ + handler(data); + } else{ + throw{ + name: 'Error', + message: " handler function for processing response after form submit not defined, please define it!" + }; + } + + + }, + // method to fulfill edited inputs with new content + fulfillInputs: function () { + var self = this; + for (input in self.formData) { + if($('#id_'+input, $('#'+self.formId)).length > 0){ + $('#id_'+input, $('#'+self.formId)).value(self.formData[input]); + } + if($('#static-'+input).length > 0){ + $('#static-'+input).html + } + } + } + }; + Forms.factory = function (type, ajaxpath) { + var constr = type, + newForm; + if (typeof Forms[constr] !== 'function'){ + throw{ + name: 'Error', + message: constr + "doesen't exist" + }; + } + if(typeof Forms[constr].prototype.pushData !== "function"){ + Forms[constr].prototype = new Forms(); + } + newForm = new Forms[constr](ajaxpath); + return newForm; + }; + + //# constructors for each indivivdual form + // please add functionality for new profile forms here + // pushHandler is for ajax to server, pullHandler for ajax from it. Data is the response information from server + // name of each method is equal 'id' attribute of
    element on the page. + + Forms.home_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + var country = $('#s2id_id_country').find('.select2-chosen').text(), + city = $('#s2id_id_city').find('.select2-chosen').text(); + $('#static-home-country').text(country); + $('#static-home-city').text(city); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.name_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + $('#static-name-value').text($('#id_last_name').val()+' '+$('#id_first_name').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.work_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + var company = $('#s2id_id_company').find('.select2-chosen').text(); + $('#static-work-value').html($('#id_position').val()+' '+EXPO.profile.lang.workIn+' "'+ company+'"'); + + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.about_company_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + window.location.reload(); + } + }; + this.ajaxPath = path; + + }; + Forms.social_form = function (path) { + this.pullHandler = function (data) { + if (data.success){ + window.location.reload(); + } + }; + this.ajaxPath = path; + + }; + Forms.phone_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + $('#static-phone-value').text($('#id_phone')[0].value); + + $('.p-editable').removeClass('pe-current'); + + } + }; + this.ajaxPath = path; + + }; + Forms.web_page_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + var userLink = $('#id_web_page').val(); + $('#static-web-page-value').attr('href',userLink).text(userLink); + $('.p-editable').removeClass('pe-current'); + } + }; + + this.ajaxPath = path; + + }; + Forms.about_form = function (path) { + var self = this; + this.pullHandler = function (data) { + if (data.success){ + $('#static-about-value').text($('#id_about').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + $('#id_about').on('keypress', function (e) { + var keycode = (e.keyCode ? e.keyCode : e.which); + if(keycode == '13'){ + return false; + } + + }); + this.ajaxPath = path; + + }; + Forms.social_form = function (path) { + var self = this, + $img, imgSrc, $input, inputValue; + this.pullHandler = function (data) { + if (data.success){ + + for (item in self.formData) { + $input = $('#id_'+item); + if($.trim(self.formData[item]) != '' && $input.length){ + $img = $('#img-'+item); + if($img.length){ + inputValue = $.trim($input.val()); + if ($img.parent('a').length){ + $img.parent('a').attr('href',inputValue); + imgSrc = $img.attr('src').replace('_hover',''); + $img.attr('src',imgSrc); + // $('.p-editable').removeClass('pe-current'); + }else { + imgSrc = $img.attr('src').replace('_hover',''); + $img.attr('src',imgSrc); + $img.wrap(''); + // $('.p-editable').removeClass('pe-current'); + } + } + }else if($input.length){ + $img = $('#img-'+item); + if ($img.parent('a').length){ + imgSrc = $img.attr('src').replace('.png','_hover.png'); + $img.attr('src',imgSrc); + $img.unwrap(); + } + + } + + } + $('.p-editable').removeClass('pe-current'); + } + }; + this.ajaxPath = path; + + }; + Forms.avatar_form = function (path) { + var self = this, + $input = $('#id_avatar'), + $editPhoto = $('#pic-edit-photo'), + $pickBlock = $('#pick-block'), + $form, + $avatar = $('.pic_block img'); + this.pullHandler = function (data) { + if (data.success){ + + if($avatar.length){ + $avatar.attr('src', data.url); + }else{ + $pickBlock.removeClass('add_pic_block').addClass('pic_block'); + $('.add-wrapper', $pickBlock).remove(); + $('').attr('src', data.url).prependTo($pickBlock); + } + // $('#static-about-value').text($('#id_about').val()); + $('.p-editable').removeClass('pe-current'); + } + }; + this.pushHandler = function(data){ + if(typeof data != 'string'){ + self.getajax(data); + $('#wait-ajax').show(); + }else{ + $form = $('#'+self.formId); + $form.off('submit'); + $form.trigger('submit'); + } + }; + $input.on('change', function () { + $(this).parents('form').submit(); + }); + $editPhoto.on('click', function () { + $input.trigger('click'); + }); + // pick-block + this.ajaxPath = path; + } + + $(function () { + + }); + + // methods + //инициализация общих свойств + that.init = function(options) { + $.extend(this.lang, options.lang); + options.lang = null; + $.extend(this.settings, options); + + var self = this, + initMaskedInput = function (inputId) { + var maskList = $.masksSort($.masksLoad("/static/client/js/plugins/inputmask/phone-codes.json"), ['#'], /[0-9]|#/, "mask"), + maskOpts = { + inputmask: { + definitions: { + '#': { + validator: "[0-9]", + cardinality: 1 + } + }, + //clearIncomplete: true, + showMaskOnHover: false, + autoUnmask: true + }, + match: /[0-9]/, + replace: '#', + list: maskList, + listKey: "mask", + onMaskChange: function(maskObj, determined) { + $(this).attr("placeholder", $(this).inputmask("getemptymask")); + } + }, + selector = '#'+inputId; + + $(selector).attr('placeholder', '+_(___)___-__-__'); + $(selector).inputmasks(maskOpts); + + }; + this.forms = {}; + $(function () { + //start of document.ready + + // styling with 3-rd party libs + $('#'+self.settings.selectBox[0].id).select2({ + width: 'element' + }); + + $('#'+self.settings.selectBox[1].id).select2({ + width: 'element', + placeholder: self.settings.selectBox[1].placeholder, + maximumSelectionSize: 3 + }); + + $('#'+self.settings.selectBox[2].id).select2({ + placeholder: self.settings.selectBox[2].placeholder, + width: 'element', + ajax: { + + url: self.settings.selectBox[2].path, + dataType: "json", + quietMillis: 200, + + data: function(term, page, country){ + var country = $('#'+self.settings.selectBox[0].id).val(); + return {term: term, + page: page, + country: country}; + }, + + results: function (data) { + var results = []; + $.each(data, function(index, item){ + results.push({ + id: item.id, + text: item.label + }); + }); + return {results: results}; + } + }, + initSelection : function(element, callback) { + var id= $(element).val(); + var text = $(element).attr('data-init-text'); + callback({id: id, text:text}); + + } + + }); + + $('#'+self.settings.selectBox[3].id).select2({ + placeholder: self.settings.selectBox[3].placeholder, + width: '200px', + minimumInputLength: 1, + ajax: { + + url: self.settings.selectBox[3].path, + dataType: "json", + quietMillis: 200, + + data: function(term, page, country){ + return {term: term, + page: page}; + }, + + results: function (data) { + var results = []; + $.each(data, function(index, item){ + results.push({ + id: item.id, + text: item.label + }); + }); + return {results: results}; + } + }, + initSelection : function(element, callback) { + var id= $(element).val(); + var text = $(element).attr('data-init-text'); + callback({id: id, text:text}); + + } + + }); + + // $('#'+ self.settings.phoneBox); + // make mask on phone field input + initMaskedInput(self.settings.phoneBox); + //forms init + $('.'+self.settings.updateFormClass).each(function () { + var formName = $(this).attr('id'), + path = $(this).attr('action'), + inputData; + + //make and initialize form objects + self.forms[formName] = Forms.factory(formName,path); + + // submit events handler + $(this).off('submit'); + $(this).on('submit', function () { + //check if formData is supported + if ( window.FormData && ("upload" in ($.ajaxSettings.xhr())) ){ + inputData = new FormData(this); + self.forms[formName].pushData(inputData, formName); + } else { + inputData = $(this).serialize(); + self.forms[formName].pushData(inputData, formName); + } + + return false; + }); + + }); + }); + + + + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/blocks/common_block.js b/templates/client/static_client/js/blocks/common_block.js new file mode 100644 index 00000000..8bdd0672 --- /dev/null +++ b/templates/client/static_client/js/blocks/common_block.js @@ -0,0 +1,240 @@ +/** + * Created by pavel.handleman@gmail.com on 15.10.2014. + * commonly using snippets and functions. this module must be loaded on every page + */ +var EXPO = EXPO || {}; //isolated namespace +//общий для всех страниц модуль Функционал общий для всех страниц +if (EXPO.common){ + console.warn('WARNING: EXPO.common is already defined!'); +}else { + + EXPO.common = (function () { +// variables + var that = {}; + var matches = function(el, selector) { + return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector); + }; + that.settings = {}; //свойства по умолчанию + // Валидация форм, каждый объект содержит поля объектов формы и методы работы с формой + var Validation = function(obj){ + //поля над которыми проводится валидация + this.fields = []; + //флаг которые опдвтерждает отправку формы. если true то ошибок нет + this.allIsClear = false; + this.ajaxUrl = obj.getAttribute('action'); + this.DOM = obj; + this._initFields(); + this._eventController(); + + + }; + Validation.prototype = { + //связывает данные объекта с html кодом + _eventController: function () { + var self = this; + if(this.DOM.addEventListener){ + this.DOM.addEventListener("submit", function (event) { + self.validate(); + event.preventDefault(); + return false; + }, false); //Modern browsers + }else if(this.DOM.attachEvent){ + this.DOM.attachEvent('onsubmit', function (event) { + self.validate(); + event.preventDefault(); + return false; + }); //Old IE + } + }, + //берет все поля с классом required + _initFields: function () { + //this.fields = this.DOM.querySelectorAll('.required input'); + + }, + //проводит валидацию, выводит сообщение об ошибках + validate: function () { + var self = this, + formData = $(self.DOM).serialize(), + responseData, + inputObj ={}, + errBoxClass = 'err-message-box', + DOMerrBox = self.DOM.querySelector('.'+errBoxClass), + errBoxText = DOMerrBox.innerHTML, + handler = function (data){ + responseData = data; + self.unHighlightFields(); + if(responseData.success){ + if(DOMerrBox){ + EXPO.common.removeClass(DOMerrBox, 'active'); + } + window.location.reload(); + }else{ + EXPO.common.removeClass(DOMerrBox, 'active'); + inputObj ={}; + self.fields = []; + for(var prop in responseData.errors) { + if (!responseData.errors.hasOwnProperty(prop)) continue; + if(prop != '__all__'){ + inputObj ={'name':prop, 'id':'id_'+prop, 'errorText':responseData.errors[prop]}; + //inputObj.name = prop; + //inputObj.id = 'id_'+prop; + //inputObj.errorText = responseData.errors[prop]; + self.fields.push(inputObj); + }else{ + if(DOMerrBox){ + EXPO.common.addClass(DOMerrBox, 'active'); + if(errBoxText.indexOf(responseData.errors[prop]) < 0) { + DOMerrBox.insertAdjacentHTML('beforeend', responseData.errors[prop]+' '); + + } + + } + + } + + + } + self.highliteFields(); + } + + + }; + self.unHighlightFields(); + EXPO.common.postRequest(formData, self.ajaxUrl,handler); + + }, + //подсвечивает неправильно введенные поля, + highliteFields: function () { + var DOMfield, + DOMfieldWrap; + for(var i = 0; i < this.fields.length; i++){ + DOMfield = this.DOM.querySelector('#'+ this.fields[i].id); + DOMfieldWrap = DOMfield.parentNode; + EXPO.common.addClass(DOMfieldWrap,'required'); + EXPO.common.addClass(DOMfieldWrap,'err'); + + } + + }, + unHighlightFields: function () { + var DOMfield, + DOMfieldWrap; + for(var i = 0; i < this.fields.length; i++){ + DOMfield = this.DOM.querySelector('#'+ this.fields[i].id); + DOMfieldWrap = DOMfield.parentNode; + EXPO.common.removeClass(DOMfieldWrap,'required'); + EXPO.common.removeClass(DOMfieldWrap,'err'); + } + }, + submit: function () { + + } + + }; +//dependences + +//private + $(function () { + /* Нестандартное оформление для поля checkbox */ + $.fn.customRadioCheck = function () { + return $(this).each(function () { + var $el = $(this); + var type = $el.attr("type"); + var $label = $el.closest("label"); + var $customCheckbox = $el.wrap("").parent(); + $label.addClass("custom-radio-check"); + function setState () { + if (type == 'radio') { + var name = $el.attr('name'); + var $radios = $('input[type="radio"]').filter('[name="' + name + '"]'); + $radios.each(function () { + var $container = $(this).closest('.custom-radio'); + $container.removeClass('checked'); + if ($(this).is(':checked')) { + $container.addClass('checked'); + } + }); + } else { + if ($el.prop("checked")) { + $customCheckbox.addClass("checked"); + } else { + $customCheckbox.removeClass("checked"); + } + } + $el.trigger('blur'); + } + setState(); + $el.on("change", setState); + }); + }; + var forms = []; + $(function () { + $('form.validate').each(function () { + forms.push(new Validation(this)); + }); + + }); + + $("input[type='checkbox'], input[type='radio']").customRadioCheck(); + }); + +// methods + //инициализация общих свойств + that.init = function (options) { + $.extend(this.settings, options); + var self = this; + + + }; + that.hasClass = function (DOM, className) { + if (DOM.classList) + return DOM.classList.contains(className); + else + return new RegExp('(^| )' + className + '( |$)', 'gi').test(el.className); + }; + that.addClass = function (DOM, className) { + if (!that.hasClass(DOM, className)) { + if (DOM.classList) + DOM.classList.add(className); + else + DOM.className += ' ' + className; + } + return DOM; + }; + that.removeClass = function (DOM, className) { + var newClass = ' ' + DOM.className.replace(/[\t\r\n]/g, ' ') + ' '; + if (that.hasClass(DOM, className)) { + if (DOM.classList){ + DOM.classList.remove(className); + }else{ + while (newClass.indexOf( ' ' + className + ' ') >= 0) { + newClass = newClass.replace(' ' + className + ' ', ' '); + } + DOM.className = newClass.replace(/^\s+|\s+$/g, ' '); + } + } + return DOM; + }; + //Jquery .closest analog for pure js + that.closest = function(el, className) { + var fn = function(className){ + return that.hasClass(el, className); + }; + while (el) { + if (fn(className)) return el; + el = el.parentNode; + } + }; + //JQUERY .children alternative ie 9+ + that.children = function (elm, sel){ + var ret = [], i = 0, l = elm.childNodes.length; + for (var i; i < l; ++i){ + if (matches(elm.childNodes[i], sel)){ + ret.push(elm.childNodes[i]); + } + } + return ret; + }; + return that; + }()); +} diff --git a/templates/client/static_client/js/blocks/search_block.js b/templates/client/static_client/js/blocks/search_block.js new file mode 100644 index 00000000..9b88152e --- /dev/null +++ b/templates/client/static_client/js/blocks/search_block.js @@ -0,0 +1,1959 @@ +var EXPO = EXPO || {}; //isolated namespace + +// module requires JQuery library, dna.js template engine (http://dnajs.org/) +// protection against duplication of a module code +if (EXPO.searchBlock){ + console.warn('WARNING: EXPO.searchBlock is already defined!'); +}else{ + + EXPO.searchBlock = (function() { + + // variables + var that = {}; + //default module setting + that.settings = { + place:{ + id:'pw-place', + selectedItemTemplate:'csb-selected', + ajaxUrl:'http://hit.expomap.ru/search-form/' + }, + subject:{ + id:'pw-subj', + ajaxUrl:'http://hit.expomap.ru/search-form/' + } + }; + that.lang ={}; + //dependence's + // module require dna.js tiny templating engine + var common = EXPO.common; + //private + // statci class methods + var Json2URI = function (jsonObj) { + var str = Object.keys(jsonObj).map(function(key){ + return encodeURIComponent(key) + '=' + encodeURIComponent(jsonObj[key]); + }).join('&'); + return ('?'+str); + }, + //STATIC MEtHOD for make ajax GET request and launch handler if exist or return data + getRequest = function (dataToSend,url,handler) { + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'GET', + url: url, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + handler(data); + } else{ + return data; + } + } + }); + }, + renameProperty = function (obj,oldName, newName) { + // Check for the old property name to avoid a ReferenceError in strict mode. + if (obj.hasOwnProperty(oldName)) { + obj[newName] = obj[oldName]; + + } + return this; + }, + // analogue of Array.length but for object + getObjectLength = function (obj) { + var size = 0, key; + for (key in obj) { + if (obj.hasOwnProperty(key)) size++; + } + return size; + }, + // returns string that contains selected values in both modal windows. values separated by ',' + // string is cutted to N symbols length + getSelectedToString = function(container, cutLength){ + var $container = $('#'+container), + index = 0, + stringToReturn = '', + closingSymbol = '...', + closerText = EXPO.searchBlock.settings.closerText, + closerTextSingle = EXPO.searchBlock.settings.closerTextSingle, + dividerSymbol = ''; + $element = $container.find('.csbs-text'); + if($element.length > 2){ + if($element.eq(0).text().length < cutLength){ + dividerSymbol = ','; + stringToReturn += $element.eq(0).text() + dividerSymbol + $element.eq(1).text() + closerText.replace('_',$element.length-2); + }else{ + stringToReturn += $element.eq(0).text() + closerText.replace('_',$element.length-1); + } + + } else if($element.length == 2){ + if($element.eq(0).text().length < cutLength){ + dividerSymbol = ','; + stringToReturn += $element.eq(0).text() + dividerSymbol + $element.eq(1).text() + closerTextSingle.replace('_',$element.length-2); + }else{ + stringToReturn += $element.eq(0).text() + closerTextSingle.replace('_',$element.length-1); + } + }else if($element.length){ + stringToReturn += $element.eq(0).text(); + }else{ + stringToReturn = false; + } + return stringToReturn; + //if($element.length > 1){ + // dividerSymbol = ', '; + //} + //if($element.length){ + // $element.each(function () { + // if (index == ($element.length -1)){ + // stringToReturn += $(this).text(); + // }else{ + // stringToReturn += $(this).text()+dividerSymbol; + // + // } + // index++ + // }); + // stringToReturn = stringToReturn .substring(0, cutLength); + // stringToReturn += closingSymbol; + // return stringToReturn; + //} else{ + // return false; + //} + }, + //ajax pending process indicator + $waiter = $('.wait-ajax.absolute'), + //temporal stub for testing autocomplete field/ must remove this before production + stubForAutocomplete = [{"url": null, "text": "\u041d\u0430\u043f\u0438\u0442\u043a\u0438", "id": 142, "label": "\u0422\u0435\u0433\u0438:"}, {"url": null, "text": "\u0421\u043f\u0438\u0440\u0442\u043d\u044b\u0435 \u043d\u0430\u043f\u0438\u0442\u043a\u0438", "id": 277, "label": "\u0422\u0435\u0433\u0438:"}, {"url": null, "text": "\u0410\u043b\u043a\u043e\u0433\u043e\u043b\u044c\u043d\u044b\u0435 \u043d\u0430\u043f\u0438\u0442\u043a\u0438", "id": 2463, "label": "\u0422\u0435\u0433\u0438:"}, {"url": null, "text": "\u041f\u0440\u043e\u0434\u0443\u043a\u0442\u044b \u043f\u0438\u0442\u0430\u043d\u0438\u044f \u0438 \u043d\u0430\u043f\u0438\u0442\u043a\u0438", "id": 4393, "label": "\u0422\u0435\u0433\u0438:"}, {"url": "/expo/event-autochtona-2014", "text": "Autochtona 2014", "id": 2802, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-coteca-2014", "text": "COTECA 2014", "id": 2479, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-food-ing-international-2014", "text": "Food-Ing International 2014", "id": 2548, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-envies-culinaries-2014", "text": "Envies Culinaries 2014", "id": 2554, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-forum-vini-2014", "text": "Forum Vini 2014", "id": 2694, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-bionord-2014", "text": "BioNord 2014", "id": 2718, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-biosud-2014", "text": "BioSud 2014", "id": 2719, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-brau-beviale-2014", "text": "Brau Beviale 2014", "id": 2517, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-florida-restaurant-lodging-show-2014", "text": "Florida Restaurant & Lodging Show 2014", "id": 2546, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-expo-comida-latina-los-angeles-2014", "text": "Expo Comida Latina Los Angeles 2014", "id": 2563, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-china-bevtek-2014", "text": "China BevTek 2014", "id": 2592, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-gaste-2015", "text": "GASTE 2015", "id": 2619, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-gastro-2014", "text": "GastRo 2014", "id": 2732, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-bbc-goodfood-show-scotland-2014", "text": "BBC GoodFood Show Scotland 2014", "id": 2558, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-china-brew-china-beverage-cbb-2014", "text": "China Brew & China Beverage (CBB) 2014", "id": 2600, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-fhc-china-2014", "text": "FHC China 2014", "id": 2689, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-coffee-fest-portland-2014", "text": "Coffee Fest Portland 2014", "id": 2477, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-coffee-fest-st-louis-2014", "text": "Coffee Fest St. Louis 2014", "id": 2478, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-bbc-good-food-show-birmingham-fall-2014", "text": "BBC Good Food Show Birmingham Fall 2014", "id": 2555, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}, {"url": "/expo/event-bbc-good-food-show-birmingham-summer-2014", "text": "BBC Good Food Show Birmingham Summer 2014", "id": 2556, "label": "\u0412\u044b\u0441\u0442\u0430\u0432\u043a\u0438:"}]; + $(function () { + //$('.modal-approve').on('click', function () { + // $.fancybox.close(); + //}); + /* modal windows opening */ + var fbPopupOptions = { + padding: 0, + fitToView: false + }; + + + }); + + // Constructor for modal window 'select subject' + var SubjectModal = function(options){ + // options init + this.opt = options; + var self = this, index = 0, + $subjWrap = $('#'+self.opt.subjectTriggerWrapId), + $topicBox, + modalId = self.opt.id, + $modal = $('#'+modalId), + $checkBox = $('.csb-menu-input', $modal), + $selectedItemsWrap = $('.csb-selected-items',$modal), + setDefault = self.opt.defaultOn, + applyBtnClass = self.opt.applyBtnClass, + $modalTrigger = $('#'+self.opt.modalTrigger), + afterRenderHandler = function () { + $waiter.hide(); + + }, + triggerSetText = function () { + var selectedString, + cutLength = 16; + + selectedString = getSelectedToString(self.opt.selectedItemsContainer,cutLength); + if(selectedString && selectedString != '~~text~~' && selectedString != '~~text~~...'){ + $modalTrigger.text(selectedString); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + }else{ + $modalTrigger.text($modalTrigger.data('default')); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + } + }; + + //this modal window DOM Instance + this.$modalInst = $('#'+modalId); + + //clones of tags for selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + this.itemsSelected = {}; + // clones of sublist of selected(checked) subject (powered by dna.js objects: see http://dnajs.org/) + this.sublist= {}; + // Jquery object of filtering input (autocomplete input) + this.$inputFilter = $('#'+self.opt.filterInputId); + this.$selectedItemsWrap = $selectedItemsWrap; + + $(function () { + $('.topicChecks', $subjWrap).on('change', function () { + + if($(this).prop('checked')){ + self._setVisible($(this).val()); + + }else{ + self._setUnvisible($(this).val()); + } + }); + // selected topic by default self.opt.defaultOn[] + for(index = 0; index < setDefault.length; index++){ + $topicBox = $('#'+setDefault[index]) + $topicBox.prop('checked',true); + $topicBox.trigger('change'); + + + } + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'); + // no more than once execution + if($(this).attr('data-sub') == 'true'){ + if($(this).parent().hasClass('level1')){ + + if(!$sublist.children().length){ + $waiter.show(); + self._renderSublist({name:name,id:id}, tmplId, afterRenderHandler); + $(this).parent().addClass('active'); + }else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + + $checkBox.on('change', function (event, param) { + var checkboxId = $(this).attr('id'), + $label = $(this).closest('.custom-radio-check'), + $parent = $(this).closest('.level'), + $parentCheckBox = $parent.parent().closest('.level').children('.custom-radio-check').find('.csb-menu-input'), + $sublist = $parent.children('.sublist'); + if(!param){ + + if($label.hasClass('active')){ + $label.removeClass('active'); + }else{ + $label.addClass('active'); + } + if(this.checked){ + var text = $(this).closest('.level').find('.trigger').first().text(), + tplObj = {'text':text,'id':checkboxId}; + + //tags field logic + if(!$selectedItemsWrap.hasClass('visible')){ + $selectedItemsWrap.addClass('visible'); + } + self._addTag(checkboxId, tplObj); + + // proper selection and selection group logic + if($sublist.length){ + //$('.csb-menu-input',$sublist).prop('checked',true); + $('.csb-menu-input',$sublist).each(function () { + var thisId = this.getAttribute('id'), + tagText = $(this).closest('.level').find('.trigger').first().text(), + tagObj = {'text':tagText,'id':thisId}, + DOMCheckboxWrap = this.parentNode, + DOMlabel = common.closest(this,'custom-radio-check'); + + this.checked = true; + self._destroyTag(thisId); + //$label.addClass('active'); + common.addClass(DOMlabel,'active'); + //$(this).trigger('change',['true']); + //self._addTag(thisId,tagObj); + }); + + }else{ + $parent = $parent.parent().closest('.level') + // if checked items count equals all items count then parent item is checked and tags for children - deleted + if ( $('.csb-menu-input',$parent.find('.sublist')).length == $('.csb-menu-input:checked',$parent.find('.sublist')).length){ + var parentId = $parentCheckBox[0].getAttribute('id'), + parentText = $parentCheckBox.closest('.level').find('.trigger').first().text(), + DOMlabel =common.closest(this,'custom-radio-check'), + DOMParentLabel = common.closest(DOMlabel.parentNode.parentNode,'level'), + parentObj = {'text':parentText,'id':parentId}; + $('.csb-menu-input:checked',$parent.find('.sublist')).each(function () { + //var DOMlabel =common.closest(this,'custom-radio-check'); + //this.checked = false; + //$(this).trigger('change',['true']); + //common.removeClass(DOMlabel,'active'); + + self._destroyTag(this.getAttribute('id')); + }); + $parentCheckBox.prop('checked', true); + common.addClass($(DOMParentLabel).find('.custom-radio-check')[0],'active'); + + //$parentCheckBox.trigger('change',['true']); + self._addTag(parentId,parentObj); + } + } + + //!uncheck event + }else { + self._destroyTag(checkboxId); + if(!$selectedItemsWrap.children('.dna-clone').length){ + $selectedItemsWrap.removeClass('visible'); + + } + //uncheck all sublist items while parent item is unchecked + if($sublist.length){ + //destroy all tags for sublist items + $('.csb-menu-input',$sublist).each(function () { + var thisId = $(this).attr('id'), + DOMlabel = common.closest(this,'custom-radio-check'); + this.checked = false; + + common.removeClass(DOMlabel, 'active'); + //$(this).trigger('change',['true']); + self._destroyTag(thisId); + }); + }else{ + // parent item is unchecked and tags for every children item are made + if($parentCheckBox.length && $parentCheckBox[0].checked){ + var DOMlabel = common.closest($parentCheckBox[0],'custom-radio-check'), + DOMParentItem = common.closest(DOMlabel,'level'), + DOMSublist = DOMParentItem.querySelector('.sublist'); + $parentCheckBox.prop('checked', false); + common.removeClass(DOMlabel, 'active'); + //$parentCheckBox.trigger('change',['true']); + self._destroyTag($parentCheckBox.attr('id')); + // checks children items + + $('.csb-menu-input:checked',DOMSublist).each(function () { + var id = this.getAttribute('id'), + tagText = common.closest(this, 'level').querySelector('.trigger').textContent, + //tagText = $(this).closest('.level').find('.trigger').first().text(), + tagObj = {'text':tagText,'id':id}; + self._addTag(id,tagObj); + }); + } + } + + } + triggerSetText(); + } + }); + $('.csbs-del', $selectedItemsWrap).on('click', function () { + var checkboxId = $(this).attr('data-checkbox-id'), + $uncheckBoxes = $('#'+checkboxId); + $uncheckBoxes.prop('checked', false); + $uncheckBoxes.trigger('change'); + dna.destroy(self.itemsSelected[checkboxId]); + if(!$selectedItemsWrap.children('.dna-clone').length){ + $selectedItemsWrap.removeClass('visible'); + } + return false; + }); + $('.clear', $modal).on('click', function () { + self.resetList(); + return false; + }); + self._autocompleteInit(); + $('.'+applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + // кнопка "очистить параметры" + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).on('click', function () { + self.resetList(); + }); + }); + }; + SubjectModal.prototype = { + //get ajax response when want sublists + _getAjax: function (dataToSend, handler) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $waiter.css({display:'block'}); + $.ajax({ + type: 'GET', + url: self.opt.ajaxUrl, + data:dataToSend, + success: function(data) { + if(typeof handler == 'function'){ + $waiter.hide(); + handler(data); + } else{ + return data; + + } + } + }); + }, + // _setVisible and _setUnvisible filter list accordingly to checked checkbox in 'select type' part of modal + _setVisible:function(type){ + var self = this; + $('.'+type, self.$modalInst).addClass('visible'); + }, + _setUnvisible: function (type) { + var self = this, + $li = $('.'+type, self.$modalInst); + $li.find('input[type="checkbox"]').each(function () { + var $this = $(this); + if($this.prop('checked')){ + $this.prop('checked', false); + $this.trigger('change'); + } + }); + $li.find('.dna-container').each(function () { + if($(this).children().length){ + $(this).addClass('hidden'); + } + }); + $li.removeClass('visible'); + + }, + //check particular checkbox input + _checkCheckBox: function (id,name) { + var self = this, + $chckBox; + if(name == 'th'){ + $chckBox = $('#tid_'+id, self.$modalInst); + }else if(name == 'tg'){ + $chckBox = $('#tgid_'+id, self.$modalInst); + } + if($chckBox.length && !$chckBox.prop('checked')){ + $chckBox.prop('checked',true); + $chckBox.trigger('change'); + } + + }, + check: function (id,name) { + var self = this, + $chckBox; + if(name == 'th'){ + $chckBox = $('#tid_'+id, self.$modalInst); + }else if(name == 'tg'){ + $chckBox = $('#tgid_'+id, self.$modalInst); + } + if($chckBox.length){ + $chckBox.prop('checked',true); + $chckBox.trigger('change'); + $chckBox.parent().addClass('active'); + } + + }, + //initiliazing and setup autocomplete field for subject list + _autocompleteInit : function () { + var self = this, dataObj, text , form = self.$inputFilter.attr('data-form'),index, + $completeWrap = $('#'+self.opt.autoCompleteId), + firstComplete = true, + selectTag = function (event, ui) { + //check of repeating execution + $waiter.show(); + var firstTime = true; + for (var prop in self.sublist) { + for (var prop2 in self.sublist[prop]) { + if (prop2 == ui.item.value){ + firstTime = false; + } + + } + } + if($('#tid_'+ui.item.value+'[name="'+ui.item.name+'"]:checked').length){ + firstTime = false; + } + // ban of repeating execution + if (firstTime) { // konec + var $checkbox = $('#tid_' + ui.item.value+'[name="'+ui.item.name+'"]'), + requestObj, requestName, + treeLoadHandler = function (data) { + // make checkboxes selected after loading + if(getObjectLength(data)){ + self._loadParentTree(data, function () { + self._checkCheckBox(ui.item.value,'tg'); + $waiter.hide(); + }); + }else{ + $waiter.hide(); + console.warn() + } + + }; + // load tree related to selected item + if (!$checkbox.length) { + + requestObj = { + id: ui.item.value, + name: ui.item.name + }; + getRequest(requestObj, self.opt.getParentUrl, treeLoadHandler); + } else{ + $waiter.hide(); + $checkbox.prop('checked', true); + $checkbox.trigger('change'); + } + + } + }, + requestHandler = function(data){ + dataObj = data; + for(index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index],'text','label'); + } + for(index = 0; index < dataObj.length; ++index) { + renameProperty(dataObj[index],'id','value'); + } + if(!self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete({ + source:dataObj, + minLength: 0, + appendTo:$completeWrap, + select:function(event, ui){ + self.$inputFilter.val(''); + self.$inputFilter.trigger('keyup'); + selectTag(event, ui); + event.preventDefault(); + // return ui.label; + } + }); + self.$inputFilter.autocomplete('search',""); + firstComplete = false; + }else{ + + self.$inputFilter.autocomplete('search',""); + } + + }; + // var newData = ['banan','banan2','banan3','banan4','banan5']; + self.$inputFilter.attr('autocomplete', 'on'); + + self.$inputFilter.on('keyup', function (event) { + text = $(this).val(); + event.stopImmediatePropagation(); + + + if (text.length > 2 && firstComplete){ + getRequest({'term':text, 'form':form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete( "destroy" ); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + //render first level sublist + _renderSublist: function (dataObj, tmplId, handler) { + var self = this, + index = 0, + template = tmplId + '-sub', + ajaxHandler = function (data) { + if(data.length){ + + self.sublist[template] = {}; + + // for dna.clone definition see dnajs.org + for (index ; index < data.length; index++) { + self.sublist[template][data[index].id] = dna.clone(tmplId, data[index]); + + } + handler(data.length); + }else{ + $waiter.hide(); + } + }; + self._getAjax(dataObj, ajaxHandler); + }, + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj,nestedSublistTemplateId, + // makes request in order to recieve children list information fires after request for parent list + handlerNested = function (length) { + var $checkbox = $('#tid_'+dataObj.id), + afterAll = function () { + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.hide(); + if($checkbox.length && getObjectLength(self.curDNA[sublistTemplateId+'-sub']) == length){ + + nestedObj = { + name:dataObj.name, + id:dataObj.id + }; + $waiter.show(); + nestedSublistTemplateId = $('#id_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, afterAll, nestedSublistTemplateId, dataObj.id); + } + + }, + handlerParent = function (){ + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.show(); + + + optObj = { + name:dataObj.name, + id:dataObj.id + }; + sublistTemplateId = $('#tid_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerParent); + + + }, + // for dna.clone definition see dnajs.org + _destroyTag:function(checkboxId){ + var self = this; + if(self.itemsSelected[checkboxId]){ + dna.destroy(self.itemsSelected[checkboxId]); + + } + }, + // for dna.clone definition see dnajs.org + _addTag: function (checkboxId, tplObj) { + var self = this; + self.itemsSelected[checkboxId] = dna.clone(self.opt.selectedItemTemplate,tplObj); + }, + //hide or show sublists according active selected link + _slideToggle:function ($sublist, $this){ + if($sublist.hasClass('hidden')){ + $sublist.removeClass('hidden'); + $this.addClass('active'); + }else{ + $sublist.addClass('hidden').find('ul').addClass('hidden'); + $this.removeClass('active'); + } + + }, + resetList: function () { + var self = this; + for (var key in self.itemsSelected) { + if (self.itemsSelected.hasOwnProperty(key)) { + $('#'+key, self.$selfContainer).prop('checked', false).trigger('change'); + + dna.destroy(self.itemsSelected[key]); + } + } + self.$selectedItemsWrap.removeClass('visible'); + }, + // кнопка применить + applyHandler: function (it) { + $.fancybox.close(); + } + + + }; + + + + // Constructor for popup window 'select place' + // select places window + var PlacesModal = function(options){ + // object properties + //modal Window options + this.opt = options; + var self = this, + $modal = $('#'+self.opt.id), + $checkBox = $('input[type="checkbox"]', $modal), + $selectedItemsWrap = $('.csb-selected-items',$modal), + DOMTagsWrapper = $('.csb-selected-items',$modal)[0], + $modalTrigger = $('#'+self.opt.modalTrigger), + applyBtnClass = self.opt.applyBtnClass, + idPrefix = 'id_', + triggerSetText = function () { + var selectedString, + cutLength = 16; + selectedString = getSelectedToString(self.opt.selectedItemsContainer,cutLength); + if(selectedString && selectedString != '~~text~~' && selectedString != '~~text~~...'){ + $modalTrigger.text(selectedString); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + + }else{ + $modalTrigger.text($modalTrigger.data('default')); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + + } + }; + // current template instances + this.curDNA = {}; + // place modal list items that had selected + this.itemsSelected = {}; + this.selectedWrap = $selectedItemsWrap; + this.$selfContainer = $modal; + this.$modal = $modal; + this.idPrefix = idPrefix; + //флаг для управления очередью асинхронных запросов + this.isReceived = true; + + // Jquery object of filtering input (autocomplete input) + this.$inputFilter = $('#'+self.opt.filterInputId); + $(function () { + self._autocompleteInit(); + $modal.on('click', 'a.trigger', function () { + var name = $(this).attr('data-name'), + id = $(this).attr('data-id'), + that = this, + tmplId = $(this).attr('data-template-id'), + $sublist = $(this).siblings('.dna-container'), + afterRenderHandler = function (elem, data) { + var DOMParent = common.closest(that,'level'), + DOMParentCheckbox = DOMParent.querySelector('.csb-menu-input'); + $('.csb-menu-input', $sublist).each(function () { + var DOMCheckboxWrap = common.closest(this,'custom-radio-check'); + if(!this.selected){ + + if(DOMParentCheckbox.checked){ + this.checked = true; + common.addClass(DOMCheckboxWrap,'active'); + } + } + }); + $waiter.hide(); + + }; + // no more than once execution + if($(this).attr('data-sub') == 'true'){ + if($(this).parent().hasClass('level1')){ + + if(!$sublist.children().length){ + $waiter.show(); + self._renderSublist({name:name,id:id}, tmplId, afterRenderHandler); + }else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + }else if($(this).parent().hasClass('level2')){ + if(!$sublist.children().length){ + self._renderNested({name:name,id:id}, afterRenderHandler, tmplId, id); + $(this).parent().addClass('active'); + } + else{ + //slideUp & Down stuff + self._slideToggle($sublist, $(this).parent()); + } + } + } + return false; + }); + + $checkBox.on('change', function (event, param) { + + var id = this.getAttribute('id'), + fakeCheckboxClass = 'custom-radio-check', + fakeCheckbox = common.closest(this, fakeCheckboxClass), + itemClass = 'level', + activeClass = 'active', + sublistClass = 'sublist', + checkboxClass = 'csb-menu-input', + highestItemClass = 'level1', + tagClass = 'csb-selected', + tagButtonClass = 'csbs-del', + triggerClass = 'trigger', + tagIdAttribute = 'data-checkbox-id', + + DOMParentRow = common.closest(this, itemClass), + + DOMParentItem = common.hasClass(DOMParentRow, highestItemClass) == false?common.closest(DOMParentRow.parentNode, itemClass):DOMParentRow, + DOMParentCheckbox = DOMParentItem.querySelector('.'+checkboxClass), + DOMSublist = DOMParentItem.querySelector('.'+sublistClass), + DOMSublistInner = DOMParentRow.querySelector('.'+sublistClass), + DOMHighestItem = common.closest(this, highestItemClass), + DOMHighestCheckbox = DOMHighestItem.querySelector('.'+checkboxClass), + selectSublist = function (it) { + var DOMParentItem = common.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.'+sublistClass); + $('.'+checkboxClass, DOMSublist).each(function () { + selectItem(this); + }); + + }, + unSelectSublist = function (it) { + var DOMParentItem = common.closest(it, itemClass) || this, + DOMSublist = DOMParentItem.querySelector('.'+sublistClass); + $('.'+checkboxClass, DOMSublist).each(function () { + unSelectItem(this); + }); + + }, + selectParent = function (it) { + var DOMParentRow = common.closest(it, itemClass), + DOMParentItem; + if(common.hasClass(DOMParentRow,'level1')){ + DOMParentItem = DOMParentRow; + }else{ + DOMParentItem = common.closest(DOMParentRow.parentNode, itemClass); + } + + common.addClass(DOMParentItem.querySelector('.'+fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.'+checkboxClass).checked = true; + + //it.selected = true; + + }, + unSelectParent = function (it) { + var DOMParentRow = common.closest(it, itemClass), + DOMParentItem = common.closest(DOMParentRow.parentNode, itemClass) || DOMParentRow; + + common.removeClass(DOMParentItem.querySelector('.'+fakeCheckboxClass), activeClass); + DOMParentItem.querySelector('.'+checkboxClass).checked = false; + //it.checked = false; + + }, + selectItem = function (it) { + var itFakeCheckbox = common.closest(it, fakeCheckboxClass); + common.addClass(itFakeCheckbox, activeClass); + it.checked = true; + + }, + unSelectItem = function (it) { + var itFakeCheckbox = common.closest(it, fakeCheckboxClass); + common.removeClass(itFakeCheckbox, activeClass); + it.checked = false; + }, + allChildrenSelected = function () { + //var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'), + var DOMSublistParent = common.closest(DOMSublist,sublistClass), + $selected = $(DOMSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked'), + selectedCount = $selected.length, + //allCount = DOMSublist.querySelectorAll('.'+checkboxClass).length; + allCount = $(DOMSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass).length; + + if(allCount == selectedCount && selectedCount != 0){ + return true; + } else{ + return false; + } + }, + parentSelected = function () { + var parentCheckbox = DOMParentItem.querySelector('.'+checkboxClass); + if(parentCheckbox.checked){ + return true; + }else{ + return false; + } + + }, + // Функционал добавления тегов: если есть в панели выбранный элемент либо его дочерние то удалить эти эдементы и разместить выбранный; иначе разместить выбранные. + refreshTags = function (it) { + var DOMSublist = common.closest(it,sublistClass); + var DOMItem = common.closest(it,itemClass); + var DOMSublistInner = DOMItem.querySelector('.'+sublistClass); + var DOMAllTags = DOMTagsWrapper.querySelectorAll('.'+tagClass); + var ARRsublist; + var ARRsublistChildren = DOMSublist.querySelector('.'+sublistClass)?$('.'+checkboxClass+':checked',DOMSublist.querySelector('.'+sublistClass)):null; + var ARRsublistChildrenLength = ARRsublistChildren?ARRsublistChildren.length:null; + var ARRSublistIds = []; + var ARRAllTagsIds = []; + var allTagsLength = 0; + var sublistIdsLength = 0; + var itId = it.getAttribute('id'); + var i = 0, j= 0, t= 0, tmp, k = 0; + var tagId; + var tagText = DOMParentRow.querySelector('.'+triggerClass).innerHTML; + + // если есть дочерние элементы + if(DOMSublistInner){ + ARRsublist = $(DOMSublistInner).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked') + //получаем массив id жлементовЮ для которых есть тег + for(k; k < ARRsublist.length; k++){ + tmp = ARRsublist[k].getAttribute('id'); + ARRSublistIds.push(tmp); + } + //очистк + for(t; t 2 && firstComplete){ + getRequest({'term':text, 'form':form}, self.opt.autoCompleteUrl, requestHandler); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$inputFilter.hasClass('ui-autocomplete-input')){ + + self.$inputFilter.autocomplete( "destroy" ); + firstComplete = true; + } + } + return false; + }).click(function () { + return false; + }); + + }, + // loads and shows list tree related to selected id + // data - is JSON object with information about parent elements. + // handler is callback function + _loadParentTree: function (data, handler, counter) { + var self = this, + dataObj = data, + optObj, sublistTemplateId, nestedObj,nestedSublistTemplateId, + $midleLevelCheckbox = $('#id_'+dataObj.id), + // makes request in order to recieve children list information fires after request for parent list + handlerNested = function (length) { + var $checkbox = $('#id_'+dataObj.id), + afterAll = function () { + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.hide(); + if($checkbox.length && getObjectLength(self.curDNA[sublistTemplateId+'-sub']) == length){ + + nestedObj = { + name:dataObj.name, + id:dataObj.id + }; + $waiter.show(); + nestedSublistTemplateId = $('#id_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, afterAll, nestedSublistTemplateId, dataObj.id); + } + + }, + handlerParent = function (){ + $waiter.hide(); + counter||counter===0?handler(counter):handler(); + }; + $waiter.show(); + //if element has parent element + if(dataObj.hasOwnProperty('parent')){ + //if checbox is existed + if($midleLevelCheckbox.length){ + nestedObj = { + name:dataObj.name, + id:dataObj.id + }; + nestedSublistTemplateId = $midleLevelCheckbox.closest('.level').children('.trigger').attr('data-template-id'); + self._renderNested(nestedObj, function(){$waiter.hide();handler();}, nestedSublistTemplateId, dataObj.id); + }else{ + + optObj = { + name:dataObj.parent.name, + id:dataObj.parent.id + }; + sublistTemplateId = $('#id_'+dataObj.parent.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerNested); + } + + + }else{ + optObj = { + name:dataObj.name, + id:dataObj.id + }; + sublistTemplateId = $('#id_'+dataObj.id).closest('.level').children('.trigger').attr('data-template-id'); + self._renderSublist(optObj,sublistTemplateId,handlerParent); + } + + }, + applyHandler: function (it) { + $.fancybox.close(); + }, + // проверка выделен ли указанный чекбокс + isSelected: function (id) { + var self = this; + return $(self.idPrefix+id, self.$modal).prop('checked'); + } + }; + + //Constructor for perios selector modal window + var PeriodModal = function (options) { + this.opt = options; + var self = this, + $dateFrom = $('#'+self.opt.dateFrom), + $dateTo = $('#'+self.opt.dateTo), + $modal = $('#'+self.opt.id), + $modalTrigger = $('#'+self.opt.modalTrigger), + applyBtnClass = self.opt.applyBtnClass, + inputsTostring = function(){ + var self = this, + stringToReturn = '', + toChar = $modalTrigger.data('lng-to'), + fromChar = $modalTrigger.data('lng-from'), + toVal = $.trim($dateTo.val()), + fromVal = $.trim($dateFrom.val()); + if(toVal != ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+' '+toChar+': '+toVal+'.'; + } else if (toVal != ''&& fromVal == ''){ + stringToReturn = toChar+': '+toVal+'.'; + } else if (toVal == ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+'.'; + } + return stringToReturn; + + }, + triggerSetText = function (selectedString) { + var cutLength = 24; + + if(selectedString != ''){ + $modalTrigger.text(selectedString).siblings('.trigger-label').addClass('hidden'); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).addClass('active'); + + + }else{ + $modalTrigger.text($modalTrigger.data('default')).siblings('.trigger-label').removeClass('hidden'); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).removeClass('active'); + } + }, + // проверяет и исправляет значение полей окна дата и ипсравляет значения так, чтобы в поле от всегда была дата "до"(меньше) даты в поле "по" + checkInterval = function (it) { + var itId = it.getAttribute('id'), + itVal = it.value, + itValInt = Date.parse(itVal), + thatId, + thatVal, + thatValInt, + bfr; + if(itId == self.opt.dateFrom){ + thatId = $dateTo[0].getAttribute('id'); + thatVal = $dateTo[0].value; + }else { + thatId = $dateFrom[0].getAttribute('id'); + thatVal = $dateFrom[0].value; + } + thatValInt = Date.parse(thatVal); + if(thatValInt > itValInt && thatValInt != 0 && thatValInt){ + bfr = document.getElementById(itId).value; + document.getElementById(itId).value = document.getElementById(thatId).value; + document.getElementById(thatId).value = bfr; + }else if(thatValInt < itValInt && thatValInt != 0 && thatValInt){ + bfr = document.getElementById(thatId).value; + document.getElementById(thatId).value = document.getElementById(itId).value; + document.getElementById(itId).value = bfr; + } + + + }; + this.$dateFrom = $dateFrom; + this.$dateTo = $dateTo; + this.$modalTrigger = $modalTrigger; + + $(function () { + $.datepicker.setDefaults($.datepicker.regional["ru"]); + + $dateFrom.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateTo.datepicker( "option", "minDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + 'oncomplete': function () { + checkInterval(this); + } + }); + $dateTo.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateFrom.datepicker( "option", "maxDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + 'oncomplete': function () { + checkInterval(this); + } + }); + $('input[type="text"]',$modal).on('change', function () { + var stringToset = inputsTostring(); + triggerSetText(stringToset); + + }); + $('.'+applyBtnClass, $modal).on('click', function () { + self.applyHandler(this); + return false; + }); + $modalTrigger.siblings('.'+self.opt.clearAllButtonClass).on('click', function () { + $(this).removeClass('active'); + self.resetList(); + }); + }); + + }; + PeriodModal.prototype = { + inputsTostring:function(){ + var self = this, + stringToReturn = '', + toChar = self.$modalTrigger.data('lng-to'), + fromChar = self.$modalTrigger.data('lng-from'), + toVal = $.trim(self.$dateTo.val()), + fromVal = $.trim(self.$dateFrom.val()); + if(toVal != ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+' '+toChar+': '+toVal+'.'; + } else if (toVal != ''&& fromVal == ''){ + stringToReturn = toChar+': '+toVal+'.'; + } else if (toVal == ''&& fromVal != ''){ + stringToReturn = fromChar+': '+fromVal+'.'; + } + return stringToreturn; + + }, + //todo: доделать + resetList: function () { + this.$dateFrom.val(''); + this.$dateTo.val(''); + this.$modalTrigger.text(this.$modalTrigger.attr('data-default')); + + }, + // функционал кнопки применить + applyHandler: function (it) { + $.fancybox.close(); + } + }; + //constructor for main searchfield + var MainField = function (options) { + this.opt = options; + this.opt.anyChar = false; + var self = this, + firstComplete = true; + this.$field = $('#'+self.opt.id); + // option when is true autocomplite fires each time user enters value + this.$completeWrap = $('#'+self.opt.autoCompleteWrapId); + //much faster than JQuery + this.DOMcompleteWrap = document.getElementById(self.opt.autoCompleteWrapId); + //data recieved by ajax response + this.afterClear; + this.rawData = { + items:[], + set:function (data) { + this.items = data; + this._rawDataChange(); + }, + get: function () { + return this.items; + }, + //executes when this.rawData changes + _rawDataChange: function (e) { + var self = this, index; + for(index = 0; index < self.items.length; index++) { + renameProperty(self.items[index],'text','label') + renameProperty(self.items[index],'id','value') + } + } + }; + this.completeName = 'autocomplete', + this.firstComplete = true; + //autocomplete event handler +// this.rawData.addEventListener('rawDataChange',self._rawDataChange,false); + + // switch off default autocomplete behaviour + //autocomplete="on | off" + this.$field.attr('autocomplete','off'); + + self.$field.on('keyup', function (event) { + var reqObj; + text = $(this).val(); + event.stopImmediatePropagation(); + if(self.dataForm){ + reqObj = { + 'term':text, + 'form':self.dataForm + } + }else{ + reqObj = { + 'term':text + } + } + if(self.opt.anyChar){ + if (text.length > 2){ + getRequest(reqObj, self.opt.autoCompleteUrl, function (data) { + if(self.$field.hasClass('ui-autocomplete-input')){ + self.$field[self.completeName]( "destroy" ); + + } + self.rawData.set(data); + self._initAutoComplete(); + self.showList(''); + }); + } else if(text.length === 0){ + if(self.$field.hasClass('ui-autocomplete-input')){ + self.$field[self.completeName]( "destroy" ); + common.removeClass(self.DOMcompleteWrap,'full-visible'); + self._resetmodals(self.afterClear); + } + } + }else{ + if (text.length > 2 && firstComplete){ + getRequest(reqObj, self.opt.autoCompleteUrl, function (data) { + + self.rawData.set(data); + self._initAutoComplete(); + self.showList(''); + // self.DOMcompleteWrap.addClass('full-visible'); + }); + firstComplete = false; + }else if(text.length == 0 && !firstComplete){ + if(self.$field.hasClass('ui-autocomplete-input')){ + + self.$field[self.completeName]( "destroy" ); + common.removeClass(self.DOMcompleteWrap,'full-visible'); + self._resetmodals(self.afterClear); + firstComplete = true; + } + }else{ + if(self.$field.hasClass('ui-autocomplete-input')){ + self.showList(text); + + } + } + + } + //for autocomplete on each keypress + //for normal flow autocomplete + return false; + }).click(function () { + return false; + }); + + + + }; + MainField.prototype = { + //Jquery autocomplete initialization and + // autocomplete functionality on this.$field + _initAutoComplete: function () { + var self = this; + self.$field[self.completeName]({ + source:self.rawData.get(), + minLength: 0, + appendTo:self.DOMcompleteWrap, + select:function(event, ui){ + self._afterSelect(event, ui); + }, + close: function () { + common.removeClass(self.DOMcompleteWrap,'full-visible'); + + + }, + open: function () { + common.addClass(self.DOMcompleteWrap,'full-visible'); + } + }); + + }, + // functionality of selected object in autocomplete list + _afterSelect: function (event, ui) { + var self = this; + event.preventDefault(); + // much faster than jquery + if(ui.item.url){ + window.location = ui.item.url; + } else if(ui.item.label.length){ + self.$field[0].value = ui.item.label; + self.selectCheckBoxes(ui.item.id, ui.item.name); + } + + }, + // method fires callback when field is cleared + _resetmodals: function (callback) { + if(callback){ + callback(); + }else{ + return 0; + } + + }, + // public property for redefine _afterSelect + selectHandler: function () { + + }, + + + //public object modificator. + newRender: function (handler) { + var self = this; + handler(this); + self.$field.data(); + }, + //select checkboxes if therer is coincidence with search result and modal subject modal window + selectCheckBoxes: function (id, name) { + + }, + //simple shows out autocomplete list + showList: function (text) { + self = this; + this.$field[self.completeName]('search',text); + + }, + //brings data from server and transfer it to handler function + pullData: function (handler) { + + } + + }; + //прототип модального окна общего для всех + Modal = function (options) { + var self = this; + this.id; + this.opt = options; + this.DOMwrap = document.getElementById(options.id); + this.DOM = this.DOMwrap.querySelector('.'+ options.wrapClass); + + $('.modal-close',this.DOM).on('click', function () { + self.close(); + }); + $('.modals > *').on('click', function (ev) { + if($(ev.target.parentNode).find(self.DOMwrap).length){ + self.close(); + + } + }); + + }; + + Modal.prototype = { + pullData: function (selector) { + this.id = selector.substr(1); + $(selector).show().siblings().hide(); + this.refresh(); + + }, + open: function () { + $(this.DOMwrap).fadeIn(); + + common.addClass(document.body, 'ov-hidden'); + }, + close: function () { + $(this.DOMwrap).fadeOut(); + common.removeClass(document.body, 'ov-hidden'); + }, + refresh: function () { + var self = this; + self.DOM.style.width = self.opt.size[self.id].width +'px'; + self.DOM.style.minHeight = self.opt.size[self.id].height +'px'; + self.DOM.style.marginLeft = -(self.opt.size[self.id].width/2)+'px'; + self.DOM.style.marginTop = -(self.opt.size[self.id].height/2)+'px'; + } + } + // methods + //initialization of the general properties and it events handlers functionality + that.init = function(options) { + // settings extending + $.extend(this.lang, options.lang); + options.lang = null; + $.extend(this.settings, options); + // begin of initialization + var self = this, + submitHandler = function () { + $(self.DOMform).find('input[name="~~name~~"]').remove(); + }; + if(this.settings.searchData != 'None' && this.settings.searchData){ + this.previousSearch = JSON.parse(this.settings.searchData) + + } + this.DOMform = document.getElementById(this.settings.formId); + + $(this.DOMform).on('submit', function () { + submitHandler(); + }); + + // custom autocomplete realization for exibition input + $.widget( "custom.exibitionComplete", $.ui.autocomplete,{ + _renderMenu: function( ul, items ) { + var that = this, + currentCategory = ""; + $.each( items, function( index, item ) { + if ( item.cat != currentCategory && item.cat) { + ul.append( "
  • " + item.cat + "
    • " ); + currentCategory = item.cat; + }/*else if(item.url){ + ul.append( "
  • " + item.label + "
    • " ); + + }*/ + that._renderItemData( ul, item ); + }); + } + }); + this.exhibitionField = new MainField(self.settings.firstField); + this.exhibitionField.completeName = 'exibitionComplete'; + + this.exhibitionField.opt.anyChar = true; + + + //modal windows + this.placesModal = new PlacesModal(self.settings.place); + this.subjModal = new SubjectModal(self.settings.subject); + this.periodModal = new PeriodModal(self.settings.period); + this.exhibitionField.selectCheckBoxes = function (id, name) { + var self = this, + DOMCheckboxes, + nestedObj, + iName = name; + if(name == 'th'){ + DOMCheckboxes = document.getElementById(self.opt.prefix+id); + + }else if(name == 'tg'){ + DOMCheckboxes = document.getElementById(self.opt.prefixInner+id); + iName = 'th'; + + } + $waiter.show(); + // load tree related to selected item + if (!DOMCheckboxes) { + nestedObj = { + name:name, + id:id + }; +// requestObj = { +// id: ui.item.value, +// name: ui.item.name +// }; + getRequest(nestedObj, EXPO.searchBlock.subjModal.opt.getParentUrl, function (data) { + + EXPO.searchBlock.subjModal._loadParentTree(data, function(){ + + EXPO.searchBlock.subjModal._checkCheckBox(id, name); + }); + }); + } else{ + $waiter.hide(); + $(DOMCheckboxes).prop('checked', true); + $(DOMCheckboxes).trigger('change'); + } + }; + /////**** + this.placesField = new MainField(self.settings.placeField); + this.placesField.dataForm = EXPO.searchBlock.placesModal.$inputFilter.attr('data-form'); + this.placesField.selectCheckBoxes = function(id,name){ + var self = this, + DOMCheckboxes, + nestedObj; + DOMCheckboxes = document.getElementById(self.opt.prefix+id); + if (!DOMCheckboxes) { + nestedObj = { + name:name, + id:id + }; + getRequest(nestedObj, EXPO.searchBlock.placesModal.opt.getParentUrl, function (data) { + + EXPO.searchBlock.placesModal._loadParentTree(data, function(){ + + EXPO.searchBlock.placesModal._checkCheckBox(id, name); + }); + }); + } else{ + $waiter.hide(); + $(DOMCheckboxes).prop('checked', true); + $(DOMCheckboxes).trigger('change'); + } + }; + + // uncheck all checboxes in modal and clear label beneath searchfield + this.exhibitionField.afterClear = function () { + self.subjModal.resetList(); + }; + this.placesField.afterClear = function () { + self.placesModal.resetList(); + }; + //модальное окно + this.modalWindow = new Modal(self.settings.modal); + + this.periodModal.applyHandler = function () { + self.modalWindow.close(); + $(self.DOMform).submit(); + }; + this.placesModal.applyHandler = function () { + //$.fancybox.close(); + self.modalWindow.close(); + $(self.DOMform).submit(); + //self.DOMform.submit(); + }; + this.subjModal.applyHandler = function () { + //$.fancybox.close(); + self.modalWindow.close(); + $(self.DOMform).submit(); + //self.DOMform.submit(); + }; + + // + // modal window calling + $('.'+self.settings.modalTriggerClass).on('click', function () { + self.modalWindow.pullData(this.getAttribute('href')); + self.modalWindow.open(); + return false; + }); + // заполнение полей предыдущими значениями + $(function () { + if(self.previousSearch){ + for (var i = 0; i < self.previousSearch.inputs.length; i++) { + // окно выбора тематики + if (self.previousSearch.inputs[i].name == 'th'){ + self.subjModal._loadParentTree(self.previousSearch.inputs[i], function (innerI) { + if(self.previousSearch.inputs[innerI].children){ + + self.subjModal.check(self.previousSearch.inputs[innerI].children.id, self.previousSearch.inputs[innerI].children.name); + }else{ + self.subjModal.check(self.previousSearch.inputs[innerI].id, self.previousSearch.inputs[innerI].name); + + } + }, i); + // окно выбора мест + } else if (self.previousSearch.inputs[i].name == 'area'){ + + //todo для renderSublist надо передавать только родителя и прародителя + if(self.previousSearch.inputs[i].children && self.previousSearch.inputs[i].children.children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children.children); + + }else if (self.previousSearch.inputs[i].children){ + self.placesModal.selectTag(self.previousSearch.inputs[i].children); + + + } else if(self.previousSearch.inputs[i]){ + self.placesModal.selectTag(self.previousSearch.inputs[i]); + + + } + } + } + + } + }); + + + }; + + return that; + }()); +} \ No newline at end of file diff --git a/templates/client/static_client/js/dna.min.js b/templates/client/static_client/js/dna.min.js index 0bd547b6..a550cb02 100644 --- a/templates/client/static_client/js/dna.min.js +++ b/templates/client/static_client/js/dna.min.js @@ -1,2 +1,2 @@ -//dna.js v0.2.9 ~~ dnajs.org/license.html +//dna.js v0.2.9 ~~ dnajs.org/license.html var dna={clone:function(a,b,c){var d={fade:!1,top:!1,container:null,empty:!1,html:!1,callback:null};$.extend(d,c);var e=dna.store.getTemplate(a);e.nested&&!d.container&&dna.core.berserk("Container missing for nested template: "+a),d.empty&&dna.empty(a);for(var f=b instanceof Array?b:[b],g=$(),h=0;h0&&c(window,a.split(".")),d}},dna.ui={toElem:function(a,b){return a instanceof jQuery?a:$(a?a.target:b)},deleteElem:function(a){return dna.ui.toElem(a,this).remove()},slideFade:function(a,b,c){function d(){a.css(h)}var e={opacity:0,transition:"opacity 0s ease 0s"},f={opacity:1,transition:"opacity 0.4s ease-in"},g={opacity:0,transition:"opacity 0.4s ease-out"},h={transition:"opacity 0s ease 0s"};return window.setTimeout(d,1e3),c?a.css(e).hide().slideDown({complete:b}).css(f):a.css(g).slideUp({complete:b}),a},slideFadeIn:function(a,b){return dna.ui.slideFade(a,b,!0)},slideFadeOut:function(a,b){return dna.ui.slideFade(a,b,!1)},slideFadeToggle:function(a,b){return dna.ui.slideFade(a,b,a.is(":hidden"))},slideFadeDelete:function(a){return dna.ui.slideFadeOut(a,dna.ui.deleteElem)},slidingFlasher:function(a,b){return a.is(":hidden")?dna.ui.slideFadeIn(a,b):a.hide().fadeIn()}},dna.compile={regexDnaField:/^[\s]*(~~|\{\{).*(~~|\}\})[\s]*$/,regexDnaBasePair:/~~|{{|}}/,regexDnaBasePairs:/~~|\{\{|\}\}/g,setupNucleotide:function(a){return void 0===a.data().dnaRules&&(a.data().dnaRules={}),a.addClass("dna-nucleotide")},isDnaField:function(){var a=$(this)[0].childNodes[0];return a&&a.nodeValue&&a.nodeValue.match(dna.compile.regexDnaField)},field:function(){var a=dna.compile.setupNucleotide($(this));return a.data().dnaRules.text=$.trim(a.text()).replace(dna.compile.regexDnaBasePairs,""),a.empty()},propsAndAttrs:function(){function a(){if(/^data-dna-prop-/.test(this.name))c.push(this.name.replace(/^data-dna-prop-/,""),this.value.replace(dna.compile.regexDnaBasePairs,""));else{if(3!==this.value.split(dna.compile.regexDnaBasePair).length)return;d.push(this.name.replace(/^data-dna-attr-/,""),this.value.split(dna.compile.regexDnaBasePair))}e.push(this.name)}var b=$(this),c=[],d=[],e=[];return $.each(b.get(0).attributes,a),c.length>0&&(dna.compile.setupNucleotide(b).data().dnaRules.props=c),d.length>0&&(dna.compile.setupNucleotide(b).data().dnaRules.attrs=d),b.removeAttr(e.join(" "))},getDataField:function(a,b){return $.trim(a.data("dna-"+b).replace(dna.compile.regexDnaBasePairs,""))},subTemplateName:function(a,b){var c=a instanceof jQuery?dna.getClone(a).data().dnaRules.template:a;return c+"-"+b+"-instance"},rules:function(a,b,c){function d(){var a=dna.compile.setupNucleotide($(this)),d=dna.compile.getDataField(a,b);a.data().dnaRules[b]=c?d.split(","):d}return a.filter("[data-dna-"+b+"]").each(d).removeAttr("data-dna-"+b)},template:function(a){function b(){$(this).data().dnaRules={template:$(this).attr("id")}}var c=$("#"+a);c.length||dna.core.berserk("Template not found: "+a),c.find(".dna-template").addBack().each(b).removeAttr("id");var d=c.find("*").addBack();return d.filter(dna.compile.isDnaField).each(dna.compile.field),dna.compile.rules(d,"array").addClass("dna-array"),dna.compile.rules(d,"class",!0),dna.compile.rules(d,"require"),dna.compile.rules(d,"missing"),dna.compile.rules(d,"truthy"),dna.compile.rules(d,"falsey"),d.each(dna.compile.propsAndAttrs),dna.store.stash(c)}},dna.store={templates:{},stash:function(a){function b(){var a=$(this),b=a.data().dnaRules.template,c={name:b,elem:a,container:a.parent().addClass("dna-container").addClass("dna-contains-"+b),nested:0!==a.parent().closest(".dna-clone").length,index:a.index(),clones:0};dna.store.templates[b]=c,a.removeClass("dna-template").addClass("dna-clone").addClass(b).detach()}function c(){var a=$(this),b=a.data().dnaRules.array,c=dna.compile.subTemplateName(d,b);dna.compile.setupNucleotide(a.parent()).data().dnaRules.loop={name:c,field:b},a.data().dnaRules.template=c}var d=a.data().dnaRules.template;return a.find(".dna-template").addBack().each(b),a.find(".dna-array").each(c).each(b),dna.store.templates[d]},getTemplate:function(a){return dna.store.templates[a]||dna.compile.template(a)}},dna.events={initializers:[],elementSetup:function(a,b){function c(){dna.util.apply($(this).data("dna-setup"),[$(this),b])}var d="[data-dna-setup]",e=a?a.find(d).addBack(d):$(".dna-setup");return e.each(c).addClass("dna-initialized")},runInitializers:function(a,b){function c(){dna.util.apply(this.func,[(this.selector?a.find(this.selector).addBack(this.selector):a).addClass("dna-initialized")].concat(this.params))}return dna.events.elementSetup(a,b),$.each(dna.events.initializers,c),a},runner:function(a,b,c){return a=a.closest("[data-dna-"+b+"]"),dna.util.apply(a.data("dna-"+b),[a,c])},handle:function(a){return dna.events.runner($(a.target),a.type.replace("key","key-"),a)},handleEnterKey:function(a){return 13===a.which?dna.events.runner($(a.target),"enter-key",a):null},setup:function(){$(document).click(dna.events.handle).change(dna.events.handle).keyup(dna.events.handle).keyup(dna.events.handleEnterKey).keydown(dna.events.handle).keypress(dna.events.handle),dna.events.elementSetup()}},$(dna.events.setup),dna.core={inject:function(a,b,c,d){function e(a,e){function f(a){return-1!==$.inArray(typeof a,h)}var g="object"==typeof b?dna.util.value(b,e):"[count]"===e?c:"[value]"===e?b:null,h=["string","number","boolean"];f(g)&&(a=d.html?a.html(g):a.text(g))}function f(a,c){for(var d=0;d1&&(a.toggleClass(c[1],e),c[2]&&a.toggleClass(c[2],!e))}function i(a,c){var d=dna.util.value(b,c.field);d&&dna.clone(c.name,d,{container:a})}function j(){var a=$(this),c=a.data().dnaRules;c.text&&e(a,c.text),c.props&&f(a,c.props),c.attrs&&g(a,c.attrs),c.class&&h(a,c.class),c.require&&a.toggle(void 0!==dna.util.value(b,c.require)),c.missing&&a.toggle(void 0===dna.util.value(b,c.missing)),c.truthy&&a.toggle(dna.util.realTruth(dna.util.value(b,c.truthy))),c.falsey&&a.toggle(!dna.util.realTruth(dna.util.value(b,c.falsey))),c.loop&&i(a,c.loop)}return a.find(".dna-array").remove(),a.find(".dna-nucleotide").addBack(".dna-nucleotide").each(j),a.data("dna-model",b)},replicate:function(a,b,c,d){var e=a.elem.clone(!0,!0);a.clones++,dna.core.inject(e,b,c,d);var f=".dna-contains-"+a.name,g=d.container?d.container.find(f).addBack(f):a.container;return g[d.top?"prepend":"append"](e),dna.events.runInitializers(e,b),d.callback&&d.callback(e,b),d.fade&&dna.ui.slideFadeIn(e),e},unload:function(a,b,c){b.error||dna.clone(a,b,c)},berserk:function(a){throw"dna.js error -> "+a}}; \ No newline at end of file diff --git a/templates/client/static_client/js/jquery.mCustomScrollbar.concat.min.js b/templates/client/static_client/js/jquery.mCustomScrollbar.concat.min.js new file mode 100644 index 00000000..f4cca9af --- /dev/null +++ b/templates/client/static_client/js/jquery.mCustomScrollbar.concat.min.js @@ -0,0 +1,4 @@ +/* == jquery mousewheel plugin == Version: 3.1.11, License: MIT License (MIT) */ +!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a:a(jQuery)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.11",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b)["offsetParent"in a.fn?"offsetParent":"parent"]();return c.length||(c=a("body")),parseInt(c.css("fontSize"),10)},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}); +/* == malihu jquery custom scrollbar plugin == Version: 3.0.4, License: MIT License (MIT) */ +(function(b,a,c){(function(d){d(jQuery)}(function(j){var g="mCustomScrollbar",d="mCS",m=".mCustomScrollbar",h={setWidth:false,setHeight:false,setTop:0,setLeft:0,axis:"y",scrollbarPosition:"inside",scrollInertia:950,autoDraggerLength:true,autoHideScrollbar:false,autoExpandScrollbar:false,alwaysShowScrollbar:0,snapAmount:null,snapOffset:0,mouseWheel:{enable:true,scrollAmount:"auto",axis:"y",preventDefault:false,deltaFactor:"auto",normalizeDelta:false,invert:false,disableOver:["select","option","keygen","datalist","textarea"]},scrollButtons:{enable:false,scrollType:"stepless",scrollAmount:"auto"},keyboard:{enable:true,scrollType:"stepless",scrollAmount:"auto"},contentTouchScroll:25,advanced:{autoExpandHorizontalScroll:false,autoScrollOnFocus:"input,textarea,select,button,datalist,keygen,a[tabindex],area,object,[contenteditable='true']",updateOnContentResize:true,updateOnImageLoad:true,updateOnSelectorChange:false},theme:"light",callbacks:{onScrollStart:false,onScroll:false,onTotalScroll:false,onTotalScrollBack:false,whileScrolling:false,onTotalScrollOffset:0,onTotalScrollBackOffset:0,alwaysTriggerOffsets:true,onOverflowY:false,onOverflowX:false,onOverflowYNone:false,onOverflowXNone:false},live:false,liveSelector:null},l=0,o={},f=function(p){if(o[p]){clearTimeout(o[p]);i._delete.call(null,o[p])}},k=(b.attachEvent&&!b.addEventListener)?1:0,n=false,e={init:function(q){var q=j.extend(true,{},h,q),p=i._selector.call(this);if(q.live){var s=q.liveSelector||this.selector||m,r=j(s);if(q.live==="off"){f(s);return}o[s]=setTimeout(function(){r.mCustomScrollbar(q);if(q.live==="once"&&r.length){f(s)}},500)}else{f(s)}q.setWidth=(q.set_width)?q.set_width:q.setWidth;q.setHeight=(q.set_height)?q.set_height:q.setHeight;q.axis=(q.horizontalScroll)?"x":i._findAxis.call(null,q.axis);q.scrollInertia=q.scrollInertia>0&&q.scrollInertia<17?17:q.scrollInertia;if(typeof q.mouseWheel!=="object"&&q.mouseWheel==true){q.mouseWheel={enable:true,scrollAmount:"auto",axis:"y",preventDefault:false,deltaFactor:"auto",normalizeDelta:false,invert:false}}q.mouseWheel.scrollAmount=!q.mouseWheelPixels?q.mouseWheel.scrollAmount:q.mouseWheelPixels;q.mouseWheel.normalizeDelta=!q.advanced.normalizeMouseWheelDelta?q.mouseWheel.normalizeDelta:q.advanced.normalizeMouseWheelDelta;q.scrollButtons.scrollType=i._findScrollButtonsType.call(null,q.scrollButtons.scrollType);i._theme.call(null,q);return j(p).each(function(){var u=j(this);if(!u.data(d)){u.data(d,{idx:++l,opt:q,scrollRatio:{y:null,x:null},overflowed:null,contentReset:{y:null,x:null},bindEvents:false,tweenRunning:false,sequential:{},langDir:u.css("direction"),cbOffsets:null,trigger:null});var w=u.data(d).opt,v=u.data("mcs-axis"),t=u.data("mcs-scrollbar-position"),x=u.data("mcs-theme");if(v){w.axis=v}if(t){w.scrollbarPosition=t}if(x){w.theme=x;i._theme.call(null,w)}i._pluginMarkup.call(this);e.update.call(null,u)}})},update:function(q){var p=q||i._selector.call(this);return j(p).each(function(){var t=j(this);if(t.data(d)){var v=t.data(d),u=v.opt,r=j("#mCSB_"+v.idx+"_container"),s=[j("#mCSB_"+v.idx+"_dragger_vertical"),j("#mCSB_"+v.idx+"_dragger_horizontal")];if(!r.length){return}if(v.tweenRunning){i._stop.call(null,t)}if(t.hasClass("mCS_disabled")){t.removeClass("mCS_disabled")}if(t.hasClass("mCS_destroyed")){t.removeClass("mCS_destroyed")}i._maxHeight.call(this);i._expandContentHorizontally.call(this);if(u.axis!=="y"&&!u.advanced.autoExpandHorizontalScroll){r.css("width",i._contentWidth(r.children()))}v.overflowed=i._overflowed.call(this);i._scrollbarVisibility.call(this);if(u.autoDraggerLength){i._setDraggerLength.call(this)}i._scrollRatio.call(this);i._bindEvents.call(this);var w=[Math.abs(r[0].offsetTop),Math.abs(r[0].offsetLeft)];if(u.axis!=="x"){if(!v.overflowed[0]){i._resetContentPosition.call(this);if(u.axis==="y"){i._unbindEvents.call(this)}else{if(u.axis==="yx"&&v.overflowed[1]){i._scrollTo.call(this,t,w[1].toString(),{dir:"x",dur:0,overwrite:"none"})}}}else{if(s[0].height()>s[0].parent().height()){i._resetContentPosition.call(this)}else{i._scrollTo.call(this,t,w[0].toString(),{dir:"y",dur:0,overwrite:"none"});v.contentReset.y=null}}}if(u.axis!=="y"){if(!v.overflowed[1]){i._resetContentPosition.call(this);if(u.axis==="x"){i._unbindEvents.call(this)}else{if(u.axis==="yx"&&v.overflowed[0]){i._scrollTo.call(this,t,w[0].toString(),{dir:"y",dur:0,overwrite:"none"})}}}else{if(s[1].width()>s[1].parent().width()){i._resetContentPosition.call(this)}else{i._scrollTo.call(this,t,w[1].toString(),{dir:"x",dur:0,overwrite:"none"});v.contentReset.x=null}}}i._autoUpdate.call(this)}})},scrollTo:function(r,q){if(typeof r=="undefined"||r==null){return}var p=i._selector.call(this);return j(p).each(function(){var u=j(this);if(u.data(d)){var x=u.data(d),w=x.opt,v={trigger:"external",scrollInertia:w.scrollInertia,scrollEasing:"mcsEaseInOut",moveDragger:false,timeout:60,callbacks:true,onStart:true,onUpdate:true,onComplete:true},s=j.extend(true,{},v,q),y=i._arr.call(this,r),t=s.scrollInertia>0&&s.scrollInertia<17?17:s.scrollInertia;y[0]=i._to.call(this,y[0],"y");y[1]=i._to.call(this,y[1],"x");if(s.moveDragger){y[0]*=x.scrollRatio.y;y[1]*=x.scrollRatio.x}s.dur=t;setTimeout(function(){if(y[0]!==null&&typeof y[0]!=="undefined"&&w.axis!=="x"&&x.overflowed[0]){s.dir="y";s.overwrite="all";i._scrollTo.call(this,u,y[0].toString(),s)}if(y[1]!==null&&typeof y[1]!=="undefined"&&w.axis!=="y"&&x.overflowed[1]){s.dir="x";s.overwrite="none";i._scrollTo.call(this,u,y[1].toString(),s)}},s.timeout)}})},stop:function(){var p=i._selector.call(this);return j(p).each(function(){var q=j(this);if(q.data(d)){i._stop.call(null,q)}})},disable:function(q){var p=i._selector.call(this);return j(p).each(function(){var r=j(this);if(r.data(d)){var t=r.data(d),s=t.opt;i._autoUpdate.call(this,"remove");i._unbindEvents.call(this);if(q){i._resetContentPosition.call(this)}i._scrollbarVisibility.call(this,true);r.addClass("mCS_disabled")}})},destroy:function(){var p=i._selector.call(this);return j(p).each(function(){var s=j(this);if(s.data(d)){var u=s.data(d),t=u.opt,q=j("#mCSB_"+u.idx),r=j("#mCSB_"+u.idx+"_container"),v=j(".mCSB_"+u.idx+"_scrollbar");if(t.live){f(p)}i._autoUpdate.call(this,"remove");i._unbindEvents.call(this);i._resetContentPosition.call(this);s.removeData(d);i._delete.call(null,this.mcs);v.remove();q.replaceWith(r.contents());s.removeClass(g+" _"+d+"_"+u.idx+" mCS-autoHide mCS-dir-rtl mCS_no_scrollbar mCS_disabled").addClass("mCS_destroyed")}})}},i={_selector:function(){return(typeof j(this)!=="object"||j(this).length<1)?m:this},_theme:function(s){var r=["rounded","rounded-dark","rounded-dots","rounded-dots-dark"],q=["rounded-dots","rounded-dots-dark","3d","3d-dark","3d-thick","3d-thick-dark","inset","inset-dark","inset-2","inset-2-dark","inset-3","inset-3-dark"],p=["minimal","minimal-dark"],u=["minimal","minimal-dark"],t=["minimal","minimal-dark"];s.autoDraggerLength=j.inArray(s.theme,r)>-1?false:s.autoDraggerLength;s.autoExpandScrollbar=j.inArray(s.theme,q)>-1?false:s.autoExpandScrollbar;s.scrollButtons.enable=j.inArray(s.theme,p)>-1?false:s.scrollButtons.enable;s.autoHideScrollbar=j.inArray(s.theme,u)>-1?true:s.autoHideScrollbar;s.scrollbarPosition=j.inArray(s.theme,t)>-1?"outside":s.scrollbarPosition},_findAxis:function(p){return(p==="yx"||p==="xy"||p==="auto")?"yx":(p==="x"||p==="horizontal")?"x":"y"},_findScrollButtonsType:function(p){return(p==="stepped"||p==="pixels"||p==="step"||p==="click")?"stepped":"stepless"},_pluginMarkup:function(){var y=j(this),x=y.data(d),r=x.opt,t=r.autoExpandScrollbar?" mCSB_scrollTools_onDrag_expand":"",B=["
    ","
    "],u=r.axis==="yx"?"mCSB_vertical_horizontal":r.axis==="x"?"mCSB_horizontal":"mCSB_vertical",w=r.axis==="yx"?B[0]+B[1]:r.axis==="x"?B[1]:B[0],v=r.axis==="yx"?"
    ":"",s=r.autoHideScrollbar?" mCS-autoHide":"",p=(r.axis!=="x"&&x.langDir==="rtl")?" mCS-dir-rtl":"";if(r.setWidth){y.css("width",r.setWidth)}if(r.setHeight){y.css("height",r.setHeight)}r.setLeft=(r.axis!=="y"&&x.langDir==="rtl")?"989999px":r.setLeft;y.addClass(g+" _"+d+"_"+x.idx+s+p).wrapInner("
    ");var q=j("#mCSB_"+x.idx),z=j("#mCSB_"+x.idx+"_container");if(r.axis!=="y"&&!r.advanced.autoExpandHorizontalScroll){z.css("width",i._contentWidth(z.children()))}if(r.scrollbarPosition==="outside"){if(y.css("position")==="static"){y.css("position","relative")}y.css("overflow","visible");q.addClass("mCSB_outside").after(w)}else{q.addClass("mCSB_inside").append(w);z.wrap(v)}i._scrollButtons.call(this);var A=[j("#mCSB_"+x.idx+"_dragger_vertical"),j("#mCSB_"+x.idx+"_dragger_horizontal")];A[0].css("min-height",A[0].height());A[1].css("min-width",A[1].width())},_contentWidth:function(p){return Math.max.apply(Math,p.map(function(){return j(this).outerWidth(true)}).get())},_expandContentHorizontally:function(){var q=j(this),s=q.data(d),r=s.opt,p=j("#mCSB_"+s.idx+"_container");if(r.advanced.autoExpandHorizontalScroll&&r.axis!=="y"){p.css({position:"absolute",width:"auto"}).wrap("
    ").css({width:(Math.ceil(p[0].getBoundingClientRect().right+0.4)-Math.floor(p[0].getBoundingClientRect().left)),position:"relative"}).unwrap()}},_scrollButtons:function(){var s=j(this),u=s.data(d),t=u.opt,q=j(".mCSB_"+u.idx+"_scrollbar:first"),r=["","","",""],p=[(t.axis==="x"?r[2]:r[0]),(t.axis==="x"?r[3]:r[1]),r[2],r[3]];if(t.scrollButtons.enable){q.prepend(p[0]).append(p[1]).next(".mCSB_scrollTools").prepend(p[2]).append(p[3])}},_maxHeight:function(){var t=j(this),w=t.data(d),v=w.opt,r=j("#mCSB_"+w.idx),q=t.css("max-height"),s=q.indexOf("%")!==-1,p=t.css("box-sizing");if(q!=="none"){var u=s?t.parent().height()*parseInt(q)/100:parseInt(q);if(p==="border-box"){u-=((t.innerHeight()-t.height())+(t.outerHeight()-t.innerHeight()))}r.css("max-height",Math.round(u))}},_setDraggerLength:function(){var u=j(this),s=u.data(d),p=j("#mCSB_"+s.idx),v=j("#mCSB_"+s.idx+"_container"),y=[j("#mCSB_"+s.idx+"_dragger_vertical"),j("#mCSB_"+s.idx+"_dragger_horizontal")],t=[p.height()/v.outerHeight(false),p.width()/v.outerWidth(false)],q=[parseInt(y[0].css("min-height")),Math.round(t[0]*y[0].parent().height()),parseInt(y[1].css("min-width")),Math.round(t[1]*y[1].parent().width())],r=k&&(q[1]q.height(),p>q.width()]},_resetContentPosition:function(){var t=j(this),v=t.data(d),u=v.opt,q=j("#mCSB_"+v.idx),r=j("#mCSB_"+v.idx+"_container"),s=[j("#mCSB_"+v.idx+"_dragger_vertical"),j("#mCSB_"+v.idx+"_dragger_horizontal")];i._stop(t);if((u.axis!=="x"&&!v.overflowed[0])||(u.axis==="y"&&v.overflowed[0])){s[0].add(r).css("top",0);i._scrollTo(t,"_resetY")}if((u.axis!=="y"&&!v.overflowed[1])||(u.axis==="x"&&v.overflowed[1])){var p=dx=0;if(v.langDir==="rtl"){p=q.width()-r.outerWidth(false);dx=Math.abs(p/v.scrollRatio.x)}r.css("left",p);s[1].css("left",dx);i._scrollTo(t,"_resetX")}},_bindEvents:function(){var r=j(this),t=r.data(d),s=t.opt;if(!t.bindEvents){i._draggable.call(this);if(s.contentTouchScroll){i._contentDraggable.call(this)}if(s.mouseWheel.enable){function q(){p=setTimeout(function(){if(!j.event.special.mousewheel){q()}else{clearTimeout(p);i._mousewheel.call(r[0])}},1000)}var p;q()}i._draggerRail.call(this);i._wrapperScroll.call(this);if(s.advanced.autoScrollOnFocus){i._focus.call(this)}if(s.scrollButtons.enable){i._buttons.call(this)}if(s.keyboard.enable){i._keyboard.call(this)}t.bindEvents=true}},_unbindEvents:function(){var s=j(this),t=s.data(d),p=d+"_"+t.idx,u=".mCSB_"+t.idx+"_scrollbar",r=j("#mCSB_"+t.idx+",#mCSB_"+t.idx+"_container,#mCSB_"+t.idx+"_container_wrapper,"+u+" .mCSB_draggerContainer,#mCSB_"+t.idx+"_dragger_vertical,#mCSB_"+t.idx+"_dragger_horizontal,"+u+">a"),q=j("#mCSB_"+t.idx+"_container");if(t.bindEvents){j(a).unbind("."+p);r.each(function(){j(this).unbind("."+p)});clearTimeout(s[0]._focusTimeout);i._delete.call(null,s[0]._focusTimeout);clearTimeout(t.sequential.step);i._delete.call(null,t.sequential.step);clearTimeout(q[0].onCompleteTimeout);i._delete.call(null,q[0].onCompleteTimeout);t.bindEvents=false}},_scrollbarVisibility:function(q){var t=j(this),v=t.data(d),u=v.opt,p=j("#mCSB_"+v.idx+"_container_wrapper"),r=p.length?p:j("#mCSB_"+v.idx+"_container"),w=[j("#mCSB_"+v.idx+"_scrollbar_vertical"),j("#mCSB_"+v.idx+"_scrollbar_horizontal")],s=[w[0].find(".mCSB_dragger"),w[1].find(".mCSB_dragger")];if(u.axis!=="x"){if(v.overflowed[0]&&!q){w[0].add(s[0]).add(w[0].children("a")).css("display","block");r.removeClass("mCS_no_scrollbar_y mCS_y_hidden")}else{if(u.alwaysShowScrollbar){if(u.alwaysShowScrollbar!==2){s[0].add(w[0].children("a")).css("display","none")}r.removeClass("mCS_y_hidden")}else{w[0].css("display","none");r.addClass("mCS_y_hidden")}r.addClass("mCS_no_scrollbar_y")}}if(u.axis!=="y"){if(v.overflowed[1]&&!q){w[1].add(s[1]).add(w[1].children("a")).css("display","block");r.removeClass("mCS_no_scrollbar_x mCS_x_hidden")}else{if(u.alwaysShowScrollbar){if(u.alwaysShowScrollbar!==2){s[1].add(w[1].children("a")).css("display","none")}r.removeClass("mCS_x_hidden")}else{w[1].css("display","none");r.addClass("mCS_x_hidden")}r.addClass("mCS_no_scrollbar_x")}}if(!v.overflowed[0]&&!v.overflowed[1]){t.addClass("mCS_no_scrollbar")}else{t.removeClass("mCS_no_scrollbar")}},_coordinates:function(q){var p=q.type;switch(p){case"pointerdown":case"MSPointerDown":case"pointermove":case"MSPointerMove":case"pointerup":case"MSPointerUp":return[q.originalEvent.pageY,q.originalEvent.pageX];break;case"touchstart":case"touchmove":case"touchend":var r=q.originalEvent.touches[0]||q.originalEvent.changedTouches[0];return[r.pageY,r.pageX];break;default:return[q.pageY,q.pageX]}},_draggable:function(){var u=j(this),s=u.data(d),p=s.opt,r=d+"_"+s.idx,t=["mCSB_"+s.idx+"_dragger_vertical","mCSB_"+s.idx+"_dragger_horizontal"],v=j("#mCSB_"+s.idx+"_container"),w=j("#"+t[0]+",#"+t[1]),A,y,z;w.bind("mousedown."+r+" touchstart."+r+" pointerdown."+r+" MSPointerDown."+r,function(E){E.stopImmediatePropagation();E.preventDefault();if(!i._mouseBtnLeft(E)){return}n=true;if(k){a.onselectstart=function(){return false}}x(false);i._stop(u);A=j(this);var F=A.offset(),G=i._coordinates(E)[0]-F.top,B=i._coordinates(E)[1]-F.left,D=A.height()+F.top,C=A.width()+F.left;if(G0&&B0){y=G;z=B}i._onDragClasses(A,"active",p.autoExpandScrollbar)}).bind("touchmove."+r,function(C){C.stopImmediatePropagation();C.preventDefault();var D=A.offset(),E=i._coordinates(C)[0]-D.top,B=i._coordinates(C)[1]-D.left;q(y,z,E,B)});j(a).bind("mousemove."+r+" pointermove."+r+" MSPointerMove."+r,function(C){if(A){var D=A.offset(),E=i._coordinates(C)[0]-D.top,B=i._coordinates(C)[1]-D.left;if(y===E){return}q(y,z,E,B)}}).add(w).bind("mouseup."+r+" touchend."+r+" pointerup."+r+" MSPointerUp."+r,function(B){if(A){i._onDragClasses(A,"active",p.autoExpandScrollbar);A=null}n=false;if(k){a.onselectstart=null}x(true)});function x(B){var C=v.find("iframe");if(!C.length){return}var D=!B?"none":"auto";C.css("pointer-events",D)}function q(D,E,G,B){v[0].idleTimer=p.scrollInertia<233?250:0;if(A.attr("id")===t[1]){var C="x",F=((A[0].offsetLeft-E)+B)*s.scrollRatio.x}else{var C="y",F=((A[0].offsetTop-D)+G)*s.scrollRatio.y}i._scrollTo(u,F.toString(),{dir:C,drag:true})}},_contentDraggable:function(){var y=j(this),K=y.data(d),I=K.opt,F=d+"_"+K.idx,v=j("#mCSB_"+K.idx),z=j("#mCSB_"+K.idx+"_container"),w=[j("#mCSB_"+K.idx+"_dragger_vertical"),j("#mCSB_"+K.idx+"_dragger_horizontal")],E,G,L,M,C=[],D=[],H,A,u,t,J,x,r=0,q,s=I.axis==="yx"?"none":"all";z.bind("touchstart."+F+" pointerdown."+F+" MSPointerDown."+F,function(N){if(!i._pointerTouch(N)||n){return}var O=z.offset();E=i._coordinates(N)[0]-O.top;G=i._coordinates(N)[1]-O.left}).bind("touchmove."+F+" pointermove."+F+" MSPointerMove."+F,function(Q){if(!i._pointerTouch(Q)||n){return}Q.stopImmediatePropagation();A=i._getTime();var P=v.offset(),S=i._coordinates(Q)[0]-P.top,U=i._coordinates(Q)[1]-P.left,R="mcsLinearOut";C.push(S);D.push(U);if(K.overflowed[0]){var O=w[0].parent().height()-w[0].height(),T=((E-S)>0&&(S-E)>-(O*K.scrollRatio.y))}if(K.overflowed[1]){var N=w[1].parent().width()-w[1].width(),V=((G-U)>0&&(U-G)>-(N*K.scrollRatio.x))}if(T||V){Q.preventDefault()}x=I.axis==="yx"?[(E-S),(G-U)]:I.axis==="x"?[null,(G-U)]:[(E-S),null];z[0].idleTimer=250;if(K.overflowed[0]){B(x[0],r,R,"y","all",true)}if(K.overflowed[1]){B(x[1],r,R,"x",s,true)}});v.bind("touchstart."+F+" pointerdown."+F+" MSPointerDown."+F,function(N){if(!i._pointerTouch(N)||n){return}N.stopImmediatePropagation();i._stop(y);H=i._getTime();var O=v.offset();L=i._coordinates(N)[0]-O.top;M=i._coordinates(N)[1]-O.left;C=[];D=[]}).bind("touchend."+F+" pointerup."+F+" MSPointerUp."+F,function(P){if(!i._pointerTouch(P)||n){return}P.stopImmediatePropagation();u=i._getTime();var N=v.offset(),T=i._coordinates(P)[0]-N.top,V=i._coordinates(P)[1]-N.left;if((u-A)>30){return}J=1000/(u-H);var Q="mcsEaseOut",R=J<2.5,W=R?[C[C.length-2],D[D.length-2]]:[0,0];t=R?[(T-W[0]),(V-W[1])]:[T-L,V-M];var O=[Math.abs(t[0]),Math.abs(t[1])];J=R?[Math.abs(t[0]/4),Math.abs(t[1]/4)]:[J,J];var U=[Math.abs(z[0].offsetTop)-(t[0]*p((O[0]/J[0]),J[0])),Math.abs(z[0].offsetLeft)-(t[1]*p((O[1]/J[1]),J[1]))];x=I.axis==="yx"?[U[0],U[1]]:I.axis==="x"?[null,U[1]]:[U[0],null];q=[(O[0]*4)+I.scrollInertia,(O[1]*4)+I.scrollInertia];var S=parseInt(I.contentTouchScroll)||0;x[0]=O[0]>S?x[0]:0;x[1]=O[1]>S?x[1]:0;if(K.overflowed[0]){B(x[0],q[0],Q,"y",s,false)}if(K.overflowed[1]){B(x[1],q[1],Q,"x",s,false)}});function p(P,N){var O=[N*1.5,N*2,N/1.5,N/2];if(P>90){return N>4?O[0]:O[3]}else{if(P>60){return N>3?O[3]:O[2]}else{if(P>30){return N>8?O[1]:N>6?O[0]:N>4?N:O[2]}else{return N>8?N:O[3]}}}}function B(P,R,S,O,N,Q){if(!P){return}i._scrollTo(y,P.toString(),{dur:R,scrollEasing:S,dir:O,overwrite:N,drag:Q})}},_mousewheel:function(){var w=j(this),v=w.data(d);if(v){var p=v.opt,s=d+"_"+v.idx,q=j("#mCSB_"+v.idx),x=[j("#mCSB_"+v.idx+"_dragger_vertical"),j("#mCSB_"+v.idx+"_dragger_horizontal")],t=j("#mCSB_"+v.idx+"_container").find("iframe"),r=q;if(t.length){t.each(function(){var y=this;if(u(y)){r=r.add(j(y).contents().find("body"))}})}r.bind("mousewheel."+s,function(C,G){i._stop(w);if(i._disableMousewheel(w,C.target)){return}var E=p.mouseWheel.deltaFactor!=="auto"?parseInt(p.mouseWheel.deltaFactor):(k&&C.deltaFactor<100)?100:C.deltaFactor||100;if(p.axis==="x"||p.mouseWheel.axis==="x"){var z="x",F=[Math.round(E*v.scrollRatio.x),parseInt(p.mouseWheel.scrollAmount)],B=p.mouseWheel.scrollAmount!=="auto"?F[1]:F[0]>=q.width()?q.width()*0.9:F[0],H=Math.abs(j("#mCSB_"+v.idx+"_container")[0].offsetLeft),D=x[1][0].offsetLeft,A=x[1].parent().width()-x[1].width(),y=C.deltaX||C.deltaY||G}else{var z="y",F=[Math.round(E*v.scrollRatio.y),parseInt(p.mouseWheel.scrollAmount)],B=p.mouseWheel.scrollAmount!=="auto"?F[1]:F[0]>=q.height()?q.height()*0.9:F[0],H=Math.abs(j("#mCSB_"+v.idx+"_container")[0].offsetTop),D=x[0][0].offsetTop,A=x[0].parent().height()-x[0].height(),y=C.deltaY||G}if((z==="y"&&!v.overflowed[0])||(z==="x"&&!v.overflowed[1])){return}if(p.mouseWheel.invert){y=-y}if(p.mouseWheel.normalizeDelta){y=y<0?-1:1}if((y>0&&D!==0)||(y<0&&D!==A)||p.mouseWheel.preventDefault){C.stopImmediatePropagation();C.preventDefault()}i._scrollTo(w,(H-(y*B)).toString(),{dir:z})})}function u(z){var y=null;try{var B=z.contentDocument||z.contentWindow.document;y=B.body.innerHTML}catch(A){}return(y!==null)}},_disableMousewheel:function(r,t){var p=t.nodeName.toLowerCase(),q=r.data(d).opt.mouseWheel.disableOver,s=["select","textarea"];return j.inArray(p,q)>-1&&!(j.inArray(p,s)>-1&&!j(t).is(":focus"))},_draggerRail:function(){var s=j(this),t=s.data(d),q=d+"_"+t.idx,r=j("#mCSB_"+t.idx+"_container"),u=r.parent(),p=j(".mCSB_"+t.idx+"_scrollbar .mCSB_draggerContainer");p.bind("touchstart."+q+" pointerdown."+q+" MSPointerDown."+q,function(v){n=true}).bind("touchend."+q+" pointerup."+q+" MSPointerUp."+q,function(v){n=false}).bind("click."+q,function(z){if(j(z.target).hasClass("mCSB_draggerContainer")||j(z.target).hasClass("mCSB_draggerRail")){i._stop(s);var w=j(this),y=w.find(".mCSB_dragger");if(w.parent(".mCSB_scrollTools_horizontal").length>0){if(!t.overflowed[1]){return}var v="x",x=z.pageX>y.offset().left?-1:1,A=Math.abs(r[0].offsetLeft)-(x*(u.width()*0.9))}else{if(!t.overflowed[0]){return}var v="y",x=z.pageY>y.offset().top?-1:1,A=Math.abs(r[0].offsetTop)-(x*(u.height()*0.9))}i._scrollTo(s,A.toString(),{dir:v,scrollEasing:"mcsEaseInOut"})}})},_focus:function(){var r=j(this),t=r.data(d),s=t.opt,p=d+"_"+t.idx,q=j("#mCSB_"+t.idx+"_container"),u=q.parent();q.bind("focusin."+p,function(x){var w=j(a.activeElement),y=q.find(".mCustomScrollBox").length,v=0;if(!w.is(s.advanced.autoScrollOnFocus)){return}i._stop(r);clearTimeout(r[0]._focusTimeout);r[0]._focusTimer=y?(v+17)*y:0;r[0]._focusTimeout=setTimeout(function(){var C=[w.offset().top-q.offset().top,w.offset().left-q.offset().left],B=[q[0].offsetTop,q[0].offsetLeft],z=[(B[0]+C[0]>=0&&B[0]+C[0]=0&&B[0]+C[1]a");q.bind("mousedown."+r+" touchstart."+r+" pointerdown."+r+" MSPointerDown."+r+" mouseup."+r+" touchend."+r+" pointerup."+r+" MSPointerUp."+r+" mouseout."+r+" pointerout."+r+" MSPointerOut."+r+" click."+r,function(z){z.preventDefault();if(!i._mouseBtnLeft(z)){return}var y=j(this).attr("class");p.type=v.scrollButtons.scrollType;switch(z.type){case"mousedown":case"touchstart":case"pointerdown":case"MSPointerDown":if(p.type==="stepped"){return}n=true;w.tweenRunning=false;x("on",y);break;case"mouseup":case"touchend":case"pointerup":case"MSPointerUp":case"mouseout":case"pointerout":case"MSPointerOut":if(p.type==="stepped"){return}n=false;if(p.dir){x("off",y)}break;case"click":if(p.type!=="stepped"||w.tweenRunning){return}x("on",y);break}function x(A,B){p.scrollAmount=v.snapAmount||v.scrollButtons.scrollAmount;i._sequentialScroll.call(this,u,A,B)}})},_keyboard:function(){var u=j(this),t=u.data(d),q=t.opt,x=t.sequential,s=d+"_"+t.idx,r=j("#mCSB_"+t.idx),w=j("#mCSB_"+t.idx+"_container"),p=w.parent(),v="input,textarea,select,datalist,keygen,[contenteditable='true']";r.attr("tabindex","0").bind("blur."+s+" keydown."+s+" keyup."+s,function(D){switch(D.type){case"blur":if(t.tweenRunning&&x.dir){y("off",null)}break;case"keydown":case"keyup":var A=D.keyCode?D.keyCode:D.which,B="on";if((q.axis!=="x"&&(A===38||A===40))||(q.axis!=="y"&&(A===37||A===39))){if(((A===38||A===40)&&!t.overflowed[0])||((A===37||A===39)&&!t.overflowed[1])){return}if(D.type==="keyup"){B="off"}if(!j(a.activeElement).is(v)){D.preventDefault();D.stopImmediatePropagation();y(B,A)}}else{if(A===33||A===34){if(t.overflowed[0]||t.overflowed[1]){D.preventDefault();D.stopImmediatePropagation()}if(D.type==="keyup"){i._stop(u);var C=A===34?-1:1;if(q.axis==="x"||(q.axis==="yx"&&t.overflowed[1]&&!t.overflowed[0])){var z="x",E=Math.abs(w[0].offsetLeft)-(C*(p.width()*0.9))}else{var z="y",E=Math.abs(w[0].offsetTop)-(C*(p.height()*0.9))}i._scrollTo(u,E.toString(),{dir:z,scrollEasing:"mcsEaseInOut"})}}else{if(A===35||A===36){if(!j(a.activeElement).is(v)){if(t.overflowed[0]||t.overflowed[1]){D.preventDefault();D.stopImmediatePropagation()}if(D.type==="keyup"){if(q.axis==="x"||(q.axis==="yx"&&t.overflowed[1]&&!t.overflowed[0])){var z="x",E=A===35?Math.abs(p.width()-w.outerWidth(false)):0}else{var z="y",E=A===35?Math.abs(p.height()-w.outerHeight(false)):0}i._scrollTo(u,E.toString(),{dir:z,scrollEasing:"mcsEaseInOut"})}}}}}break}function y(F,G){x.type=q.keyboard.scrollType;x.scrollAmount=q.snapAmount||q.keyboard.scrollAmount;if(x.type==="stepped"&&t.tweenRunning){return}i._sequentialScroll.call(this,u,F,G)}})},_sequentialScroll:function(r,u,s){var w=r.data(d),q=w.opt,y=w.sequential,x=j("#mCSB_"+w.idx+"_container"),p=y.type==="stepped"?true:false;switch(u){case"on":y.dir=[(s==="mCSB_buttonRight"||s==="mCSB_buttonLeft"||s===39||s===37?"x":"y"),(s==="mCSB_buttonUp"||s==="mCSB_buttonLeft"||s===38||s===37?-1:1)];i._stop(r);if(i._isNumeric(s)&&y.type==="stepped"){return}t(p);break;case"off":v();if(p||(w.tweenRunning&&y.dir)){t(true)}break}function t(z){var F=y.type!=="stepped",J=!z?1000/60:F?q.scrollInertia/1.5:q.scrollInertia,B=!z?2.5:F?7.5:40,I=[Math.abs(x[0].offsetTop),Math.abs(x[0].offsetLeft)],E=[w.scrollRatio.y>10?10:w.scrollRatio.y,w.scrollRatio.x>10?10:w.scrollRatio.x],C=y.dir[0]==="x"?I[1]+(y.dir[1]*(E[1]*B)):I[0]+(y.dir[1]*(E[0]*B)),H=y.dir[0]==="x"?I[1]+(y.dir[1]*parseInt(y.scrollAmount)):I[0]+(y.dir[1]*parseInt(y.scrollAmount)),G=y.scrollAmount!=="auto"?H:C,D=!z?"mcsLinear":F?"mcsLinearOut":"mcsEaseInOut",A=!z?false:true;if(z&&J<17){G=y.dir[0]==="x"?I[1]:I[0]}i._scrollTo(r,G.toString(),{dir:y.dir[0],scrollEasing:D,dur:J,onComplete:A});if(z){y.dir=false;return}clearTimeout(y.step);y.step=setTimeout(function(){t()},J)}function v(){clearTimeout(y.step);i._stop(r)}},_arr:function(r){var q=j(this).data(d).opt,p=[];if(typeof r==="function"){r=r()}if(!(r instanceof Array)){p[0]=r.y?r.y:r.x||q.axis==="x"?null:r;p[1]=r.x?r.x:r.y||q.axis==="y"?null:r}else{p=r.length>1?[r[0],r[1]]:q.axis==="x"?[null,r[0]]:[r[0],null]}if(typeof p[0]==="function"){p[0]=p[0]()}if(typeof p[1]==="function"){p[1]=p[1]()}return p},_to:function(v,w){if(v==null||typeof v=="undefined"){return}var C=j(this),B=C.data(d),u=B.opt,D=j("#mCSB_"+B.idx+"_container"),r=D.parent(),F=typeof v;if(!w){w=u.axis==="x"?"x":"y"}var q=w==="x"?D.outerWidth(false):D.outerHeight(false),x=w==="x"?D.offset().left:D.offset().top,E=w==="x"?D[0].offsetLeft:D[0].offsetTop,z=w==="x"?"left":"top";switch(F){case"function":return v();break;case"object":if(v.nodeType){var A=w==="x"?j(v).offset().left:j(v).offset().top}else{if(v.jquery){if(!v.length){return}var A=w==="x"?v.offset().left:v.offset().top}}return A-x;break;case"string":case"number":if(i._isNumeric.call(null,v)){return Math.abs(v)}else{if(v.indexOf("%")!==-1){return Math.abs(q*parseInt(v)/100)}else{if(v.indexOf("-=")!==-1){return Math.abs(E-parseInt(v.split("-=")[1]))}else{if(v.indexOf("+=")!==-1){var s=(E+parseInt(v.split("+=")[1]));return s>=0?0:Math.abs(s)}else{if(v.indexOf("px")!==-1&&i._isNumeric.call(null,v.split("px")[0])){return Math.abs(v.split("px")[0])}else{if(v==="top"||v==="left"){return 0}else{if(v==="bottom"){return Math.abs(r.height()-D.outerHeight(false))}else{if(v==="right"){return Math.abs(r.width()-D.outerWidth(false))}else{if(v==="first"||v==="last"){var y=D.find(":"+v),A=w==="x"?j(y).offset().left:j(y).offset().top;return A-x}else{if(j(v).length){var A=w==="x"?j(v).offset().left:j(v).offset().top;return A-x}else{D.css(z,v);e.update.call(null,C[0]);return}}}}}}}}}}break}},_autoUpdate:function(q){var t=j(this),F=t.data(d),z=F.opt,v=j("#mCSB_"+F.idx+"_container");if(q){clearTimeout(v[0].autoUpdate);i._delete.call(null,v[0].autoUpdate);return}var s=v.parent(),p=[j("#mCSB_"+F.idx+"_scrollbar_vertical"),j("#mCSB_"+F.idx+"_scrollbar_horizontal")],D=function(){return[p[0].is(":visible")?p[0].outerHeight(true):0,p[1].is(":visible")?p[1].outerWidth(true):0]},E=y(),x,u=[v.outerHeight(false),v.outerWidth(false),s.height(),s.width(),D()[0],D()[1]],H,B=G(),w;C();function C(){clearTimeout(v[0].autoUpdate);v[0].autoUpdate=setTimeout(function(){if(z.advanced.updateOnSelectorChange){x=y();if(x!==E){r();E=x;return}}if(z.advanced.updateOnContentResize){H=[v.outerHeight(false),v.outerWidth(false),s.height(),s.width(),D()[0],D()[1]];if(H[0]!==u[0]||H[1]!==u[1]||H[2]!==u[2]||H[3]!==u[3]||H[4]!==u[4]||H[5]!==u[5]){r();u=H}}if(z.advanced.updateOnImageLoad){w=G();if(w!==B){v.find("img").each(function(){A(this.src)});B=w}}if(z.advanced.updateOnSelectorChange||z.advanced.updateOnContentResize||z.advanced.updateOnImageLoad){C()}},60)}function G(){var I=0;if(z.advanced.updateOnImageLoad){I=v.find("img").length}return I}function A(L){var I=new Image();function K(M,N){return function(){return N.apply(M,arguments)}}function J(){this.onload=null;r()}I.onload=K(I,J);I.src=L}function y(){if(z.advanced.updateOnSelectorChange===true){z.advanced.updateOnSelectorChange="*"}var I=0,J=v.find(z.advanced.updateOnSelectorChange);if(z.advanced.updateOnSelectorChange&&J.length>0){J.each(function(){I+=j(this).height()+j(this).width()})}return I}function r(){clearTimeout(v[0].autoUpdate);e.update.call(null,t[0])}},_snapAmount:function(r,p,q){return(Math.round(r/p)*p-q)},_stop:function(p){var r=p.data(d),q=j("#mCSB_"+r.idx+"_container,#mCSB_"+r.idx+"_container_wrapper,#mCSB_"+r.idx+"_dragger_vertical,#mCSB_"+r.idx+"_dragger_horizontal");q.each(function(){i._stopTween.call(this)})},_scrollTo:function(q,s,u){var I=q.data(d),E=I.opt,D={trigger:"internal",dir:"y",scrollEasing:"mcsEaseOut",drag:false,dur:E.scrollInertia,overwrite:"all",callbacks:true,onStart:true,onUpdate:true,onComplete:true},u=j.extend(D,u),G=[u.dur,(u.drag?0:u.dur)],v=j("#mCSB_"+I.idx),B=j("#mCSB_"+I.idx+"_container"),K=E.callbacks.onTotalScrollOffset?i._arr.call(q,E.callbacks.onTotalScrollOffset):[0,0],p=E.callbacks.onTotalScrollBackOffset?i._arr.call(q,E.callbacks.onTotalScrollBackOffset):[0,0];I.trigger=u.trigger;if(s==="_resetY"&&!I.contentReset.y){if(t("onOverflowYNone")){E.callbacks.onOverflowYNone.call(q[0])}I.contentReset.y=1}if(s==="_resetX"&&!I.contentReset.x){if(t("onOverflowXNone")){E.callbacks.onOverflowXNone.call(q[0])}I.contentReset.x=1}if(s==="_resetY"||s==="_resetX"){return}if((I.contentReset.y||!q[0].mcs)&&I.overflowed[0]){if(t("onOverflowY")){E.callbacks.onOverflowY.call(q[0])}I.contentReset.x=null}if((I.contentReset.x||!q[0].mcs)&&I.overflowed[1]){if(t("onOverflowX")){E.callbacks.onOverflowX.call(q[0])}I.contentReset.x=null}if(E.snapAmount){s=i._snapAmount(s,E.snapAmount,E.snapOffset)}switch(u.dir){case"x":var x=j("#mCSB_"+I.idx+"_dragger_horizontal"),z="left",C=B[0].offsetLeft,H=[v.width()-B.outerWidth(false),x.parent().width()-x.width()],r=[s,s===0?0:(s/I.scrollRatio.x)],L=K[1],J=p[1],A=L>0?L/I.scrollRatio.x:0,w=J>0?J/I.scrollRatio.x:0;break;case"y":var x=j("#mCSB_"+I.idx+"_dragger_vertical"),z="top",C=B[0].offsetTop,H=[v.height()-B.outerHeight(false),x.parent().height()-x.height()],r=[s,s===0?0:(s/I.scrollRatio.y)],L=K[0],J=p[0],A=L>0?L/I.scrollRatio.y:0,w=J>0?J/I.scrollRatio.y:0;break}if(r[1]<0||(r[0]===0&&r[1]===0)){r=[0,0]}else{if(r[1]>=H[1]){r=[H[0],H[1]]}else{r[0]=-r[0]}}if(!q[0].mcs){F()}clearTimeout(B[0].onCompleteTimeout);if(!I.tweenRunning&&((C===0&&r[0]>=0)||(C===H[0]&&r[0]<=H[0]))){return}i._tweenTo.call(null,x[0],z,Math.round(r[1]),G[1],u.scrollEasing);i._tweenTo.call(null,B[0],z,Math.round(r[0]),G[0],u.scrollEasing,u.overwrite,{onStart:function(){if(u.callbacks&&u.onStart&&!I.tweenRunning){if(t("onScrollStart")){F();E.callbacks.onScrollStart.call(q[0])}I.tweenRunning=true;i._onDragClasses(x);I.cbOffsets=y()}},onUpdate:function(){if(u.callbacks&&u.onUpdate){if(t("whileScrolling")){F();E.callbacks.whileScrolling.call(q[0])}}},onComplete:function(){if(u.callbacks&&u.onComplete){if(E.axis==="yx"){clearTimeout(B[0].onCompleteTimeout)}var M=B[0].idleTimer||0;B[0].onCompleteTimeout=setTimeout(function(){if(t("onScroll")){F();E.callbacks.onScroll.call(q[0])}if(t("onTotalScroll")&&r[1]>=H[1]-A&&I.cbOffsets[0]){F();E.callbacks.onTotalScroll.call(q[0])}if(t("onTotalScrollBack")&&r[1]<=w&&I.cbOffsets[1]){F();E.callbacks.onTotalScrollBack.call(q[0])}I.tweenRunning=false;B[0].idleTimer=0;i._onDragClasses(x,"hide")},M)}}});function t(M){return I&&E.callbacks[M]&&typeof E.callbacks[M]==="function"}function y(){return[E.callbacks.alwaysTriggerOffsets||C>=H[0]+L,E.callbacks.alwaysTriggerOffsets||C<=-J]}function F(){var O=[B[0].offsetTop,B[0].offsetLeft],P=[x[0].offsetTop,x[0].offsetLeft],M=[B.outerHeight(false),B.outerWidth(false)],N=[v.height(),v.width()];q[0].mcs={content:B,top:O[0],left:O[1],draggerTop:P[0],draggerLeft:P[1],topPct:Math.round((100*Math.abs(O[0]))/(Math.abs(M[0])-N[0])),leftPct:Math.round((100*Math.abs(O[1]))/(Math.abs(M[1])-N[1])),direction:u.dir}}},_tweenTo:function(r,u,s,q,B,t,K){var K=K||{},H=K.onStart||function(){},C=K.onUpdate||function(){},I=K.onComplete||function(){},z=i._getTime(),x,v=0,E=r.offsetTop,F=r.style,A;if(u==="left"){E=r.offsetLeft}var y=s-E;r._mcsstop=0;if(t!=="none"){D()}p();function J(){if(r._mcsstop){return}if(!v){H.call()}v=i._getTime()-z;G();if(v>=r._mcstime){r._mcstime=(v>r._mcstime)?v+x-(v-r._mcstime):v+x-1;if(r._mcstime0){r._mcscurrVal=w(r._mcstime,E,y,q,B);F[u]=Math.round(r._mcscurrVal)+"px"}else{F[u]=s+"px"}C.call()}function p(){x=1000/60;r._mcstime=v+x;A=(!b.requestAnimationFrame)?function(L){G();return setTimeout(L,0.01)}:b.requestAnimationFrame;r._mcsid=A(J)}function D(){if(r._mcsid==null){return}if(!b.requestAnimationFrame){clearTimeout(r._mcsid)}else{b.cancelAnimationFrame(r._mcsid)}r._mcsid=null}function w(N,M,R,Q,O){switch(O){case"linear":case"mcsLinear":return R*N/Q+M;break;case"mcsLinearOut":N/=Q;N--;return R*Math.sqrt(1-N*N)+M;break;case"easeInOutSmooth":N/=Q/2;if(N<1){return R/2*N*N+M}N--;return -R/2*(N*(N-2)-1)+M;break;case"easeInOutStrong":N/=Q/2;if(N<1){return R/2*Math.pow(2,10*(N-1))+M}N--;return R/2*(-Math.pow(2,-10*N)+2)+M;break;case"easeInOut":case"mcsEaseInOut":N/=Q/2;if(N<1){return R/2*N*N*N+M}N-=2;return R/2*(N*N*N+2)+M;break;case"easeOutSmooth":N/=Q;N--;return -R*(N*N*N*N-1)+M;break;case"easeOutStrong":return R*(-Math.pow(2,-10*N/Q)+1)+M;break;case"easeOut":case"mcsEaseOut":default:var P=(N/=Q)*N,L=P*N;return M+R*(0.499999999999997*L*P+-2.5*P*P+5.5*L+-6.5*P+4*N)}}},_getTime:function(){if(b.performance&&b.performance.now){return b.performance.now()}else{if(b.performance&&b.performance.webkitNow){return b.performance.webkitNow()}else{if(Date.now){return Date.now()}else{return new Date().getTime()}}}},_stopTween:function(){var p=this;if(p._mcsid==null){return}if(!b.requestAnimationFrame){clearTimeout(p._mcsid)}else{b.cancelAnimationFrame(p._mcsid)}p._mcsid=null;p._mcsstop=1},_delete:function(r){try{delete r}catch(q){r=null}},_mouseBtnLeft:function(p){return !(p.which&&p.which!==1)},_pointerTouch:function(q){var p=q.originalEvent.pointerType;return !(p&&p!=="touch"&&p!==2)},_isNumeric:function(p){return !isNaN(parseFloat(p))&&isFinite(p)}};j.fn[g]=function(p){if(e[p]){return e[p].apply(this,Array.prototype.slice.call(arguments,1))}else{if(typeof p==="object"||!p){return e.init.apply(this,arguments)}else{j.error("Method "+p+" does not exist")}}};j[g]=function(p){if(e[p]){return e[p].apply(this,Array.prototype.slice.call(arguments,1))}else{if(typeof p==="object"||!p){return e.init.apply(this,arguments)}else{j.error("Method "+p+" does not exist")}}};j[g].defaults=h;b[g]=true;j(b).load(function(){j(m)[g]()})}))}(window,document)); \ No newline at end of file diff --git a/templates/client/static_client/js/jquery.mCustomScrollbar.js b/templates/client/static_client/js/jquery.mCustomScrollbar.js new file mode 100644 index 00000000..ec3555c5 --- /dev/null +++ b/templates/client/static_client/js/jquery.mCustomScrollbar.js @@ -0,0 +1,2166 @@ +/* +== malihu jquery custom scrollbar plugin == +Version: 3.0.4 +Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller +Author: malihu +Author URI: http://manos.malihu.gr +License: MIT License (MIT) +*/ + +/* +Copyright 2010 Manos Malihutsakis (email: manos@malihu.gr) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +/* +The code below is fairly long, fully commented and should be normally used in development. +For production, use either the minified jquery.mCustomScrollbar.min.js script or +the production-ready jquery.mCustomScrollbar.concat.min.js which contains the plugin +and dependencies (minified). +*/ + +;(function(window,document,undefined){ + +/* plugin dependencies */ +(function(init){ + /* support for RequireJS */ + if(typeof define==="function" && define.amd){ + define(["jquery", "jquery-mousewheel"], init); + }else{ + init(jQuery); + } +} + +(function($){ + + /* + ---------------------------------------- + PLUGIN NAMESPACE, PREFIX, DEFAULT SELECTOR(S) + ---------------------------------------- + */ + + var pluginNS="mCustomScrollbar", + pluginPfx="mCS", + defaultSelector=".mCustomScrollbar", + + + + + + /* + ---------------------------------------- + DEFAULT OPTIONS + ---------------------------------------- + */ + + defaults={ + /* + set element/content width programmatically + values: boolean, pixels, percentage + */ + setWidth:false, + /* + set element/content height programmatically + values: boolean, pixels, percentage + */ + setHeight:false, + /* + set the initial css top property of content + values: string (e.g. "-100px", "10%" etc.) + */ + setTop:0, + /* + set the initial css left property of content + values: string (e.g. "-100px", "10%" etc.) + */ + setLeft:0, + /* + scrollbar axis (vertical and/or horizontal scrollbars) + values (string): "y", "x", "yx" + */ + axis:"y", + /* + position of scrollbar relative to content + values (string): "inside", "outside" ("outside" requires elements with position:relative) + */ + scrollbarPosition:"inside", + /* + scrolling inertia + values: integer (milliseconds) + */ + scrollInertia:950, + /* + auto-adjust scrollbar dragger length + values: boolean + */ + autoDraggerLength:true, + /* + auto-hide scrollbar when idle + values: boolean + */ + autoHideScrollbar:false, + /* + auto-expands scrollbar on mouse-over and dragging + */ + autoExpandScrollbar:false, + /* + always show scrollbar, even when there's nothing to scroll + values: integer (0=disable, 1=always show dragger rail, 2=always show dragger rail, dragger and buttons), boolean + */ + alwaysShowScrollbar:0, + /* + scrolling always snaps to a multiple of this number in pixels + values: integer + */ + snapAmount:null, + /* + when snapping, snap with this number in pixels as an offset + values: integer + */ + snapOffset:0, + /* + mouse-wheel scrolling + */ + mouseWheel:{ + /* + enable mouse-wheel scrolling + values: boolean + */ + enable:true, + /* + scrolling amount in pixels + values: "auto", integer + */ + scrollAmount:"auto", + /* + mouse-wheel scrolling axis + the default scrolling direction when both vertical and horizontal scrollbars are present + values (string): "y", "x" + */ + axis:"y", + /* + prevent the default behaviour which automatically scrolls the parent element(s) + when end of scrolling is reached + values: boolean + */ + preventDefault:false, + /* + the reported mouse-wheel delta value. The number of lines (translated to pixels) one wheel notch scrolls. + values: "auto", integer + "auto" uses the default OS/browser value + */ + deltaFactor:"auto", + /* + normalize mouse-wheel delta to -1 or 1 (disables mouse-wheel acceleration) + values: boolean + */ + normalizeDelta:false, + /* + invert mouse-wheel scrolling direction + values: boolean + */ + invert:false, + /* + the tags that disable mouse-wheel when cursor is over them + */ + disableOver:["select","option","keygen","datalist","textarea"] + }, + /* + scrollbar buttons + */ + scrollButtons:{ + /* + enable scrollbar buttons + values: boolean + */ + enable:false, + /* + scrollbar buttons scrolling type + values (string): "stepless", "stepped" + */ + scrollType:"stepless", + /* + scrolling amount in pixels + values: "auto", integer + */ + scrollAmount:"auto" + }, + /* + keyboard scrolling + */ + keyboard:{ + /* + enable scrolling via keyboard + values: boolean + */ + enable:true, + /* + keyboard scrolling type + values (string): "stepless", "stepped" + */ + scrollType:"stepless", + /* + scrolling amount in pixels + values: "auto", integer + */ + scrollAmount:"auto" + }, + /* + enable content touch-swipe scrolling + values: boolean, integer, string (number) + integer values define the axis-specific minimum amount required for scrolling momentum + */ + contentTouchScroll:25, + /* + advanced option parameters + */ + advanced:{ + /* + auto-expand content horizontally (for "x" or "yx" axis) + values: boolean + */ + autoExpandHorizontalScroll:false, + /* + auto-scroll to elements with focus + */ + autoScrollOnFocus:"input,textarea,select,button,datalist,keygen,a[tabindex],area,object,[contenteditable='true']", + /* + auto-update scrollbars on content, element or viewport resize + should be true for fluid layouts/elements, adding/removing content dynamically, hiding/showing elements, content with images etc. + values: boolean + */ + updateOnContentResize:true, + /* + auto-update scrollbars each time each image inside the element is fully loaded + values: boolean + */ + updateOnImageLoad:true, + /* + auto-update scrollbars based on the amount and size changes of specific selectors + useful when you need to update the scrollbar(s) automatically, each time a type of element is added, removed or changes its size + values: boolean, string (e.g. "ul li" will auto-update scrollbars each time list-items inside the element are changed) + a value of true (boolean) will auto-update scrollbars each time any element is changed + */ + updateOnSelectorChange:false + }, + /* + scrollbar theme + values: string + ready-to-use themes: "light", "dark", "light-2", "dark-2", "light-3", "dark-3", "light-thick", "dark-thick", "light-thin", "dark-thin", + "rounded", "rounded-dark", "rounded-dots", "rounded-dots-dark", "3d", "3d-dark", "3d-thick", "3d-thick-dark", "minimal", "minimal-dark", + "inset", "inset-dark", "inset-2", "inset-2-dark", "inset-3", "inset-3-dark" + */ + theme:"light", + /* + user defined callback functions + */ + callbacks:{ + /* + function to call when a scroll event starts + values (function): function(){} + */ + onScrollStart:false, + /* + function to call when a scroll event is complete + values (function): function(){} + */ + onScroll:false, + /* + function to call when a scroll event is complete and content is scrolled all the way to the end (bottom/right) + values (function): function(){} + */ + onTotalScroll:false, + /* + function to call when a scroll event is complete and content is scrolled back to the beginning (top/left) + values (function): function(){} + */ + onTotalScrollBack:false, + /* + function to call when a scroll event is running + values (function): function(){} + */ + whileScrolling:false, + /* + onTotalScroll offset value + values: integer (pixels) + */ + onTotalScrollOffset:0, + /* + onTotalScrollBack offset value + values: integer (pixels) + */ + onTotalScrollBackOffset:0, + /* + callback offsets will trigger even if content is already scrolled to the end or beginning + values: boolean + */ + alwaysTriggerOffsets:true, + /* + function to call when content becomes long enough and vertical scrollbar is added + values (function): function(){} + */ + onOverflowY:false, + /* + function to call when content becomes wide enough and horizontal scrollbar is added + values (function): function(){} + */ + onOverflowX:false, + /* + function to call when content becomes short enough and vertical scrollbar is removed + values (function): function(){} + */ + onOverflowYNone:false, + /* + function to call when content becomes narrow enough and horizontal scrollbar is removed + values (function): function(){} + */ + onOverflowXNone:false + }, + /* + add scrollbar(s) on all elements matching the current selector, now and in the future + values: boolean, string + string values: "on" (enable), "once" (disable after first invocation), "off" (disable) + */ + live:false, + /* + the matching set of elements (instead of the current selector) to add scrollbar(s), now and in the future + values: string (selector) + */ + liveSelector:null + }, + + + + + + /* + ---------------------------------------- + VARS, CONSTANTS + ---------------------------------------- + */ + + totalInstances=0, /* plugin instances amount */ + liveTimers={}, /* live option timers */ + /* live option timers removal */ + removeLiveTimers=function(selector){ + if(liveTimers[selector]){ + clearTimeout(liveTimers[selector]); + functions._delete.call(null,liveTimers[selector]); + } + }, + oldIE=(window.attachEvent && !window.addEventListener) ? 1 : 0, /* detect IE < 9 */ + touchActive=false, /* global touch state (for touch and pointer events) */ + + + + + + /* + ---------------------------------------- + METHODS + ---------------------------------------- + */ + + methods={ + + /* + plugin initialization method + creates the scrollbar(s), plugin data object and options + ---------------------------------------- + */ + + init:function(options){ + + var options=$.extend(true,{},defaults,options), + selector=functions._selector.call(this); /* validate selector */ + + /* + if live option is enabled, monitor for elements matching the current selector and + apply scrollbar(s) when found (now and in the future) + */ + if(options.live){ + var liveSelector=options.liveSelector || this.selector || defaultSelector, /* live selector(s) */ + $liveSelector=$(liveSelector); /* live selector(s) as jquery object */ + if(options.live==="off"){ + /* + disable live if requested + usage: $(selector).mCustomScrollbar({live:"off"}); + */ + removeLiveTimers(liveSelector); + return; + } + liveTimers[liveSelector]=setTimeout(function(){ + /* call mCustomScrollbar fn on live selector(s) every half-second */ + $liveSelector.mCustomScrollbar(options); + if(options.live==="once" && $liveSelector.length){ + /* disable live after first invocation */ + removeLiveTimers(liveSelector); + } + },500); + }else{ + removeLiveTimers(liveSelector); + } + + /* options backward compatibility (for versions < 3.0.0) and normalization */ + options.setWidth=(options.set_width) ? options.set_width : options.setWidth; + options.setHeight=(options.set_height) ? options.set_height : options.setHeight; + options.axis=(options.horizontalScroll) ? "x" : functions._findAxis.call(null,options.axis); + options.scrollInertia=options.scrollInertia>0 && options.scrollInertia<17 ? 17 : options.scrollInertia; + if(typeof options.mouseWheel!=="object" && options.mouseWheel==true){ /* old school mouseWheel option (non-object) */ + options.mouseWheel={enable:true,scrollAmount:"auto",axis:"y",preventDefault:false,deltaFactor:"auto",normalizeDelta:false,invert:false} + } + options.mouseWheel.scrollAmount=!options.mouseWheelPixels ? options.mouseWheel.scrollAmount : options.mouseWheelPixels; + options.mouseWheel.normalizeDelta=!options.advanced.normalizeMouseWheelDelta ? options.mouseWheel.normalizeDelta : options.advanced.normalizeMouseWheelDelta; + options.scrollButtons.scrollType=functions._findScrollButtonsType.call(null,options.scrollButtons.scrollType); + + functions._theme.call(null,options); /* theme-specific options */ + + /* plugin constructor */ + return $(selector).each(function(){ + + var $this=$(this); + + if(!$this.data(pluginPfx)){ /* prevent multiple instantiations */ + + /* store options and create objects in jquery data */ + $this.data(pluginPfx,{ + idx:++totalInstances, /* instance index */ + opt:options, /* options */ + scrollRatio:{y:null,x:null}, /* scrollbar to content ratio */ + overflowed:null, /* overflowed axis */ + contentReset:{y:null,x:null}, /* object to check when content resets */ + bindEvents:false, /* object to check if events are bound */ + tweenRunning:false, /* object to check if tween is running */ + sequential:{}, /* sequential scrolling object */ + langDir:$this.css("direction"), /* detect/store direction (ltr or rtl) */ + cbOffsets:null, /* object to check whether callback offsets always trigger */ + /* + object to check how scrolling events where last triggered + "internal" (default - triggered by this script), "external" (triggered by other scripts, e.g. via scrollTo method) + usage: object.data("mCS").trigger + */ + trigger:null + }); + + /* HTML data attributes */ + var o=$this.data(pluginPfx).opt, + htmlDataAxis=$this.data("mcs-axis"),htmlDataSbPos=$this.data("mcs-scrollbar-position"),htmlDataTheme=$this.data("mcs-theme"); + if(htmlDataAxis){o.axis=htmlDataAxis;} /* usage example: data-mcs-axis="y" */ + if(htmlDataSbPos){o.scrollbarPosition=htmlDataSbPos;} /* usage example: data-mcs-scrollbar-position="outside" */ + if(htmlDataTheme){ /* usage example: data-mcs-theme="minimal" */ + o.theme=htmlDataTheme; + functions._theme.call(null,o); /* theme-specific options */ + } + + functions._pluginMarkup.call(this); /* add plugin markup */ + + methods.update.call(null,$this); /* call the update method */ + + } + + }); + + }, + /* ---------------------------------------- */ + + + + /* + plugin update method + updates content and scrollbar(s) values, events and status + ---------------------------------------- + usage: $(selector).mCustomScrollbar("update"); + */ + + update:function(el){ + + var selector=el || functions._selector.call(this); /* validate selector */ + + return $(selector).each(function(){ + + var $this=$(this); + + if($this.data(pluginPfx)){ /* check if plugin has initialized */ + + var d=$this.data(pluginPfx),o=d.opt, + mCSB_container=$("#mCSB_"+d.idx+"_container"), + mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")]; + + if(!mCSB_container.length){return;} + + if(d.tweenRunning){functions._stop.call(null,$this);} /* stop any running tweens while updating */ + + /* if element was disabled or destroyed, remove class(es) */ + if($this.hasClass("mCS_disabled")){$this.removeClass("mCS_disabled");} + if($this.hasClass("mCS_destroyed")){$this.removeClass("mCS_destroyed");} + + functions._maxHeight.call(this); /* detect/set css max-height value */ + + functions._expandContentHorizontally.call(this); /* expand content horizontally */ + + if(o.axis!=="y" && !o.advanced.autoExpandHorizontalScroll){ + mCSB_container.css("width",functions._contentWidth(mCSB_container.children())); + } + + d.overflowed=functions._overflowed.call(this); /* determine if scrolling is required */ + + functions._scrollbarVisibility.call(this); /* show/hide scrollbar(s) */ + + /* auto-adjust scrollbar dragger length analogous to content */ + if(o.autoDraggerLength){functions._setDraggerLength.call(this);} + + functions._scrollRatio.call(this); /* calculate and store scrollbar to content ratio */ + + functions._bindEvents.call(this); /* bind scrollbar events */ + + /* reset scrolling position and/or events */ + var to=[Math.abs(mCSB_container[0].offsetTop),Math.abs(mCSB_container[0].offsetLeft)]; + if(o.axis!=="x"){ /* y/yx axis */ + if(!d.overflowed[0]){ /* y scrolling is not required */ + functions._resetContentPosition.call(this); /* reset content position */ + if(o.axis==="y"){ + functions._unbindEvents.call(this); + }else if(o.axis==="yx" && d.overflowed[1]){ + functions._scrollTo.call(this,$this,to[1].toString(),{dir:"x",dur:0,overwrite:"none"}); + } + }else if(mCSB_dragger[0].height()>mCSB_dragger[0].parent().height()){ + functions._resetContentPosition.call(this); /* reset content position */ + }else{ /* y scrolling is required */ + functions._scrollTo.call(this,$this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"}); + d.contentReset.y=null; + } + } + if(o.axis!=="y"){ /* x/yx axis */ + if(!d.overflowed[1]){ /* x scrolling is not required */ + functions._resetContentPosition.call(this); /* reset content position */ + if(o.axis==="x"){ + functions._unbindEvents.call(this); + }else if(o.axis==="yx" && d.overflowed[0]){ + functions._scrollTo.call(this,$this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"}); + } + }else if(mCSB_dragger[1].width()>mCSB_dragger[1].parent().width()){ + functions._resetContentPosition.call(this); /* reset content position */ + }else{ /* x scrolling is required */ + functions._scrollTo.call(this,$this,to[1].toString(),{dir:"x",dur:0,overwrite:"none"}); + d.contentReset.x=null; + } + } + + functions._autoUpdate.call(this); /* initialize automatic updating (for dynamic content, fluid layouts etc.) */ + + } + + }); + + }, + /* ---------------------------------------- */ + + + + /* + plugin scrollTo method + triggers a scrolling event to a specific value + ---------------------------------------- + usage: $(selector).mCustomScrollbar("scrollTo",value,options); + */ + + scrollTo:function(val,options){ + + /* prevent silly things like $(selector).mCustomScrollbar("scrollTo",undefined); */ + if(typeof val=="undefined" || val==null){return;} + + var selector=functions._selector.call(this); /* validate selector */ + + return $(selector).each(function(){ + + var $this=$(this); + + if($this.data(pluginPfx)){ /* check if plugin has initialized */ + + var d=$this.data(pluginPfx),o=d.opt, + /* method default options */ + methodDefaults={ + trigger:"external", /* method is by default triggered externally (e.g. from other scripts) */ + scrollInertia:o.scrollInertia, /* scrolling inertia (animation duration) */ + scrollEasing:"mcsEaseInOut", /* animation easing */ + moveDragger:false, /* move dragger instead of content */ + timeout:60, /* scroll-to delay */ + callbacks:true, /* enable/disable callbacks */ + onStart:true, + onUpdate:true, + onComplete:true + }, + methodOptions=$.extend(true,{},methodDefaults,options), + to=functions._arr.call(this,val),dur=methodOptions.scrollInertia>0 && methodOptions.scrollInertia<17 ? 17 : methodOptions.scrollInertia; + + /* translate yx values to actual scroll-to positions */ + to[0]=functions._to.call(this,to[0],"y"); + to[1]=functions._to.call(this,to[1],"x"); + + /* + check if scroll-to value moves the dragger instead of content. + Only pixel values apply on dragger (e.g. 100, "100px", "-=100" etc.) + */ + if(methodOptions.moveDragger){ + to[0]*=d.scrollRatio.y; + to[1]*=d.scrollRatio.x; + } + + methodOptions.dur=dur; + + setTimeout(function(){ + /* do the scrolling */ + if(to[0]!==null && typeof to[0]!=="undefined" && o.axis!=="x" && d.overflowed[0]){ /* scroll y */ + methodOptions.dir="y"; + methodOptions.overwrite="all"; + functions._scrollTo.call(this,$this,to[0].toString(),methodOptions); + } + if(to[1]!==null && typeof to[1]!=="undefined" && o.axis!=="y" && d.overflowed[1]){ /* scroll x */ + methodOptions.dir="x"; + methodOptions.overwrite="none"; + functions._scrollTo.call(this,$this,to[1].toString(),methodOptions); + } + },methodOptions.timeout); + + } + + }); + + }, + /* ---------------------------------------- */ + + + + /* + plugin stop method + stops scrolling animation + ---------------------------------------- + usage: $(selector).mCustomScrollbar("stop"); + */ + stop:function(){ + + var selector=functions._selector.call(this); /* validate selector */ + + return $(selector).each(function(){ + + var $this=$(this); + + if($this.data(pluginPfx)){ /* check if plugin has initialized */ + + functions._stop.call(null,$this); + + } + + }); + + }, + /* ---------------------------------------- */ + + + + /* + plugin disable method + temporarily disables the scrollbar(s) + ---------------------------------------- + usage: $(selector).mCustomScrollbar("disable",reset); + reset (boolean): resets content position to 0 + */ + disable:function(r){ + + var selector=functions._selector.call(this); /* validate selector */ + + return $(selector).each(function(){ + + var $this=$(this); + + if($this.data(pluginPfx)){ /* check if plugin has initialized */ + + var d=$this.data(pluginPfx),o=d.opt; + + functions._autoUpdate.call(this,"remove"); /* remove automatic updating */ + + functions._unbindEvents.call(this); /* unbind events */ + + if(r){functions._resetContentPosition.call(this);} /* reset content position */ + + functions._scrollbarVisibility.call(this,true); /* show/hide scrollbar(s) */ + + $this.addClass("mCS_disabled"); /* add disable class */ + + } + + }); + + }, + /* ---------------------------------------- */ + + + + /* + plugin destroy method + completely removes the scrollbar(s) and returns the element to its original state + ---------------------------------------- + usage: $(selector).mCustomScrollbar("destroy"); + */ + destroy:function(){ + + var selector=functions._selector.call(this); /* validate selector */ + + return $(selector).each(function(){ + + var $this=$(this); + + if($this.data(pluginPfx)){ /* check if plugin has initialized */ + + var d=$this.data(pluginPfx),o=d.opt, + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + scrollbar=$(".mCSB_"+d.idx+"_scrollbar"); + + if(o.live){removeLiveTimers(selector);} /* remove live timer */ + + functions._autoUpdate.call(this,"remove"); /* remove automatic updating */ + + functions._unbindEvents.call(this); /* unbind events */ + + functions._resetContentPosition.call(this); /* reset content position */ + + $this.removeData(pluginPfx); /* remove plugin data object */ + + functions._delete.call(null,this.mcs); /* delete callbacks object */ + + /* remove plugin markup */ + scrollbar.remove(); /* remove scrollbar(s) first (those can be either inside or outside plugin's inner wrapper) */ + mCustomScrollBox.replaceWith(mCSB_container.contents()); /* replace plugin's inner wrapper with the original content */ + /* remove plugin classes from the element and add destroy class */ + $this.removeClass(pluginNS+" _"+pluginPfx+"_"+d.idx+" mCS-autoHide mCS-dir-rtl mCS_no_scrollbar mCS_disabled").addClass("mCS_destroyed"); + + } + + }); + + } + /* ---------------------------------------- */ + + }, + + + + + + /* + ---------------------------------------- + FUNCTIONS + ---------------------------------------- + */ + + functions={ + + /* validates selector (if selector is invalid or undefined uses the default one) */ + _selector:function(){ + return (typeof $(this)!=="object" || $(this).length<1) ? defaultSelector : this; + }, + /* -------------------- */ + + /* changes options according to theme */ + _theme:function(obj){ + var fixedSizeScrollbarThemes=["rounded","rounded-dark","rounded-dots","rounded-dots-dark"], + nonExpandedScrollbarThemes=["rounded-dots","rounded-dots-dark","3d","3d-dark","3d-thick","3d-thick-dark","inset","inset-dark","inset-2","inset-2-dark","inset-3","inset-3-dark"], + disabledScrollButtonsThemes=["minimal","minimal-dark"], + enabledAutoHideScrollbarThemes=["minimal","minimal-dark"], + scrollbarPositionOutsideThemes=["minimal","minimal-dark"]; + obj.autoDraggerLength=$.inArray(obj.theme,fixedSizeScrollbarThemes) > -1 ? false : obj.autoDraggerLength; + obj.autoExpandScrollbar=$.inArray(obj.theme,nonExpandedScrollbarThemes) > -1 ? false : obj.autoExpandScrollbar; + obj.scrollButtons.enable=$.inArray(obj.theme,disabledScrollButtonsThemes) > -1 ? false : obj.scrollButtons.enable; + obj.autoHideScrollbar=$.inArray(obj.theme,enabledAutoHideScrollbarThemes) > -1 ? true : obj.autoHideScrollbar; + obj.scrollbarPosition=$.inArray(obj.theme,scrollbarPositionOutsideThemes) > -1 ? "outside" : obj.scrollbarPosition; + }, + /* -------------------- */ + + + /* normalizes axis option to valid values: "y", "x", "yx" */ + _findAxis:function(val){ + return (val==="yx" || val==="xy" || val==="auto") ? "yx" : (val==="x" || val==="horizontal") ? "x" : "y"; + }, + /* -------------------- */ + + + /* normalizes scrollButtons.scrollType option to valid values: "stepless", "stepped" */ + _findScrollButtonsType:function(val){ + return (val==="stepped" || val==="pixels" || val==="step" || val==="click") ? "stepped" : "stepless"; + }, + /* -------------------- */ + + + /* generates plugin markup */ + _pluginMarkup:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + expandClass=o.autoExpandScrollbar ? " mCSB_scrollTools_onDrag_expand" : "", + scrollbar=["
    ","
    "], + wrapperClass=o.axis==="yx" ? "mCSB_vertical_horizontal" : o.axis==="x" ? "mCSB_horizontal" : "mCSB_vertical", + scrollbars=o.axis==="yx" ? scrollbar[0]+scrollbar[1] : o.axis==="x" ? scrollbar[1] : scrollbar[0], + contentWrapper=o.axis==="yx" ? "
    " : "", + autoHideClass=o.autoHideScrollbar ? " mCS-autoHide" : "", + scrollbarDirClass=(o.axis!=="x" && d.langDir==="rtl") ? " mCS-dir-rtl" : ""; + if(o.setWidth){$this.css("width",o.setWidth);} /* set element width */ + if(o.setHeight){$this.css("height",o.setHeight);} /* set element height */ + o.setLeft=(o.axis!=="y" && d.langDir==="rtl") ? "989999px" : o.setLeft; /* adjust left position for rtl direction */ + $this.addClass(pluginNS+" _"+pluginPfx+"_"+d.idx+autoHideClass+scrollbarDirClass).wrapInner("
    "); + var mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"); + if(o.axis!=="y" && !o.advanced.autoExpandHorizontalScroll){ + mCSB_container.css("width",functions._contentWidth(mCSB_container.children())); + } + if(o.scrollbarPosition==="outside"){ + if($this.css("position")==="static"){ /* requires elements with non-static position */ + $this.css("position","relative"); + } + $this.css("overflow","visible"); + mCustomScrollBox.addClass("mCSB_outside").after(scrollbars); + }else{ + mCustomScrollBox.addClass("mCSB_inside").append(scrollbars); + mCSB_container.wrap(contentWrapper); + } + functions._scrollButtons.call(this); /* add scrollbar buttons */ + /* minimum dragger length */ + var mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")]; + mCSB_dragger[0].css("min-height",mCSB_dragger[0].height()); + mCSB_dragger[1].css("min-width",mCSB_dragger[1].width()); + }, + /* -------------------- */ + + + /* calculates content width */ + _contentWidth:function(el){ + return Math.max.apply(Math,el.map(function(){return $(this).outerWidth(true);}).get()); + }, + /* -------------------- */ + + + /* expands content horizontally */ + _expandContentHorizontally:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCSB_container=$("#mCSB_"+d.idx+"_container"); + if(o.advanced.autoExpandHorizontalScroll && o.axis!=="y"){ + /* + wrap content with an infinite width div and set its position to absolute and width to auto. + Setting width to auto before calculating the actual width is important! + We must let the browser set the width as browser zoom values are impossible to calculate. + */ + mCSB_container.css({"position":"absolute","width":"auto"}) + .wrap("
    ") + .css({ /* set actual width, original position and un-wrap */ + /* + get the exact width (with decimals) and then round-up. + Using jquery outerWidth() will round the width value which will mess up with inner elements that have non-integer width + */ + "width":(Math.ceil(mCSB_container[0].getBoundingClientRect().right+0.4)-Math.floor(mCSB_container[0].getBoundingClientRect().left)), + "position":"relative" + }).unwrap(); + } + }, + /* -------------------- */ + + + /* adds scrollbar buttons */ + _scrollButtons:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCSB_scrollTools=$(".mCSB_"+d.idx+"_scrollbar:first"), + btnHTML=[ + "","", + "","" + ], + btn=[(o.axis==="x" ? btnHTML[2] : btnHTML[0]),(o.axis==="x" ? btnHTML[3] : btnHTML[1]),btnHTML[2],btnHTML[3]]; + if(o.scrollButtons.enable){ + mCSB_scrollTools.prepend(btn[0]).append(btn[1]).next(".mCSB_scrollTools").prepend(btn[2]).append(btn[3]); + } + }, + /* -------------------- */ + + + /* detects/sets css max-height value */ + _maxHeight:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCustomScrollBox=$("#mCSB_"+d.idx), + mh=$this.css("max-height"),pct=mh.indexOf("%")!==-1, + bs=$this.css("box-sizing"); + if(mh!=="none"){ + var val=pct ? $this.parent().height()*parseInt(mh)/100 : parseInt(mh); + /* if element's css box-sizing is "border-box", subtract any paddings and/or borders from max-height value */ + if(bs==="border-box"){val-=(($this.innerHeight()-$this.height())+($this.outerHeight()-$this.innerHeight()));} + mCustomScrollBox.css("max-height",Math.round(val)); + } + }, + /* -------------------- */ + + + /* auto-adjusts scrollbar dragger length */ + _setDraggerLength:function(){ + var $this=$(this),d=$this.data(pluginPfx), + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")], + ratio=[mCustomScrollBox.height()/mCSB_container.outerHeight(false),mCustomScrollBox.width()/mCSB_container.outerWidth(false)], + l=[ + parseInt(mCSB_dragger[0].css("min-height")),Math.round(ratio[0]*mCSB_dragger[0].parent().height()), + parseInt(mCSB_dragger[1].css("min-width")),Math.round(ratio[1]*mCSB_dragger[1].parent().width()) + ], + h=oldIE && (l[1]mCustomScrollBox.height(),contentWidth>mCustomScrollBox.width()]; + }, + /* -------------------- */ + + + /* resets content position to 0 */ + _resetContentPosition:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")]; + functions._stop($this); /* stop any current scrolling before resetting */ + if((o.axis!=="x" && !d.overflowed[0]) || (o.axis==="y" && d.overflowed[0])){ /* reset y */ + mCSB_dragger[0].add(mCSB_container).css("top",0); + functions._scrollTo($this,"_resetY"); + } + if((o.axis!=="y" && !d.overflowed[1]) || (o.axis==="x" && d.overflowed[1])){ /* reset x */ + var cx=dx=0; + if(d.langDir==="rtl"){ /* adjust left position for rtl direction */ + cx=mCustomScrollBox.width()-mCSB_container.outerWidth(false); + dx=Math.abs(cx/d.scrollRatio.x); + } + mCSB_container.css("left",cx); + mCSB_dragger[1].css("left",dx); + functions._scrollTo($this,"_resetX"); + } + }, + /* -------------------- */ + + + /* binds scrollbar events */ + _bindEvents:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt; + if(!d.bindEvents){ /* check if events are already bound */ + functions._draggable.call(this); + if(o.contentTouchScroll){functions._contentDraggable.call(this);} + if(o.mouseWheel.enable){ /* bind mousewheel fn when plugin is available */ + function _mwt(){ + mousewheelTimeout=setTimeout(function(){ + if(!$.event.special.mousewheel){ + _mwt(); + }else{ + clearTimeout(mousewheelTimeout); + functions._mousewheel.call($this[0]); + } + },1000); + } + var mousewheelTimeout; + _mwt(); + } + functions._draggerRail.call(this); + functions._wrapperScroll.call(this); + if(o.advanced.autoScrollOnFocus){functions._focus.call(this);} + if(o.scrollButtons.enable){functions._buttons.call(this);} + if(o.keyboard.enable){functions._keyboard.call(this);} + d.bindEvents=true; + } + }, + /* -------------------- */ + + + /* unbinds scrollbar events */ + _unbindEvents:function(){ + var $this=$(this),d=$this.data(pluginPfx), + namespace=pluginPfx+"_"+d.idx, + sb=".mCSB_"+d.idx+"_scrollbar", + sel=$("#mCSB_"+d.idx+",#mCSB_"+d.idx+"_container,#mCSB_"+d.idx+"_container_wrapper,"+sb+" .mCSB_draggerContainer,#mCSB_"+d.idx+"_dragger_vertical,#mCSB_"+d.idx+"_dragger_horizontal,"+sb+">a"), + mCSB_container=$("#mCSB_"+d.idx+"_container"); + if(d.bindEvents){ /* check if events are bound */ + /* unbind namespaced events from document/selectors */ + $(document).unbind("."+namespace); + sel.each(function(){ + $(this).unbind("."+namespace); + }); + /* clear and delete timeouts/objects */ + clearTimeout($this[0]._focusTimeout); functions._delete.call(null,$this[0]._focusTimeout); + clearTimeout(d.sequential.step); functions._delete.call(null,d.sequential.step); + clearTimeout(mCSB_container[0].onCompleteTimeout); functions._delete.call(null,mCSB_container[0].onCompleteTimeout); + d.bindEvents=false; + } + }, + /* -------------------- */ + + + /* toggles scrollbar visibility */ + _scrollbarVisibility:function(disabled){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + contentWrapper=$("#mCSB_"+d.idx+"_container_wrapper"), + content=contentWrapper.length ? contentWrapper : $("#mCSB_"+d.idx+"_container"), + scrollbar=[$("#mCSB_"+d.idx+"_scrollbar_vertical"),$("#mCSB_"+d.idx+"_scrollbar_horizontal")], + mCSB_dragger=[scrollbar[0].find(".mCSB_dragger"),scrollbar[1].find(".mCSB_dragger")]; + if(o.axis!=="x"){ + if(d.overflowed[0] && !disabled){ + scrollbar[0].add(mCSB_dragger[0]).add(scrollbar[0].children("a")).css("display","block"); + content.removeClass("mCS_no_scrollbar_y mCS_y_hidden"); + }else{ + if(o.alwaysShowScrollbar){ + if(o.alwaysShowScrollbar!==2){mCSB_dragger[0].add(scrollbar[0].children("a")).css("display","none");} + content.removeClass("mCS_y_hidden"); + }else{ + scrollbar[0].css("display","none"); + content.addClass("mCS_y_hidden"); + } + content.addClass("mCS_no_scrollbar_y"); + } + } + if(o.axis!=="y"){ + if(d.overflowed[1] && !disabled){ + scrollbar[1].add(mCSB_dragger[1]).add(scrollbar[1].children("a")).css("display","block"); + content.removeClass("mCS_no_scrollbar_x mCS_x_hidden"); + }else{ + if(o.alwaysShowScrollbar){ + if(o.alwaysShowScrollbar!==2){mCSB_dragger[1].add(scrollbar[1].children("a")).css("display","none");} + content.removeClass("mCS_x_hidden"); + }else{ + scrollbar[1].css("display","none"); + content.addClass("mCS_x_hidden"); + } + content.addClass("mCS_no_scrollbar_x"); + } + } + if(!d.overflowed[0] && !d.overflowed[1]){ + $this.addClass("mCS_no_scrollbar"); + }else{ + $this.removeClass("mCS_no_scrollbar"); + } + }, + /* -------------------- */ + + + /* returns input coordinates of pointer, touch and mouse events (relative to document) */ + _coordinates:function(e){ + var t=e.type; + switch(t){ + case "pointerdown": case "MSPointerDown": case "pointermove": case "MSPointerMove": case "pointerup": case "MSPointerUp": + return [e.originalEvent.pageY,e.originalEvent.pageX]; + break; + case "touchstart": case "touchmove": case "touchend": + var touch=e.originalEvent.touches[0] || e.originalEvent.changedTouches[0]; + return [touch.pageY,touch.pageX]; + break; + default: + return [e.pageY,e.pageX]; + } + }, + /* -------------------- */ + + + /* + SCROLLBAR DRAG EVENTS + scrolls content via scrollbar dragging + */ + _draggable:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + namespace=pluginPfx+"_"+d.idx, + draggerId=["mCSB_"+d.idx+"_dragger_vertical","mCSB_"+d.idx+"_dragger_horizontal"], + mCSB_container=$("#mCSB_"+d.idx+"_container"), + mCSB_dragger=$("#"+draggerId[0]+",#"+draggerId[1]), + draggable,dragY,dragX; + mCSB_dragger.bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){ + e.stopImmediatePropagation(); + e.preventDefault(); + if(!functions._mouseBtnLeft(e)){return;} /* left mouse button only */ + touchActive=true; + if(oldIE){document.onselectstart=function(){return false;}} /* disable text selection for IE < 9 */ + _iframe(false); /* enable scrollbar dragging over iframes by disabling their events */ + functions._stop($this); + draggable=$(this); + var offset=draggable.offset(),y=functions._coordinates(e)[0]-offset.top,x=functions._coordinates(e)[1]-offset.left, + h=draggable.height()+offset.top,w=draggable.width()+offset.left; + if(y0 && x0){ + dragY=y; + dragX=x; + } + functions._onDragClasses(draggable,"active",o.autoExpandScrollbar); + }).bind("touchmove."+namespace,function(e){ + e.stopImmediatePropagation(); + e.preventDefault(); + var offset=draggable.offset(),y=functions._coordinates(e)[0]-offset.top,x=functions._coordinates(e)[1]-offset.left; + _drag(dragY,dragX,y,x); + }); + $(document).bind("mousemove."+namespace+" pointermove."+namespace+" MSPointerMove."+namespace,function(e){ + if(draggable){ + var offset=draggable.offset(),y=functions._coordinates(e)[0]-offset.top,x=functions._coordinates(e)[1]-offset.left; + if(dragY===y){return;} /* has it really moved? */ + _drag(dragY,dragX,y,x); + } + }).add(mCSB_dragger).bind("mouseup."+namespace+" touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace,function(e){ + if(draggable){ + functions._onDragClasses(draggable,"active",o.autoExpandScrollbar); + draggable=null; + } + touchActive=false; + if(oldIE){document.onselectstart=null;} /* enable text selection for IE < 9 */ + _iframe(true); /* enable iframes events */ + }); + function _iframe(evt){ + var el=mCSB_container.find("iframe"); + if(!el.length){return;} /* check if content contains iframes */ + var val=!evt ? "none" : "auto"; + el.css("pointer-events",val); /* for IE11, iframe's display property should not be "block" */ + } + function _drag(dragY,dragX,y,x){ + mCSB_container[0].idleTimer=o.scrollInertia<233 ? 250 : 0; + if(draggable.attr("id")===draggerId[1]){ + var dir="x",to=((draggable[0].offsetLeft-dragX)+x)*d.scrollRatio.x; + }else{ + var dir="y",to=((draggable[0].offsetTop-dragY)+y)*d.scrollRatio.y; + } + functions._scrollTo($this,to.toString(),{dir:dir,drag:true}); + } + }, + /* -------------------- */ + + + /* + TOUCH SWIPE EVENTS + scrolls content via touch swipe + Emulates the native touch-swipe scrolling with momentum found in iOS, Android and WP devices + */ + _contentDraggable:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + namespace=pluginPfx+"_"+d.idx, + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")], + dragY,dragX,touchStartY,touchStartX,touchMoveY=[],touchMoveX=[],startTime,runningTime,endTime,distance,speed,amount, + durA=0,durB,overwrite=o.axis==="yx" ? "none" : "all"; + mCSB_container.bind("touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){ + if(!functions._pointerTouch(e) || touchActive){return;} + var offset=mCSB_container.offset(); + dragY=functions._coordinates(e)[0]-offset.top; + dragX=functions._coordinates(e)[1]-offset.left; + }).bind("touchmove."+namespace+" pointermove."+namespace+" MSPointerMove."+namespace,function(e){ + if(!functions._pointerTouch(e) || touchActive){return;} + e.stopImmediatePropagation(); + runningTime=functions._getTime(); + var offset=mCustomScrollBox.offset(),y=functions._coordinates(e)[0]-offset.top,x=functions._coordinates(e)[1]-offset.left, + easing="mcsLinearOut"; + touchMoveY.push(y); + touchMoveX.push(x); + if(d.overflowed[0]){ + var limit=mCSB_dragger[0].parent().height()-mCSB_dragger[0].height(), + prevent=((dragY-y)>0 && (y-dragY)>-(limit*d.scrollRatio.y)); + } + if(d.overflowed[1]){ + var limitX=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(), + preventX=((dragX-x)>0 && (x-dragX)>-(limitX*d.scrollRatio.x)); + } + if(prevent || preventX){e.preventDefault();} /* prevent native document scrolling */ + amount=o.axis==="yx" ? [(dragY-y),(dragX-x)] : o.axis==="x" ? [null,(dragX-x)] : [(dragY-y),null]; + mCSB_container[0].idleTimer=250; + if(d.overflowed[0]){_drag(amount[0],durA,easing,"y","all",true);} + if(d.overflowed[1]){_drag(amount[1],durA,easing,"x",overwrite,true);} + }); + mCustomScrollBox.bind("touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){ + if(!functions._pointerTouch(e) || touchActive){return;} + e.stopImmediatePropagation(); + functions._stop($this); + startTime=functions._getTime(); + var offset=mCustomScrollBox.offset(); + touchStartY=functions._coordinates(e)[0]-offset.top; + touchStartX=functions._coordinates(e)[1]-offset.left; + touchMoveY=[]; touchMoveX=[]; + }).bind("touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace,function(e){ + if(!functions._pointerTouch(e) || touchActive){return;} + e.stopImmediatePropagation(); + endTime=functions._getTime(); + var offset=mCustomScrollBox.offset(),y=functions._coordinates(e)[0]-offset.top,x=functions._coordinates(e)[1]-offset.left; + if((endTime-runningTime)>30){return;} + speed=1000/(endTime-startTime); + var easing="mcsEaseOut",slow=speed<2.5, + diff=slow ? [touchMoveY[touchMoveY.length-2],touchMoveX[touchMoveX.length-2]] : [0,0]; + distance=slow ? [(y-diff[0]),(x-diff[1])] : [y-touchStartY,x-touchStartX]; + var absDistance=[Math.abs(distance[0]),Math.abs(distance[1])]; + speed=slow ? [Math.abs(distance[0]/4),Math.abs(distance[1]/4)] : [speed,speed]; + var a=[ + Math.abs(mCSB_container[0].offsetTop)-(distance[0]*_m((absDistance[0]/speed[0]),speed[0])), + Math.abs(mCSB_container[0].offsetLeft)-(distance[1]*_m((absDistance[1]/speed[1]),speed[1])) + ]; + amount=o.axis==="yx" ? [a[0],a[1]] : o.axis==="x" ? [null,a[1]] : [a[0],null]; + durB=[(absDistance[0]*4)+o.scrollInertia,(absDistance[1]*4)+o.scrollInertia]; + var md=parseInt(o.contentTouchScroll) || 0; /* absolute minimum distance required */ + amount[0]=absDistance[0]>md ? amount[0] : 0; + amount[1]=absDistance[1]>md ? amount[1] : 0; + if(d.overflowed[0]){_drag(amount[0],durB[0],easing,"y",overwrite,false);} + if(d.overflowed[1]){_drag(amount[1],durB[1],easing,"x",overwrite,false);} + }); + function _m(ds,s){ + var r=[s*1.5,s*2,s/1.5,s/2]; + if(ds>90){ + return s>4 ? r[0] : r[3]; + }else if(ds>60){ + return s>3 ? r[3] : r[2]; + }else if(ds>30){ + return s>8 ? r[1] : s>6 ? r[0] : s>4 ? s : r[2]; + }else{ + return s>8 ? s : r[3]; + } + } + function _drag(amount,dur,easing,dir,overwrite,drag){ + if(!amount){return;} + functions._scrollTo($this,amount.toString(),{dur:dur,scrollEasing:easing,dir:dir,overwrite:overwrite,drag:drag}); + } + }, + /* -------------------- */ + + + /* + MOUSE WHEEL EVENT + scrolls content via mouse-wheel + via mouse-wheel plugin (https://github.com/brandonaaron/jquery-mousewheel) + */ + _mousewheel:function(){ + var $this=$(this),d=$this.data(pluginPfx); + if(d){ /* Check if the scrollbar is ready to use mousewheel events (issue: #185) */ + var o=d.opt, + namespace=pluginPfx+"_"+d.idx, + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")], + iframe=$("#mCSB_"+d.idx+"_container").find("iframe"), + el=mCustomScrollBox /* mousewheel element selector */; + /* check for cross domain iframes and bind mousewheel event on them in addition to default mousewheel element selector */ + if(iframe.length){ + iframe.each(function(){ + var iFobj=this; + if(_canAccessIFrame(iFobj)){ /* check if iframe can be accessed */ + el=el.add($(iFobj).contents().find("body")); + } + }); + } + el.bind("mousewheel."+namespace,function(e,delta){ + functions._stop($this); + if(functions._disableMousewheel($this,e.target)){return;} /* disables mouse-wheel when hovering specific elements */ + var deltaFactor=o.mouseWheel.deltaFactor!=="auto" ? parseInt(o.mouseWheel.deltaFactor) : (oldIE && e.deltaFactor<100) ? 100 : e.deltaFactor || 100; + if(o.axis==="x" || o.mouseWheel.axis==="x"){ + var dir="x", + px=[Math.round(deltaFactor*d.scrollRatio.x),parseInt(o.mouseWheel.scrollAmount)], + amount=o.mouseWheel.scrollAmount!=="auto" ? px[1] : px[0]>=mCustomScrollBox.width() ? mCustomScrollBox.width()*0.9 : px[0], + contentPos=Math.abs($("#mCSB_"+d.idx+"_container")[0].offsetLeft), + draggerPos=mCSB_dragger[1][0].offsetLeft, + limit=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(), + dlt=e.deltaX || e.deltaY || delta; + }else{ + var dir="y", + px=[Math.round(deltaFactor*d.scrollRatio.y),parseInt(o.mouseWheel.scrollAmount)], + amount=o.mouseWheel.scrollAmount!=="auto" ? px[1] : px[0]>=mCustomScrollBox.height() ? mCustomScrollBox.height()*0.9 : px[0], + contentPos=Math.abs($("#mCSB_"+d.idx+"_container")[0].offsetTop), + draggerPos=mCSB_dragger[0][0].offsetTop, + limit=mCSB_dragger[0].parent().height()-mCSB_dragger[0].height(), + dlt=e.deltaY || delta; + } + if((dir==="y" && !d.overflowed[0]) || (dir==="x" && !d.overflowed[1])){return;} + if(o.mouseWheel.invert){dlt=-dlt;} + if(o.mouseWheel.normalizeDelta){dlt=dlt<0 ? -1 : 1;} + if((dlt>0 && draggerPos!==0) || (dlt<0 && draggerPos!==limit) || o.mouseWheel.preventDefault){ + e.stopImmediatePropagation(); + e.preventDefault(); + } + functions._scrollTo($this,(contentPos-(dlt*amount)).toString(),{dir:dir}); + }); + } + /* check if iframe can be accessed */ + function _canAccessIFrame(iframe){ + var html=null; + try{ + var doc=iframe.contentDocument || iframe.contentWindow.document; + html=doc.body.innerHTML; + }catch(err){/* do nothing */} + return(html!==null); + } + }, + /* -------------------- */ + + + /* disables mouse-wheel when hovering specific elements like select, datalist etc. */ + _disableMousewheel:function(el,target){ + var tag=target.nodeName.toLowerCase(), + tags=el.data(pluginPfx).opt.mouseWheel.disableOver, + /* elements that require focus */ + focusTags=["select","textarea"]; + return $.inArray(tag,tags) > -1 && !($.inArray(tag,focusTags) > -1 && !$(target).is(":focus")); + }, + /* -------------------- */ + + + /* + DRAGGER RAIL CLICK EVENT + scrolls content via dragger rail + */ + _draggerRail:function(){ + var $this=$(this),d=$this.data(pluginPfx), + namespace=pluginPfx+"_"+d.idx, + mCSB_container=$("#mCSB_"+d.idx+"_container"), + wrapper=mCSB_container.parent(), + mCSB_draggerContainer=$(".mCSB_"+d.idx+"_scrollbar .mCSB_draggerContainer"); + mCSB_draggerContainer.bind("touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){ + touchActive=true; + }).bind("touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace,function(e){ + touchActive=false; + }).bind("click."+namespace,function(e){ + if($(e.target).hasClass("mCSB_draggerContainer") || $(e.target).hasClass("mCSB_draggerRail")){ + functions._stop($this); + var el=$(this),mCSB_dragger=el.find(".mCSB_dragger"); + if(el.parent(".mCSB_scrollTools_horizontal").length>0){ + if(!d.overflowed[1]){return;} + var dir="x", + clickDir=e.pageX>mCSB_dragger.offset().left ? -1 : 1, + to=Math.abs(mCSB_container[0].offsetLeft)-(clickDir*(wrapper.width()*0.9)); + }else{ + if(!d.overflowed[0]){return;} + var dir="y", + clickDir=e.pageY>mCSB_dragger.offset().top ? -1 : 1, + to=Math.abs(mCSB_container[0].offsetTop)-(clickDir*(wrapper.height()*0.9)); + } + functions._scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"}); + } + }); + }, + /* -------------------- */ + + + /* + FOCUS EVENT + scrolls content via element focus (e.g. clicking an input, pressing TAB key etc.) + */ + _focus:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + namespace=pluginPfx+"_"+d.idx, + mCSB_container=$("#mCSB_"+d.idx+"_container"), + wrapper=mCSB_container.parent(); + mCSB_container.bind("focusin."+namespace,function(e){ + var el=$(document.activeElement), + nested=mCSB_container.find(".mCustomScrollBox").length, + dur=0; + if(!el.is(o.advanced.autoScrollOnFocus)){return;} + functions._stop($this); + clearTimeout($this[0]._focusTimeout); + $this[0]._focusTimer=nested ? (dur+17)*nested : 0; + $this[0]._focusTimeout=setTimeout(function(){ + var to=[el.offset().top-mCSB_container.offset().top,el.offset().left-mCSB_container.offset().left], + contentPos=[mCSB_container[0].offsetTop,mCSB_container[0].offsetLeft], + isVisible=[ + (contentPos[0]+to[0]>=0 && contentPos[0]+to[0]=0 && contentPos[0]+to[1]a"); + btn.bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace+" mouseup."+namespace+" touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace+" mouseout."+namespace+" pointerout."+namespace+" MSPointerOut."+namespace+" click."+namespace,function(e){ + e.preventDefault(); + if(!functions._mouseBtnLeft(e)){return;} /* left mouse button only */ + var btnClass=$(this).attr("class"); + seq.type=o.scrollButtons.scrollType; + switch(e.type){ + case "mousedown": case "touchstart": case "pointerdown": case "MSPointerDown": + if(seq.type==="stepped"){return;} + touchActive=true; + d.tweenRunning=false; + _seq("on",btnClass); + break; + case "mouseup": case "touchend": case "pointerup": case "MSPointerUp": + case "mouseout": case "pointerout": case "MSPointerOut": + if(seq.type==="stepped"){return;} + touchActive=false; + if(seq.dir){_seq("off",btnClass);} + break; + case "click": + if(seq.type!=="stepped" || d.tweenRunning){return;} + _seq("on",btnClass); + break; + } + function _seq(a,c){ + seq.scrollAmount=o.snapAmount || o.scrollButtons.scrollAmount; + functions._sequentialScroll.call(this,$this,a,c); + } + }); + }, + /* -------------------- */ + + + /* + KEYBOARD EVENTS + scrolls content via keyboard + Keys: up arrow, down arrow, left arrow, right arrow, PgUp, PgDn, Home, End + */ + _keyboard:function(){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt,seq=d.sequential, + namespace=pluginPfx+"_"+d.idx, + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + wrapper=mCSB_container.parent(), + editables="input,textarea,select,datalist,keygen,[contenteditable='true']"; + mCustomScrollBox.attr("tabindex","0").bind("blur."+namespace+" keydown."+namespace+" keyup."+namespace,function(e){ + switch(e.type){ + case "blur": + if(d.tweenRunning && seq.dir){_seq("off",null);} + break; + case "keydown": case "keyup": + var code=e.keyCode ? e.keyCode : e.which,action="on"; + if((o.axis!=="x" && (code===38 || code===40)) || (o.axis!=="y" && (code===37 || code===39))){ + /* up (38), down (40), left (37), right (39) arrows */ + if(((code===38 || code===40) && !d.overflowed[0]) || ((code===37 || code===39) && !d.overflowed[1])){return;} + if(e.type==="keyup"){action="off";} + if(!$(document.activeElement).is(editables)){ + e.preventDefault(); + e.stopImmediatePropagation(); + _seq(action,code); + } + }else if(code===33 || code===34){ + /* PgUp (33), PgDn (34) */ + if(d.overflowed[0] || d.overflowed[1]){ + e.preventDefault(); + e.stopImmediatePropagation(); + } + if(e.type==="keyup"){ + functions._stop($this); + var keyboardDir=code===34 ? -1 : 1; + if(o.axis==="x" || (o.axis==="yx" && d.overflowed[1] && !d.overflowed[0])){ + var dir="x",to=Math.abs(mCSB_container[0].offsetLeft)-(keyboardDir*(wrapper.width()*0.9)); + }else{ + var dir="y",to=Math.abs(mCSB_container[0].offsetTop)-(keyboardDir*(wrapper.height()*0.9)); + } + functions._scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"}); + } + }else if(code===35 || code===36){ + /* End (35), Home (36) */ + if(!$(document.activeElement).is(editables)){ + if(d.overflowed[0] || d.overflowed[1]){ + e.preventDefault(); + e.stopImmediatePropagation(); + } + if(e.type==="keyup"){ + if(o.axis==="x" || (o.axis==="yx" && d.overflowed[1] && !d.overflowed[0])){ + var dir="x",to=code===35 ? Math.abs(wrapper.width()-mCSB_container.outerWidth(false)) : 0; + }else{ + var dir="y",to=code===35 ? Math.abs(wrapper.height()-mCSB_container.outerHeight(false)) : 0; + } + functions._scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"}); + } + } + } + break; + } + function _seq(a,c){ + seq.type=o.keyboard.scrollType; + seq.scrollAmount=o.snapAmount || o.keyboard.scrollAmount; + if(seq.type==="stepped" && d.tweenRunning){return;} + functions._sequentialScroll.call(this,$this,a,c); + } + }); + }, + /* -------------------- */ + + + /* scrolls content sequentially (used when scrolling via buttons, keyboard arrows etc.) */ + _sequentialScroll:function(el,action,trigger){ + var d=el.data(pluginPfx),o=d.opt,seq=d.sequential, + mCSB_container=$("#mCSB_"+d.idx+"_container"), + once=seq.type==="stepped" ? true : false; + switch(action){ + case "on": + seq.dir=[ + (trigger==="mCSB_buttonRight" || trigger==="mCSB_buttonLeft" || trigger===39 || trigger===37 ? "x" : "y"), + (trigger==="mCSB_buttonUp" || trigger==="mCSB_buttonLeft" || trigger===38 || trigger===37 ? -1 : 1) + ]; + functions._stop(el); + if(functions._isNumeric(trigger) && seq.type==="stepped"){return;} + _start(once); + break; + case "off": + _stop(); + if(once || (d.tweenRunning && seq.dir)){ + _start(true); + } + break; + } + /* starts sequence */ + function _start(once){ + var c=seq.type!=="stepped", /* continuous scrolling */ + t=!once ? 1000/60 : c ? o.scrollInertia/1.5 : o.scrollInertia, /* timer */ + m=!once ? 2.5 : c ? 7.5 : 40, /* multiplier */ + contentPos=[Math.abs(mCSB_container[0].offsetTop),Math.abs(mCSB_container[0].offsetLeft)], + ratio=[d.scrollRatio.y>10 ? 10 : d.scrollRatio.y,d.scrollRatio.x>10 ? 10 : d.scrollRatio.x], + amount=seq.dir[0]==="x" ? contentPos[1]+(seq.dir[1]*(ratio[1]*m)) : contentPos[0]+(seq.dir[1]*(ratio[0]*m)), + px=seq.dir[0]==="x" ? contentPos[1]+(seq.dir[1]*parseInt(seq.scrollAmount)) : contentPos[0]+(seq.dir[1]*parseInt(seq.scrollAmount)), + to=seq.scrollAmount!=="auto" ? px : amount, + easing=!once ? "mcsLinear" : c ? "mcsLinearOut" : "mcsEaseInOut", + onComplete=!once ? false : true; + if(once && t<17){ + to=seq.dir[0]==="x" ? contentPos[1] : contentPos[0]; + } + functions._scrollTo(el,to.toString(),{dir:seq.dir[0],scrollEasing:easing,dur:t,onComplete:onComplete}); + if(once){ + seq.dir=false; + return; + } + clearTimeout(seq.step); + seq.step=setTimeout(function(){ + _start(); + },t); + } + /* stops sequence */ + function _stop(){ + clearTimeout(seq.step); + functions._stop(el); + } + }, + /* -------------------- */ + + + /* returns a yx array from value */ + _arr:function(val){ + var o=$(this).data(pluginPfx).opt,vals=[]; + if(typeof val==="function"){val=val();} /* check if the value is a single anonymous function */ + /* check if value is object or array, its length and create an array with yx values */ + if(!(val instanceof Array)){ /* object value (e.g. {y:"100",x:"100"}, 100 etc.) */ + vals[0]=val.y ? val.y : val.x || o.axis==="x" ? null : val; + vals[1]=val.x ? val.x : val.y || o.axis==="y" ? null : val; + }else{ /* array value (e.g. [100,100]) */ + vals=val.length>1 ? [val[0],val[1]] : o.axis==="x" ? [null,val[0]] : [val[0],null]; + } + /* check if array values are anonymous functions */ + if(typeof vals[0]==="function"){vals[0]=vals[0]();} + if(typeof vals[1]==="function"){vals[1]=vals[1]();} + return vals; + }, + /* -------------------- */ + + + /* translates values (e.g. "top", 100, "100px", "#id") to actual scroll-to positions */ + _to:function(val,dir){ + if(val==null || typeof val=="undefined"){return;} + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCSB_container=$("#mCSB_"+d.idx+"_container"), + wrapper=mCSB_container.parent(), + t=typeof val; + if(!dir){dir=o.axis==="x" ? "x" : "y";} + var contentLength=dir==="x" ? mCSB_container.outerWidth(false) : mCSB_container.outerHeight(false), + contentOffset=dir==="x" ? mCSB_container.offset().left : mCSB_container.offset().top, + contentPos=dir==="x" ? mCSB_container[0].offsetLeft : mCSB_container[0].offsetTop, + cssProp=dir==="x" ? "left" : "top"; + switch(t){ + case "function": /* this currently is not used. Consider removing it */ + return val(); + break; + case "object": + if(val.nodeType){ /* DOM */ + var objOffset=dir==="x" ? $(val).offset().left : $(val).offset().top; + }else if(val.jquery){ /* jquery object */ + if(!val.length){return;} + var objOffset=dir==="x" ? val.offset().left : val.offset().top; + } + return objOffset-contentOffset; + break; + case "string": case "number": + if(functions._isNumeric.call(null,val)){ /* numeric value */ + return Math.abs(val); + }else if(val.indexOf("%")!==-1){ /* percentage value */ + return Math.abs(contentLength*parseInt(val)/100); + }else if(val.indexOf("-=")!==-1){ /* decrease value */ + return Math.abs(contentPos-parseInt(val.split("-=")[1])); + }else if(val.indexOf("+=")!==-1){ /* inrease value */ + var p=(contentPos+parseInt(val.split("+=")[1])); + return p>=0 ? 0 : Math.abs(p); + }else if(val.indexOf("px")!==-1 && functions._isNumeric.call(null,val.split("px")[0])){ /* pixels string value (e.g. "100px") */ + return Math.abs(val.split("px")[0]); + }else{ + if(val==="top" || val==="left"){ /* special strings */ + return 0; + }else if(val==="bottom"){ + return Math.abs(wrapper.height()-mCSB_container.outerHeight(false)); + }else if(val==="right"){ + return Math.abs(wrapper.width()-mCSB_container.outerWidth(false)); + }else if(val==="first" || val==="last"){ + var obj=mCSB_container.find(":"+val), + objOffset=dir==="x" ? $(obj).offset().left : $(obj).offset().top; + return objOffset-contentOffset; + }else{ + if($(val).length){ /* jquery selector */ + var objOffset=dir==="x" ? $(val).offset().left : $(val).offset().top; + return objOffset-contentOffset; + }else{ /* other values (e.g. "100em") */ + mCSB_container.css(cssProp,val); + methods.update.call(null,$this[0]); + return; + } + } + } + break; + } + }, + /* -------------------- */ + + + /* calls the update method automatically */ + _autoUpdate:function(rem){ + var $this=$(this),d=$this.data(pluginPfx),o=d.opt, + mCSB_container=$("#mCSB_"+d.idx+"_container"); + if(rem){ + /* + removes autoUpdate timer + usage: functions._autoUpdate.call(this,"remove"); + */ + clearTimeout(mCSB_container[0].autoUpdate); + functions._delete.call(null,mCSB_container[0].autoUpdate); + return; + } + var wrapper=mCSB_container.parent(), + scrollbar=[$("#mCSB_"+d.idx+"_scrollbar_vertical"),$("#mCSB_"+d.idx+"_scrollbar_horizontal")], + scrollbarSize=function(){return [ + scrollbar[0].is(":visible") ? scrollbar[0].outerHeight(true) : 0, /* returns y-scrollbar height */ + scrollbar[1].is(":visible") ? scrollbar[1].outerWidth(true) : 0 /* returns x-scrollbar width */ + ]}, + oldSelSize=sizesSum(),newSelSize, + os=[mCSB_container.outerHeight(false),mCSB_container.outerWidth(false),wrapper.height(),wrapper.width(),scrollbarSize()[0],scrollbarSize()[1]],ns, + oldImgsLen=imgSum(),newImgsLen; + upd(); + function upd(){ + clearTimeout(mCSB_container[0].autoUpdate); + mCSB_container[0].autoUpdate=setTimeout(function(){ + /* update on specific selector(s) length and size change */ + if(o.advanced.updateOnSelectorChange){ + newSelSize=sizesSum(); + if(newSelSize!==oldSelSize){ + doUpd(); + oldSelSize=newSelSize; + return; + } + } + /* update on main element and scrollbar size changes */ + if(o.advanced.updateOnContentResize){ + ns=[mCSB_container.outerHeight(false),mCSB_container.outerWidth(false),wrapper.height(),wrapper.width(),scrollbarSize()[0],scrollbarSize()[1]]; + if(ns[0]!==os[0] || ns[1]!==os[1] || ns[2]!==os[2] || ns[3]!==os[3] || ns[4]!==os[4] || ns[5]!==os[5]){ + doUpd(); + os=ns; + } + } + /* update on image load */ + if(o.advanced.updateOnImageLoad){ + newImgsLen=imgSum(); + if(newImgsLen!==oldImgsLen){ + mCSB_container.find("img").each(function(){ + imgLoader(this.src); + }); + oldImgsLen=newImgsLen; + } + } + if(o.advanced.updateOnSelectorChange || o.advanced.updateOnContentResize || o.advanced.updateOnImageLoad){upd();} + },60); + } + /* returns images amount */ + function imgSum(){ + var total=0 + if(o.advanced.updateOnImageLoad){total=mCSB_container.find("img").length;} + return total; + } + /* a tiny image loader */ + function imgLoader(src){ + var img=new Image(); + function createDelegate(contextObject,delegateMethod){ + return function(){return delegateMethod.apply(contextObject,arguments);} + } + function imgOnLoad(){ + this.onload=null; + doUpd(); + } + img.onload=createDelegate(img,imgOnLoad); + img.src=src; + } + /* returns the total height and width sum of all elements matching the selector */ + function sizesSum(){ + if(o.advanced.updateOnSelectorChange===true){o.advanced.updateOnSelectorChange="*";} + var total=0,sel=mCSB_container.find(o.advanced.updateOnSelectorChange); + if(o.advanced.updateOnSelectorChange && sel.length>0){sel.each(function(){total+=$(this).height()+$(this).width();});} + return total; + } + /* calls the update method */ + function doUpd(){ + clearTimeout(mCSB_container[0].autoUpdate); + methods.update.call(null,$this[0]); + } + }, + /* -------------------- */ + + + /* snaps scrolling to a multiple of a pixels number */ + _snapAmount:function(to,amount,offset){ + return (Math.round(to/amount)*amount-offset); + }, + /* -------------------- */ + + + /* stops content and scrollbar animations */ + _stop:function(el){ + var d=el.data(pluginPfx), + sel=$("#mCSB_"+d.idx+"_container,#mCSB_"+d.idx+"_container_wrapper,#mCSB_"+d.idx+"_dragger_vertical,#mCSB_"+d.idx+"_dragger_horizontal"); + sel.each(function(){ + functions._stopTween.call(this); + }); + }, + /* -------------------- */ + + + /* + ANIMATES CONTENT + This is where the actual scrolling happens + */ + _scrollTo:function(el,to,options){ + var d=el.data(pluginPfx),o=d.opt, + defaults={ + trigger:"internal", + dir:"y", + scrollEasing:"mcsEaseOut", + drag:false, + dur:o.scrollInertia, + overwrite:"all", + callbacks:true, + onStart:true, + onUpdate:true, + onComplete:true + }, + options=$.extend(defaults,options), + dur=[options.dur,(options.drag ? 0 : options.dur)], + mCustomScrollBox=$("#mCSB_"+d.idx), + mCSB_container=$("#mCSB_"+d.idx+"_container"), + totalScrollOffsets=o.callbacks.onTotalScrollOffset ? functions._arr.call(el,o.callbacks.onTotalScrollOffset) : [0,0], + totalScrollBackOffsets=o.callbacks.onTotalScrollBackOffset ? functions._arr.call(el,o.callbacks.onTotalScrollBackOffset) : [0,0]; + d.trigger=options.trigger; + if(to==="_resetY" && !d.contentReset.y){ + /* callbacks: onOverflowYNone */ + if(_cb("onOverflowYNone")){o.callbacks.onOverflowYNone.call(el[0]);} + d.contentReset.y=1; + } + if(to==="_resetX" && !d.contentReset.x){ + /* callbacks: onOverflowXNone */ + if(_cb("onOverflowXNone")){o.callbacks.onOverflowXNone.call(el[0]);} + d.contentReset.x=1; + } + if(to==="_resetY" || to==="_resetX"){return;} + if((d.contentReset.y || !el[0].mcs) && d.overflowed[0]){ + /* callbacks: onOverflowY */ + if(_cb("onOverflowY")){o.callbacks.onOverflowY.call(el[0]);} + d.contentReset.x=null; + } + if((d.contentReset.x || !el[0].mcs) && d.overflowed[1]){ + /* callbacks: onOverflowX */ + if(_cb("onOverflowX")){o.callbacks.onOverflowX.call(el[0]);} + d.contentReset.x=null; + } + if(o.snapAmount){to=functions._snapAmount(to,o.snapAmount,o.snapOffset);} /* scrolling snapping */ + switch(options.dir){ + case "x": + var mCSB_dragger=$("#mCSB_"+d.idx+"_dragger_horizontal"), + property="left", + contentPos=mCSB_container[0].offsetLeft, + limit=[ + mCustomScrollBox.width()-mCSB_container.outerWidth(false), + mCSB_dragger.parent().width()-mCSB_dragger.width() + ], + scrollTo=[to,to===0 ? 0 : (to/d.scrollRatio.x)], + tso=totalScrollOffsets[1], + tsbo=totalScrollBackOffsets[1], + totalScrollOffset=tso>0 ? tso/d.scrollRatio.x : 0, + totalScrollBackOffset=tsbo>0 ? tsbo/d.scrollRatio.x : 0; + break; + case "y": + var mCSB_dragger=$("#mCSB_"+d.idx+"_dragger_vertical"), + property="top", + contentPos=mCSB_container[0].offsetTop, + limit=[ + mCustomScrollBox.height()-mCSB_container.outerHeight(false), + mCSB_dragger.parent().height()-mCSB_dragger.height() + ], + scrollTo=[to,to===0 ? 0 : (to/d.scrollRatio.y)], + tso=totalScrollOffsets[0], + tsbo=totalScrollBackOffsets[0], + totalScrollOffset=tso>0 ? tso/d.scrollRatio.y : 0, + totalScrollBackOffset=tsbo>0 ? tsbo/d.scrollRatio.y : 0; + break; + } + if(scrollTo[1]<0 || (scrollTo[0]===0 && scrollTo[1]===0)){ + scrollTo=[0,0]; + }else if(scrollTo[1]>=limit[1]){ + scrollTo=[limit[0],limit[1]]; + }else{ + scrollTo[0]=-scrollTo[0]; + } + if(!el[0].mcs){_mcs();} /* init mcs object (once) to make it available before callbacks */ + clearTimeout(mCSB_container[0].onCompleteTimeout); + if(!d.tweenRunning && ((contentPos===0 && scrollTo[0]>=0) || (contentPos===limit[0] && scrollTo[0]<=limit[0]))){return;} + functions._tweenTo.call(null,mCSB_dragger[0],property,Math.round(scrollTo[1]),dur[1],options.scrollEasing); + functions._tweenTo.call(null,mCSB_container[0],property,Math.round(scrollTo[0]),dur[0],options.scrollEasing,options.overwrite,{ + onStart:function(){ + if(options.callbacks && options.onStart && !d.tweenRunning){ + /* callbacks: onScrollStart */ + if(_cb("onScrollStart")){_mcs(); o.callbacks.onScrollStart.call(el[0]);} + d.tweenRunning=true; + functions._onDragClasses(mCSB_dragger); + d.cbOffsets=_cbOffsets(); + } + },onUpdate:function(){ + if(options.callbacks && options.onUpdate){ + /* callbacks: whileScrolling */ + if(_cb("whileScrolling")){_mcs(); o.callbacks.whileScrolling.call(el[0]);} + } + },onComplete:function(){ + if(options.callbacks && options.onComplete){ + if(o.axis==="yx"){clearTimeout(mCSB_container[0].onCompleteTimeout);} + var t=mCSB_container[0].idleTimer || 0; + mCSB_container[0].onCompleteTimeout=setTimeout(function(){ + /* callbacks: onScroll, onTotalScroll, onTotalScrollBack */ + if(_cb("onScroll")){_mcs(); o.callbacks.onScroll.call(el[0]);} + if(_cb("onTotalScroll") && scrollTo[1]>=limit[1]-totalScrollOffset && d.cbOffsets[0]){_mcs(); o.callbacks.onTotalScroll.call(el[0]);} + if(_cb("onTotalScrollBack") && scrollTo[1]<=totalScrollBackOffset && d.cbOffsets[1]){_mcs(); o.callbacks.onTotalScrollBack.call(el[0]);} + d.tweenRunning=false; + mCSB_container[0].idleTimer=0; + functions._onDragClasses(mCSB_dragger,"hide"); + },t); + } + } + }); + /* checks if callback function exists */ + function _cb(cb){ + return d && o.callbacks[cb] && typeof o.callbacks[cb]==="function"; + } + /* checks whether callback offsets always trigger */ + function _cbOffsets(){ + return [o.callbacks.alwaysTriggerOffsets || contentPos>=limit[0]+tso,o.callbacks.alwaysTriggerOffsets || contentPos<=-tsbo]; + } + /* + populates object with useful values for the user + values: + content: this.mcs.content + content top position: this.mcs.top + content left position: this.mcs.left + dragger top position: this.mcs.draggerTop + dragger left position: this.mcs.draggerLeft + scrolling y percentage: this.mcs.topPct + scrolling x percentage: this.mcs.leftPct + scrolling direction: this.mcs.direction + */ + function _mcs(){ + var cp=[mCSB_container[0].offsetTop,mCSB_container[0].offsetLeft], /* content position */ + dp=[mCSB_dragger[0].offsetTop,mCSB_dragger[0].offsetLeft], /* dragger position */ + cl=[mCSB_container.outerHeight(false),mCSB_container.outerWidth(false)], /* content length */ + pl=[mCustomScrollBox.height(),mCustomScrollBox.width()]; /* content parent length */ + el[0].mcs={ + content:mCSB_container, /* original content wrapper as jquery object */ + top:cp[0],left:cp[1],draggerTop:dp[0],draggerLeft:dp[1], + topPct:Math.round((100*Math.abs(cp[0]))/(Math.abs(cl[0])-pl[0])),leftPct:Math.round((100*Math.abs(cp[1]))/(Math.abs(cl[1])-pl[1])), + direction:options.dir + }; + /* + this refers to the original element containing the scrollbar(s) + usage: this.mcs.top, this.mcs.leftPct etc. + */ + } + }, + /* -------------------- */ + + + /* + CUSTOM JAVASCRIPT ANIMATION TWEEN + Lighter and faster than jquery animate() and css transitions + Animates top/left properties and includes easings + */ + _tweenTo:function(el,prop,to,duration,easing,overwrite,callbacks){ + var callbacks=callbacks || {}, + onStart=callbacks.onStart || function(){},onUpdate=callbacks.onUpdate || function(){},onComplete=callbacks.onComplete || function(){}, + startTime=functions._getTime(),_delay,progress=0,from=el.offsetTop,elStyle=el.style,_request; + if(prop==="left"){from=el.offsetLeft;} + var diff=to-from; + el._mcsstop=0; + if(overwrite!=="none"){_cancelTween();} + _startTween(); + function _step(){ + if(el._mcsstop){return;} + if(!progress){onStart.call();} + progress=functions._getTime()-startTime; + _tween(); + if(progress>=el._mcstime){ + el._mcstime=(progress>el._mcstime) ? progress+_delay-(progress- el._mcstime) : progress+_delay-1; + if(el._mcstime0){ + el._mcscurrVal=_ease(el._mcstime,from,diff,duration,easing); + elStyle[prop]=Math.round(el._mcscurrVal)+"px"; + }else{ + elStyle[prop]=to+"px"; + } + onUpdate.call(); + } + function _startTween(){ + _delay=1000/60; + el._mcstime=progress+_delay; + _request=(!window.requestAnimationFrame) ? function(f){_tween(); return setTimeout(f,0.01);} : window.requestAnimationFrame; + el._mcsid=_request(_step); + } + function _cancelTween(){ + if(el._mcsid==null){return;} + if(!window.requestAnimationFrame){clearTimeout(el._mcsid); + }else{window.cancelAnimationFrame(el._mcsid);} + el._mcsid=null; + } + function _ease(t,b,c,d,type){ + switch(type){ + case "linear": case "mcsLinear": + return c*t/d + b; + break; + case "mcsLinearOut": + t/=d; t--; return c * Math.sqrt(1 - t*t) + b; + break; + case "easeInOutSmooth": + t/=d/2; + if(t<1) return c/2*t*t + b; + t--; + return -c/2 * (t*(t-2) - 1) + b; + break; + case "easeInOutStrong": + t/=d/2; + if(t<1) return c/2 * Math.pow( 2, 10 * (t - 1) ) + b; + t--; + return c/2 * ( -Math.pow( 2, -10 * t) + 2 ) + b; + break; + case "easeInOut": case "mcsEaseInOut": + t/=d/2; + if(t<1) return c/2*t*t*t + b; + t-=2; + return c/2*(t*t*t + 2) + b; + break; + case "easeOutSmooth": + t/=d; t--; + return -c * (t*t*t*t - 1) + b; + break; + case "easeOutStrong": + return c * ( -Math.pow( 2, -10 * t/d ) + 1 ) + b; + break; + case "easeOut": case "mcsEaseOut": default: + var ts=(t/=d)*t,tc=ts*t; + return b+c*(0.499999999999997*tc*ts + -2.5*ts*ts + 5.5*tc + -6.5*ts + 4*t); + } + } + }, + /* -------------------- */ + + + /* returns current time */ + _getTime:function(){ + if(window.performance && window.performance.now){ + return window.performance.now(); + }else{ + if(window.performance && window.performance.webkitNow){ + return window.performance.webkitNow(); + }else{ + if(Date.now){return Date.now();}else{return new Date().getTime();} + } + } + }, + /* -------------------- */ + + + /* stops a tween */ + _stopTween:function(){ + var el=this; + if(el._mcsid==null){return;} + if(!window.requestAnimationFrame){clearTimeout(el._mcsid); + }else{window.cancelAnimationFrame(el._mcsid);} + el._mcsid=null; + el._mcsstop=1; + }, + /* -------------------- */ + + + /* deletes a property (avoiding the exception thrown by IE) */ + _delete:function(p){ + try{delete p;}catch(e){p=null;} + }, + /* -------------------- */ + + + /* detects left mouse button */ + _mouseBtnLeft:function(e){ + return !(e.which && e.which!==1); + }, + /* -------------------- */ + + + /* detects if pointer type event is touch */ + _pointerTouch:function(e){ + var t=e.originalEvent.pointerType; + return !(t && t!=="touch" && t!==2); + }, + /* -------------------- */ + + + /* checks if value is numeric */ + _isNumeric:function(val){ + return !isNaN(parseFloat(val)) && isFinite(val); + } + /* -------------------- */ + + }; + + + + + + /* + ---------------------------------------- + PLUGIN SETUP + ---------------------------------------- + */ + + /* plugin constructor functions */ + $.fn[pluginNS]=function(method){ /* usage: $(selector).mCustomScrollbar(); */ + if(methods[method]){ + return methods[method].apply(this,Array.prototype.slice.call(arguments,1)); + }else if(typeof method==="object" || !method){ + return methods.init.apply(this,arguments); + }else{ + $.error("Method "+method+" does not exist"); + } + }; + $[pluginNS]=function(method){ /* usage: $.mCustomScrollbar(); */ + if(methods[method]){ + return methods[method].apply(this,Array.prototype.slice.call(arguments,1)); + }else if(typeof method==="object" || !method){ + return methods.init.apply(this,arguments); + }else{ + $.error("Method "+method+" does not exist"); + } + }; + + /* + allow setting plugin default options. + usage: $.mCustomScrollbar.defaults.scrollInertia=500; + to apply any changed default options on default selectors (below), use inside document ready fn + e.g.: $(document).ready(function(){ $.mCustomScrollbar.defaults.scrollInertia=500; }); + */ + $[pluginNS].defaults=defaults; + + /* + add window object (window.mCustomScrollbar) + usage: if(window.mCustomScrollbar){console.log("custom scrollbar plugin loaded");} + */ + window[pluginNS]=true; + + $(window).load(function(){ + $(defaultSelector)[pluginNS](); /* add scrollbars automatically on default selector */ + }); + +}))}(window,document)); diff --git a/templates/client/static_client/js/jquery.mCustomScrollbar.min.js b/templates/client/static_client/js/jquery.mCustomScrollbar.min.js index 94da2581..67a21eb5 100644 --- a/templates/client/static_client/js/jquery.mCustomScrollbar.min.js +++ b/templates/client/static_client/js/jquery.mCustomScrollbar.min.js @@ -1 +1,2 @@ -(function(c){var b={init:function(e){var f={set_width:false,set_height:false,horizontalScroll:false,scrollInertia:950,mouseWheel:true,mouseWheelPixels:"auto",autoDraggerLength:true,autoHideScrollbar:false,alwaysShowScrollbar:false,snapAmount:null,snapOffset:0,scrollButtons:{enable:false,scrollType:"continuous",scrollSpeed:"auto",scrollAmount:40},advanced:{updateOnBrowserResize:true,updateOnContentResize:false,autoExpandHorizontalScroll:false,autoScrollOnFocus:true,normalizeMouseWheelDelta:false},contentTouchScroll:true,callbacks:{onScrollStart:function(){},onScroll:function(){},onTotalScroll:function(){},onTotalScrollBack:function(){},onTotalScrollOffset:0,onTotalScrollBackOffset:0,whileScrolling:function(){}},theme:"light"},e=c.extend(true,f,e);return this.each(function(){var m=c(this);if(e.set_width){m.css("width",e.set_width)}if(e.set_height){m.css("height",e.set_height)}if(!c(document).data("mCustomScrollbar-index")){c(document).data("mCustomScrollbar-index","1")}else{var t=parseInt(c(document).data("mCustomScrollbar-index"));c(document).data("mCustomScrollbar-index",t+1)}m.wrapInner("
    ").addClass("mCustomScrollbar _mCS_"+c(document).data("mCustomScrollbar-index"));var g=m.children(".mCustomScrollBox");if(e.horizontalScroll){g.addClass("mCSB_horizontal").wrapInner("
    ");var k=g.children(".mCSB_h_wrapper");k.wrapInner("
    ").children(".mCSB_container").css({width:k.children().outerWidth(),position:"relative"}).unwrap()}else{g.wrapInner("
    ")}var o=g.children(".mCSB_container");if(c.support.touch){o.addClass("mCS_touch")}o.after("
    ");var l=g.children(".mCSB_scrollTools"),h=l.children(".mCSB_draggerContainer"),q=h.children(".mCSB_dragger");if(e.horizontalScroll){q.data("minDraggerWidth",q.width())}else{q.data("minDraggerHeight",q.height())}if(e.scrollButtons.enable){if(e.horizontalScroll){l.prepend("    ").append("")}else{l.prepend("").append("")}}g.bind("scroll",function(){if(!m.is(".mCS_disabled")){g.scrollTop(0).scrollLeft(0)}});m.data({mCS_Init:true,mCustomScrollbarIndex:c(document).data("mCustomScrollbar-index"),horizontalScroll:e.horizontalScroll,scrollInertia:e.scrollInertia,scrollEasing:"mcsEaseOut",mouseWheel:e.mouseWheel,mouseWheelPixels:e.mouseWheelPixels,autoDraggerLength:e.autoDraggerLength,autoHideScrollbar:e.autoHideScrollbar,alwaysShowScrollbar:e.alwaysShowScrollbar,snapAmount:e.snapAmount,snapOffset:e.snapOffset,scrollButtons_enable:e.scrollButtons.enable,scrollButtons_scrollType:e.scrollButtons.scrollType,scrollButtons_scrollSpeed:e.scrollButtons.scrollSpeed,scrollButtons_scrollAmount:e.scrollButtons.scrollAmount,autoExpandHorizontalScroll:e.advanced.autoExpandHorizontalScroll,autoScrollOnFocus:e.advanced.autoScrollOnFocus,normalizeMouseWheelDelta:e.advanced.normalizeMouseWheelDelta,contentTouchScroll:e.contentTouchScroll,onScrollStart_Callback:e.callbacks.onScrollStart,onScroll_Callback:e.callbacks.onScroll,onTotalScroll_Callback:e.callbacks.onTotalScroll,onTotalScrollBack_Callback:e.callbacks.onTotalScrollBack,onTotalScroll_Offset:e.callbacks.onTotalScrollOffset,onTotalScrollBack_Offset:e.callbacks.onTotalScrollBackOffset,whileScrolling_Callback:e.callbacks.whileScrolling,bindEvent_scrollbar_drag:false,bindEvent_content_touch:false,bindEvent_scrollbar_click:false,bindEvent_mousewheel:false,bindEvent_buttonsContinuous_y:false,bindEvent_buttonsContinuous_x:false,bindEvent_buttonsPixels_y:false,bindEvent_buttonsPixels_x:false,bindEvent_focusin:false,bindEvent_autoHideScrollbar:false,mCSB_buttonScrollRight:false,mCSB_buttonScrollLeft:false,mCSB_buttonScrollDown:false,mCSB_buttonScrollUp:false});if(e.horizontalScroll){if(m.css("max-width")!=="none"){if(!e.advanced.updateOnContentResize){e.advanced.updateOnContentResize=true}}}else{if(m.css("max-height")!=="none"){var s=false,r=parseInt(m.css("max-height"));if(m.css("max-height").indexOf("%")>=0){s=r,r=m.parent().height()*s/100}m.css("overflow","hidden");g.css("max-height",r)}}m.mCustomScrollbar("update");if(e.advanced.updateOnBrowserResize){var i,j=c(window).width(),u=c(window).height();c(window).bind("resize."+m.data("mCustomScrollbarIndex"),function(){if(i){clearTimeout(i)}i=setTimeout(function(){if(!m.is(".mCS_disabled")&&!m.is(".mCS_destroyed")){var w=c(window).width(),v=c(window).height();if(j!==w||u!==v){if(m.css("max-height")!=="none"&&s){g.css("max-height",m.parent().height()*s/100)}m.mCustomScrollbar("update");j=w;u=v}}},150)})}if(e.advanced.updateOnContentResize){var p;if(e.horizontalScroll){var n=o.outerWidth()}else{var n=o.outerHeight()}p=setInterval(function(){if(e.horizontalScroll){if(e.advanced.autoExpandHorizontalScroll){o.css({position:"absolute",width:"auto"}).wrap("
    ").css({width:o.outerWidth(),position:"relative"}).unwrap()}var v=o.outerWidth()}else{var v=o.outerHeight()}if(v!=n){m.mCustomScrollbar("update");n=v}},300)}})},update:function(){var n=c(this),k=n.children(".mCustomScrollBox"),q=k.children(".mCSB_container");q.removeClass("mCS_no_scrollbar");n.removeClass("mCS_disabled mCS_destroyed");k.scrollTop(0).scrollLeft(0);var y=k.children(".mCSB_scrollTools"),o=y.children(".mCSB_draggerContainer"),m=o.children(".mCSB_dragger");if(n.data("horizontalScroll")){var A=y.children(".mCSB_buttonLeft"),t=y.children(".mCSB_buttonRight"),f=k.width();if(n.data("autoExpandHorizontalScroll")){q.css({position:"absolute",width:"auto"}).wrap("
    ").css({width:q.outerWidth(),position:"relative"}).unwrap()}var z=q.outerWidth()}else{var w=y.children(".mCSB_buttonUp"),g=y.children(".mCSB_buttonDown"),r=k.height(),i=q.outerHeight()}if(i>r&&!n.data("horizontalScroll")){y.css("display","block");var s=o.height();if(n.data("autoDraggerLength")){var u=Math.round(r/i*s),l=m.data("minDraggerHeight");if(u<=l){m.css({height:l})}else{if(u>=s-10){var p=s-10;m.css({height:p})}else{m.css({height:u})}}m.children(".mCSB_dragger_bar").css({"line-height":m.height()+"px"})}var B=m.height(),x=(i-r)/(s-B);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().top);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{if(z>f&&n.data("horizontalScroll")){y.css("display","block");var h=o.width();if(n.data("autoDraggerLength")){var j=Math.round(f/z*h),C=m.data("minDraggerWidth");if(j<=C){m.css({width:C})}else{if(j>=h-10){var e=h-10;m.css({width:e})}else{m.css({width:j})}}}var v=m.width(),x=(z-f)/(h-v);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().left);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{k.unbind("mousewheel focusin");if(n.data("horizontalScroll")){m.add(q).css("left",0)}else{m.add(q).css("top",0)}if(n.data("alwaysShowScrollbar")){if(!n.data("horizontalScroll")){m.css({height:o.height()})}else{if(n.data("horizontalScroll")){m.css({width:o.width()})}}}else{y.css("display","none");q.addClass("mCS_no_scrollbar")}n.data({bindEvent_mousewheel:false,bindEvent_focusin:false})}}},scrolling:function(i,q,n,k,A,f,D,w){var l=c(this);if(!l.data("bindEvent_scrollbar_drag")){var o,p,C,z,e;if(c.support.pointer){C="pointerdown";z="pointermove";e="pointerup"}else{if(c.support.msPointer){C="MSPointerDown";z="MSPointerMove";e="MSPointerUp"}}if(c.support.pointer||c.support.msPointer){k.bind(C,function(K){K.preventDefault();l.data({on_drag:true});k.addClass("mCSB_dragger_onDrag");var J=c(this),M=J.offset(),I=K.originalEvent.pageX-M.left,L=K.originalEvent.pageY-M.top;if(I0&&L0){o=L;p=I}});c(document).bind(z+"."+l.data("mCustomScrollbarIndex"),function(K){K.preventDefault();if(l.data("on_drag")){var J=k,M=J.offset(),I=K.originalEvent.pageX-M.left,L=K.originalEvent.pageY-M.top;G(o,p,L,I)}}).bind(e+"."+l.data("mCustomScrollbarIndex"),function(x){l.data({on_drag:false});k.removeClass("mCSB_dragger_onDrag")})}else{k.bind("mousedown touchstart",function(K){K.preventDefault();K.stopImmediatePropagation();var J=c(this),N=J.offset(),I,M;if(K.type==="touchstart"){var L=K.originalEvent.touches[0]||K.originalEvent.changedTouches[0];I=L.pageX-N.left;M=L.pageY-N.top}else{l.data({on_drag:true});k.addClass("mCSB_dragger_onDrag");I=K.pageX-N.left;M=K.pageY-N.top}if(I0&&M0){o=M;p=I}}).bind("touchmove",function(K){K.preventDefault();K.stopImmediatePropagation();var N=K.originalEvent.touches[0]||K.originalEvent.changedTouches[0],J=c(this),M=J.offset(),I=N.pageX-M.left,L=N.pageY-M.top;G(o,p,L,I)});c(document).bind("mousemove."+l.data("mCustomScrollbarIndex"),function(K){if(l.data("on_drag")){var J=k,M=J.offset(),I=K.pageX-M.left,L=K.pageY-M.top;G(o,p,L,I)}}).bind("mouseup."+l.data("mCustomScrollbarIndex"),function(x){l.data({on_drag:false});k.removeClass("mCSB_dragger_onDrag")})}l.data({bindEvent_scrollbar_drag:true})}function G(J,K,L,I){if(l.data("horizontalScroll")){l.mCustomScrollbar("scrollTo",(k.position().left-(K))+I,{moveDragger:true,trigger:"internal"})}else{l.mCustomScrollbar("scrollTo",(k.position().top-(J))+L,{moveDragger:true,trigger:"internal"})}}if(c.support.touch&&l.data("contentTouchScroll")){if(!l.data("bindEvent_content_touch")){var m,E,s,t,v,F,H;q.bind("touchstart",function(x){x.stopImmediatePropagation();m=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];E=c(this);s=E.offset();v=m.pageX-s.left;t=m.pageY-s.top;F=t;H=v});q.bind("touchmove",function(x){x.preventDefault();x.stopImmediatePropagation();m=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];E=c(this).parent();s=E.offset();v=m.pageX-s.left;t=m.pageY-s.top;if(l.data("horizontalScroll")){l.mCustomScrollbar("scrollTo",H-v,{trigger:"internal"})}else{l.mCustomScrollbar("scrollTo",F-t,{trigger:"internal"})}})}}if(!l.data("bindEvent_scrollbar_click")){n.bind("click",function(I){var x=(I.pageY-n.offset().top)*l.data("scrollAmount"),y=c(I.target);if(l.data("horizontalScroll")){x=(I.pageX-n.offset().left)*l.data("scrollAmount")}if(y.hasClass("mCSB_draggerContainer")||y.hasClass("mCSB_draggerRail")){l.mCustomScrollbar("scrollTo",x,{trigger:"internal",scrollEasing:"draggerRailEase"})}});l.data({bindEvent_scrollbar_click:true})}if(l.data("mouseWheel")){if(!l.data("bindEvent_mousewheel")){i.bind("mousewheel",function(K,M){var J,I=l.data("mouseWheelPixels"),x=Math.abs(q.position().top),L=k.position().top,y=n.height()-k.height();if(l.data("normalizeMouseWheelDelta")){if(M<0){M=-1}else{M=1}}if(I==="auto"){I=100+Math.round(l.data("scrollAmount")/2)}if(l.data("horizontalScroll")){L=k.position().left;y=n.width()-k.width();x=Math.abs(q.position().left)}if((M>0&&L!==0)||(M<0&&L!==y)){K.preventDefault();K.stopImmediatePropagation()}J=x-(M*I);l.mCustomScrollbar("scrollTo",J,{trigger:"internal"})});l.data({bindEvent_mousewheel:true})}}if(l.data("scrollButtons_enable")){if(l.data("scrollButtons_scrollType")==="pixels"){if(l.data("horizontalScroll")){w.add(D).unbind("mousedown touchstart MSPointerDown pointerdown mouseup MSPointerUp pointerup mouseout MSPointerOut pointerout touchend",j,h);l.data({bindEvent_buttonsContinuous_x:false});if(!l.data("bindEvent_buttonsPixels_x")){w.bind("click",function(x){x.preventDefault();r(Math.abs(q.position().left)+l.data("scrollButtons_scrollAmount"))});D.bind("click",function(x){x.preventDefault();r(Math.abs(q.position().left)-l.data("scrollButtons_scrollAmount"))});l.data({bindEvent_buttonsPixels_x:true})}}else{f.add(A).unbind("mousedown touchstart MSPointerDown pointerdown mouseup MSPointerUp pointerup mouseout MSPointerOut pointerout touchend",j,h);l.data({bindEvent_buttonsContinuous_y:false});if(!l.data("bindEvent_buttonsPixels_y")){f.bind("click",function(x){x.preventDefault();r(Math.abs(q.position().top)+l.data("scrollButtons_scrollAmount"))});A.bind("click",function(x){x.preventDefault();r(Math.abs(q.position().top)-l.data("scrollButtons_scrollAmount"))});l.data({bindEvent_buttonsPixels_y:true})}}function r(x){if(!k.data("preventAction")){k.data("preventAction",true);l.mCustomScrollbar("scrollTo",x,{trigger:"internal"})}}}else{if(l.data("horizontalScroll")){w.add(D).unbind("click");l.data({bindEvent_buttonsPixels_x:false});if(!l.data("bindEvent_buttonsContinuous_x")){w.bind("mousedown touchstart MSPointerDown pointerdown",function(y){y.preventDefault();var x=B();l.data({mCSB_buttonScrollRight:setInterval(function(){l.mCustomScrollbar("scrollTo",Math.abs(q.position().left)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var j=function(x){x.preventDefault();clearInterval(l.data("mCSB_buttonScrollRight"))};w.bind("mouseup touchend MSPointerUp pointerup mouseout MSPointerOut pointerout",j);D.bind("mousedown touchstart MSPointerDown pointerdown",function(y){y.preventDefault();var x=B();l.data({mCSB_buttonScrollLeft:setInterval(function(){l.mCustomScrollbar("scrollTo",Math.abs(q.position().left)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var h=function(x){x.preventDefault();clearInterval(l.data("mCSB_buttonScrollLeft"))};D.bind("mouseup touchend MSPointerUp pointerup mouseout MSPointerOut pointerout",h);l.data({bindEvent_buttonsContinuous_x:true})}}else{f.add(A).unbind("click");l.data({bindEvent_buttonsPixels_y:false});if(!l.data("bindEvent_buttonsContinuous_y")){f.bind("mousedown touchstart MSPointerDown pointerdown",function(y){y.preventDefault();var x=B();l.data({mCSB_buttonScrollDown:setInterval(function(){l.mCustomScrollbar("scrollTo",Math.abs(q.position().top)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var u=function(x){x.preventDefault();clearInterval(l.data("mCSB_buttonScrollDown"))};f.bind("mouseup touchend MSPointerUp pointerup mouseout MSPointerOut pointerout",u);A.bind("mousedown touchstart MSPointerDown pointerdown",function(y){y.preventDefault();var x=B();l.data({mCSB_buttonScrollUp:setInterval(function(){l.mCustomScrollbar("scrollTo",Math.abs(q.position().top)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var g=function(x){x.preventDefault();clearInterval(l.data("mCSB_buttonScrollUp"))};A.bind("mouseup touchend MSPointerUp pointerup mouseout MSPointerOut pointerout",g);l.data({bindEvent_buttonsContinuous_y:true})}}function B(){var x=l.data("scrollButtons_scrollSpeed");if(l.data("scrollButtons_scrollSpeed")==="auto"){x=Math.round((l.data("scrollInertia")+100)/40)}return x}}}if(l.data("autoScrollOnFocus")){if(!l.data("bindEvent_focusin")){i.bind("focusin",function(){i.scrollTop(0).scrollLeft(0);var x=c(document.activeElement);if(x.is("input,textarea,select,button,a[tabindex],area,object")){var J=q.position().top,y=x.position().top,I=i.height()-x.outerHeight();if(l.data("horizontalScroll")){J=q.position().left;y=x.position().left;I=i.width()-x.outerWidth()}if(J+y<0||J+y>I){l.mCustomScrollbar("scrollTo",y,{trigger:"internal"})}}});l.data({bindEvent_focusin:true})}}if(l.data("autoHideScrollbar")&&!l.data("alwaysShowScrollbar")){if(!l.data("bindEvent_autoHideScrollbar")){i.bind("mouseenter",function(x){i.addClass("mCS-mouse-over");d.showScrollbar.call(i.children(".mCSB_scrollTools"))}).bind("mouseleave touchend",function(x){i.removeClass("mCS-mouse-over");if(x.type==="mouseleave"){d.hideScrollbar.call(i.children(".mCSB_scrollTools"))}});l.data({bindEvent_autoHideScrollbar:true})}}},scrollTo:function(e,f){var i=c(this),o={moveDragger:false,trigger:"external",callbacks:true,scrollInertia:i.data("scrollInertia"),scrollEasing:i.data("scrollEasing")},f=c.extend(o,f),p,g=i.children(".mCustomScrollBox"),k=g.children(".mCSB_container"),r=g.children(".mCSB_scrollTools"),j=r.children(".mCSB_draggerContainer"),h=j.children(".mCSB_dragger"),t=draggerSpeed=f.scrollInertia,q,s,m,l;if(!k.hasClass("mCS_no_scrollbar")){i.data({mCS_trigger:f.trigger});if(i.data("mCS_Init")){f.callbacks=false}if(e||e===0){if(typeof(e)==="number"){if(f.moveDragger){p=e;if(i.data("horizontalScroll")){e=h.position().left*i.data("scrollAmount")}else{e=h.position().top*i.data("scrollAmount")}draggerSpeed=0}else{p=e/i.data("scrollAmount")}}else{if(typeof(e)==="string"){var v;if(e==="top"){v=0}else{if(e==="bottom"&&!i.data("horizontalScroll")){v=k.outerHeight()-g.height()}else{if(e==="left"){v=0}else{if(e==="right"&&i.data("horizontalScroll")){v=k.outerWidth()-g.width()}else{if(e==="first"){v=i.find(".mCSB_container").find(":first")}else{if(e==="last"){v=i.find(".mCSB_container").find(":last")}else{v=i.find(e)}}}}}}if(v.length===1){if(i.data("horizontalScroll")){e=v.position().left}else{e=v.position().top}p=e/i.data("scrollAmount")}else{p=e=v}}}if(i.data("horizontalScroll")){if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.width()-k.outerWidth()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollLeft"));if(!s){q=true}}else{if(p>=j.width()-h.width()){p=j.width()-h.width();e=g.width()-k.outerWidth();clearInterval(i.data("mCSB_buttonScrollRight"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"left",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"left",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")&&!i.data("alwaysShowScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().left>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().left<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")&&!i.data("alwaysShowScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}else{if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.height()-k.outerHeight()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollUp"));if(!s){q=true}}else{if(p>=j.height()-h.height()){p=j.height()-h.height();e=g.height()-k.outerHeight();clearInterval(i.data("mCSB_buttonScrollDown"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"top",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"top",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")&&!i.data("alwaysShowScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().top>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().top<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")&&!i.data("alwaysShowScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}if(i.data("mCS_Init")){i.data({mCS_Init:false})}}}function u(w){if(i.data("mCustomScrollbarIndex")){this.mcs={top:k.position().top,left:k.position().left,draggerTop:h.position().top,draggerLeft:h.position().left,topPct:Math.round((100*Math.abs(k.position().top))/Math.abs(k.outerHeight()-g.height())),leftPct:Math.round((100*Math.abs(k.position().left))/Math.abs(k.outerWidth()-g.width()))};switch(w){case"onScrollStart":i.data("mCS_tweenRunning",true).data("onScrollStart_Callback").call(i,this.mcs);break;case"whileScrolling":i.data("whileScrolling_Callback").call(i,this.mcs);break;case"onScroll":i.data("onScroll_Callback").call(i,this.mcs);break;case"onTotalScrollBack":i.data("onTotalScrollBack_Callback").call(i,this.mcs);break;case"onTotalScroll":i.data("onTotalScroll_Callback").call(i,this.mcs);break}}}},stop:function(){var g=c(this),e=g.children().children(".mCSB_container"),f=g.children().children().children().children(".mCSB_dragger");d.mTweenAxisStop.call(this,e[0]);d.mTweenAxisStop.call(this,f[0])},disable:function(e){var j=c(this),f=j.children(".mCustomScrollBox"),h=f.children(".mCSB_container"),g=f.children(".mCSB_scrollTools"),i=g.children().children(".mCSB_dragger");f.unbind("mousewheel focusin mouseenter mouseleave touchend");h.unbind("touchstart touchmove");if(e){if(j.data("horizontalScroll")){i.add(h).css("left",0)}else{i.add(h).css("top",0)}}g.css("display","none");h.addClass("mCS_no_scrollbar");j.data({bindEvent_mousewheel:false,bindEvent_focusin:false,bindEvent_content_touch:false,bindEvent_autoHideScrollbar:false}).addClass("mCS_disabled")},destroy:function(){var e=c(this);e.removeClass("mCustomScrollbar _mCS_"+e.data("mCustomScrollbarIndex")).addClass("mCS_destroyed").children().children(".mCSB_container").unwrap().children().unwrap().siblings(".mCSB_scrollTools").remove();c(document).unbind("mousemove."+e.data("mCustomScrollbarIndex")+" mouseup."+e.data("mCustomScrollbarIndex")+" MSPointerMove."+e.data("mCustomScrollbarIndex")+" MSPointerUp."+e.data("mCustomScrollbarIndex"));c(window).unbind("resize."+e.data("mCustomScrollbarIndex"))}},d={showScrollbar:function(){this.stop().animate({opacity:1},"fast")},hideScrollbar:function(){this.stop().animate({opacity:0},"fast")},mTweenAxis:function(g,i,h,f,o,y){var y=y||{},v=y.onStart||function(){},p=y.onUpdate||function(){},w=y.onComplete||function(){};var n=t(),l,j=0,r=g.offsetTop,s=g.style;if(i==="left"){r=g.offsetLeft}var m=h-r;q();e();function t(){if(window.performance&&window.performance.now){return window.performance.now()}else{if(window.performance&&window.performance.webkitNow){return window.performance.webkitNow()}else{if(Date.now){return Date.now()}else{return new Date().getTime()}}}}function x(){if(!j){v.call()}j=t()-n;u();if(j>=g._time){g._time=(j>g._time)?j+l-(j-g._time):j+l-1;if(g._time0){g.currVal=k(g._time,r,m,f,o);s[i]=Math.round(g.currVal)+"px"}else{s[i]=h+"px"}p.call()}function e(){l=1000/60;g._time=j+l;_request=(!window.requestAnimationFrame)?function(z){u();return setTimeout(z,0.01)}:window.requestAnimationFrame;g._id=_request(x)}function q(){if(g._id==null){return}if(!window.requestAnimationFrame){clearTimeout(g._id)}else{window.cancelAnimationFrame(g._id)}g._id=null}function k(B,A,F,E,C){switch(C){case"linear":return F*B/E+A;break;case"easeOutQuad":B/=E;return -F*B*(B-2)+A;break;case"easeInOutQuad":B/=E/2;if(B<1){return F/2*B*B+A}B--;return -F/2*(B*(B-2)-1)+A;break;case"easeOutCubic":B/=E;B--;return F*(B*B*B+1)+A;break;case"easeOutQuart":B/=E;B--;return -F*(B*B*B*B-1)+A;break;case"easeOutQuint":B/=E;B--;return F*(B*B*B*B*B+1)+A;break;case"easeOutCirc":B/=E;B--;return F*Math.sqrt(1-B*B)+A;break;case"easeOutSine":return F*Math.sin(B/E*(Math.PI/2))+A;break;case"easeOutExpo":return F*(-Math.pow(2,-10*B/E)+1)+A;break;case"mcsEaseOut":var D=(B/=E)*B,z=D*B;return A+F*(0.499999999999997*z*D+-2.5*D*D+5.5*z+-6.5*D+4*B);break;case"draggerRailEase":B/=E/2;if(B<1){return F/2*B*B*B+A}B-=2;return F/2*(B*B*B+2)+A;break}}},mTweenAxisStop:function(e){if(e._id==null){return}if(!window.requestAnimationFrame){clearTimeout(e._id)}else{window.cancelAnimationFrame(e._id)}e._id=null},rafPolyfill:function(){var f=["ms","moz","webkit","o"],e=f.length;while(--e>-1&&!window.requestAnimationFrame){window.requestAnimationFrame=window[f[e]+"RequestAnimationFrame"];window.cancelAnimationFrame=window[f[e]+"CancelAnimationFrame"]||window[f[e]+"CancelRequestAnimationFrame"]}}};d.rafPolyfill.call();c.support.touch=!!("ontouchstart" in window);c.support.pointer=window.navigator.pointerEnabled;c.support.msPointer=window.navigator.msPointerEnabled;var a=("https:"==document.location.protocol)?"https:":"http:";c.event.special.mousewheel||document.write('