conference fixes

static/client/css/main.css

@@ -4924,11 +4924,13 @@ dl.add-info dd a:hover {
     -o-transition: color .3s;
     transition: color .3s
 }
-.i-address header,
-.i-info .i-address,
 .i-info .i-area {
     margin-bottom: 15px
 }
+.i-address header,
+.i-info .i-address{
+    margin-bottom: 10px;
+}
 .i-info .i-position {
     font-size: 20px
 }
@@ -14276,6 +14278,23 @@ h1 .preview_toggle:hover{
 }
 
 .event_org{
-    font: 18px dindisplay_pro, sans-serif;
+    font: 16px dindisplay_pro, sans-serif;
-    color: #9100ba;
+    color: #6d6d6d;
+}
+
+.event_org:after{
+    content: '';
+    display: block;
+    clear: both;
+}
+
+.new_subribe_btn {
+    float: right;
+    border-color: #ef3976;
+    color: #ef3976;
+}
+
+.new_subribe_btn:hover{
+    background-color: #ef3976;
+    color: #fff;
 }

templates/client/includes/conference/conference_partner.html

@@ -63,8 +63,10 @@
                             </div>
                             <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
                         </header>
+
                         <div class="i-map">
-                            <div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
+                            <div class="close-map">
+                                <a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
                             </div>
                             <div class="map-canvas" id="map-canvas" data-coords="{{ event.place.address.lat|stringformat:'f' }},{{ event.place.address.lng|stringformat:'f' }}" ></div>
                         </div>
@@ -78,11 +80,12 @@
                         </header>
                     </div>
                 {% endif %}
-                {% if event.org %}
                 <div class="event_org">
+                    {% if event.org %}
                         {% trans 'Организатор' %}: {{ event.org }}
-                    </div>
                     {% endif %}
+                    <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
+                </div>
             </div>
         </div>
 
@@ -164,7 +167,7 @@
             {% endif %}
         {% endwith %}
 
-        <p><a href="#pw-event-news-subscribe" class="button pw-open"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>&nbsp;&nbsp;&nbsp;<i>{% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}</i></p>
+{#        <p><a href="#pw-event-news-subscribe" class="button pw-open"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>&nbsp;&nbsp;&nbsp;<i>{% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}</i></p>#}
 
         <hr>
 
@@ -356,18 +359,23 @@
                 {% with visitors=event.users.all|slice:":17" %}
                     <h3>{% trans 'Планируют быть на' %} {{ event.name }}</h3>
 
+
+                    <ul class="visitors-list" id="visitors-list">
                         {% if visitors %}
                         {# есть посетители #}
-                        <ul class="visitors-list">
                             {% for user in visitors %}
+                                {% if user == request.user %}
+                                    <li class="current"><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
+                                {% else %}
                                     <li><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
+                                {% endif %}
                             {% endfor %}
+                        {% endif %}
                     </ul>
-                    {% else %}
+
                     <p id="nobody" class=" mb-1em {% if event.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
-                    {% endif %}
 
-{#                    <a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ event.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>#}
+                    <p><a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ event.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a></p>
                 {% endwith %}
 
                 {% with event=event user=user %}
@@ -559,6 +567,7 @@
     {% else %}
         <script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
     {% endif %}
+
     <script>
         EXPO.exposition.object.init({
             visit:{

templates/client/includes/exposition/expo_paid.html

@@ -38,6 +38,7 @@
                 </div>
                 {% endif %}
 			</aside>
+
             <div class="i-info">
 				<header>
 					<h1 class="i-title">
@@ -48,6 +49,7 @@
 					{% endif %}
 					</h1>
 				</header>
+
 				<div class="i-date">
 					{% with obj=exposition  %}
 						{% include 'client/includes/show_date_block.html' %}
@@ -55,6 +57,7 @@
 
                     {% include "client/includes/sharing_block.html" %}
 				</div>
+
 				{% if exposition.place %}
                     <div class="i-address">
                         <header>
@@ -71,6 +74,9 @@
                         </div>
                     </div>
 				{% endif %}
+                <div class="event_org">
+                    <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
+                </div>
 				<hr />
 				<div class="i-buttons clearfix">
 					<div class="ib-main">

templates/client/includes/exposition/exposition_object.html

@@ -19,14 +19,17 @@
                         {% include 'client/includes/show_logo.html' %}
                     {% endwith %}
 				</div>
+
 				<div class="i-stats">
 					{% if exposition.visitors %}
 					    <span class="visitors" title="{% trans 'Посетители' %}">{{ exposition.visitors }}</span>
 					{% endif %}
+
 					{% if exposition.members %}
 					    <span class="participants" title="{% trans 'Участники' %}">{{ exposition.members }}</span>
 					{% endif %}
 				</div>
+
 				<div class="i-discount">
                     {% if exposition.discount %}
                         <a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a>
@@ -34,8 +37,8 @@
 					{% endif %}
 				 </div>
 			</aside>
-			<div class="i-info">
 
+			<div class="i-info">
 				<header>
 					<h1 class="i-title">
 					{% if exposition.main_title %}
@@ -45,6 +48,7 @@
 					{% endif %}
 					</h1>
 				</header>
+
 				<div class="i-date">
 					{% with obj=exposition  %}
 						{% include 'client/includes/show_date_block.html' %}
@@ -52,6 +56,7 @@
 
 					{% include "client/includes/sharing_block.html" %}
 				</div>
+
 				{% if exposition.place %}
                     <div class="i-address">
                         <header>
@@ -62,8 +67,10 @@
                         </header>
 
                         <div class="i-map">
-						<div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
+                            <div class="close-map">
+                                <a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
                             </div>
+
                             <div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|coord_format }},{{ exposition.place.address.lng|coord_format }}" ></div>
                         </div>
                     </div>
@@ -76,13 +83,21 @@
                         </header>
                     </div>
 				{% endif %}
+
+                <div class="event_org">
+                    <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
+                </div>
+
 				<hr />
+
 				<div class="i-buttons clearfix">
 					<div class="ib-main">
 						{% with event=exposition user=user %}
 							{% include 'client/includes/visit_button.html' %}
 						{% endwith %}
+
                         {% include 'client/includes/calendar_button.html'  with obj=object %}
+
                         <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
 							{% with note=object|note_by_user:request.user %}
 							<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
@@ -96,14 +111,16 @@
 						{% if request.user.is_admin %}
 						    <a target="_blank" class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
 						{% endif %}
+
                         {% if exposition.photogallery_id %}
                             <a class="button blue icon-photo" href="{{ exposition.get_permanent_url }}photo/">{% trans 'фото' %}</a>
                         {% endif %}
-
 					</div>
 					<div class="ib-add"><a target="_blank" class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ object.city.id }}">{% trans 'Найти отель' %}</a></div>
 				</div>
+
 				<hr />
+
 				<div class="i-divs clearfix">
 					<div class="i-subj">
 						<ul>
@@ -125,8 +142,6 @@
 			</div>
 		</div>
 
-        <p><a href="#pw-event-news-subscribe" class="button pw-open"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>&nbsp;&nbsp;&nbsp;<i>{% blocktrans with name=exposition.name|safe %}Получайте актуальную информацию о выставке {{ name }} на свой email{% endblocktrans %}</i></p>
-
         {% include 'client/includes/exposition/exposition_services.html' with object=exposition %}
 
         {% include 'client/includes/event_steps.html' with event=exposition %}
@@ -164,12 +179,15 @@
             {% else %}
                {% include "client/includes/exposition/default_description.html" with expo=exposition %}
             {% endif %}
-
         </div>
+
 	    <hr />
+
         {% include 'client/includes/banners/expo_detail.html' %}
+
         <div id="additional" class="i-event-additional clearfix">
             <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
+
             <ul class="e-docs">
                 {% if exposition.business_program.exists %}
                     <li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
@@ -180,6 +198,7 @@
                     <li><a href="{{ exposition.get_permanent_url }}statistic/">{% trans 'Статистика' %}</a></li>
                 {% endif %}
             </ul>
+
             <dl class="add-info">
                 {% if exposition.organiser.all.exists %}
                     <dt>{% trans 'Организатор' %}:</dt>
@@ -273,11 +292,13 @@
                 {% endif %}
             {% endwith %}
             </div>
+
             <div class="im-visitors">
                 {% with visitors=exposition.users.all|slice:":17" %}
                     <header>
                         <div class="im-title">{% trans 'Посетители' %}</div>
                     </header>
+
                     <ul id="visitors-list">
                         {% if visitors %}
                         {# есть посетители #}
@@ -290,14 +311,18 @@
                             {% endfor %}
                         {% endif %}
                     </ul>
+
                     <a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ exposition.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>
                 {% endwith %}
+
                 <p id="nobody" class=" mb-1em {% if exposition.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
+
                 {% with event=exposition user=user %}
                     {% include 'client/includes/visit_button.html' %}
                 {% endwith %}
             </div>
         </div>
+
 	    <hr/>
         {% if exposition.area %}
         {% else %}
@@ -305,6 +330,7 @@
                 <p class="title"> <i class="fa fa-bar-chart">&nbsp;</i>{% trans "Статистика" %}</p>
             {% endif %}
         {% endif %}
+
         {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
             <div class="e-num-info">
                 {% if exposition.area %}
@@ -319,9 +345,11 @@
                     {% if exposition.members %}
                         <div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
                     {% endif %}
+
                     {% if exposition.visitors %}
                         <div class="enis-item"><b>{{ exposition.visitors }}</b> {% trans 'посетителей' %}</div>
                     {% endif %}
+
                     {% if exposition.foundation_year %}
                         <div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
                     {% endif %}
@@ -329,8 +357,11 @@
             </div>
         {% endif %}
 	</div>
+
 	{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
+
     <hr />
+
 	{% if exposition.get_nearest_events %}
         <div class="e-cat">
             <div class="sect-title">{% trans 'Другие выставки, которые могут быть вам интересны' %}</div>
@@ -352,11 +383,13 @@
                                             <img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
                                         </div>
                                     {% endif %}
+
                                     {% if exp.quality_label.exporating.is_set %}
                                         <div class="cli-approved">
                                             <img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" />
                                         </div>
                                     {% endif %}
+
                                     {% if exp.quality_label.ufi.is_set %}
                                         <div class="cli-approved">
                                             <img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
@@ -376,6 +409,7 @@
                                                 {% include 'client/includes/show_date_block.html' %}
                                             {% endwith %}
                                         </div>
+
                                         <div class="cli-place">
                                             <a href="{{ exposition.catalog }}country/{{ exp.country.url }}/">{{ exp.country }}</a>, <a href="{{ exposition.catalog }}city/{{ exp.city.url }}/">{{ exp.city }}</a>
                                             {% if exp.place %}
@@ -393,6 +427,7 @@
         </div>
         {% include 'client/includes/banners/detail_inner_3.html' %}
 	{% endif %}
+
 	<div class="e-cat look-also">
 		<div class="sect-title">{% trans 'Смотрите также:' %}</div>
 		<a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>