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

exposition detail front fixes

Browse Source
stage8
ya_dim4ik 9 years ago
parent b66554d07d
commit a3950bed10
5 changed files with 103 additions and 77 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. 55
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. 2
      templates/client/blank.html
  4. 103
      templates/client/exposition/exposition_detail.html
  5. 18
      templates/client/includes/comments.html

55
static/client/css/main.css
Unescape View File

@ -5630,7 +5630,7 @@ dl.add-info dd ul li {
width: 11px;
height: 13px;
background: url(../img/sprites.png) -211px 0 no-repeat;
margin: -1px 5px 0 0
margin: -1px 10px 0 0;
}
.i-event-additional .e-docs a.translator:before {
width: 15px;
@ -14795,4 +14795,57 @@ h1 .preview_toggle:hover{
.exposition_booking_block .h-booking ul li:last-child {
margin-right: 0;
}
.exposition_booking_block .h-booking .sect-title a {
color: #40bbea;
}
.exposition_booking_block .h-booking .sect-title a:hover {
color: #1d447d;
}
.exposition_additional {
padding-left: 30px;
}
.exposition_additional:after {
content: '';
display: block;
clear: both;
}
.exposition_additional .sect-title {
font-size: 22px;
color: #333333;
font-weight: 600;
}
.exposition_additional .add-info {
font-size: 14px;
color: #808080;
line-height: 22px;
}
.exposition_additional .add-info a {
color: #808080;
text-decoration: underline;
}
.exposition_additional dl.add-info dd,
.exposition_additional dl.add-info dt {
margin-bottom: 20px;
}
.exposition_additional .e-docs {
padding-top: 22px;
}
.exposition_additional .e-docs li{
margin-bottom: 13px;
}
.exposition_nearest .sect-title {
font-size: 23px;
font-weight: 500;
}

2
static/client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
templates/client/blank.html
Unescape View File

@ -169,7 +169,7 @@ This template include basic anf main styles and js files,
{% block main_part %}{% endblock %}
{# {% block top %}{% endblock %}#}
{% block top %}{% endblock %}
{% block search %}{% endblock %}

103
templates/client/exposition/exposition_detail.html
Unescape View File

@ -231,11 +231,11 @@
<hr>
{# Дополнительная информация #}
<div id="additional" class="i-event-additional clearfix">
<div class="sect-title">{% trans 'Дополнительная информация' %}</div>
<div id="additional" class="i-event-additional exposition_additional">
<div class="sect-title">{% trans 'Дополнительная информация и сервисы:' %}</div>
<ul class="e-docs">
{% if exposition.business_program.exists %}
{% comment %}{% if exposition.business_program.exists %}
<li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
{% endif %}
@ -243,19 +243,29 @@
{% if exposition.statistic_exists %}
<li><a href="{{ exposition.get_permanent_url }}statistic/">{% trans 'Статистика' %}</a></li>
{% endif %}
{% endif %}{% endcomment %}
<li><a href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ exposition.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ exposition.data_begin|date:'j' }}&checkin_year_month={{ exposition.data_begin|date:'Y' }}-{{ exposition.data_begin|date:'n' }}&checkout_monthday={{ exposition.data_end|date:'j' }}&checkout_year_month={{ exposition.data_end|date:'Y' }}-{{ exposition.data_end|date:'n' }}" class="find_hotel" target="_blank">{% trans 'Найти отель' %}</a></li>
<li><a href="http://www.rentalcars.com/SearchResults.do?enabler=&country={{ exposition.country }}&doYear={{ exposition.data_begin|date:'Y' }}&city={{ exposition.city }}&driverage=on&doFiltering=true&dropCity={{ exposition.city }}&driversAge=30&filterTo=49&fromLocChoose=true&dropLocationName={{ exposition.city }}+(Все+места)+&dropCountryCode=&doMinute=0&countryCode=&puYear={{ exposition.data_end|date:'Y' }}&locationName={{ exposition.city }}+(Все+места)+&puMinute=0&doDay={{ exposition.data_begin|date:'d' }}&searchType=allareasgeosearch&filterFrom=0&puMonth={{ exposition.data_end|date:'m' }}&dropLocation=-1&doHour=10&dropCountry={{ exposition.country }}&puDay={{ exposition.data_end|date:'d' }}&puHour=10&location=-1&doMonth={{ exposition.data_begin|date:'m' }}&filterName=CarCategorisationSupplierFilter&affiliateCode=expomap790&preflang=ru" class="car_rent" target="_blank">{% trans 'Арендовать авто' %}</a></li>
<li><a href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ exposition.city.name }}" class="translator" target="_blank">{% trans 'Услуги переводчика' %}</a></li>
</ul>
<dl class="add-info">
{% if exposition.products %}
<dt>{% trans 'Экспонируемые продукты' %}:</dt>
<dd>{{ exposition.products|safe }}</dd>
{% endif %}
{% if exposition.time %}
<dt>{% trans 'Время работы' %}:</dt>
<dd>{{ exposition.time|safe }}</dd>
{% endif %}
{% if exposition.organiser.all.exists %}
<dt>{% trans 'Организатор' %}:</dt>
<dd>
{% with organisers=exposition.organiser.all %}
{% for organiser in organisers %}
{{ organiser.name }}<br />
{{ organiser.name|safe }}<br />
{% endfor %}
{% endwith %}
</dd>
@ -264,22 +274,19 @@
{% for item in exposition.org_split %}
<dt>{% if forloop.counter == 1 %}{% trans 'Организатор' %}:{% endif %}</dt>
<dd>
{{ item }}
</dd>
<dd>{{ item|safe }}</dd>
{% endfor %}
{% endif %}
{% endif %}
{% if exposition.web_page %}
<dt>{% trans 'Веб-сайт' %}:</dt>
<dd>
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{{ exposition.web_page }}</a>
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{% trans 'перейти на сайт выставки' %}</a>
</dd>
{% endif %}
{% if exposition.get_audience %}
{% comment %}{% if exposition.get_audience %}
<dt>{% trans 'Аудитория' %}:</dt>
<dd>{{ exposition.get_audience }}</dd>
{% endif %}
@ -287,22 +294,14 @@
{% if exposition.get_periodic %}
<dt>{% trans 'Периодичность' %}:</dt>
<dd>{{ exposition.get_periodic }}</dd>
{% endif %}
{% if exposition.products %}
<dt>{% trans 'Экспонируемые продукты' %}:</dt>
<dd>{{ exposition.products|safe }}</dd>
{% endif %}
{% if exposition.time %}
<dt>{% trans 'Время работы' %}:</dt>
<dd>{{ exposition.time|safe }}</dd>
{% endif %}
{% endif %}{% endcomment %}
</dl>
</div>
<hr>
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
<div class="exposition_booking_block">
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
</div>
{# Планируют быть #}
<div class="conf_visitors">
@ -336,7 +335,7 @@
{% if exposition.get_photos %}
{% with photos=exposition.get_photos %}
<div class="conference_slider">
<h2><a href="{{ exposition.get_permanent_url }}photo/">{% trans 'Фотографии с прошлой конференции' %}</a></h2>
<h2><a href="{{ exposition.get_permanent_url }}photo/">{% trans 'Фотографии с прошлой выставки' %}</a></h2>
<div class="last_photos_slider">
{% for photo in photos %}
{% thumbnail photo.image '936x468' crop="center" as im %}
@ -360,34 +359,8 @@
{% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %}
</div>
{% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
<div class="e-num-info">
{% if exposition.area %}
<div class="eni-area-wrap">
<div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
<div class="eni-area">
{{ exposition.area }} {% trans 'м²' %}
</div>
</div>
{% endif %}
<div class="eni-stats">
{% 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 %}
</div>
</div>
{% endif %}
<div class="conf_comments">
<h2>{% trans 'Комментарии' %}</h2>
<h2>{% trans 'Что вы думаете о выставке?' %}</h2>
{% include 'client/includes/comments.html' %}
</div>
</div>
@ -398,22 +371,10 @@
{% include 'client/includes/banners/catalog_inner_2.html' %}
<div class="e-cat look-also">
<div class="sect-title">{% trans 'Смотрите также:' %}</div>
{% with themes=exposition.themes %}
{% for theme in themes %}
<a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a>
{% endfor %}
{% endwith %}
</div>
{% if exposition.get_nearest_events %}
<div class="e-cat">
<div class="e-cat exposition_nearest">
<div class="sect-title">
{% with themes=exposition.themes %}
{% trans 'Ближайшие выставки по тематике' %} «{% for theme in themes %}{{ theme.name }}{% if not forloop.last %}, {% endif %}{% endfor %}»
{% endwith %}
{% trans 'Другие выставки, которые могут быть вам интересны:' %}
</div>
<ul class="cat-list cl-exhibitions">
{% for exp in exposition.get_nearest_events %}
@ -477,6 +438,18 @@
</div>
{% endif %}
{% include 'client/includes/banners/detail_inner_3.html' %}
<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>
<a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
{% if exposition.theme.all %}
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
{% endif %}
</div>
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>

18
templates/client/includes/comments.html
Unescape View File

@ -1,12 +1,12 @@
<div id="mc-container"></div>
<script type="text/javascript">
cackle_widget = window.cackle_widget || [];
cackle_widget.push({widget: 'Comment', id: 53712});
(function() {
var mc = document.createElement('script');
mc.type = 'text/javascript';
mc.async = true;
mc.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cackle.me/widget.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(mc, s.nextSibling);
})();
cackle_widget = window.cackle_widget || [];
cackle_widget.push({widget: 'Comment', id: 53712});
(function() {
var mc = document.createElement('script');
mc.type = 'text/javascript';
mc.async = true;
mc.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cackle.me/widget.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(mc, s.nextSibling);
})();
</script>

Write Preview
Loading…
Cancel
Save