Merge branch 'master' of gitlab.com:OldminTeam/expomap

remotes/origin/HEAD
Slava Kyrachevsky 9 years ago
commit 28bcbe9294
  1. 55
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. BIN
      static/client/img/search-bg.jpg
  4. BIN
      static/client/img/sprites.png
  5. 57
      static/client/js/main.js
  6. 12
      static/client/js/scripts.js
  7. 69
      static/client/js/vendor.js
  8. 4
      static/client/js_min/vendor.min.js
  9. 20
      static/participation_landing/css/main.css
  10. BIN
      static/participation_landing/images/arrow.png
  11. 8
      templates/client/blank.html
  12. 8
      templates/client/includes/accounts/current_user.html
  13. 242
      templates/client/includes/conference/conference_list.html
  14. 4
      templates/client/includes/exposition/catalog_filter_period.html
  15. 280
      templates/client/includes/exposition/exposition_list.html
  16. 3
      templates/client/includes/footer.html
  17. 18
      templates/client/includes/header.html
  18. 36
      templates/client/includes/index/main_events.html
  19. 11
      templates/client/includes/reverseorder_warning.html
  20. 38
      templates/client/index.html
  21. 3
      templates/client/simple_pages/participation_landing.html

@ -968,10 +968,16 @@ aside nav+hr {
list-style: none
}
.mp-top .recent-expo ul li {
float: left;
/*float: left;*/
width: 100%;
background-color: #f8f8f6;
display: none
}
.mp-top .recent-expo ul li:after{
content: '';
display: block;
clear: both;
}
.mp-top .recent-expo ul li:first-child {
display: block
}
@ -9670,6 +9676,7 @@ hr+.rq-note {
.blog_block h1 {
color: #424242;
font-size: 25px;
line-height: 1;
font-weight: 400;
margin: 0;
padding: 0
@ -10000,7 +10007,8 @@ hr+.rq-note {
}
.acticle_list h3 a {
color: #464646;
text-decoration: none
text-decoration: none;
line-height: 1.1;
}
.acticle_list h3 a:hover {
color: #f60
@ -11640,7 +11648,7 @@ button.gray:hover {
right: 0;
top: 0;
left: 0;
z-index: 10;
z-index: 110;
background: url(../lib/fancybox/fancybox_overlay.png);
display: none;
overflow-y: auto
@ -14298,3 +14306,44 @@ h1 .preview_toggle:hover{
background-color: #ef3976;
color: #fff;
}
.modal_not_found{
display: none;
}
.modal_not_found_body{
max-width: 620px;
padding: 20px 20px 10px;
font-family: dindisplay_pro, sans-serif;
font-size: 18px;
line-height: 1.5;
}
.modal_not_found_body h3{
font-size: 32px;
line-height: 35px;
color: #f60;
font-weight: 100;
margin: 0 0 15px;
}
[data-tooltip]{
position: relative;
}
[data-tooltip]:hover:before{
content: attr(data-tooltip);
position: absolute;
background-color: #666666;
color: #ffffff;
top: -26px;
left: 50%;
-webkit-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-o-transform: translateX(-50%);
transform: translateX(-50%);
padding: 0 10px;
font-size: 12px;
line-height: 22px;
white-space: nowrap;
}

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 39 KiB

@ -352,67 +352,10 @@ function placeInput(width){
var $reSwipeWrap = $reContainer.children('ul');
var $reSwipeItems = $reSwipeWrap.children('li');
var $reControls = $reContainer.children('div.re-controls');
var $recPrev = $reControls.children('a.prev');
var $recNext = $reControls.children('a.next');
if ($reSwipeItems.length > 1) {
$reControls.addClass('enabled');
$reSwipeItems.css({
display: 'block'
});
$reContainer.height($reSwipeItems.eq(0).height());
var $reSwiper = $reContainer.swiper({
speed: 500,
mode:'horizontal',
loop: false,
simulateTouch: false,
autoplay:4200,
onInit: function () {
$recPrev.addClass('disabled');
},
onSlideChangeStart: function (swiper) {
$reContainer.animate({
height: $reSwipeItems.eq(swiper.activeIndex).children('div.re-body').height()
}, 300);
if (swiper.activeIndex == 0) {
if (!$recPrev.hasClass('disabled')) {
$recPrev.addClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
} else if (swiper.activeIndex == swiper.slides.length-1) {
if (!$recNext.hasClass('disabled')) {
$recNext.addClass('disabled');
}
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
} else {
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
}
}
});
$recPrev.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipePrev();
}
return false;
});
$recNext.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipeNext();
}
return false;
});
}
});
$('#mp-photo-gallery').each(function () {

@ -216,7 +216,7 @@ $(document).ready(function () {
$.fancybox.close();
submit_search_form();
})
});
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -247,11 +247,9 @@ $(document).ready(function () {
});
$(window).resize(function () {
$("div.ht-main_1").each(function () {
$(this).width($('div.serv-links').width());
});
});
@ -259,6 +257,7 @@ $(document).ready(function () {
$("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")});
return false;
});
$("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")});
@ -319,6 +318,9 @@ $(document).ready(function () {
$('.new_article').toggleClass('hidden');
});
if ($('#message-not-found').length){
$.fancybox.open({
href: '#message-not-found'
})
}
});

@ -4031,67 +4031,10 @@ function placeInput(width){
var $reSwipeWrap = $reContainer.children('ul');
var $reSwipeItems = $reSwipeWrap.children('li');
var $reControls = $reContainer.children('div.re-controls');
var $recPrev = $reControls.children('a.prev');
var $recNext = $reControls.children('a.next');
if ($reSwipeItems.length > 1) {
$reControls.addClass('enabled');
$reSwipeItems.css({
display: 'block'
});
$reContainer.height($reSwipeItems.eq(0).height());
var $reSwiper = $reContainer.swiper({
speed: 500,
mode:'horizontal',
loop: false,
simulateTouch: false,
autoplay:4200,
onInit: function () {
$recPrev.addClass('disabled');
},
onSlideChangeStart: function (swiper) {
$reContainer.animate({
height: $reSwipeItems.eq(swiper.activeIndex).children('div.re-body').height()
}, 300);
if (swiper.activeIndex == 0) {
if (!$recPrev.hasClass('disabled')) {
$recPrev.addClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
} else if (swiper.activeIndex == swiper.slides.length-1) {
if (!$recNext.hasClass('disabled')) {
$recNext.addClass('disabled');
}
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
} else {
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
}
}
});
$recPrev.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipePrev();
}
return false;
});
$recNext.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipeNext();
}
return false;
});
}
});
$('#mp-photo-gallery').each(function () {
@ -5133,7 +5076,7 @@ $(document).ready(function () {
$.fancybox.close();
submit_search_form();
})
});
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -5164,11 +5107,9 @@ $(document).ready(function () {
});
$(window).resize(function () {
$("div.ht-main_1").each(function () {
$(this).width($('div.serv-links').width());
});
});
@ -5176,6 +5117,7 @@ $(document).ready(function () {
$("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")});
return false;
});
$("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")});
@ -5236,8 +5178,11 @@ $(document).ready(function () {
$('.new_article').toggleClass('hidden');
});
if ($('#message-not-found').length){
$.fancybox.open({
href: '#message-not-found'
})
}
});
var Base64 = {

File diff suppressed because one or more lines are too long

@ -253,6 +253,11 @@ h1 .orange{
background: #f5f5f5;
}
.what_to_do iframe{
display: block;
margin: 50px auto 0;
}
.variants{
padding-top: 50px;
}
@ -306,6 +311,21 @@ h1 .orange{
border-bottom-color: transparent;
}
.variant .with_arrow{
position: relative;
}
.variant .with_arrow:after{
content: '';
display: block;
width: 42px;
height: 70px;
background: url(../images/arrow.png);
position: absolute;
bottom: -60px;
right: 250px;
}
.expomap p a{
color: #0b0301;
border-bottom: 0px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -42,10 +42,12 @@ This template include basic anf main styles and js files,
{% else %}
<link rel="stylesheet" href="{% static 'client/css_min/main.min.css' %}">
{% endif %}
<link rel="stylesheet" href="{% static 'client/lib/font-awesome-4.3.0/css/font-awesome.min.css' %}">
{% block styles %}
{% endblock %}
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
{% block styles %}{% endblock %}
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
<script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}" type="text/javascript"></script>

@ -186,7 +186,7 @@
<div class="form-item-wrap"><!-- 1 -->
<div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn social not-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social not-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>&nbsp;
<a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -271,7 +271,7 @@
<div class="ic-links dd_width_5">
<div class="form-item-wrap"> <!-- 1 -->
<div class="i-descr add_link_text add_link_text_medium {% if phone_form.phone.value %}hidden{% else %}{% endif %}">
<a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>&nbsp;
<div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div>
</div>
<div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value %}{% else %}hidden{% endif %}"> <!-- 2 -->
@ -333,7 +333,7 @@
{% endcomment %}
<div class="form-item-wrap">
<div class=" i-descr ic-site p-editable add_link_text add_link_text_medium {% if web_page_form.web_page.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>&nbsp;
<div class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
</div>
<div class="ic-site p-editable editable-wrap {% if web_page_form.web_page.value %}{% else %}hidden{% endif %}">
@ -373,7 +373,7 @@
<div class="ia-title">{% trans 'О себе:' %}</div>
<div class="form-item-wrap">
<div class="i-descr add_link_text {% if about_form.about.value %}hidden{% else %}{% endif %}">
<a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>&nbsp;
<div class="add_link_text_text">{% trans 'информацию о себе' %} <b>+10</b></div>
</div>
<div class="p-editable editable-wrap {% if about_form.about.value %}{% else %}hidden{% endif %}">

@ -1,118 +1,134 @@
{% load static %}
{% load i18n %}
{% load template_filters %}
{% with objects=object_list %}
{% if objects %}
{% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions">
{% if objects %}
{% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
<a target="_blank" href="{{ obj.get_permanent_url }}">
{% if obj.canceled %}
<div class="cancel"></div>
{% else %}
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
{% endif %}
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
<div class="cli-info">
<div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %}
<div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div>
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
<a target="_blank" href="{{ obj.get_permanent_url }}">
{% if obj.canceled %}
<div class="cancel"></div>
{% else %}
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
{% endif %}
{% if obj.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 class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
{% endif %}
{% if obj.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" />
</a>
<div class="cli-info">
<div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %}
<div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div>
{% endif %}
{% if obj.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 obj.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" />
</div>
{% endif %}
<header>
<div class="cli-title"><a target="_blank" href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ obj.main_title|safe }}
</div>
</div>
{% endif %}
<header>
<div class="cli-title"><a target="_blank" href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ obj.main_title|safe }}
<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 %}
</div>
{% endif %}
</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>
<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 %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<div class="note-wrap">
<a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>
</div>
{% endif %}
<div></div>
</div>
<div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=obj %}
</div>
{% 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 %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<div class="note-wrap">
<a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>
</div>
<footer class="clearfix">
<div class="cli-stats">
{% if obj.visitors %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %}
{% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %}
<div></div>
</div>
<div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=obj %}
<div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %}
</div>
</div>
</div>
<footer class="clearfix">
<div class="cli-stats">
{% if obj.visitors %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %}
{% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %}
</div>
<div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %}
</div>
</footer>
</li>
{% if forloop.counter == 5 or objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %}
{% if forloop.counter == 10 %}
{% include 'client/includes/banners/catalog_inner.html' %}
{%endif %}
{% endfor %}
</footer>
</li>
{% if forloop.counter == 5 or objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %}
{% if forloop.counter == 10 %}
{% include 'client/includes/banners/catalog_inner.html' %}
{%endif %}
{% endfor %}
</ul>
{% else %}
<p class="message-not-found">
<span class="message">
@ -121,22 +137,24 @@
</p>
{% endif %}
{% endwith %}
{% block scripts %}
{% 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:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</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:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %}

@ -15,9 +15,5 @@
{% endfor %}
{% endwith %}
</div>
<div class="ch-dates-range">
<a class="pw-open" href="#pwPeriod">{% trans 'Указать диапазон дат' %}</a>
</div>
</div>
{% endif %}

@ -1,128 +1,137 @@
{% load static %}
{% load i18n %}
{% load template_filters %}
{% with objects=object_list %}
{% if objects %}
{% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
{% if not obj.canceled %}
<a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
{% else %}
<div class="cancel"></div>
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
{% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions">
{% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix">
{% if not obj.canceled %}
<a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">
{% if obj.expohit %}
<div class="hit"></div>
{% endif %}
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
{% else %}
<div class="cancel"></div>
<div class="cli-pict">
{% with obj=obj %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
{% endif %}
<div class="cli-info">
<div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %}
<div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div>
{% endif %}
{% if obj.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 obj.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" />
</div>
{% endif %}
<header>
<div class="cli-title"><a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ 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 %}
</div>
{% 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 %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<div class="note-wrap">
<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>
</div>
{% endif %}
<div></div>
</div>
<div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=obj %}
</div>
</div>
</div>
{% endif %}
<div class="cli-info">
<div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %}
<div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div>
{% endif %}
{% if obj.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 obj.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" />
</div>
{% endif %}
<header>
<div class="cli-title"><a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ 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 %}
</div>
{% 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 %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<div class="note-wrap">
<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>
</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 %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %}
{% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %}
</div>
<div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %}
</div>
</footer>
</li>
{% if forloop.counter == 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% elif forloop.last and objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %}
{% if forloop.counter == 10 %}
{% include 'client/includes/banners/catalog_inner.html' %}
{%endif %}
{% endfor %}
<footer class="clearfix">
<div class="cli-stats">
{% if obj.visitors %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %}
{% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %}
</div>
<div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %}
</div>
</footer>
</li>
</ul>
{% if forloop.counter == 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% elif forloop.last and objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %}
{% if forloop.counter == 10 %}
{% include 'client/includes/banners/catalog_inner.html' %}
{%endif %}
{% endfor %}
</ul>
{% else %}
<p class="message-not-found">
<span class="message">
@ -130,26 +139,25 @@
</span>
</p>
{% endif %}
{% endwith %}
{% block scripts %}
{% 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:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</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:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %}

@ -43,7 +43,7 @@
<div class="counters">
<ul>
{% comment %}
<li>
<!--LiveInternet counter--><script type="text/javascript"><!--
document.write("<a href='http://www.liveinternet.ru/click' "+
@ -57,6 +57,7 @@
"border='0' width='88' height='31'><\/a>")
//--></script><!--/LiveInternet-->
</li>
{% endcomment %}
<li>
<a href="//yandex.ru/cy?base=0&amp;host=expomap.ru" rel="nofollow">
<img src="//www.yandex.ru/cycounter?expomap.ru"

@ -89,24 +89,30 @@
<div class="clb-settings">
{# <a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a>#}
<a href="/profile/settings/"><i class="fa fa-cog"></i></a>
<a href="/profile/settings/" data-tooltip="{% trans 'Настройки' %}">
<i class="fa fa-cog"></i>
</a>
{% if user.is_superuser %}
<a href="/admin/"><i class="fa fa-lock"></i></a>
<a href="/admin/" data-tooltip="{% trans 'Админпанель' %}"><i class="fa fa-lock"></i></a>
{% endif %}
</div>
<div class="clb-messages">
{# <a class="icon-msg" style="float: left;" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a>#}
{# <a href="{% url 'accounts-mailing_settings' %}" style="font-size: 18px" target="_blank">@</a>#}
<a style="float: left;" href="/profile/messages/"><i class="fa fa-envelope-o"></i>{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a>
<a href="{% url 'accounts-mailing_settings' %}" style="font-size: 18px" target="_blank"><i class="fa fa-at"></i></a>
<a style="float: left;" href="/profile/messages/" data-tooltip="{% trans 'Сообщения' %}">
<i class="fa fa-envelope-o"></i>{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}
</a>
<a href="{% url 'accounts-mailing_settings' %}" style="font-size: 18px" target="_blank" data-tooltip="{% trans 'Настройки рассылки' %}">
<i class="fa fa-at"></i>
</a>
</div>
<div class="clb-docs">
{# <a class="cl-btn icon-cal" href="{% url 'account_calendar' %}">{% trans 'календарь' %}</a>#}
{# <a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>#}
<a href="{% url 'account_calendar' %}"><i class="fa fa-calendar"></i></a>
<a href="/profile/feed/"><i class="fa fa-file-text-o"></i></a>
<a href="{% url 'account_calendar' %}" data-tooltip="{% trans 'Календарь' %}"><i class="fa fa-calendar"></i></a>
<a href="/profile/feed/" data-tooltip="{% trans 'Лента событий' %}"><i class="fa fa-file-text-o"></i></a>
</div>
<div class="clb-profile">

@ -6,18 +6,26 @@
<div class="mcl">
<div id="mp-recent-expo" class="recent-expo swiper-container">
<ul class="swiper-wrapper">
<div id="mp-recent-expo" class="recent-expo">
<ul class="cycle-slideshow"
data-cycle-fx="scrollHorz"
data-cycle-timeout="4000"
data-cycle-prev=".swiper-button-prev"
data-cycle-next=".swiper-button-next"
data-cycle-pause-on-hover="true"
data-cycle-slides="> li"
data-cycle-log="false">
{% for event in events %}
<li class="swiper-slide">
<li>
<div class="re-pict pict-over" >
{% if event.logo %}
<a href="{{ event.get_main_link }}">
<!--<img src="{{ event.logo.url }}">-->
{# <img src="{{ event.logo.url }}"> #}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
</a>
{% endif %}
@ -25,11 +33,11 @@
<div class="re-body">
<div class="re-info">
<a href="{{ event.get_main_link }}">
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
</a>
</div>
<footer>
@ -57,8 +65,8 @@
{% endfor %}
</ul>
<div class="re-controls">
<a class="prev" href="#">&lt;</a>
<a class="next" href="#">&gt;</a>
<a class="prev swiper-button-prev" href="javascript:void(0)">&lt;</a>
<a class="next swiper-button-next" href="javascript:void(0)">&gt;</a>
</div>
</div>
</div>

@ -1,5 +1,14 @@
{% load i18n %}
<div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "События по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div>
<div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "События по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div>
<div id="message-not-found" class="modal_not_found">
<div class="modal_not_found_body">
<h3>{% trans 'События по указанным параметрам не найдены' %}</h3>
<p>{% trans "Попробуйте упростить параметры или расширить временные рамки. Также вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</p>
</div>
</div>
<div class="page-title">
<h2 style="font-size:30px;">{% trans "Прошедшие события" %}</h2>
</div>

@ -9,6 +9,7 @@
</style>
{% endblock %}
{% block body_class %} class="main-page" {% endblock %}
{% block top %}
<section class="layout mp-top">
<div class="layout-wrap">
@ -22,9 +23,11 @@
</div>
</section>
{% endblock %}
{% block search %}
{% include 'client/includes/catalog_search_main.html' with search_form=search_form %}
{% endblock %}
{% block catalog %}
<section class="layout mp-catalog">
<div class="layout-wrap">
@ -112,6 +115,7 @@
</div>
</section>
{% endblock %}
{% block partners %}
<section class="layout mp-partners">
<div class="mpp-wrap">
@ -129,6 +133,7 @@
</div>
</section>
{% endblock %}
{% block services %}
<section class="layout mp-services">
<div class="layout-wrap">
@ -142,19 +147,22 @@
</div>
</div>
</section>
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.index.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.index.min.js' %}"></script>
{% endif %}
<script>
EXPO.index.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
}
});
</script>
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.index.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.index.min.js' %}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/2.1.6/jquery.cycle2.min.js" defer></script>
{% endif %}
<script>
EXPO.index.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
}
});
</script>
{% endblock %}

@ -108,6 +108,7 @@
<h3>{% trans "Решение 1." %}</h3>
<p>{% blocktrans %}<a href="#" data-scroll="#reviews">Воспитать выставочного специалиста</a> в своей компании.{% endblocktrans %}</p>
<p>{% trans "Необходимо выделить хотя бы 1 человека, который в течение минимум 2-3 месяцев будет заниматься подготовкой к выставке." %}</p>
<p class="with_arrow">{% trans 'А как это может быть в реальности, посмотрите в нашем мультфильме.' %}</p>
</div>
<div class="variant expomap">
@ -128,6 +129,8 @@
</a>
</div>
</div>
<iframe width="853" height="480" src="https://www.youtube.com/embed/kgkKyQFKPPM?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
</div>
</div>

Loading…
Cancel
Save