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

t92: intagration interpreters.travel

Browse Source
remotes/origin/t79_search_places_modal
Slava Kyrachevsky 9 years ago
parent e39fd5808b
commit 886233168f
5 changed files with 20 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      static/client/js/main.js
  2. 2
      static/client/js/vendor.js
  3. 4
      static/client/js_min/vendor.min.js
  4. 3
      templates/client/includes/event_steps.html
  5. 24
      templates/client/specialist_catalog/catalog_detailed.html

2
static/client/js/main.js
Unescape View File

@ -1115,7 +1115,7 @@ function placeInput(width){
$('div.request-form').each(function () { $('div.request-form').each(function () {
var $mContainer = $(this); var $mContainer = $(this);
var $switchContainer = $mContainer.find('div.rq-btn-to-hide'); var $switchContainer = $mContainer.find('div.rq-btn-to-hide');
var $switchBtn = $switchContainer.find('a'); var $switchBtn = $switchContainer.find('a:not(.link)');
var $formContainer = $mContainer.find('div.rq-form'); var $formContainer = $mContainer.find('div.rq-form');
var $hideData = $mContainer.find('div.rq-to-hide'); var $hideData = $mContainer.find('div.rq-to-hide');
var $formBtnContainer = $formContainer.find('div.rq-btn-wrap'); var $formBtnContainer = $formContainer.find('div.rq-btn-wrap');

2
static/client/js/vendor.js
Unescape View File

@ -4794,7 +4794,7 @@ function placeInput(width){
$('div.request-form').each(function () { $('div.request-form').each(function () {
var $mContainer = $(this); var $mContainer = $(this);
var $switchContainer = $mContainer.find('div.rq-btn-to-hide'); var $switchContainer = $mContainer.find('div.rq-btn-to-hide');
var $switchBtn = $switchContainer.find('a'); var $switchBtn = $switchContainer.find('a:not(.link)');
var $formContainer = $mContainer.find('div.rq-form'); var $formContainer = $mContainer.find('div.rq-form');
var $hideData = $mContainer.find('div.rq-to-hide'); var $hideData = $mContainer.find('div.rq-to-hide');
var $formBtnContainer = $formContainer.find('div.rq-btn-wrap'); var $formBtnContainer = $formContainer.find('div.rq-btn-wrap');

4
static/client/js_min/vendor.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
templates/client/includes/event_steps.html
Unescape View File

@ -58,7 +58,8 @@
<li class="s3"> <li class="s3">
<div class="label">{% trans 'Устраните языковые барьеры' %}</div> <div class="label">{% trans 'Устраните языковые барьеры' %}</div>
<a class="step" href="{{ event.get_permanent_url }}service/translator/" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a> {# <a class="step" href="{{ event.get_permanent_url }}service/translator/" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>#}
<a class="step" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ event.city.name }}" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>
</li> </li>
</ul> </ul>
</div> </div>

24
templates/client/specialist_catalog/catalog_detailed.html
Unescape View File

@ -42,7 +42,6 @@
<div class="i-address map-opened country_map"> <div class="i-address map-opened country_map">
{# #}
<div class="i-map"> <div class="i-map">
{% thumbnail object.place_photo "957x400" crop="center" as im %} {% thumbnail object.place_photo "957x400" crop="center" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"> <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
@ -120,18 +119,18 @@
<div class="pwf-field validate-field{% if form.fr.errors %} error-field{% endif %}"> <div class="pwf-field validate-field{% if form.fr.errors %} error-field{% endif %}">
<label>{% trans 'с' %}</label> <label>{% trans 'с' %}</label>
{{ form.fr }} {{ form.fr }}
<div class="error-blob"> <div class="error-blob">
{{ form.fr.errors }} {{ form.fr.errors }}
</div> </div>
</div> </div>
<div class="pwf-field validate-field{% if form.to.errors %} error-field{% endif %}"> <div class="pwf-field validate-field{% if form.to.errors %} error-field{% endif %}">
<label>{% trans 'по' %}</label> <label>{% trans 'по' %}</label>
{{ form.to }} {{ form.to }}
<div class="error-blob"> <div class="error-blob">
{{ form.to.errors }} {{ form.to.errors }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -210,7 +209,7 @@
<div class="rq-order-button"> <div class="rq-order-button">
<div class="rqob-wrap"> <div class="rqob-wrap">
<div class="rqob-button"> <div class="rqob-button">
<button type="submit">{% trans 'отправить запрос' %}</button> <button type="submit">{% trans 'отправить запрос' %}</button>
</div> </div>
</div> </div>
@ -229,7 +228,12 @@
<div class="rqob-wrap"> <div class="rqob-wrap">
<div class="rqob-price">от {{ object.price }} {{ object.currency }} / {% trans 'день' %}</div> <div class="rqob-price">от {{ object.price }} {{ object.currency }} / {% trans 'день' %}</div>
<div class="rqob-button"> <div class="rqob-button">
<a class="ob-text" href="#">{% trans 'заказать услугу' %}</a> {# вместо формы выше временно ставим ссылку на партнёров #}
{% if object.type == 1 %}
<a class="ob-text" href="#">{% trans 'заказать услугу' %}</a>
{% else %}
<a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place }}" target="_blank">{% trans 'заказать услугу' %}</a>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@ -323,4 +327,4 @@
</div> </div>
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save