diff --git a/app/settings.py b/app/settings.py index 616432f..fa0517d 100644 --- a/app/settings.py +++ b/app/settings.py @@ -56,7 +56,7 @@ EMAIL_HOST_PASSWORD = 'cntyjuhfa,kznm' EMAIL_PORT = 587 EMAIL_USE_TLS = True EMAIL_HOST_USER = "info@stenograph.us" -DEFAULT_FROM_EMAIL = u"Стеня Графов " +DEFAULT_FROM_EMAIL = u"Зуйков и партнёры " ROOT_URLCONF = 'app.urls' diff --git a/djangocms_forms/forms.py b/djangocms_forms/forms.py index 794113e..96da3f8 100644 --- a/djangocms_forms/forms.py +++ b/djangocms_forms/forms.py @@ -295,21 +295,37 @@ class FormBuilder(forms.Form): # Отправляем, только если конец сессии # Если есть сессия для этой формы, то сохраняем в неё. form_slug = "form-%d" % (self.form_definition.plugin_reference.id or self.form_definition.id) + print form_slug + if request.session.get(form_slug, False): + try: + form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False)) + form_data = form_instance.form_data + # print "LOADING ---" + # print form_data + except (FormSubmission.DoesNotExist): + form_instance = None + # print "NOT EXIST" + # print form_data + pass send = False for data in form_data: if data['name'] == 'end_session': + # print "SEND OK" request.session[form_slug] = None send = True + if data['type'] == 'email': + client_mail_to = data['value'] if not send: return + # Send to company mail_to = re.compile('\s*[,;]+\s*').split(self.form_definition.email_to) mail_from = self.form_definition.email_from or None mail_subject = self.form_definition.email_subject or \ - 'Form Submission - %s' % self.form_definition.name + u'%s №%d – заявка с сайта' % (self.form_definition.name, form_instance.id) context = { 'form': self.form_definition, 'referrer': referrer, @@ -331,6 +347,31 @@ class FormBuilder(forms.Form): email.send(fail_silently=False) + # Send to client + if client_mail_to: + mail_to = re.compile('\s*[,;]+\s*').split(client_mail_to) + mail_from = self.form_definition.email_from or None + mail_subject = self.form_definition.email_subject or \ + u'%s. Обращение №%d' % (self.form_definition.name, form_instance.id) + context = { + 'form': self.form_definition, + 'referrer': referrer, + 'title': mail_subject, + 'form_data': form_data, + 'request': request, + 'recipients': mail_to, + 'form_instance': form_instance + } + + message = render_to_string('djangocms_forms/email_template/client_email.txt', context) + message_html = render_to_string('djangocms_forms/email_template/client_email.html', context) + + email = EmailMultiAlternatives(mail_subject, message, mail_from, mail_to) + email.attach_alternative(message_html, 'text/html') + + email.send(fail_silently=False) + + class SubmissionExportForm(forms.Form): FORMAT_CHOICES = ( diff --git a/djangocms_forms/templates/djangocms_forms/email_template/client_email.html b/djangocms_forms/templates/djangocms_forms/email_template/client_email.html new file mode 100644 index 0000000..a7d8c6b --- /dev/null +++ b/djangocms_forms/templates/djangocms_forms/email_template/client_email.html @@ -0,0 +1,25 @@ +{% load i18n djangocms_forms_tags %} + + + + + {{ form.name }} + + +

{{ form.name }}

+ +

Вас интересовала услуга «{{ form.name }}» на сайте компании «Зуйков и партнёры»,
+ ваше обращение №{{ form_instance.id }} по этому вопросу зарегистрировано.

+ +

В ближайшее время наш специалист свяжется с вами, ответит на ваши вопросы.

+ +

Контакты

+

ООО «Зуйков и партнёры»

+

Вы можете сами позвонить нам +7 800 700-16-37
+ написать нам на почту info@zuykov.com
+ или приехать на встречу.

+ +

Грохольский переулок, дом 28,
+ Москва, Россия, 129090

+ + diff --git a/djangocms_forms/templates/djangocms_forms/email_template/client_email.txt b/djangocms_forms/templates/djangocms_forms/email_template/client_email.txt new file mode 100644 index 0000000..d69afd2 --- /dev/null +++ b/djangocms_forms/templates/djangocms_forms/email_template/client_email.txt @@ -0,0 +1,17 @@ +{% load i18n djangocms_forms_tags %} + +Вас интересовала услуга «{{ form.name }}» на сайте компании «Зуйков и партнёры», +ваше обращение №{{ form_instance.id }} по этому вопросу зарегистрировано. + +В ближайшее время наш специалист свяжется с вами, +ответит на ваши вопросы. + + +Контакты + +Вы можете сами позвонить нам +7 800 700-16-37 +написать на почту info@zuykov.com +или приехать на встречу. + +Грохольский переулок, дом 28, +Москва, Россия, 129090 \ No newline at end of file diff --git a/djangocms_forms/templates/djangocms_forms/email_template/email.html b/djangocms_forms/templates/djangocms_forms/email_template/email.html index 6965263..2d186f2 100755 --- a/djangocms_forms/templates/djangocms_forms/email_template/email.html +++ b/djangocms_forms/templates/djangocms_forms/email_template/email.html @@ -3,17 +3,22 @@ - {{ title }} + {{ form.name }} -

{{ form.title }}

-

{% trans 'Date:' %} {% now 'jS F Y H:i' %}

+

{{ form.name }}

+

{% trans 'Обращение зарегистрировано' %}: {% now 'jS F Y H:i' %}

{% for item in form_data %} + {% if "session" not in item.name %}

{% if item.label %}{{ item.label }}{% else %}{{ item.name }}{% endif %}:
{{ item.value|friendly|default_if_none:'—' }}

+ {% endif %} {% endfor %} - {% trans 'Sent via' %} {{ request.get_host }}{{ referrer }} +

+ {% trans 'Отправлено со страницы' %}:
+ {{ request.get_host }}{{ referrer }} +

diff --git a/djangocms_forms/templates/djangocms_forms/email_template/email.txt b/djangocms_forms/templates/djangocms_forms/email_template/email.txt index dde1c8f..56fe564 100644 --- a/djangocms_forms/templates/djangocms_forms/email_template/email.txt +++ b/djangocms_forms/templates/djangocms_forms/email_template/email.txt @@ -3,9 +3,12 @@ {% trans 'Form:' %} {{ form.name }} {% trans 'Date:' %} {% now "jS F Y H:i" %} + {% for item in form_data %} -{% if item.label %}{{ item.label }}{% else %}{{ item.name }}{% endif %}: -{{ item.value|friendly|default_if_none:'—' }} + {% if "session" not in item.name %} + {% if item.label %}{{ item.label }}{% else %}{{ item.name }}{% endif %}: + {{ item.value|friendly|default_if_none:'—' }} + {% endif %} {% endfor %} {% trans 'Sent via' %} http://{{ request.get_host }} diff --git a/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/bbk_new_logo_gradient_f8d6cc2bbf444aed2b2b53f2699e8775739d491f.jpg b/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/bbk_new_logo_gradient_f8d6cc2bbf444aed2b2b53f2699e8775739d491f.jpg new file mode 100644 index 0000000..6d3ca6e Binary files /dev/null and b/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/bbk_new_logo_gradient_f8d6cc2bbf444aed2b2b53f2699e8775739d491f.jpg differ diff --git a/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/tumblr_ntnb69De2l1qivwiwo1_500_41fd3d2de2548a2aea6300cb4767e12f5d0f8d23.jpg b/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/tumblr_ntnb69De2l1qivwiwo1_500_41fd3d2de2548a2aea6300cb4767e12f5d0f8d23.jpg new file mode 100644 index 0000000..56876a1 Binary files /dev/null and b/media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/tumblr_ntnb69De2l1qivwiwo1_500_41fd3d2de2548a2aea6300cb4767e12f5d0f8d23.jpg differ diff --git a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_8334334afb7d23903c9b985accdd5a581702485f.jpg b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_8334334afb7d23903c9b985accdd5a581702485f.jpg new file mode 100644 index 0000000..6d3ca6e Binary files /dev/null and b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_8334334afb7d23903c9b985accdd5a581702485f.jpg differ diff --git a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_a6c42aeba43d62e113a4cf0fc5cb4580cdf4034f.jpg b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_a6c42aeba43d62e113a4cf0fc5cb4580cdf4034f.jpg new file mode 100644 index 0000000..6d3ca6e Binary files /dev/null and b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_a6c42aeba43d62e113a4cf0fc5cb4580cdf4034f.jpg differ diff --git a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_c825f7fb0f6d707bdf3c0e2b8c6ce94d586bc0df.jpg b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_c825f7fb0f6d707bdf3c0e2b8c6ce94d586bc0df.jpg new file mode 100644 index 0000000..6d3ca6e Binary files /dev/null and b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/bbk_new_logo_gradient_c825f7fb0f6d707bdf3c0e2b8c6ce94d586bc0df.jpg differ diff --git a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_185d6f63562abbf7f2ac192a53dae1977928305f.jpg b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_185d6f63562abbf7f2ac192a53dae1977928305f.jpg new file mode 100644 index 0000000..d276830 Binary files /dev/null and b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_185d6f63562abbf7f2ac192a53dae1977928305f.jpg differ diff --git a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_5808dae2f8a7e9c446f633a57a4a228a5cc9edea.jpg b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_5808dae2f8a7e9c446f633a57a4a228a5cc9edea.jpg new file mode 100644 index 0000000..d276830 Binary files /dev/null and b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_5808dae2f8a7e9c446f633a57a4a228a5cc9edea.jpg differ diff --git a/media/filer_public/19/60/1960cf35-4e92-42ea-b6d7-e4621df16bd1/opf-partners_ranked-in_euro_2013_firm.jpg b/media/filer_public/19/60/1960cf35-4e92-42ea-b6d7-e4621df16bd1/opf-partners_ranked-in_euro_2013_firm.jpg new file mode 100644 index 0000000..27d2631 Binary files /dev/null and b/media/filer_public/19/60/1960cf35-4e92-42ea-b6d7-e4621df16bd1/opf-partners_ranked-in_euro_2013_firm.jpg differ diff --git a/media/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png b/media/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png new file mode 100644 index 0000000..1883b6a Binary files /dev/null and b/media/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png differ diff --git a/media/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg b/media/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg new file mode 100644 index 0000000..9534f7a Binary files /dev/null and b/media/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg differ diff --git a/media/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png b/media/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png new file mode 100644 index 0000000..8bf1de2 Binary files /dev/null and b/media/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png differ diff --git a/media/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg b/media/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg new file mode 100644 index 0000000..27d2631 Binary files /dev/null and b/media/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__150x49_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__150x49_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..7398c07 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__150x49_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__151x50_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__151x50_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..35de104 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__151x50_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..8b3e663 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..26b6c50 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_subsampling-2.jpg new file mode 100644 index 0000000..12cb6eb Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__180x59_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__181x60_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__181x60_q85_subsampling-2.jpg new file mode 100644 index 0000000..9a5f8fa Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__181x60_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__210x10000_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__210x10000_q85_subsampling-2.jpg new file mode 100644 index 0000000..d53c7f5 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__210x10000_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__302x100_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__302x100_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..1253de7 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__302x100_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..62d97a7 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..cfce622 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__523x173_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__523x173_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..b068664 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__523x173_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..d5ea59e Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/3d/cb/3dcbe471-4f45-4339-9436-64fe77ee3f57/pravo300.png__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__121x20_q85_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__121x20_q85_subsampling-2_upscale.jpg new file mode 100644 index 0000000..a237c8c Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__121x20_q85_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__152x25_q85_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__152x25_q85_subsampling-2_upscale.jpg new file mode 100644 index 0000000..32046d3 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__152x25_q85_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..2024e0b Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__213x35_q85_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__213x35_q85_subsampling-2_upscale.jpg new file mode 100644 index 0000000..64f684d Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__213x35_q85_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..b79158f Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__365x60_q85_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__365x60_q85_subsampling-2_upscale.jpg new file mode 100644 index 0000000..906d562 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__365x60_q85_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..ee238b5 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..9445e82 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/76/6c/766c9e55-4bbf-42c2-9d5b-8fb25383854b/aipla_logo.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__110x66_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__110x66_q85_subsampling-2.jpg new file mode 100644 index 0000000..de723c3 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__110x66_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__120x72_q85_subsampling-2.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__120x72_q85_subsampling-2.jpg new file mode 100644 index 0000000..bb8a4ac Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__120x72_q85_subsampling-2.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..545840c Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..d025015 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..fe2cb67 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..7c4aef4 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/b4/0e/b40efe41-c8a1-4f11-bcfb-4600737b6b8e/9cae9577423bb5afa91e6d75712f8ac3.png__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__110x118_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__110x118_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..5ec2182 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__110x118_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__150x161_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__150x161_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..74586b3 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__150x161_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..b3bf243 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..f56a675 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..5b412a7 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..677c5c7 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__676x728_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__676x728_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..79babdb Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ee/23/ee2377e5-312f-4852-8335-89c4f4981193/opf-partners_ranked-in_euro_2013_firm.jpg__676x728_q85_crop_subsampling-2_upscale.jpg differ diff --git a/zsite/static/less/consultation.less b/zsite/static/less/consultation.less index 2f3f97d..22b48a3 100644 --- a/zsite/static/less/consultation.less +++ b/zsite/static/less/consultation.less @@ -42,5 +42,10 @@ .btn-consultation { margin-bottom: 10px; + margin-right: -13px; + } + + .plugin-people { + margin-left: -36px; } } diff --git a/zsite/static/less/people.less b/zsite/static/less/people.less index 00feec7..9a44780 100644 --- a/zsite/static/less/people.less +++ b/zsite/static/less/people.less @@ -104,7 +104,7 @@ font-size: 14px; - padding-top: 25px; + padding-top: 36px; padding-left: 15px; diff --git a/zsite/static/less/service.less b/zsite/static/less/service.less index 0b50bb7..64a2b1b 100644 --- a/zsite/static/less/service.less +++ b/zsite/static/less/service.less @@ -68,6 +68,7 @@ h3 { font-weight: 600; + margin-top: 0; } .description { @@ -105,6 +106,8 @@ } .bill { + margin-top: 62px; + font-size: 12px; position: relative; @@ -156,6 +159,8 @@ .price, .text-right { width: 77px; + + white-space: nowrap; } } } @@ -245,6 +250,9 @@ } .service-s { + + margin-top: 5px; + h4 { margin-bottom: 2px; } @@ -253,6 +261,11 @@ font-size: 12px; margin-bottom: 3px; } + + li { + margin-bottom: 10px; + + } } .service-xs { diff --git a/zsite/static/less/sub_content.less b/zsite/static/less/sub_content.less index 97515c2..ce413b6 100644 --- a/zsite/static/less/sub_content.less +++ b/zsite/static/less/sub_content.less @@ -61,13 +61,16 @@ } .content-about { + h1:first-child { + margin-top: 0; + } .make-xs-column(12); .make-sm-column(10); } .content { - :first-child { + h1:first-child { margin-top: 0; } .make-lg-column(8); diff --git a/zsite/static/less/theory.less b/zsite/static/less/theory.less index 101c777..8e6ecff 100644 --- a/zsite/static/less/theory.less +++ b/zsite/static/less/theory.less @@ -28,7 +28,7 @@ .theory-block { .about-videos { margin-top: 15px; - margin-left: 10px; + margin-left: 31px; } } diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 8018364..02ce72e 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -20,7 +20,7 @@
-
{{ GetNoun(classes, 'Выбран', 'Выбраны', 'Выбрано') }} {{ classes }} {{ GetNoun(classes, 'класс', 'класса', 'классов') }}
+
{{ GetNoun(classes, 'Выбран', 'Выбраны', 'Выбрано') }} {{ classes }} {{ GetNoun(classes, 'класс', 'класса', 'классов') }}
  • {{ nice[id-1].id }} – {{ nice[id-1].title }}