lalal ebala

10 years ago · ca300d8877
parent d8ba7693f7
commit ca300d8877
58 changed files with 126 additions and 14 deletions
--- 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"Стеня Графов <info@stenograph.us>"
+DEFAULT_FROM_EMAIL = u"Зуйков и партнёры <info@stenograph.us>"

 ROOT_URLCONF = 'app.urls'

--- 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 = (
--- a/djangocms_forms/templates/djangocms_forms/email_template/client_email.html
+++ b/djangocms_forms/templates/djangocms_forms/email_template/client_email.html
@ -0,0 +1,25 @@
+{% load i18n djangocms_forms_tags %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta name="viewport" content="width=device-width" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>{{ form.name }}</title>
+    </head>
+    <body itemscope itemtype="http://schema.org/EmailMessage">
+        <h1>{{ form.name }}</h1>
+
+        <p>Вас интересовала услуга «{{ form.name }}» на сайте компании «<a href="http://zuykov.com">Зуйков и партнёры</a>»,<br/>
+        ваше <strong>обращение №{{ form_instance.id }}</strong> по этому вопросу зарегистрировано.</p>
+
+        <p>В ближайшее время наш специалист свяжется с вами, ответит на ваши вопросы.</p>
+
+        <h2><a href="http://zuykov.com/ru/about/contacts">Контакты</a></h2>
+        <p>ООО «Зуйков и партнёры»</p>
+        <p>Вы можете сами <em>позвонить нам</em> <strong>+7 800 700-16-37</strong><br/>
+        <em>написать нам на почту</em> <a href="mailto:info@zuykov.com">info@zuykov.com</a><br/>
+        или приехать на встречу.</p>
+
+        <p>Грохольский переулок, дом 28,<br/>
+        Москва, Россия, 129090</p>
+    </body>
+</html>
--- a/djangocms_forms/templates/djangocms_forms/email_template/client_email.txt
+++ 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
--- a/djangocms_forms/templates/djangocms_forms/email_template/email.html
+++ b/djangocms_forms/templates/djangocms_forms/email_template/email.html
@ -3,17 +3,22 @@
    <head>
        <meta name="viewport" content="width=device-width" />
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>{{ title }}</title>
+        <title>{{ form.name }}</title>
    </head>
    <body itemscope itemtype="http://schema.org/EmailMessage">
-        <h1>{{ form.title }}</h1>
-        <p><strong>{% trans 'Date:' %}</strong> {% now 'jS F Y H:i' %}</p>
+        <h1>{{ form.name }}</h1>
+        <p><strong>{% trans 'Обращение зарегистрировано' %}:</strong> {% now 'jS F Y H:i' %}</p>
        {% for item in form_data %}
+            {% if "session" not in item.name %}
            <p>
                <strong>{% if item.label %}{{ item.label }}{% else %}{{ item.name }}{% endif %}:</strong><br/>
                {{ item.value|friendly|default_if_none:'—' }}
            </p>
+            {% endif %}
        {% endfor %}
-        {% trans 'Sent via' %} <a href="http://{{ request.get_host }}{{ referrer }}">{{ request.get_host }}{{ referrer }}</a>
+        <p>
+            <strong>{% trans 'Отправлено со страницы' %}:</strong><br/>
+            <a href="http://{{ request.get_host }}{{ referrer }}">{{ request.get_host }}{{ referrer }}</a>
+        </p>
    </body>
 </html>
--- 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 "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 }}
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_185d6f63562abbf7f2ac192a53dae1977928305f.jpg
+++ b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_185d6f63562abbf7f2ac192a53dae1977928305f.jpg
--- a/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_5808dae2f8a7e9c446f633a57a4a228a5cc9edea.jpg
+++ b/media/djangocms_forms/registratsiia-tovarnogo-znaka-54/kanon-farma_5808dae2f8a7e9c446f633a57a4a228a5cc9edea.jpg
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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;
    }
 }
--- 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;
        
--- 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 {
--- 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);
--- 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;
    }
 }

--- a/zsite/templates/base.html
+++ b/zsite/templates/base.html
@ -20,7 +20,7 @@

            <div class="wrapper no-print">
                <div class="header-logo">
-                    <a href="/">
+                    <a href="/{{request.LANGUAGE_CODE}}/">
                        <img src="{% with 'imgs/logo_'|add:request.LANGUAGE_CODE|add:'.svg' as image_static %}{% static image_static %}{% endwith %}">
                    </a>
                    <h5 class="slogan">{% trans 'Intellectual Property Protection' %}</h5>
--- a/zsite/templates/form_template/product_class.html
+++ b/zsite/templates/form_template/product_class.html
@ -51,7 +51,7 @@ var form = {
        <div id="{{ tabs_list_id }}" ng-tabs class="nice-tabs tabs-plugin">
            <ul class="tabs-list list-unstyled list-inline">
                <li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#nice-catalog">Каталог классов</a></li>
-                <li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#nice-all">Все по порядку</a></li>
+                <li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#nice-all">Все классы</a></li>
            </ul>


@ -94,7 +94,7 @@ var form = {
            </div>
        </div>

-        <h5>{{ GetNoun(classes, 'Выбран', 'Выбраны', 'Выбрано') }} {{ classes }}  {{ GetNoun(classes, 'класс', 'класса', 'классов') }}</h5>
+        <h5 ng-show="classes_values.length > 0">{{ GetNoun(classes, 'Выбран', 'Выбраны', 'Выбрано') }} {{ classes }}  {{ GetNoun(classes, 'класс', 'класса', 'классов') }}</h5>
        <ul class="nice-selected list-unstyled list-inline">
            <li ng-repeat="id in classes_values"><span class="label label-default"><strong>{{ nice[id-1].id }}</strong> – {{ nice[id-1].title }}</span></li>
        </ul>