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

Merged

Browse Source
remotes/origin/1203
Назар Котюк 11 years ago
parent 73779a7320 211373d195
commit 86feee5387
9 changed files with 30 additions and 146 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
      templates/client/includes/conference/conference_list.html
  2. 6
      templates/client/includes/event_steps.html
  3. 2
      templates/client/includes/exposition/exposition_list.html
  4. 6
      templates/client/service/participation.html
  5. 5
      templates/client/service/remotely.html
  6. 59
      templates/client/service/tickets.html
  7. 90
      templates/client/service/tour.html
  8. 5
      templates/client/service/translator.html
  9. 1
      templates/client/static_client/css/main.css

2
templates/client/includes/conference/conference_list.html
Unescape View File

@ -110,7 +110,7 @@
yandex_direct_url_color = '000000';
yandex_direct_text_color = '000000';
yandex_direct_hover_color = 'FF3333';
yandex_direct_sitelinks_color = '0000CC';
yandex_direct_sitelinks_color = '666666';
yandex_direct_favicon = false;
yandex_no_sitelinks = false;
document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>');

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

@ -1,7 +1,7 @@
{% load i18n %}
<div class="i-steps">
<div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Посетить выставку' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div>
<div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div>
<ul>
{% if event.country_id in sng_countries %}
<li class="s1">
@ -25,12 +25,12 @@
<li class="s2">
<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
<div class="label">{% trans 'Забронируйте отель по лучшей цене' %}</div>
<a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
</li>
<li class="s3">
<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
<div class="label">{% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
<a class="step" href="http://www.aviasales.ru/?marker=29868" target="_blank"><b>aviasales</b>.ru</a>
</li>
</ul>

2
templates/client/includes/exposition/exposition_list.html
Unescape View File

@ -112,7 +112,7 @@
yandex_direct_url_color = '000000';
yandex_direct_text_color = '000000';
yandex_direct_hover_color = 'FF3333';
yandex_direct_sitelinks_color = '0000CC';
yandex_direct_sitelinks_color = '666666';
yandex_direct_favicon = false;
yandex_no_sitelinks = false;
document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>');

6
templates/client/service/participation.html
Unescape View File

@ -270,7 +270,11 @@
{% endif %}
</ul>
</div>
{% if object %}
<div class="m-article">
{% include 'client/includes/booking_block.html' with city=object.city place=object.place %}
</div>
{% endif %}
</div>

5
templates/client/service/remotely.html
Unescape View File

@ -260,6 +260,11 @@
{% endif %}
</ul>
</div>
{% if object %}
<div class="m-article">
{% include 'client/includes/booking_block.html' with city=object.city place=object.place %}
</div>
{% endif %}
</div>

59
templates/client/service/tickets.html
Unescape View File

@ -274,64 +274,11 @@
{% endif %}
</ul>
</div>
{% comment %}
{% if object %}
<div class="m-article">
<div class="h-booking">
<header class="clearfix">
<div class="sect-title"><a href="#">{% trans 'Отели рядом с выставкой от' %} <b>Booking</b>.com</a></div>
<a class="more blue2" href="#">{% trans 'Все отели поблизости' %}</a>
</header>
<ul>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg ' %}" alt="" /></span>
Галерея Гранд Отель
</a>
<div class="hb-price">{% trans '6 500 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg ' %}" alt="" /></span>
Radisson Hotel
</a>
<div class="hb-price">{% trans '17 800 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Савой
</a>
<div class="hb-price">{% trans '8 000 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Novotel Moscow City
</a>
<div class="hb-price">{% trans '13 500 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
</ul>
</div>
{% include 'client/includes/booking_block.html' with city=object.city place=object.place %}
</div>
{% endcomment %}
{% endif %}
</div>
</div>

90
templates/client/service/tour.html
Unescape View File

@ -151,7 +151,7 @@
<div class="rq-s-line">
<div class="mf-field full-width">
<input type="text" name="languages" id="id_languages" placeholder="{% trans 'Знание языков' %}"/>
<div class="error-blob"></div>
</div>
@ -286,33 +286,8 @@
<div class="rq-to-hide">
{% comment %}
{% include 'includes/event_steps.html' with event=exposition filter=filter %}
{% comment %}
<div class="s-tour">
<div class="sect-title">{% trans 'Или организуйте поездку самостоятельно' %}:</div>
<div class="m-article">
<div class="i-steps">
<ul>
<li class="s1">
<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
<a class="step" href="#">{% trans 'Билеты на выставку' %}</a>
</li>
<li class="s2">
<div class="label">2. {% trans 'Забронируйте отель по лучшей цене' %}</div>
<a class="step" href="#"><b>booking</b>.com</a>
</li>
<li class="s3">
<div class="label">3. {% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
<a class="step" href="#">Any<b>way</b>Any<b>day</b></a>
</li>
</ul>
</div>
</div>
</div>
{% endcomment %}
<div class="s-comments">
@ -394,64 +369,11 @@
{% endif %}
</ul>
</div>
{% if object %}
<div class="m-article">
<div class="h-booking">
<header class="clearfix">
<div class="sect-title"><a href="#">{% trans 'Отели рядом с выставкой от' %} <b>Booking</b>.com</a></div>
<a class="more blue2" href="#">{% trans 'Все отели поблизости' %}</a>
</header>
<ul>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Галерея Гранд Отель
</a>
<div class="hb-price">{% trans '6 500 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Radisson Hotel
</a>
<div class="hb-price">{% trans '17 800 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Савой
</a>
<div class="hb-price">{% trans '8 000 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
<li>
<div class="hb-item">
<a href="#">
<span class="hb-pict"><img src="{% static 'client/img/_del-temp/hotel-1.jpg' %}" alt="" /></span>
Novotel Moscow City
</a>
<div class="hb-price">{% trans '13 500 руб./ночь' %}</div>
<a class="button blue2 lc icon-bell" href="#">{% trans 'Забронировать' %}</a>
</div>
</li>
</ul>
</div>
</div>
{% include 'client/includes/booking_block.html' with city=object.city place=object.place %}
</div>
{% endif %}
</div>

5
templates/client/service/translator.html
Unescape View File

@ -349,6 +349,11 @@
{% endif %}
</ul>
</div>
{% if object %}
<div class="m-article">
{% include 'client/includes/booking_block.html' with city=object.city place=object.place %}
</div>
{% endif %}
</div>

1
templates/client/static_client/css/main.css
Unescape View File

@ -6539,6 +6539,7 @@ dl.add-info dd ul li {
font-style: italic;
margin-bottom: 5px;
white-space: nowrap;
text-align: center;
}
.i-steps a.step {

Write Preview
Loading…
Cancel
Save