diff --git a/apps/emencia/django/newsletter/forms.py b/apps/emencia/django/newsletter/forms.py index 41a2593e..28623a57 100644 --- a/apps/emencia/django/newsletter/forms.py +++ b/apps/emencia/django/newsletter/forms.py @@ -228,22 +228,6 @@ class ContactForm(forms.ModelForm): return email -class ContactSettingsForm(forms.ModelForm): - theme = forms.MultipleChoiceField(choices=[(str(item.id), item.name) for item in list(Theme.objects.language().all())], - widget=forms.CheckboxSelectMultiple(attrs={'class': 'pr-checkbox'}), required=False) - - class Meta: - model = ContactSettings - fields = ('exponent_practicum', 'organiser_practicum', 'theme') - - def clean_theme(self): - theme = self.cleaned_data.get('theme') - if theme: - return Theme.objects.filter(id__in=theme) - else: - return Theme.objects.none() - - types_choice = EnumChoices( ALL=(1, _(u'Все')), USERS=(2, _(u'Пользователи')), diff --git a/apps/emencia/django/newsletter/views/expo_views.py b/apps/emencia/django/newsletter/views/expo_views.py index 7d06434b..bd05260d 100644 --- a/apps/emencia/django/newsletter/views/expo_views.py +++ b/apps/emencia/django/newsletter/views/expo_views.py @@ -1,18 +1,26 @@ # -*- coding: utf-8 -*- import json + +from django.core.urlresolvers import reverse_lazy from django.views.generic import TemplateView, FormView from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import redirect -from emencia.django.newsletter.forms import ContactForm, ContactSettingsForm -from emencia.django.newsletter.models import Contact, ContactSettings, MailingList -from emencia.django.newsletter.forms import SubscribeAssideForm + +from emencia.django.newsletter.forms import ContactForm +from emencia.django.newsletter.models import Contact, MailingList +from emencia.django.newsletter.forms import ( + SubscribeAssideForm, MailingSettingsForm +) from accounts.models import User +from accounts.views import GetUserMixin +from functions.custom_views import ContextMixin +from city.models import City -class SubscribeView(FormView): +class SubscribeView(GetUserMixin, ContextMixin, FormView): form_class = ContactForm template_name = 'client/newsletters/subcribe.html' - success_url = '/newsletters/activation/send/' + success_url = reverse_lazy('subscription_activation_send') def get_form(self, form_class): if self.request.POST: @@ -20,7 +28,8 @@ class SubscribeView(FormView): if email: try: contact = Contact.objects.get(email=email) - return form_class(instance=contact, **self.get_form_kwargs()) + return form_class(instance=contact, + **self.get_form_kwargs()) except Contact.DoesNotExist: pass @@ -30,43 +39,9 @@ class SubscribeView(FormView): def form_valid(self, form): contact = form.save() - try: - setting = contact.contactsettings - except ContactSettings.DoesNotExist: - setting = None - if setting: - form2 = ContactSettingsForm(self.request.POST, instance=setting) - else: - form2 = ContactSettingsForm(self.request.POST) - - if form2.is_valid(): - contact_setting = form2.save(commit=False) - - if not contact_setting.contact_id: - contact_setting.contact = contact - contact_setting.save() - form2.save_m2m() - """ - # get country from request - country_code = self.request.META.get('HTTP_GEOIP_COUNTRY_CODE') - try: - country = Country.objects.get(country_code=country_code) - except Country.DoesNotExist: - pass - else: - contact_setting.contact_country = country - contact_setting.save() - """ - contact.send_activation() return HttpResponseRedirect(self.success_url) - def get_context_data(self, **kwargs): - context = super(SubscribeView, self).get_context_data(**kwargs) - context['form2'] = ContactSettingsForm(initial=self.get_initial()) - - return context - def get_initial(self): data = super(SubscribeView, self).get_initial() if self.request.user.is_authenticated(): @@ -78,11 +53,40 @@ class SubscribeView(FormView): data['email'] = self.request.GET['email'] if self.request.GET.get('first_name'): data['first_name'] = self.request.GET['first_name'] - if self.request.GET.getlist('theme'): - theme = self.request.GET.getlist('theme') - data['theme'] = theme return data + def get_context_data(self, **kwargs): + ctx = super(SubscribeView, self).get_context_data(**kwargs) + ctx['mailsettings_object'] = self.get_mailsettings_object() + ctx['mailsettings_form'] = MailingSettingsForm( + instance=self.get_user() + ) + return ctx + + def get_mailsettings_object(self): + """ + передаём контекст в шаблон по городам, странам, а так же выбранным + :return: instance of mail settings + """ + self.extra_ctx.update({ + 'r_cities': City.used.russia(), + }) + instance = self.get_user() + if instance is not None: + self.extra_ctx.update({ + 'checked_f_countries': list( + instance.f_countries.values_list('pk', flat=True)), + 'checked_r_cities': list( + instance.r_cities.values_list('pk', flat=True)), + 'checked_tg': list(instance.tags.values_list('pk', flat=True)), + 'checked_th': list( + instance.themes.values_list('pk', flat=True)), + 'contact': instance, + }) + if not instance.subscriber: + self.extra_ctx.update({'unsubscribed': True}) + return instance + class ActivationView(TemplateView): http_method_names = ['get'] @@ -149,14 +153,6 @@ def popup_validate(request): form = ContactForm(request.GET) if form.is_valid(): contact = form.save() - form2 = ContactSettingsForm(request.GET) - if form2.is_valid(): - contact_setting = form2.save(commit=False) - contact_setting.contact = contact - contact_setting.exponent_practicum, contact_setting.organiser_practicum = True, True - contact_setting.save() - form2.save_m2m() - contact.send_activation() response['success'] = True response['redirect'] = True @@ -173,16 +169,8 @@ def landing_partisipation_validate(request): form = ContactForm(request.POST) if form.is_valid(): contact = form.save() - form2 = ContactSettingsForm(request.POST) - if form2.is_valid(): - contact_setting = form2.save(commit=False) - contact_setting.contact = contact - contact_setting.exponent_practicum = True - contact_setting.save() - form2.save_m2m() - - contact.send_activation() - response['success'] = True + contact.send_activation() + response['success'] = True else: response['errors'] = form.errors return HttpResponse(json.dumps(response), content_type='application/json') diff --git a/static/mailing_settings/css/fonts.css b/static/mailing_settings/css/fonts.css new file mode 100644 index 00000000..474d591c --- /dev/null +++ b/static/mailing_settings/css/fonts.css @@ -0,0 +1,56 @@ +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-med-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-med-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-med-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-med-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-med-webfont.svg#pf_dindisplay_promedium) format('svg'); + font-weight: 500; + font-style: normal +} +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-thin-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-thin-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-thin-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-thin-webfont.woff) format('woff'); + font-weight: 100; + font-style: normal +} +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-light-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-light-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-light-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-light-webfont.ttf) format('truetype'); + font-weight: 300; + font-style: normal +} +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-italic-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-italic-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-italic-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-italic-webfont.ttf) format('truetype'); + font-weight: 400; + font-style: italic +} +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-bold-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-bold-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-bold-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-bold-webfont.woff) format('woff'); + font-weight: 700; + font-style: normal +} +@font-face { + font-family: dindisplay_pro; + src: url(../../client/fonts/pfdindisplaypro-reg-webfont.eot); + src: url(../../client/fonts/pfdindisplaypro-reg-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-reg-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-reg-webfont.ttf) format('truetype'); + font-weight: 400; + font-style: normal +} +@font-face { + font-family: pt_sans; + src: url(../../client/fonts/pts75f-webfont.eot); + src: url(../../client/fonts/pts75f-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pts75f-webfont.woff) format('woff'), url(../../client/fonts/pts75f-webfont.ttf) format('truetype'); + font-weight: 700; + font-style: normal +} +@font-face { + font-family: pt_sans; + src: url(../../client/fonts/pts55f-webfont.eot); + src: url(../../client/fonts/pts55f-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pts55f-webfont.woff) format('woff'), url(../../client/fonts/pts55f-webfont.ttf) format('truetype'); + font-weight: 400; + font-style: normal +} diff --git a/static/mailing_settings/css/form.css b/static/mailing_settings/css/form.css new file mode 100644 index 00000000..2112e99a --- /dev/null +++ b/static/mailing_settings/css/form.css @@ -0,0 +1,652 @@ +.themes_block h2, +.subjects_block h2, +.period_block h2 { + font-size: 30px; + font-weight: 400; + text-align: center; + margin-bottom: 50px; +} + +.themes_block, +.period_block{ + background-color: #fbfbfb; + border-top: 1px solid #ebebeb; + border-bottom: 1px solid #ebebeb; + padding-top: 50px; +} + +.themes_block{ + padding-bottom: 55px; +} + +.themes_block h3 { + margin-bottom: 30px; +} + +.subjects_block{ + padding: 50px 0; +} + +.page_footer{ + border-top: 1px solid #ebebeb; + border-bottom: 1px solid #ebebeb; + text-align: center; + line-height: 40px; + font-size: 16px; + color: #999; +} + +.columns{ + font-size: 0; + width: 1045px; + margin: 0 auto; +} + +.columns .column{ + display: inline-block; +} + +.themes_block .column{ + display: inline-block; + width: 50%; + vertical-align: top; +} + +.geo_filters{ + list-style: none; + background-color: #fff; + border: 1px solid #ebebeb; + border-radius: 3px; + padding: 30px; + font-size: 16px; +} + +.geo_filters > li + li{ + margin-top: 34px; +} + +.geo_filters .modal_trigger{ + font-size: 16px; + color: #333; + text-decoration: none; + display: inline-block; + border-bottom: 1px dashed #333; + margin-left: 40px; +} + +.geo_filters .modal_trigger:hover{ + border-bottom-color: transparent; +} + +.geo_filters input{ + display: none; +} + +.geo_filters .moscow{ + /*color: #49d026;*/ + color: #ccc; +} + +.geo_filters .moscow:hover, +.geo_filters input:checked + .moscow{ + border-color: #49d026; + box-shadow: 0 0 0 2px #49d026; + cursor: pointer; + color: #49d026; +} + +.geo_filters .rf{ + /*color: #ff6600;*/ + color: #ccc; +} + +.geo_filters .rf:hover, +.geo_filters input:checked + .rf{ + border-color: #ff6600; + box-shadow: 0 0 0 2px #ff6600; + cursor: pointer; + color: #ff6600; +} + +.geo_filters .foreign{ + /*color: #0099ff;*/ + color: #ccc; +} + +.geo_filters .foreign:hover, +.geo_filters input:checked + .foreign{ + border-color: #0099ff; + box-shadow: 0 0 0 2px #0099ff; + cursor: pointer; + color: #0099ff; +} + +.geo_filters input + .label{ + display: inline-block; + width: 283px; + padding: 6px 15px; + border: 1px solid #ebebeb; + font-size: 20px; + border-radius: 3px; +} + +.geo_filters input + .label + .geo_checkbox{ + display: inline-block; + height: 24px; + vertical-align: middle; + margin-left: 20px; + position: relative; +} + +.geo_filters input + .label + .geo_checkbox:before{ + content: ""; + display: inline-block; + width: 22px; + height: 22px; + border-radius: 50%; + border: 1px solid #e0e0e0; + position: absolute; + top: 0; + left:0; + transition: border-color .3s; +} + +.geo_filters input + .label + .geo_checkbox:after{ + content: ''; + display: block; + width: 23px; + height: 22px; + background: url(../images/checkbox.png); + position: absolute; + top: 1px; + left: 0; + opacity: 0; + transition: opacity .3s; +} + +.geo_filters input:checked + .label + .geo_checkbox:before{ + border-color: #FF6600; + transition: border-color .3s; +} + +.geo_filters input:checked + .label + .geo_checkbox:after{ + opacity: 1; + transition: opacity .3s; +} + +.geo_filters .selected{ + padding-top: 20px; + width: 285px; +} + +.subjects_block .column{ + vertical-align: top; + width: calc(100%/3); + font-size: 16px; +} + +.subjects_block p{ + color: #999999; + font-weight: 100; + padding: 0 40px; + font-size: 16px; +} + +.subjects_block input, +.periodic input, +.mailing_day input{ + display: none; +} + +.subjects_block input + label, +.periodic input + .radio{ + position: relative; + padding-left: 40px; + cursor: pointer; + font-size: 18px; +} + +.subjects_block input + label:before, +.periodic input + .radio:before, +.mailing_day input + .radio:before{ + content: ""; + display: inline-block; + width: 22px; + height: 22px; + border-radius: 50%; + border: 1px solid #e0e0e0; + position: absolute; + top: 0; + left:0; + transition: border-color .3s; +} + +.subjects_block input + label:after, +.periodic input + .radio:after, +.mailing_day input + .radio:after{ + content: ''; + display: block; + width: 23px; + height: 22px; + background: url(../images/checkbox.png); + position: absolute; + top: 1px; + left: 0; + opacity: 0; + transition: opacity .3s; +} + +.subjects_block input:checked + label:before, +.periodic input:checked + .radio:before, +.mailing_day input:checked + .radio:before{ + border-color: #FF6600; + transition: border-color .3s; +} + +.subjects_block input:checked + label:after, +.periodic input:checked + .radio:after, +.mailing_day input:checked + .radio:after{ + opacity: 1; + transition: opacity .3s; +} + +.periodic{ + width: 270px; + border-right: 1px solid #ebebeb; + padding-bottom: 45px; +} + +.periodic li{ + margin-bottom: 17px; + list-style: none; +} + +.mailing_day{ + padding-left: 110px; + padding-top: 20px; + vertical-align: top; +} + + +.mailing_day label{ + display: inline-block; + font-size: 25px; + font-weight: 300; + text-transform: uppercase; + width: 80px; + height: 80px; + background-color: #fff; + border-radius: 50%; + box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -moz-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -webkit-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + -o-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); + position: relative; + cursor: pointer; +} + +.mailing_day label:hover .radio:before, +.periodic label:hover .radio:before, +.subjects_block label:hover:before { + border-color: #FF6600; +} + +.mailing_day label + label{ + margin-left: 40px; +} + +.mailing_day input + .radio{ + display: block; + text-align: center; + cursor: pointer; + line-height: 80px; +} + +.mailing_day input + .radio:before{ + background-color: #fff; +} + +.mailing_day input + .radio:before, +.mailing_day input + .radio:after{ + left: auto; + right: 0; +} + +.button_block{ + padding: 62px 0; + text-align: center; +} + +.button_block button{ + display: block; + width: 265px; + height: 46px; + margin: 0 auto 26px; + border: 0; + background-color: #ff6600; + border-radius: 3px; + transition: background-color .3s; + color: #fff; + font-size: 19px; + font-weight: 300; + text-transform: uppercase; + cursor: pointer; +} + +.button_block button:hover{ + background-color: #ff9900; + transition: background-color .3s; +} + +.button_block a{ + color: #999; + font-size: 16px; +} + +.button_block a:hover{ + text-decoration: none; +} + +a.themes_trigger{ + display: block; + width: 190px; + height: 35px; + line-height: 35px; + background-color: #FF6600; + border-radius: 3px; + font-size: 19px; + color: #fff; + text-decoration: none; + text-align: center; + font-weight: 300; +} + +.selected{ + list-style: none; + font-size: 16px; + color: #333333; + font-weight: 100; +} + +.selected li{ + display: inline-block; + vertical-align: top; + border: 1px solid #FF6600; + border-radius: 3px; + padding: 6px 8px 6px 15px; + line-height: 16px; + margin-bottom: 10px; + margin-right: 10px; +} + +.selected li a{ + text-decoration: none; + margin-left: 15px; + color: #FF6600; + font-size: 22px; +} + +.popup-window{ + padding: 35px 50px 30px; + width: 640px; + font-size: 15px; +} + +.popup-window header{ + padding-bottom: 20px; + font-size: 35px; + line-height: 35px; + color: #f60; + font-weight: 100; +} + +.scroll-container{ + max-height: 230px; + overflow-y: scroll; +} + +.mCSB_scrollTools .mCSB_draggerRail { + width: 10px; + background: #dbdbdb; + border: 1px solid #ccc; +} + +.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar { + width: 8px; + border: solid #dbdbdb; + border-width: 2px 1px; +} + +.themes_wrapper{ + position: relative; + border: 1px solid #bdbdbd; + outline: 0; + width: 100%; + padding: 3px; + font-family: dindisplay_pro,sans-serif; + font-size: 15px; + line-height: 19px; + border-radius: 3px; + box-shadow: inset 0 2px 2px -2px #aaa; + background-color: #fff; +} + +.wait-ajax{ + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(191,191,191,.3) url('/static/client/img/ajax-loader.gif') no-repeat center; + display: none; +} + +.modal_checkboxes{ + list-style: none; + padding: 5px 10px; +} + +.modal_checkboxes li + li{ + margin-top: 4px; +} + +.modal_checkboxes .hidden_checkbox{ + display: none; +} + +.modal_checkboxes .hidden_checkbox + .custom_checkbox{ + display: inline-block; + vertical-align: middle; + width: 13px; + height: 13px; + line-height: 11px; + border-radius: 3px; + border: 1px solid #444; +} + +.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox{ + border-color: #FF6600; +} + +.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox:before{ + content: '∨'; + font-size: 10px; + height: 11px; + display: block; + text-align: center; + color: #FF6600; +} + +.modal_checkboxes .hidden{ + display: none; +} + +.modal_checkboxes .trigger{ + padding: 0 0 0 14px; + color: #464646; + position: relative; + font-weight: normal; + -webkit-font-smoothing: antialiased; +} + +.modal_checkboxes .trigger:hover{ + color: #FF6600; +} + +.modal_checkboxes .trigger[data-sub="true"]:before{ + content: "›"; + color: #FF6600; + position: absolute; + left: 3px; +} + +.modal_checkboxes .sub{ + list-style: none; + margin-left: 1em; + margin-top: .5em; +} + +.modal_checkboxes .label{ + padding-left: 14px; + font-weight: normal; + -webkit-font-smoothing: antialiased; +} + +.buttons_block{ + padding-top: 25px; +} + +.buttons_block button{ + display: inline-block; + vertical-align: top; + height: 40px; + border: 1px solid #fff; + outline: 0; + color: #fff; + font-family: dindisplay_pro,Arial,sans-serif; + font-weight: 700; + font-size: 15px; + line-height: 41px; + text-transform: uppercase; + padding: 0 25px; + border-radius: 4px; + -moz-box-sizing: border-box; + box-sizing: border-box; + box-shadow: 0 1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(0,0,0,.2); + -webkit-filter: none; + filter: none; +} + +.buttons_block .modal-approve{ + background: #f60; + background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#ff8000),color-stop(100%,#f60)); + background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); + background: -o-linear-gradient(top,#ff8000 0,#f60 100%); + background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); + background: -o-linear-gradient(top,#ff8000 0,#f60 100%); + background: linear-gradient(to bottom,#ff8000 0,#f60 100%); +} + +.buttons_block button:hover{ + margin-top: -1px; +} + +.modals{ + display: none; +} + +.resend_email_form fieldset{ + border: 0; +} + +.resend_email_form fieldset + fieldset{ + margin-top: 30px; +} + +.resend_email_form fieldset p + p{ + margin-top: 10px; +} + +.resend_email_form label{ + font-size: 18px; + display: inline-block; + vertical-align: middle; + width: 180px; +} + +.resend_email_form input{ + display: inline-block; + vertical-align: middle; + width: 350px; + height: 34px; + border: 1px solid #ebebeb; + border-radius: 3px; + background-color: #fff; + padding: 15px; +} + +.autocomplete_block{ + position: relative; + margin-bottom: 5px; +} + +.autocomplete_input{ + display: block; + min-width: 100%; + border: 0; + border-bottom: 1px dotted #cdcdcd; + height: 35px; + padding: 0 15px; + font-size: 15px; + color: rgb(34, 34, 34); + font-weight: 300; +} + +.autocomplete_themes_results{ + list-style: none; + max-height: 230px; + overflow-y: auto; + background-color: #fff; + border: 1px solid #cdcdcd; + position: absolute; + top: calc(100% - 1px); + left: 0; + right: 0; + z-index: 1; + display: none; +} + +.autocomplete_themes_results li{ + padding: 2px 10px; + cursor: pointer; + color: #464646; +} + +.autocomplete_themes_results li:hover{ + color: #ff6600; +} + +.autocomplete_themes_results span{ + color: #ababab; +} + +.popup-window .selected_themes{ + display: none; + border-bottom: 1px dotted #cdcdcd; + margin-bottom: 5px; + padding-bottom: 5px; +} + +.selected_themes.visible{ + display: block; +} + +.popup-window .selected_themes li { + margin-bottom: 3px; + margin-right: 3px; + padding: 3px 5px; +} + +.popup-window .selected_themes li a{ + margin-left: 5px; +} diff --git a/static/mailing_settings/css/main.css b/static/mailing_settings/css/main.css index daa2fa6c..9778cfe3 100644 --- a/static/mailing_settings/css/main.css +++ b/static/mailing_settings/css/main.css @@ -1,59 +1,4 @@ -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-med-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-med-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-med-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-med-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-med-webfont.svg#pf_dindisplay_promedium) format('svg'); - font-weight: 500; - font-style: normal -} -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-thin-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-thin-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-thin-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-thin-webfont.woff) format('woff'); - font-weight: 100; - font-style: normal -} -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-light-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-light-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-light-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-light-webfont.ttf) format('truetype'); - font-weight: 300; - font-style: normal -} -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-italic-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-italic-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-italic-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-italic-webfont.ttf) format('truetype'); - font-weight: 400; - font-style: italic -} -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-bold-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-bold-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-bold-webfont.ttf) format('truetype'), url(../../client/fonts/pfdindisplaypro-bold-webfont.woff) format('woff'); - font-weight: 700; - font-style: normal -} -@font-face { - font-family: dindisplay_pro; - src: url(../../client/fonts/pfdindisplaypro-reg-webfont.eot); - src: url(../../client/fonts/pfdindisplaypro-reg-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pfdindisplaypro-reg-webfont.woff) format('woff'), url(../../client/fonts/pfdindisplaypro-reg-webfont.ttf) format('truetype'); - font-weight: 400; - font-style: normal -} -@font-face { - font-family: pt_sans; - src: url(../../client/fonts/pts75f-webfont.eot); - src: url(../../client/fonts/pts75f-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pts75f-webfont.woff) format('woff'), url(../../client/fonts/pts75f-webfont.ttf) format('truetype'); - font-weight: 700; - font-style: normal -} -@font-face { - font-family: pt_sans; - src: url(../../client/fonts/pts55f-webfont.eot); - src: url(../../client/fonts/pts55f-webfont.eot?#iefix) format('embedded-opentype'), url(../../client/fonts/pts55f-webfont.woff) format('woff'), url(../../client/fonts/pts55f-webfont.ttf) format('truetype'); - font-weight: 400; - font-style: normal -} +@import url(fonts.css); *{ margin: 0; @@ -125,647 +70,3 @@ h3{ .page_header p span{ color: #FF6600; } - -.themes_block, -.period_block{ - background-color: #fbfbfb; - border-top: 1px solid #ebebeb; - border-bottom: 1px solid #ebebeb; - padding-top: 50px; -} - -.themes_block{ - padding-bottom: 55px; -} - -.themes_block h3 { - margin-bottom: 30px; -} - -.subjects_block{ - padding: 50px 0; -} - -.page_footer{ - border-top: 1px solid #ebebeb; - border-bottom: 1px solid #ebebeb; - text-align: center; - line-height: 40px; - font-size: 16px; - color: #999; -} - -.columns{ - font-size: 0; - width: 1045px; - margin: 0 auto; -} - -.columns .column{ - display: inline-block; -} - -.themes_block .column{ - display: inline-block; - width: 50%; - vertical-align: top; -} - -.geo_filters{ - list-style: none; - background-color: #fff; - border: 1px solid #ebebeb; - border-radius: 3px; - padding: 30px; - font-size: 16px; -} - -.geo_filters > li + li{ - margin-top: 34px; -} - -.geo_filters .modal_trigger{ - font-size: 16px; - color: #333; - text-decoration: none; - display: inline-block; - border-bottom: 1px dashed #333; - margin-left: 40px; -} - -.geo_filters .modal_trigger:hover{ - border-bottom-color: transparent; -} - -.geo_filters input{ - display: none; -} - -.geo_filters .moscow{ - /*color: #49d026;*/ - color: #ccc; -} - -.geo_filters .moscow:hover, -.geo_filters input:checked + .moscow{ - border-color: #49d026; - box-shadow: 0 0 0 2px #49d026; - cursor: pointer; - color: #49d026; -} - -.geo_filters .rf{ - /*color: #ff6600;*/ - color: #ccc; -} - -.geo_filters .rf:hover, -.geo_filters input:checked + .rf{ - border-color: #ff6600; - box-shadow: 0 0 0 2px #ff6600; - cursor: pointer; - color: #ff6600; -} - -.geo_filters .foreign{ - /*color: #0099ff;*/ - color: #ccc; -} - -.geo_filters .foreign:hover, -.geo_filters input:checked + .foreign{ - border-color: #0099ff; - box-shadow: 0 0 0 2px #0099ff; - cursor: pointer; - color: #0099ff; -} - -.geo_filters input + .label{ - display: inline-block; - width: 283px; - padding: 6px 15px; - border: 1px solid #ebebeb; - font-size: 20px; - border-radius: 3px; -} - -.geo_filters input + .label + .geo_checkbox{ - display: inline-block; - height: 24px; - vertical-align: middle; - margin-left: 20px; - position: relative; -} - -.geo_filters input + .label + .geo_checkbox:before{ - content: ""; - display: inline-block; - width: 22px; - height: 22px; - border-radius: 50%; - border: 1px solid #e0e0e0; - position: absolute; - top: 0; - left:0; - transition: border-color .3s; -} - -.geo_filters input + .label + .geo_checkbox:after{ - content: ''; - display: block; - width: 23px; - height: 22px; - background: url(../images/checkbox.png); - position: absolute; - top: 1px; - left: 0; - opacity: 0; - transition: opacity .3s; -} - -.geo_filters input:checked + .label + .geo_checkbox:before{ - border-color: #FF6600; - transition: border-color .3s; -} - -.geo_filters input:checked + .label + .geo_checkbox:after{ - opacity: 1; - transition: opacity .3s; -} - -.geo_filters .selected{ - padding-top: 20px; - width: 285px; -} - -.subjects_block .column{ - vertical-align: top; - width: calc(100%/3); - font-size: 16px; -} - -.subjects_block p{ - color: #999999; - font-weight: 100; - padding: 0 40px; - font-size: 16px; -} - -.subjects_block input, -.periodic input, -.mailing_day input{ - display: none; -} - -.subjects_block input + label, -.periodic input + .radio{ - position: relative; - padding-left: 40px; - cursor: pointer; - font-size: 18px; -} - -.subjects_block input + label:before, -.periodic input + .radio:before, -.mailing_day input + .radio:before{ - content: ""; - display: inline-block; - width: 22px; - height: 22px; - border-radius: 50%; - border: 1px solid #e0e0e0; - position: absolute; - top: 0; - left:0; - transition: border-color .3s; -} - -.subjects_block input + label:after, -.periodic input + .radio:after, -.mailing_day input + .radio:after{ - content: ''; - display: block; - width: 23px; - height: 22px; - background: url(../images/checkbox.png); - position: absolute; - top: 1px; - left: 0; - opacity: 0; - transition: opacity .3s; -} - -.subjects_block input:checked + label:before, -.periodic input:checked + .radio:before, -.mailing_day input:checked + .radio:before{ - border-color: #FF6600; - transition: border-color .3s; -} - -.subjects_block input:checked + label:after, -.periodic input:checked + .radio:after, -.mailing_day input:checked + .radio:after{ - opacity: 1; - transition: opacity .3s; -} - -.periodic{ - width: 270px; - border-right: 1px solid #ebebeb; - padding-bottom: 45px; -} - -.periodic li{ - margin-bottom: 17px; - list-style: none; -} - -.mailing_day{ - padding-left: 110px; - padding-top: 20px; - vertical-align: top; -} - - -.mailing_day label{ - display: inline-block; - font-size: 25px; - font-weight: 300; - text-transform: uppercase; - width: 80px; - height: 80px; - background-color: #fff; - border-radius: 50%; - box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -moz-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -webkit-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - -o-box-shadow: 0 7px 32px rgba(25, 25, 25, 0.1); - position: relative; - cursor: pointer; -} - -.mailing_day label:hover .radio:before, -.periodic label:hover .radio:before, -.subjects_block label:hover:before { - border-color: #FF6600; -} - -.mailing_day label + label{ - margin-left: 40px; -} - -.mailing_day input + .radio{ - display: block; - text-align: center; - cursor: pointer; - line-height: 80px; -} - -.mailing_day input + .radio:before{ - background-color: #fff; -} - -.mailing_day input + .radio:before, -.mailing_day input + .radio:after{ - left: auto; - right: 0; -} - -.button_block{ - padding: 62px 0; - text-align: center; -} - -.button_block button{ - display: block; - width: 265px; - height: 46px; - margin: 0 auto 26px; - border: 0; - background-color: #ff6600; - border-radius: 3px; - transition: background-color .3s; - color: #fff; - font-size: 19px; - font-weight: 300; - text-transform: uppercase; - cursor: pointer; -} - -.button_block button:hover{ - background-color: #ff9900; - transition: background-color .3s; -} - -.button_block a{ - color: #999; - font-size: 16px; -} - -.button_block a:hover{ - text-decoration: none; -} - -.themes_trigger{ - display: block; - width: 190px; - height: 35px; - line-height: 35px; - background-color: #FF6600; - border-radius: 3px; - font-size: 19px; - color: #fff; - text-decoration: none; - text-align: center; - font-weight: 300; -} - -.selected{ - list-style: none; - font-size: 16px; - color: #333333; - font-weight: 100; -} - -.selected li{ - display: inline-block; - vertical-align: top; - border: 1px solid #FF6600; - border-radius: 3px; - padding: 6px 8px 6px 15px; - line-height: 16px; - margin-bottom: 10px; - margin-right: 10px; -} - -.selected li a{ - text-decoration: none; - margin-left: 15px; - color: #FF6600; - font-size: 22px; -} - -.popup-window{ - padding: 35px 50px 30px; - width: 640px; - font-size: 15px; -} - -.popup-window header{ - padding-bottom: 20px; - font-size: 35px; - line-height: 35px; - color: #f60; - font-weight: 100; -} - -.scroll-container{ - max-height: 230px; - overflow-y: scroll; -} - -.mCSB_scrollTools .mCSB_draggerRail { - width: 10px; - background: #dbdbdb; - border: 1px solid #ccc; -} - -.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar { - width: 8px; - border: solid #dbdbdb; - border-width: 2px 1px; -} - -.themes_wrapper{ - position: relative; - border: 1px solid #bdbdbd; - outline: 0; - width: 100%; - padding: 3px; - font-family: dindisplay_pro,sans-serif; - font-size: 15px; - line-height: 19px; - border-radius: 3px; - box-shadow: inset 0 2px 2px -2px #aaa; - background-color: #fff; -} - -.wait-ajax{ - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(191,191,191,.3) url('/static/client/img/ajax-loader.gif') no-repeat center; - display: none; -} - -.modal_checkboxes{ - list-style: none; - padding: 5px 10px; -} - -.modal_checkboxes li + li{ - margin-top: 4px; -} - -.modal_checkboxes .hidden_checkbox{ - display: none; -} - -.modal_checkboxes .hidden_checkbox + .custom_checkbox{ - display: inline-block; - vertical-align: middle; - width: 13px; - height: 13px; - line-height: 11px; - border-radius: 3px; - border: 1px solid #444; -} - -.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox{ - border-color: #FF6600; -} - -.modal_checkboxes .hidden_checkbox:checked + .custom_checkbox:before{ - content: '∨'; - font-size: 10px; - height: 11px; - display: block; - text-align: center; - color: #FF6600; -} - -.modal_checkboxes .hidden{ - display: none; -} - -.modal_checkboxes .trigger{ - padding: 0 0 0 14px; - color: #464646; - position: relative; - font-weight: normal; - -webkit-font-smoothing: antialiased; -} - -.modal_checkboxes .trigger:hover{ - color: #FF6600; -} - -.modal_checkboxes .trigger[data-sub="true"]:before{ - content: "›"; - color: #FF6600; - position: absolute; - left: 3px; -} - -.modal_checkboxes .sub{ - list-style: none; - margin-left: 1em; - margin-top: .5em; -} - -.modal_checkboxes .label{ - padding-left: 14px; - font-weight: normal; - -webkit-font-smoothing: antialiased; -} - -.buttons_block{ - padding-top: 25px; -} - -.buttons_block button{ - display: inline-block; - vertical-align: top; - height: 40px; - border: 1px solid #fff; - outline: 0; - color: #fff; - font-family: dindisplay_pro,Arial,sans-serif; - font-weight: 700; - font-size: 15px; - line-height: 41px; - text-transform: uppercase; - padding: 0 25px; - border-radius: 4px; - -moz-box-sizing: border-box; - box-sizing: border-box; - box-shadow: 0 1px 0 rgba(0,0,0,.2),inset 0 1px 0 rgba(0,0,0,.2); - -webkit-filter: none; - filter: none; -} - -.buttons_block .modal-approve{ - background: #f60; - background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#ff8000),color-stop(100%,#f60)); - background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); - background: -o-linear-gradient(top,#ff8000 0,#f60 100%); - background: -webkit-linear-gradient(top,#ff8000 0,#f60 100%); - background: -o-linear-gradient(top,#ff8000 0,#f60 100%); - background: linear-gradient(to bottom,#ff8000 0,#f60 100%); -} - -.buttons_block button:hover{ - margin-top: -1px; -} - -.modals{ - display: none; -} - -.resend_email_form fieldset{ - border: 0; -} - -.resend_email_form fieldset + fieldset{ - margin-top: 30px; -} - -.resend_email_form fieldset p + p{ - margin-top: 10px; -} - -.resend_email_form label{ - font-size: 18px; - display: inline-block; - vertical-align: middle; - width: 180px; -} - -.resend_email_form input{ - display: inline-block; - vertical-align: middle; - width: 350px; - height: 34px; - border: 1px solid #ebebeb; - border-radius: 3px; - background-color: #fff; - padding: 15px; -} - -.autocomplete_block{ - position: relative; - margin-bottom: 5px; -} - -.autocomplete_input{ - display: block; - min-width: 100%; - border: 0; - border-bottom: 1px dotted #cdcdcd; - height: 35px; - padding: 0 15px; - font-size: 15px; - color: rgb(34, 34, 34); - font-weight: 300; -} - -.autocomplete_themes_results{ - list-style: none; - max-height: 230px; - overflow-y: auto; - background-color: #fff; - border: 1px solid #cdcdcd; - position: absolute; - top: calc(100% - 1px); - left: 0; - right: 0; - z-index: 1; - display: none; -} - -.autocomplete_themes_results li{ - padding: 2px 10px; - cursor: pointer; - color: #464646; -} - -.autocomplete_themes_results li:hover{ - color: #ff6600; -} - -.autocomplete_themes_results span{ - color: #ababab; -} - -.popup-window .selected_themes{ - display: none; - border-bottom: 1px dotted #cdcdcd; - margin-bottom: 5px; - padding-bottom: 5px; -} - -.selected_themes.visible{ - display: block; -} - -.popup-window .selected_themes li { - margin-bottom: 3px; - margin-right: 3px; - padding: 3px 5px; -} - -.popup-window .selected_themes li a{ - margin-left: 5px; -} diff --git a/static/subscribe_lending/css/all.css b/static/subscribe_lending/css/all.css index b5e05014..a8aafffd 100644 --- a/static/subscribe_lending/css/all.css +++ b/static/subscribe_lending/css/all.css @@ -32,43 +32,43 @@ font-style: normal; } @font-face { - font-family: 'MyriadProRegular'; - src: url('../fonts/myriad_pro-webfont.eot'); - src: url('../fonts/myriad_pro-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/myriad_pro-webfont.woff') format('woff'), - url('../fonts/myriad_pro-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; + font-family: 'MyriadProRegular'; + src: url('../fonts/myriad_pro-webfont.eot'); + src: url('../fonts/myriad_pro-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/myriad_pro-webfont.woff') format('woff'), + url('../fonts/myriad_pro-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; } body.pr { - margin:0; - color:#090909; - font:20px/24px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif; - background:#fff; - min-width:1000px; + margin:0; + color:#090909; + font:20px/24px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif; + background:#fff; + min-width:1000px; } .pr img { - border-style:none; - vertical-align:top; + border-style:none; + vertical-align:top; } .pr a { - color:#090909; - outline:none; + color:#090909; + outline:none; } .pr a:hover { - text-decoration:none; + text-decoration:none; } .pr * { - outline:none; + outline:none; } .pr input { - font:100% Arial, Helvetica, sans-serif; - vertical-align:middle; + font:100% Arial, Helvetica, sans-serif; + vertical-align:middle; } .pr form, .pr fieldset { - margin:0; - padding:0; - border-style:none; + margin:0; + padding:0; + border-style:none; } .pr header, .pr nav, @@ -79,402 +79,415 @@ body.pr { .pr figure, .pr menu, .pr dialog { - display: block; + display: block; } #pr-wrapper{ - width:100%; - overflow:hidden; + width:100%; + overflow:hidden; } .pr-center{ - width:964px; - margin:0 auto; - padding:0 18px; + width:964px; + margin:0 auto; + padding:0 18px; +} +.pr-center:after{ + display:block; + clear:both; + content:''; } -.pr-center:after{ display:block; clear:both; content:''; } #pr-header{ - overflow:hidden; - min-height:98px; - padding:62px 0 10px; + overflow:hidden; + min-height:98px; + padding:62px 0 10px; } .pr-logo{ - float:left; - width:254px; - height:74px; - background:url(../images/pr-logo.png) no-repeat; - text-indent:-9999px; - overflow:hidden; + float:left; + width:254px; + height:74px; + background:url(../images/pr-logo.png) no-repeat; + text-indent:-9999px; + overflow:hidden; } .pr-logo a{ - display:block; - height:100%; + display:block; + height:100%; } .pr-slogan{ - float:left; - margin:0 0 0 20px; - background:url(../images/pr-line01.png) no-repeat 0 50%; - padding:28px 0 20px 20px; - color:#454545; - font:19px/21px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; - text-transform:uppercase; + float:left; + margin:0 0 0 20px; + background:url(../images/pr-line01.png) no-repeat 0 50%; + padding:28px 0 20px 20px; + color:#454545; + font:19px/21px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; + text-transform:uppercase; } .pr-search-icon{ - background:url(../images/pr-icon01.png) no-repeat; - width:17px; - height:19px; - display:inline-block; - vertical-align:top; - margin:0 1px 0 3px; + background:url(../images/pr-icon01.png) no-repeat; + width:17px; + height:19px; + display:inline-block; + vertical-align:top; + margin:0 1px 0 3px; } .pr-header-box{ - float:right; - text-align:right; - margin:-4px 0 0; + float:right; + text-align:right; + margin:-4px 0 0; } .pr-phone{ - font-size: 25px; - line-height:30px; - text-decoration:none; - color:#454545; - display:inline-block; - vertical-align:top; - margin:0 0 5px; + font-size: 25px; + line-height:30px; + text-decoration:none; + color:#454545; + display:inline-block; + vertical-align:top; + margin:0 0 5px; } .pr-social{ - margin:0; padding:0; list-style:none; - font-size: 0; - line-height:0; + margin:0; + padding:0; + list-style:none; + font-size: 0; + line-height:0; } .pr-social li{ - display:inline-block; - vertical-align:middle; - margin:0 0 0 6px; - -webkit-transition: all 100ms linear; - -moz-transition: all 100ms linear; - -ms-transition: all 100ms linear; - -o-transition: all 100ms linear; - transition: all 100ms linear; + display:inline-block; + vertical-align:middle; + margin:0 0 0 6px; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; } .pr-social li:hover{ - opacity:0.8; + opacity:0.8; } #pr-promo{ - background:url(../images/pr-img01.jpg) no-repeat 50% 0; - background-size:cover; - min-height:400px; - padding:35px 0 47px; - color:#fff; + background:url(../images/pr-img01.jpg) no-repeat 50% 0; + background-size:cover; + min-height:400px; + padding:35px 0 47px; + color:#fff; } #pr-promo .pr-center{ - padding:0 25px; - width:950px; + padding:0 25px; + width:950px; } #pr-promo h1{ - font-weight:normal; - margin:0 0 16px; - font:39px/39px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; - color:#fff; + font-weight:normal; + margin:0 0 16px; + font:39px/39px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; + color:#fff; } #pr-promo h2{ - font-weight:normal; - margin:0 0 15px; - font:27px/33px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; - color:#99fbff; + font-weight:normal; + margin:0 0 15px; + font:27px/33px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; + color:#99fbff; } #pr-promo p{ - margin:0; + margin:0; } .pr-promo-text{ - max-width:400px; - margin:0 0 22px; + max-width:400px; + margin:0 0 22px; } .pr .pr-promo-text a{ - color:#fff; + color:#fff; } .pr-form{ - width:509px; - text-align:center; + width:509px; + text-align:center; } .pr-form .pr-row{ - overflow:hidden; - margin:0 0 14px; + overflow:hidden; + margin:0 0 14px; } .pr-input{ - float:left; - height:46px; - width:186px; - padding:0 44px 0 18px; - margin:0 0 0 13px; - background:#fff; - border-radius:4px; - position:relative; + float:left; + height:46px; + width:186px; + padding:0 44px 0 18px; + margin:0 0 0 13px; + background:#fff; + border-radius:4px; + position:relative; } .pr-input:first-child{ - margin:0; -} -.pr-input:after{ content:''; - position:absolute; - top:13px; - right:14px; - width:20px; - height:20px; } + margin:0; +} +.pr-input:after{ + content:''; + position:absolute; + top:13px; + right:14px; + width:20px; + height:20px; +} .pr-input.pr-name:after{ - background:url(../images/pr-icon02.png) no-repeat 50% 50%; + background:url(../images/pr-icon02.png) no-repeat 50% 50%; } .pr-input.pr-email:after{ - background:url(../images/pr-icon03.png) no-repeat 50% 50%; + background:url(../images/pr-icon03.png) no-repeat 50% 50%; } .pr-form input{ - padding:0; - border:none; - color:#000; - font:17px/21px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; - height:24px; - margin:12px 0 0; + padding:0; + border:none; + color:#000; + font:17px/21px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; + height:24px; + margin:12px 0 0; } .pr-form input:focus::-webkit-input-placeholder { - color:transparent; + color:transparent; } .pr-form input:focus:-moz-placeholder { - color:transparent; + color:transparent; } .pr-form input:focus:-ms-input-placeholder { - color:transparent; + color:transparent; } .pr-form input:focus::-moz-placeholder { - color:transparent; + color:transparent; } .pr-form input::-webkit-input-placeholder { /* WebKit browsers */ - color:#808080; - opacity:1; + color:#808080; + opacity:1; } .pr-form input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ - color:#808080; - opacity:1; + color:#808080; + opacity:1; } .pr-form input::-moz-placeholder { /* Mozilla Firefox 19+ */ - color:#808080; - opacity:1; + color:#808080; + opacity:1; } .pr-form input:-ms-input-placeholder { /* Internet Explorer 10+ */ - color:#808080; - opacity:1; + color:#808080; + opacity:1; } .pr-form button{ - display:block; - border:2px solid #fff; - border-radius:4px; - background:#ff6900; - height:64px; - font: 30px/58px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif; - text-align:center; - text-transform:uppercase; - color:#fff; - width:100%; - cursor:pointer; - -webkit-transition: all 100ms linear; - -moz-transition: all 100ms linear; - -ms-transition: all 100ms linear; - -o-transition: all 100ms linear; - transition: all 100ms linear; + display:block; + border:2px solid #fff; + border-radius:4px; + background:#ff6900; + height:64px; + font: 30px/58px 'pf_dindisplay_proregular', Arial, Helvetica, sans-serif; + text-align:center; + text-transform:uppercase; + color:#fff; + width:100%; + cursor:pointer; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; } .pr-form button:hover{ - opacity:0.9; + opacity:0.9; } #pr-content{ - padding:59px 0 26px; - overflow:hidden; + padding:59px 0 26px; + overflow:hidden; } .pr .pr-interesting-form{ - overflow:hidden; - margin:0 0 50px; + overflow:hidden; + margin:0 0 50px; } .pr-interesting{ - float:left; - width:300px; - margin:0 85px 0 0; + float:left; + width:300px; + margin:0 85px 0 0; } .pr-interesting h3{ - font-weight:normal; - margin:0 0 14px; - font:27px/27px 'MyriadProRegular', Arial, Helvetica, sans-serif; - color:#080808; + font-weight:normal; + margin:0 0 14px; + font:27px/27px 'MyriadProRegular', Arial, Helvetica, sans-serif; + color:#080808; } .pr-interesting h4{ - font-weight:normal; - margin:0 17px 18px; - font-size: 20px; - line-height:22px; - color:#060606; + font-weight:normal; + margin:0 17px 18px; + font-size: 20px; + line-height:22px; + color:#060606; } .pr-interesting-list{ - margin:0; padding:0; list-style:none; - font-size: 17px; - line-height:21px; - color:#010100; + margin:0; + padding:0; + list-style:none; + font-size: 17px; + line-height:21px; + color:#010100; } .pr-interesting-list li{ - margin:0 0 7px; + margin:0 0 7px; } .pr-close{ - background:url(../images/pr-icon04.png) no-repeat; - width:12px; - height:12px; - display:inline-block; - vertical-align:top; - margin:4px 3px 0 0; - text-decoration:none; + background:url(../images/pr-icon04.png) no-repeat; + width:12px; + height:12px; + display:inline-block; + vertical-align:top; + margin:4px 3px 0 0; + text-decoration:none; } .pr-interesting-box{ - overflow:hidden; + overflow:hidden; } .pr-interesting-wrap{ - overflow:hidden; - margin:0 0 38px; + overflow:hidden; + margin:0 0 38px; } .pr-interesting-col{ - margin:0 0 0 8px; padding:0; list-style:none; - float:left; - width:285px; + margin:0 0 0 8px; + padding:0; + list-style:none; + float:left; + width:285px; } .pr-interesting-col:first-child{ - margin:0; + margin:0; } .pr-interesting-col li{ - margin:0 0 16px; + margin:0 0 16px; } .pr .pr-btn-open{ - display:block; - height:65px; - border:2px solid #ff7d22; - text-align:center; - padding:0 20px; - font:24px/65px 'MyriadProRegular', Arial, Helvetica, sans-serif; - color:#ff6900; - -webkit-transition: all 100ms linear; - -moz-transition: all 100ms linear; - -ms-transition: all 100ms linear; - -o-transition: all 100ms linear; - transition: all 100ms linear; + display:block; + height:65px; + border:2px solid #ff7d22; + text-align:center; + padding:0 20px; + font:24px/65px 'MyriadProRegular', Arial, Helvetica, sans-serif; + color:#ff6900; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; } .pr .pr-btn-open:hover{ - opacity:0.8; + opacity:0.8; } .pr-btn-open span{ - display:inline-block; - vertical-align:top; - padding:0 0 0 22px; - background:url(../images/pr-icon05.png) no-repeat 0 47%; + display:inline-block; + vertical-align:top; + padding:0 0 0 22px; + background:url(../images/pr-icon05.png) no-repeat 0 47%; } .pr-interesting-col label{ - display:block; - overflow:hidden; - cursor:pointer; - padding:0 0 0 10px; - line-height:25px; - text-decoration:underline; + display:block; + overflow:hidden; + cursor:pointer; + padding:0 0 0 10px; + line-height:25px; + text-decoration:underline; } .pr-interesting-col label:hover{ - text-decoration:none; + text-decoration:none; } div.pr-check, div.pr-radio { - float: left; - width: 24px; - height: 24px; - position: relative; - background:url(../images/pr-icon06.png) no-repeat; - cursor: pointer; + float: left; + width: 24px; + height: 24px; + position: relative; + background:url(../images/pr-icon06.png) no-repeat; + cursor: pointer; } div.pr-check.checked{ - background-position:0 -40px; + background-position:0 -40px; } div.pr-radio.checked{ - background-position:-0 -40px; + background-position:-0 -40px; } div.check.disabled, div.check.disabled + label { - cursor: default !important; + cursor: default !important; } div.pr-radio.disabled, div.pr-radio.disabled + label{ - cursor: default !important; + cursor: default !important; } .pr-subscription{ - overflow:hidden; + overflow:hidden; } .pr-subscription h3{ - font-weight:normal; - margin:0 0 46px; - font:27px/33px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; - color:#000; + font-weight:normal; + margin:0 0 46px; + font:27px/33px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; + color:#000; } .pr-subscription-box{ - overflow:hidden; + overflow:hidden; } .pr-subscription-list{ - float:left; - width:300px; - margin: 0 85px 0 0; - padding:0; list-style:none; + float:left; + width:300px; + margin: 0 85px 0 0; + padding:0; + list-style:none; } .pr-subscription-list li{ - margin:0 0 27px; + margin:0 0 27px; } .pr-subscription-row{ - overflow:hidden; - margin:0 0 5px; + overflow:hidden; + margin:0 0 5px; } .pr-subscription-list label{ - overflow:hidden; - display:block; - padding:0 0 0 12px; - cursor:pointer; - font-size: 23px; - line-height:26px; + overflow:hidden; + display:block; + padding:0 0 0 12px; + cursor:pointer; + font-size: 23px; + line-height:26px; } .pr-subscription-row:hover label{ - color:#ff6900; + color:#ff6900; } .pr-subscription-list .pr-title{ - margin:0 0 0 36px; - color:#482500; - font-size: 17px; - line-height:21px; + margin:0 0 0 36px; + color:#482500; + font-size: 17px; + line-height:21px; } .pr-subscription-list p{ - margin:0 0 5px; + margin:0 0 5px; } .pr .pr-subscription-list .pr-title a{ - color:#ff6900; + color:#ff6900; } .pr-subscription-col{ - overflow:hidden; - padding:88px 0 0; - text-align:center; + overflow:hidden; + padding:88px 0 0; + text-align:center; } .pr-subscription-col button{ - display:block; - background:#ff6900; - height:92px; - font: 35px/92px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; - text-align:center; - text-transform:uppercase; - color:#fff; - width:100%; - margin:0 0 36px; - border:none; - cursor:pointer; - -webkit-transition: all 100ms linear; - -moz-transition: all 100ms linear; - -ms-transition: all 100ms linear; - -o-transition: all 100ms linear; - transition: all 100ms linear; + display:block; + background:#ff6900; + height:92px; + font: 35px/92px 'pf_dindisplay_prolight', Arial, Helvetica, sans-serif; + text-align:center; + text-transform:uppercase; + color:#fff; + width:100%; + margin:0 0 36px; + border:none; + cursor:pointer; + -webkit-transition: all 100ms linear; + -moz-transition: all 100ms linear; + -ms-transition: all 100ms linear; + -o-transition: all 100ms linear; + transition: all 100ms linear; } .pr-subscription-col button:hover{ - opacity:0.9; + opacity:0.9; } .pr-subscription-col strong{ - font-weight:normal; - font:18px/22px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; - color:#8f9698; + font-weight:normal; + font:18px/22px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; + color:#8f9698; } diff --git a/static/subscribe_lending/js/jquery.main.js b/static/subscribe_lending/js/jquery.main.js index 97572405..251b3214 100644 --- a/static/subscribe_lending/js/jquery.main.js +++ b/static/subscribe_lending/js/jquery.main.js @@ -1,28 +1,28 @@ $(document).ready(function(){ - $('.pr-form input, .pr-form textarea').placeholder(); - $('.pr-btn-open').click(function(){ - _this = $(this); - $('.pr-interesting-box').find('.pr-interesting-col li').slideDown(200, function(){ - _this.fadeOut(400); - }); - return false; - }); - $('.pr form input').iCheck({ - checkboxClass: 'pr-check', - radioClass: 'pr-radio', - increaseArea: '20%' // optional - }); - $('.pr-interesting-form .pr-checkbox:checkbox').on('ifToggled', function(){ - $('.pr-interesting-list').html(''); - $('.pr-interesting-form input:checkbox').each(function(){ - if ($(this).is(':checked')){ - $('.pr-interesting-list').append('
  •   '+$(this).parent().parent().find('label').text()+'
    • '); - } - }) - }); - $('.pr-interesting-list').on('click', '.pr-close', function(){ - var _id = $(this).parent().attr('data-id'); - $('.pr-interesting-form input:checkbox#'+_id).iCheck('uncheck'); - return false; - }); -}); \ No newline at end of file + // $('.pr-form input, .pr-form textarea').placeholder(); + // $('.pr-btn-open').click(function(){ + // _this = $(this); + // $('.pr-interesting-box').find('.pr-interesting-col li').slideDown(200, function(){ + // _this.fadeOut(400); + // }); + // return false; + // }); + // $('.pr form input').iCheck({ + // checkboxClass: 'pr-check', + // radioClass: 'pr-radio', + // increaseArea: '20%' // optional + // }); + // $('.pr-interesting-form .pr-checkbox:checkbox').on('ifToggled', function(){ + // $('.pr-interesting-list').html(''); + // $('.pr-interesting-form input:checkbox').each(function(){ + // if ($(this).is(':checked')){ + // $('.pr-interesting-list').append('
  •   '+$(this).parent().parent().find('label').text()+'
    • '); + // } + // }) + // }); + // $('.pr-interesting-list').on('click', '.pr-close', function(){ + // var _id = $(this).parent().attr('data-id'); + // $('.pr-interesting-form input:checkbox#'+_id).iCheck('uncheck'); + // return false; + // }); +}); diff --git a/templates/client/accounts/mailing_settings.html b/templates/client/accounts/mailing_settings.html index ec6ec2d3..1e15c6c1 100644 --- a/templates/client/accounts/mailing_settings.html +++ b/templates/client/accounts/mailing_settings.html @@ -10,6 +10,8 @@ + + @@ -25,162 +27,7 @@ -
    - {% csrf_token %} -
    -
    -

    {% trans 'Какие события включать в ваше письмо?' %}

    - -
    -
    -

    {% trans 'Ваши темы:' %}

    -{% comment %} {{ form.th.label_tag }} - {{ form.th }} -
      -{#
        #} - {% trans 'Уточнить темы' %} - - {#

        {% trans 'Теги' %}

        #} - - {{ form.tg }}{% endcomment %} - -
          - {% for theme in object.themes.all %} -
        • - - {{ theme }} - × -
          • - {% endfor %} - - {% for tag in object.tags.all %} -
        • - - {{ tag }} - × -
          • - {% endfor %} -
        - {% trans 'Уточнить темы' %} -
        - -
        -

        {% trans 'Ваши гео-фильтры:' %}

        - - -
        -
        -
        -
        - -
        -
        -

        {% trans 'Включать ли новости / обзоры / статьи в письмо?' %}

        - -
        -
        - {{ form.content_news }} - {{ form.content_news.label_tag }} -

        {% trans "Получайте новости выставок и конференций по выбранным тематикам" %}

        -
        - -
        - {{ form.content_overview }} - {{ form.content_overview.label_tag }} -

        {% trans "Практические материалы, интервью, кейсы, которые помогут эффективно участвовать в выставках" %}

        -
        - -
        - {{ form.content_articles }} - {{ form.content_articles.label_tag }} -

        {% trans "Блог о том, как создавать и продвигать крутые event`ы" %}

        -
        -
        -
        -
        - -
        -
        -

        {% trans 'Регулярность получения писем' %}

        - -
        -
        -
          - {% for field in form.periodic %} -
        • - -
          • - {% endfor %} -
        -
        - -
        - {% for field in form.periodic_day %} - - {% endfor %} -
        -
        -
        -
        - -
        -
        - - {% trans 'Не хочу быть в курсе событий (отписаться от всего)' %} -
        -
        -
        + {% include 'client/includes/accounts/mailing_settings_form.html' %} diff --git a/templates/client/includes/accounts/mailing_settings_form.html b/templates/client/includes/accounts/mailing_settings_form.html new file mode 100644 index 00000000..d4584d66 --- /dev/null +++ b/templates/client/includes/accounts/mailing_settings_form.html @@ -0,0 +1,148 @@ +{% load i18n %} +
        + {% csrf_token %} +
        +
        +

        {% trans 'Какие события включать в ваше письмо?' %}

        + +
        +
        +

        {% trans 'Ваши темы:' %}

        + +
          + {% for theme in object.themes.all %} +
        • + + {{ theme }} + × +
          • + {% endfor %} + + {% for tag in object.tags.all %} +
        • + + {{ tag }} + × +
          • + {% endfor %} +
        + {% trans 'Уточнить темы' %} +
        + +
        +

        {% trans 'Ваши гео-фильтры:' %}

        + + +
        +
        +
        +
        + +
        +
        +

        {% trans 'Включать ли новости / обзоры / статьи в письмо?' %}

        + +
        +
        + {{ form.content_news }} + {{ form.content_news.label_tag }} +

        {% trans "Получайте новости выставок и конференций по выбранным тематикам" %}

        +
        + +
        + {{ form.content_overview }} + {{ form.content_overview.label_tag }} +

        {% trans "Практические материалы, интервью, кейсы, которые помогут эффективно участвовать в выставках" %}

        +
        + +
        + {{ form.content_articles }} + {{ form.content_articles.label_tag }} +

        {% trans "Блог о том, как создавать и продвигать крутые event`ы" %}

        +
        +
        +
        +
        + +
        +
        +

        {% trans 'Регулярность получения писем' %}

        + +
        +
        +
          + {% for field in form.periodic %} +
        • + +
          • + {% endfor %} +
        +
        + +
        + {% for field in form.periodic_day %} + + {% endfor %} +
        +
        +
        +
        + +
        +
        + + {% trans 'Не хочу быть в курсе событий (отписаться от всего)' %} +
        +
        +
        diff --git a/templates/client/newsletters/subcribe.html b/templates/client/newsletters/subcribe.html index a54f99b8..b0345858 100644 --- a/templates/client/newsletters/subcribe.html +++ b/templates/client/newsletters/subcribe.html @@ -1,178 +1,107 @@ -{% load static %} -{% load i18n %} +{% load static i18n %}{% spaceless %} - - - - - Expomap - - - - - - - - + + + + + Expomap + + + + + + + + + + +{# #} + + + + + + + + + - - + + +
        + {% if user.is_authenticated %} +
        +
        +
        + Expomap + expomap.ru › +
        +

        {% trans 'Настройте рассылку от Expomap' %}

        +

        {% trans 'для' %} {{ contact.email }}

        +
        +
        + {% else %} +
        +
        +
        + +7 (499) 999-12-07 +
          +
          • +
          • +
          • +
          • +
          • +
          • +
        +
        + + {% blocktrans %}Писковик деловых событий{% endblocktrans %} +
        +
        + {% endif %} + + +
        +
        +

        {% trans 'Анонсы выставок' %}
        {% trans 'и конференций на ваш e-mail' %}

        +

        {% trans 'Хотите быть в курсе событий?' %}

        +
        +

        {% trans 'Получайте анонсы выставок и конференций на email каждую среду. Вы можете выбрать несколько интересующих вас тематических направлений.' %} {% trans 'Пример письма' %}

        +
        +
        {% csrf_token %} +
        +
        + {{ form.first_name }} + {{ form.email }} +
        + +
        +
        +
        +
        + + {% include 'client/includes/accounts/mailing_settings_form.html' with object=mailsettings_object form=mailsettings_form %} + +
        -
        -
        -
        -
        - +7 (499) 999-12-07 -
          -
          • -
          • -
          • -
          • -
          • -
          • -
        -
        - - {% blocktrans %}Писковик деловых событий{% endblocktrans %} -
        -
        -
        -
        -

        {% trans 'Анонсы выставок' %}
        {% trans 'и конференций на ваш e-mail' %}

        -

        {% trans 'Хотите быть в курсе событий?' %}

        -
        -

        {% trans 'Получайте анонсы выставок и конференций на email каждую среду. Вы можете выбрать несколько интересующих вас тематических направлений.' %} {% trans 'Пример письма' %}

        -
        -
        {% csrf_token %} -
        -
        - {{ form.first_name }} - {{ form.email }} -
        - -
        -
        -
        -
        -
        -
        -
        -
        -
        -

        {% trans 'Выберите то, что вам интересно' %}

        -

        {% trans 'Ваши тематики:' %}

        -
          - {% for item in form2.theme.field.choices %} - {% if item.0 in form2.theme.value %} -
        • -   {{ item.1 }} -
          • - {% endif %} - {% endfor %} -
        -
        -
        -
        - {% with choices=form2.theme.field.choices %} -
          - {% for item in form2.theme.field.choices %} - {% if forloop.counter|divisibleby:2 %} -
        • 18 %}style="display: none;" {% endif %}> - - -
          • - {% endif %} - {% endfor %} -
        -
          - {% for item in form2.theme.field.choices %} - {% if not forloop.counter|divisibleby:2 %} -
        • 18 %}style="display: none;" {% endif %}> - - -
          • - {% endif %} - {% endfor %} -
        - {% endwith %} -
        - {% trans 'Открыть весь список' %} -
        -
        -
        -
        {% csrf_token %} -
        -

        {% trans 'Подписка на бесплатные учебные и практические материалы' %}

        -
        -
          -
        • -
          - {{ form2.exponent_practicum }} +
          +
          + {% include 'client/popups/new_themes.html' %} +
          - -
          -
          -

          {% trans 'Учимся эффективно участвовать в выставках и грамотно пиарить свою компанию на событиях.' %}

          -
          -
          • -
        • -
          - {{ form2.organiser_practicum }} - -
          -
          -

          {% trans 'Создаем, наполняем и продвигаем собственные ивэнты.' %}

          -
          -
          • -
        -
        - - {% trans 'Нажимая «Подписаться», вы соглашаетесь получать' %}
        {% trans 'материалы компании Expomap на свой электронный адрес' %}         - {% trans "Пользовательское соглашение" %} -
        -
        -
        -
        -
        -
        -
        - - - +
        + {% include 'client/popups/mailing_settings_countries.html' %} +
        + + +{% endspaceless %} diff --git a/templates/client/popups/russia_cities.html b/templates/client/popups/russia_cities.html index ee170aed..e6d687c7 100644 --- a/templates/client/popups/russia_cities.html +++ b/templates/client/popups/russia_cities.html @@ -14,6 +14,7 @@