mitri4
/
zuykov
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

contacts fix

Browse Source
master
fefa4ka 10 years ago
parent e699fae593
commit 59d35763aa
8 changed files with 185 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blog/locale/ru/LC_MESSAGES/django.po
  2. BIN
      zsite/locale/ru/LC_MESSAGES/django.mo
  3. 84
      zsite/locale/ru/LC_MESSAGES/django.po
  4. 31
      zsite/static/less/consultation.less
  5. 4
      zsite/static/less/footer.less
  6. 9
      zsite/templates/base.html
  7. 75
      zsite/templates/form_template/consultation.html
  8. 66
      zsite/templates/form_template/order_modal.html

2
blog/locale/ru/LC_MESSAGES/django.po
Unescape View File

@ -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 <i.spalletti@nephila.it>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/djangocms-blog/"

BIN
zsite/locale/ru/LC_MESSAGES/django.mo
View File

Binary file not shown.

84
zsite/locale/ru/LC_MESSAGES/django.po
Unescape View File

@ -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 <alex@nder.so>\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"
" <h3>Submission successful</h3>\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"

31
zsite/static/less/consultation.less
Unescape View File

@ -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) {}
}

4
zsite/static/less/footer.less
Unescape View File

@ -90,5 +90,9 @@ footer {
li {
margin-bottom: 10px;
}
.btn {
margin-left: -5px;
}
}
}

9
zsite/templates/base.html
Unescape View File

@ -72,14 +72,7 @@
{% show_menu 0 1 100 100 "menu_footer.html" %}
</div>
<div class="contacts pull-right">
<ul class="list-unstyled">
<li>{% trans "Contact us:" %} <a href="mailto:info@zuykov.com">info@zuykov.com</a></li>
<li><a href="{% page_url "contacts" %}">{% trans "Groholskiy pereulok" %},<br/>
{% trans "dom 28" %}<br/>
{% trans "Moscow, Russia, 129090" %}</a>
</li>
<li>+7 800 700-16-37</li>
</ul>
{% static_placeholder 'footer-contacts' %}
</div>
</footer>
</div>

75
zsite/templates/form_template/consultation.html
Unescape View File

@ -5,34 +5,71 @@
<div class="modal-body modal-consultation">
<img src="{% with 'imgs/phone.png' as image_static %}{% static image_static %}{% endwith %}">
<div class="forms" id="{{ instance.form_id }}">
{% if instance.title %}
<h3 class="title">{{ instance.title }}</h3>
{% if instance.title != instance.name %}
<h1 class="title">{{ instance.title }}</h1>
<h2 class="title">{% trans 'Service' %} «{{ instance.name }}»</h2>
{% else %}
<h1 class="title">{{ instance.name }}</h1>
{% endif %}
{% if instance.description %}
<div class="description">
{{ instance.description|safe }}
</div>
{% endif %}
<div class="form-wrapper">
<form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data" onsubmit="yaCounter950321.reachGoal('Callback'); return true;">
<form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data" onsubmit="yaCounter950321.reachGoal('Order'); return true;">
<div class="form-errors" style="display:none;"></div>
{% for field in form.visible_fields %}
<div class="field-wrapper {{ field|input_class }} {{ field.css_classes }}">
{% if field.help_text %}
<div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
{% endif %}
<div class="field-errors" style="display:none;"></div>
{% if field|is_checkbox %}
{{ field }}
{% endif %}
<label for="{{ field.id_for_label }}">
{{ field.label }}
</label>
{% if not field|is_checkbox %}
<p>{{ field }}</p>
{% endif %}
<div class="field-wrapper">
<label for="name">
{% trans 'Name' %}
</label>
<p>
{{ form.name }}
</p>
{% if form.email %}
<p>{% trans 'We can call you or anwser by email' %}</p>
<div id="contact-type" ng-tabs class="tabs-plugin">
<ul class="tabs-list list-unstyled list-inline">
<li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#contact-phone">{% trans 'Call' %}</a></li>
<li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#contact-email">{% trans 'Email' %}</a>
</ul>
<div id="contact-phone" ng-tab-body class="tab-body">
{{ form.phone }}
</div>
<div id="contact-email" ng-tab-body class="tab-body">
<p>{{ form.email }}</p>
<label for="comment">
{% trans 'Question' %}
</label>
<p>{{ form.comment }}</p>
</div>
</div>
{% endfor %}
{% else %}
<label for="phone">
{% trans 'Phone' %}
</label>
<p>
{{ form.phone }}
</p>
<label for="subject">
{% trans 'Subject' %}
</label>
<p>
{{ form.subject }}
</p>
{% endif %}
</div>
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{ hidden }}

66
zsite/templates/form_template/order_modal.html
Unescape View File

@ -1,13 +1,17 @@
{% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %}
<div class="order order-form" ng-controller="ModalFormCtrl" class="modal-form">
<div class="order order-form" ng-controller="ModalFormCtrl">
<script type="text/ng-template" id="modalFormTemplate-{{ instance.id }}.html">
<div class="modal-body modal-form">
<div class="modal-body modal-form modal-consultation">
<img src="{% with 'imgs/phone.png' as image_static %}{% static image_static %}{% endwith %}">
<div class="forms" id="{{ instance.form_id }}">
{% if instance.title %}
<h3 class="title">{{ instance.title }}</h3>
{% if instance.title != instance.name %}
<h1 class="title">{{ instance.title }}</h1>
<h2 class="title">Услуга «{{ instance.name }}»</h2>
{% else %}
<h1 class="title">{{ instance.name }}</h1>
{% endif %}
{% if instance.description %}
<div class="description">
{{ instance.description|safe }}
@ -16,23 +20,45 @@
<div class="form-wrapper">
<form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data" onsubmit="yaCounter950321.reachGoal('Order'); return true;">
<div class="form-errors" style="display:none;"></div>
{% for field in form.visible_fields %}
<div class="field-wrapper {{ field|input_class }} {{ field.css_classes }}">
{% if field.help_text %}
<div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
{% endif %}
<div class="field-errors" style="display:none;"></div>
{% if field|is_checkbox %}
{{ field }}
{% endif %}
<label for="{{ field.id_for_label }}">
{{ field.label }}
</label>
{% if not field|is_checkbox %}
<p>{{ field }}</p>
{% endif %}
<div class="field-wrapper">
<label for="name">
Имя
</label>
<p>
{{ form.name }}
</p>
{% if form.email %}
<p>Мы можем вам позвонить или ответить письмом</p>
<div id="contact-type" ng-tabs class="tabs-plugin">
<ul class="tabs-list list-unstyled list-inline">
<li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#contact-phone">Связаться по телефону</a></li>
<li ng-tab-head="active"><a ng-click="$event.preventDefault()" href="#contact-email">По почте</a>
</ul>
<div id="contact-phone" ng-tab-body class="tab-body">
{{ form.phone }}
</div>
<div id="contact-email" ng-tab-body class="tab-body">
<p>{{ form.email }}</p>
<label for="comment">
Ваш вопрос
</label>
<p>{{ form.comment }}</p>
</div>
</div>
{% endfor %}
{% else %}
<label for="phone">
Телефон
</label>
<p>
{{ form.phone }}
</p>
{% endif %}
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{ hidden }}

Write Preview
Loading…
Cancel
Save