diff --git a/blog/locale/ru/LC_MESSAGES/django.po b/blog/locale/ru/LC_MESSAGES/django.po index 4692864..965dee7 100644 --- a/blog/locale/ru/LC_MESSAGES/django.po +++ b/blog/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 17:46+0300\n" +"POT-Creation-Date: 2015-11-07 22:29+0300\n" "PO-Revision-Date: 2014-11-30 11:49+0000\n" "Last-Translator: yakky \n" "Language-Team: Russian (http://www.transifex.com/projects/p/djangocms-blog/" diff --git a/zsite/locale/ru/LC_MESSAGES/django.mo b/zsite/locale/ru/LC_MESSAGES/django.mo index 899a17c..bd70e80 100644 Binary files a/zsite/locale/ru/LC_MESSAGES/django.mo and b/zsite/locale/ru/LC_MESSAGES/django.mo differ diff --git a/zsite/locale/ru/LC_MESSAGES/django.po b/zsite/locale/ru/LC_MESSAGES/django.po index e675fdf..7aadcfe 100644 --- a/zsite/locale/ru/LC_MESSAGES/django.po +++ b/zsite/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-24 17:46+0300\n" +"POT-Creation-Date: 2015-11-07 22:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Alexander Kondratev \n" "Language-Team: Zuykov and partners\n" @@ -85,14 +85,16 @@ msgid "Text Area" msgstr "" #: djangocms_forms/conf.py:29 djangocms_forms/settings.py:22 +#: zsite/templates/form_template/consultation.html:38 msgid "Email" -msgstr "" +msgstr "По почте" #: djangocms_forms/conf.py:30 djangocms_forms/settings.py:23 msgid "Number" msgstr "" #: djangocms_forms/conf.py:31 djangocms_forms/settings.py:24 +#: zsite/templates/form_template/consultation.html:55 #, fuzzy #| msgid "Phone:" msgid "Phone" @@ -179,51 +181,52 @@ msgstr "" msgid "Please select an option" msgstr "" -#: djangocms_forms/forms.py:374 +#: djangocms_forms/forms.py:372 msgid "CSV" msgstr "" -#: djangocms_forms/forms.py:375 +#: djangocms_forms/forms.py:373 msgid "JSON" msgstr "" -#: djangocms_forms/forms.py:376 +#: djangocms_forms/forms.py:374 msgid "YAML" msgstr "" -#: djangocms_forms/forms.py:377 +#: djangocms_forms/forms.py:375 msgid "Microsoft Excel" msgstr "" -#: djangocms_forms/forms.py:381 +#: djangocms_forms/forms.py:379 msgid "Select a Form" msgstr "" -#: djangocms_forms/forms.py:382 +#: djangocms_forms/forms.py:380 msgid "Please select a form." msgstr "" -#: djangocms_forms/forms.py:383 +#: djangocms_forms/forms.py:381 msgid "" "Select the form you would like to export entry data from. You may only " "export data from one form at a time." msgstr "" -#: djangocms_forms/forms.py:387 djangocms_forms/forms.py:388 +#: djangocms_forms/forms.py:385 djangocms_forms/forms.py:386 msgid "Fields" msgstr "" -#: djangocms_forms/forms.py:390 +#: djangocms_forms/forms.py:388 msgid "From date" msgstr "" -#: djangocms_forms/forms.py:392 +#: djangocms_forms/forms.py:390 msgid "To date" msgstr "" #: djangocms_forms/models.py:19 +#: zsite/templates/form_template/consultation.html:27 msgid "Name" -msgstr "" +msgstr "Имя" #: djangocms_forms/models.py:25 djangocms_forms/models.py:86 msgid "form" @@ -441,7 +444,7 @@ msgstr "" msgid "Invalid form data, one or more fields had errors" msgstr "" -#: service/cms_app.py:11 +#: service/cms_app.py:11 zsite/templates/form_template/consultation.html:10 #, fuzzy #| msgid "Our Services" msgid "Service" @@ -555,31 +558,28 @@ msgstr "Наши сотрудники" msgid "Intellectual Property Protection" msgstr "Защита интеллектуальной собственности" -#: zsite/templates/base.html:41 -msgid "Worldwide" -msgstr "По всей России" - -#: zsite/templates/base.html:70 +#: zsite/templates/base.html:71 msgid "— There is nothing impossible. Almost nothing" msgstr "— Защищаем две части целого: идею и право" -#: zsite/templates/base.html:75 -msgid "Contact us:" -msgstr "Пишите" +#: zsite/templates/form_template/consultation.html:33 +msgid "We can call you or anwser by email" +msgstr "Мы можем вам позвонить или ответить письмом" -#: zsite/templates/base.html:76 -msgid "Groholskiy pereulok" -msgstr "Грохольский переулок" +#: zsite/templates/form_template/consultation.html:36 +msgid "Call" +msgstr "Связаться по телефону" -#: zsite/templates/base.html:77 -msgid "dom 28" -msgstr "дом 28" +#: zsite/templates/form_template/consultation.html:48 +msgid "Question" +msgstr "Ваш вопрос" -#: zsite/templates/base.html:78 -msgid "Moscow, Russia, 129090" -msgstr "Москва, Россия, 129090" +#: zsite/templates/form_template/consultation.html:62 +msgid "Subject" +msgstr "Тема" -#: zsite/templates/form_template/consultation.html:49 +#: zsite/templates/form_template/consultation.html:86 +#: zsite/templates/form_template/order_modal.html:75 msgid "" "\n" "

Submission successful

\n" @@ -596,7 +596,7 @@ msgstr "Каталог классов" msgid "All Classes" msgstr "Все классы" -#: zsite/templates/form_template/product_class.html:158 +#: zsite/templates/form_template/product_class.html:165 #: zsite/templates/form_template/wizard.html:44 msgid "" "\n" @@ -614,6 +614,21 @@ msgstr "Изменить язык на:" msgid "Our Services" msgstr "Наши услуги" +#~ msgid "Worldwide" +#~ msgstr "По всей России" + +#~ msgid "Contact us:" +#~ msgstr "Пишите" + +#~ msgid "Groholskiy pereulok" +#~ msgstr "Грохольский переулок" + +#~ msgid "dom 28" +#~ msgstr "дом 28" + +#~ msgid "Moscow, Russia, 129090" +#~ msgstr "Москва, Россия, 129090" + #~ msgid "Moscow" #~ msgstr "Москва" @@ -628,9 +643,6 @@ msgstr "Наши услуги" #~ msgid "Free Consultation" #~ msgstr "Бесплатная консультация" -#~ msgid "Callback" -#~ msgstr "Обратный звонок" - #~ msgid "Mobile:" #~ msgstr "Мобильный телефон6" diff --git a/zsite/static/less/consultation.less b/zsite/static/less/consultation.less index f7eb6cd..620982d 100644 --- a/zsite/static/less/consultation.less +++ b/zsite/static/less/consultation.less @@ -1,7 +1,9 @@ -.modal-consultation, .modal-form { +.modal-consultation, .consultation-form { img { float: left; - width: 30%; } + width: 30%; + margin-top: 60px; + } .forms { padding-left: 35%; @@ -27,6 +29,31 @@ } } +.modal-consultation { + .tabs-list { + margin-left: -5px; + margin-bottom: 5px; + + .active { + font-weight: 600; + } + } + + input { + font-size: 20px; + width: 100%; + } + + textarea { + width: 100%; + height: 60px; + } + + #phone { + width: 175px; + } +} + .consultation { .btn-consultation:extend(.btn-default, .btn-xs) {} } diff --git a/zsite/static/less/footer.less b/zsite/static/less/footer.less index 042ec4e..c29d1bf 100644 --- a/zsite/static/less/footer.less +++ b/zsite/static/less/footer.less @@ -90,5 +90,9 @@ footer { li { margin-bottom: 10px; } + + .btn { + margin-left: -5px; + } } } diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 819b786..39f9edc 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -72,14 +72,7 @@ {% show_menu 0 1 100 100 "menu_footer.html" %}
- + {% static_placeholder 'footer-contacts' %}
diff --git a/zsite/templates/form_template/consultation.html b/zsite/templates/form_template/consultation.html index d454609..779aabc 100644 --- a/zsite/templates/form_template/consultation.html +++ b/zsite/templates/form_template/consultation.html @@ -5,34 +5,71 @@
- {% if instance.title %} -

{{ instance.title }}

+ {% if instance.title != instance.name %} +

{{ instance.title }}

+

{% trans 'Service' %} «{{ instance.name }}»

+ {% else %} +

{{ instance.name }}

{% endif %} + {% if instance.description %}
{{ instance.description|safe }}
{% endif %}
-
+ - {% for field in form.visible_fields %} -
- {% if field.help_text %} -
{{ field.help_text|safe }}
- {% endif %} - - {% if field|is_checkbox %} - {{ field }} - {% endif %} - - {% if not field|is_checkbox %} -

{{ field }}

- {% endif %} + +
+ + +

+ {{ form.name }} +

+ {% if form.email %} +

{% trans 'We can call you or anwser by email' %}

+
+ + +
+ {{ form.phone }} +
+ +
+

{{ form.email }}

+ +

{{ form.comment }}

+
- {% endfor %} + {% else %} + +

+ {{ form.phone }} +

+ + +

+ {{ form.subject }} +

+ + {% endif %} + +
+ + {% csrf_token %} {% for hidden in form.hidden_fields %} {{ hidden }} diff --git a/zsite/templates/form_template/order_modal.html b/zsite/templates/form_template/order_modal.html index 7d5b217..06c6532 100644 --- a/zsite/templates/form_template/order_modal.html +++ b/zsite/templates/form_template/order_modal.html @@ -1,13 +1,17 @@ {% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %} -
+