Merge branch 'develop' of http://git.general-servers.com/expomap/expomap into develop

templates/client/includes/conference/conference_list.html

@@ -1,13 +1,11 @@
 {% load static %}
 {% load i18n %}
 {% load template_filters %}
-
 <ul class="cat-list cl-exhibitions">
 	{% with objects=object_list %}
 	{% for obj in objects %}
 	<li class="cl-item {% if obj.canceled %}canceled{% endif %}">
 		<div class="cl-item-wrap clearfix">
-
 			<a href="{{ obj.get_permanent_url }}">
 				{% if obj.canceled %}
 					<div class="cancel"></div>
@@ -22,19 +20,13 @@
 				{% endwith %}
 				</div>
 			</a>
-
-
 			<div class="cli-info">
 				<div class="cli-top clearfix">
-
-
 					{% if obj.quality_label.ufi.is_set %}
 					<div class="cli-approved">
 						<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
 					</div>
 					{% endif %}
-
-
 					<header>
 						<div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
 					</header>
@@ -42,19 +34,15 @@
 						{{ obj.main_title|safe }}
 					</div>
 				</div>
-
 				<div class="cli-bot clearfix">
-
 					<div class="cli-date">
 					{% with obj=obj  %}
 						{% include 'client/includes/show_date_block.html' %}
 					{% endwith %}
 					</div>
-
 					{% if obj.country %}
 					<div class="cli-place">
 						<a href="{{ obj.catalog }}country/{{ obj.country.url }}/">{{ obj.country }}</a>, <a href="{{ obj.catalog }}city/{{ obj.city.url }}/">{{ obj.city }}</a>
-
 						{% if obj.place %}
 							, <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
 						{% endif %}
@@ -62,12 +50,9 @@
 					{% endif %}
 				</div>
 			</div>
-
-
 			<div class="cli-buttons clearfix">
 				<div class="cli-m-buttons">
 					{% include 'client/includes/exposition/services.html' with obj=obj %}
-
 					{% include 'client/includes/calendar_button.html'  with obj=obj%}
 					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
 						{% with note=obj|note_by_user:request.user %}
@@ -85,15 +70,12 @@
 						</div>
 					{% endif %}
 					<div></div>
-
 				</div>
-
 				<div class="cli-s-buttons">
 					{% include 'client/buttons/booking_button.html' with object=obj %}
 				</div>
 			</div>
 		</div>
-
 		<footer class="clearfix">
 			<div class="cli-stats">
 				{% if obj.visitors %}
@@ -108,12 +90,15 @@
 			</div>
 		</footer>
 	</li>
-
 	{% endfor %}
 	{% endwith %}
 </ul>
 {% block scripts %}
-<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.exposition.list{% if debug %}{% else %}.min{% endif %}.js"></script>
+{% if request.GET.debug == '1' %}
+<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
+{% else %}
+<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
+{% endif %}
 <script>
 	EXPO.exposition.list.init({
 		note:{

templates/client/includes/conference/conference_object.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load thumbnail %}
 {% load template_filters %}
-
 {% block page_body %}
 	<div class="m-article event-page">
 		<div class="item-wrap event clearfix">
@@ -15,9 +14,6 @@
 					{% include 'client/includes/show_logo.html' %}
 				{% endwith %}
 				</div>
-                <!--
-                <div class="i-rating" title="Рейтинг: 551">551</div>
-                -->
 				<div class="i-stats">
 					{% if event.visitors %}
 					<span class="visitors" title="Посетители">{{ event.visitors }}</span>
@@ -26,7 +22,6 @@
 					<span class="participants" title="Участники">{{ event.members }}</span>
 					{% endif %}
 				</div>
-
 				<div class="i-discount">
 				{% if event.discount %}
 					<a class="discount-button" href="#">{% trans 'Скидка' %} -{{ event.discount }}%</a>
@@ -34,7 +29,6 @@
 					{% endif %}
 				 </div>
 			</aside>
-
 			<div class="i-info">
 				<header>
 					<div class="i-title">
@@ -45,7 +39,6 @@
 					{% endif %}
 					</div>
 				</header>
-
 				<div class="i-date">
 					{% with obj=event  %}
 						{% include 'client/includes/show_date_block.html' %}
@@ -59,7 +52,6 @@
 						</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>
@@ -84,15 +76,11 @@
 							</div>
 							{% endwith %}
 						</div>
-
 						{% if request.user.is_admin %}
 						<a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
 						{% endif %}
-
 					</div>
-
 					<div class="ib-add"><a 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">
@@ -106,26 +94,21 @@
 
 						</ul>
 					</div>
-
 					<div class="i-tags">
 						{% with tags=event.tag.all %}
 							{% for tag in tags %}
 								<a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
 							{% endfor %}
 						{% endwith %}
-
 					</div>
 				</div>
 			</div>
 		</div>
 	{% include 'client/includes/conference/conference_services.html' with event=event %}
-
 	{% include 'includes/event_steps.html' with event=event %}
-
 	{% if event.get_photos %}
 		{% with photos=event.get_photos|slice:"5" %}
 	<hr />
-
 	<div class="i-photo-slides">
 		<div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой конференции' %}</a></div>
 		<div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
@@ -146,7 +129,6 @@
 	{% endif %}
 	{% if event.description %}
 	<div class="i-event-description">
-
 		<div class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</div>
 		<div class="ied-text">{{ event.description|safe|linebreaks }}</div>
 	</div>
@@ -155,7 +137,6 @@
 	<div class="i-event-additional clearfix">
 		<div class="sect-title">{% trans 'Дополнительная информация' %}</div>
 		<ul class="e-docs">
-
 			{% if event.business_program.exists %}
 			<li><a href="{{ event.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
 			{% endif %}
@@ -178,27 +159,21 @@
 				<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ event.web_page|base64_encode }}" class="link-encode">{{ event.web_page }}</a>
 			</dd>
 			{% endif %}
-
 			{% if event.get_audience %}
 			<dt>{% trans 'Аудитория' %}:</dt>
 			<dd>
 				{{ event.get_audience }}
 			</dd>
 			{% endif %}
-
 			{% if event.get_periodic %}
 			<dt>{% trans 'Периодичность' %}:</dt>
 			<dd>{{ event.get_periodic }}</dd>
 			{% endif %}
-
-
 			{% if event.time %}
 			<dt>{% trans 'Время работы' %}:</dt>
 			<dd>{{ event.time|safe }}</dd>
 			{% endif %}
-
 		</dl>
-
 	</div>
 	<hr />
 	<div class="i-members clearfix">
@@ -208,12 +183,10 @@
 			{# есть участники #}
 				<header>
 					<div class="im-title">{% trans 'Спикеры' %}</div>
-
 					<a class="more" href="{{ event.get_permanent_url }}members/">{% trans 'Все спикеры' %}</a>
 				</header>
 				<ul>
 					{% for company in companies %}
-
 					<li>
 						<a href="{{ company.get_permanent_url }}">
 							<span class="imp-pict">
@@ -232,7 +205,6 @@
 				<header>
 					<div class="im-title">{% trans 'Спикеры' %}</div>
 					<p>{% trans 'Привлекайте целевых посетителей на стенд' %}</p>
-                    <!--//todo: обработчик-->
 					<p><a href="#pw-advertise" class="button icon-up pw-open" >{% trans 'Рекламировать спикера' %}</a></p>
 				</header>
 			{% endif %}
@@ -255,28 +227,19 @@
 						{% endif %}
 					{% endfor %}
 				{% endif %}
-
 				</ul>
 				<a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ event.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>
 		{% endwith %}
-
 			<p id="nobody" class=" mb-1em {% if event.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
-
-
 			{% with event=event user=user %}
 			{% include 'client/includes/visit_button.html' %}
 			{% endwith %}
 		</div>
 	</div>
-
-
 	<hr/>
-
 	{% if event.members or event.visitors or event.foundation_year %}
 		<div class="e-num-info">
-
 			<div class="eni-stats">
-
 				{% if event.members %}
 				<div class="enis-item"><b>{{ event.members }}</b> {% trans 'участников' %}</div>
 				{% endif %}
@@ -289,13 +252,8 @@
 			</div>
 		</div>
 	{% endif %}
-
-
-
 	</div>
-
 	{% include 'client/includes/booking_block.html' with city=event.city place=event.place %}
-
 	<hr />
 	{% if event.get_nearest_events|slice:":6" %}
 	<div class="e-cat">
@@ -309,7 +267,6 @@
 							{% with obj=exp  %}
 								{% include 'client/includes/show_logo.html' %}
 							{% endwith %}
-
 							</div>
 						</a>
 						<div class="cli-info">
@@ -348,9 +305,6 @@
 		</ul>
 	</div>
 	{% endif %}
-        <!--
-    <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-    -->
 	<div class="e-cat look-also">
 		<div class="sect-title">{% trans 'Смотрите также:' %}</div>
 		<a href="{{ event.catalog }}city/{{ event.city.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
@@ -358,18 +312,18 @@
 		<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/country/{{ event.country.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
 		<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/city/{{ event.city.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
 	</div>
-
 {% endblock %}
 {% block content_text %}
 {% endblock %}
-
 {% block popup %}
 	{% include 'client/popups/advertise_member.html' with form=advertising_form %}
 {% endblock %}
 {% block scripts %}
-<!-- todo: вернуть .min-->
+{% if request.GET.debug == '1' %}
-<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.exposition.object{% if debug %}{% else %}.min{% endif %}.js"></script>-->
 <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
+{% else %}
+<script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
+{% endif %}
 <script>
 	EXPO.exposition.object.init({
 		visit:{