From db23ee786fe76e1c72999ec83b3588a5abde76c3 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Mon, 4 May 2015 14:08:44 +0000
Subject: [PATCH 1/2] EXPO-151 11

---
 .../includes/conference/conference_list.html  |  2 +-
 .../includes/exposition/exposition_list.html  |  2 +-
 templates/client/service/participation.html   |  6 +-
 templates/client/service/remotely.html        |  5 ++
 templates/client/service/tickets.html         | 59 +-----------
 templates/client/service/tour.html            | 90 ++-----------------
 templates/client/service/translator.html      |  5 ++
 7 files changed, 26 insertions(+), 143 deletions(-)

diff --git a/templates/client/includes/conference/conference_list.html b/templates/client/includes/conference/conference_list.html
index 42ffccb1..6ecc720f 100644
--- a/templates/client/includes/conference/conference_list.html
+++ b/templates/client/includes/conference/conference_list.html
@@ -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>');
diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html
index 5dabdba6..b0cbcd8f 100644
--- a/templates/client/includes/exposition/exposition_list.html
+++ b/templates/client/includes/exposition/exposition_list.html
@@ -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>');
diff --git a/templates/client/service/participation.html b/templates/client/service/participation.html
index 935accbc..75312caf 100644
--- a/templates/client/service/participation.html
+++ b/templates/client/service/participation.html
@@ -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>
 
 
diff --git a/templates/client/service/remotely.html b/templates/client/service/remotely.html
index 418a7061..8dcc0c48 100644
--- a/templates/client/service/remotely.html
+++ b/templates/client/service/remotely.html
@@ -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>
 
diff --git a/templates/client/service/tickets.html b/templates/client/service/tickets.html
index 24f60052..723b49a3 100644
--- a/templates/client/service/tickets.html
+++ b/templates/client/service/tickets.html
@@ -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>
diff --git a/templates/client/service/tour.html b/templates/client/service/tour.html
index abac0d85..d4df8daf 100644
--- a/templates/client/service/tour.html
+++ b/templates/client/service/tour.html
@@ -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>
 
 
diff --git a/templates/client/service/translator.html b/templates/client/service/translator.html
index 68988d7f..5d9025bc 100644
--- a/templates/client/service/translator.html
+++ b/templates/client/service/translator.html
@@ -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>
 

From 211373d195ade4009350a45ab4426d607e484145 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Mon, 4 May 2015 14:56:59 +0000
Subject: [PATCH 2/2] steps bugs

---
 templates/client/includes/event_steps.html  | 10 +++++-----
 templates/client/static_client/css/main.css |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html
index a6e9c869..4b432828 100644
--- a/templates/client/includes/event_steps.html
+++ b/templates/client/includes/event_steps.html
@@ -1,24 +1,24 @@
 {% 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>
             <li class="s1">
-				<div class="label">1. {% trans 'Зарегистрируйтесь на событие' %}</div>
+				<div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
 			    <a class="step"
                    href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}service/tickets/{% endif %}"
                    target="_blank">
-                    {% if event.catalog == '/expo/' %}{% trans 'Билеты на выставку' %}{% else %}{% trans 'Регистрация' %}{% endif %}
+                    {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}
                 </a>
 			</li>
 
 			<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>
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index 0d034d29..b5dcd8a1 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -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 {