t80: исправил выбор города в ленте событий + убрал лишний hr

remotes/origin/t90_expo_page
Slava Kyrachevsky 9 years ago
parent b94c2357f9
commit b905640121
  1. 18
      apps/expobanner/views.py
  2. 81
      static/client/js/_modules/block.exposition.list.js
  3. 3708
      static/client/js/_modules/page.events.feed.js
  4. 330
      static/client/js/_modules/page.exposition.object.js
  5. 74
      static/client/js/_modules/page.index.js
  6. 2
      static/client/js/rejs/tops.js
  7. 2
      static/client/js_min/_modules/block.exposition.list.min.js
  8. 2
      static/client/js_min/_modules/page.events.feed.min.js
  9. 2
      static/client/js_min/_modules/page.exposition.object.min.js
  10. 1
      static/client/js_min/_modules/page.index.min.js
  11. 262
      templates/client/accounts/feed.html
  12. 6
      templates/client/includes/conference/conference_list.html
  13. 638
      templates/client/includes/conference/conference_object.html
  14. 6
      templates/client/includes/conference/conference_paid.html
  15. 6
      templates/client/includes/conference/conference_partner.html
  16. 238
      templates/client/includes/events/filter_result.html
  17. 224
      templates/client/includes/exposition/expo_list_paid.html
  18. 6
      templates/client/includes/exposition/expo_paid.html
  19. 6
      templates/client/includes/exposition/exposition_list.html
  20. 6
      templates/client/includes/exposition/exposition_object.html
  21. 212
      templates/client/includes/exposition/search_result.html
  22. 18
      templates/client/index.html

@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json import json
import re import re
from django.http import HttpResponse from django.http import HttpResponse
from django.shortcuts import redirect, get_object_or_404 from django.shortcuts import redirect, get_object_or_404, render
from django.shortcuts import render_to_response
from django.template import RequestContext
from .models import Banner, BannerGroup, URL, Top from .models import Banner, BannerGroup, URL, Top
from expobanner.utils import get_banner_by_params, get_client_ip, get_top_events, get_referer_view, set_cookie from expobanner.utils import get_banner_by_params, get_client_ip, get_top_events, get_referer_view, set_cookie
@ -102,7 +102,13 @@ def get_top(request):
tops = Top.cached.all() tops = Top.cached.all()
events = get_top_events(tops, params, request) events = get_top_events(tops, params, request)
context = {'objects': events} ctx = {'objects': events}
if not events:
return HttpResponse('')
if catalog == 'places': if catalog == 'places':
return render_to_response('client/includes/exposition/expo_top_place.html', context, context_instance=RequestContext(request)) return render(
return render_to_response('client/includes/exposition/expo_top.html', context, context_instance=RequestContext(request)) request, 'client/includes/exposition/expo_top_place.html', ctx
)
return render(request, 'client/includes/exposition/expo_top.html', ctx)

@ -1,78 +1,27 @@
var EXPO = EXPO || {}; //isolated namespace var EXPO = EXPO || {}; //isolated namespace
EXPO.exposition = EXPO.exposition || {}; EXPO.exposition = EXPO.exposition || {};
if (EXPO.exposition.list){ if (EXPO.exposition.list){
console.warn('WARNING: EXPO.place.object is already defined!'); console.warn('WARNING: EXPO.place.object is already defined!');
}else { }else {
EXPO.exposition.list = (function () { EXPO.exposition.list = (function () {
// dependencies // dependencies
var com = EXPO.common; var com = EXPO.common;
// variables // variables
var that = {}, var that = {};
Note = function (it, opt) { that.opt = {}; //свойства по умолчанию
this.opt = opt;
this.DOMthis = it;
this.DOMbutton = it.querySelector('.'+opt.buttonClass);
this.DOMinput = it.querySelector('.'+opt.inputClass);
this.inputName = this.DOMinput.getAttribute('name');
this.url = this.DOMbutton.getAttribute('href');
this._controller();
};
Note.prototype = {
_init: function () {
},
_controller: function () {
var self = this;
$(this.DOMinput).on('blur', function () {
self.send();
});
$(this.DOMbutton).on('click', function () {
return false;
});
},
send: function () {
var data = {},
response,
self = this,
handler = function (data) {
if (data.success) {
console.log('ok');
$(self.DOMbutton).addClass('active');
} else {
console.log('data not send');
}
};
data[this.inputName] = this.DOMinput.value;
response = com.getRequest(data,this.url,handler);
}
};
that.opt = {}; //свойства по умолчанию
//private //private
$(function () { $(function () {
}); });
// methods // methods
//инициализация общих свойств //инициализация общих свойств
that.init = function (options) { that.init = function (options) {
$.extend(this.opt, options); $.extend(this.opt, options);
this.notes = []; com.opt.addCalendarText = this.opt.addCalendarText;
var self = this; com.opt.removeCalendarText = this.opt.removeCalendarText;
};
$('.'+this.opt.note.wrapClass).each(function () { return that;
var note = new Note(this,self.opt.note); }());
self.notes.push(note);
});
$('.'+this.opt.note.wrapDisabledClass).on('click', function () {
$.fancybox.open('#pw-login');
return false;
});
com.opt.addCalendarText = this.opt.addCalendarText;
com.opt.removeCalendarText = this.opt.removeCalendarText;
};
return that;
}());
} }

File diff suppressed because it is too large Load Diff

@ -1,202 +1,154 @@
var EXPO = EXPO || {}; //isolated namespace var EXPO = EXPO || {}; //isolated namespace
EXPO.exposition = EXPO.exposition || {}; EXPO.exposition = EXPO.exposition || {};
if (EXPO.exposition.object){ if (EXPO.exposition.object){
console.warn('WARNING: EXPO.exposition.object is already defined!'); console.warn('WARNING: EXPO.exposition.object is already defined!');
}else { }else {
EXPO.exposition.object = (function () { EXPO.exposition.object = (function () {
// dependencies // dependencies
var com = EXPO.common, var com = EXPO.common,
$waiter; $waiter;
// variables // variables
var that = {}, var that = {};
Note = function (it, opt) { that.opt = {}; //свойства по умолчанию
this.opt = opt;
this.DOMthis = it;
this.DOMbutton = it.querySelector('.'+opt.buttonClass);
this.DOMinput = it.querySelector('.'+opt.inputClass);
this.inputName = this.DOMinput.getAttribute('name');
this.url = this.DOMbutton.getAttribute('href');
this._controller();
};
Note.prototype = {
_init: function () {
},
_controller: function () {
var self = this;
$(this.DOMinput).on('blur', function () {
self.send();
});
$(this.DOMbutton).on('click', function () {
return false;
});
},
send: function () {
var data = {},
response,
self = this,
handler = function (data) {
if (data.success){
console.log('ok');
$(self.DOMbutton).addClass('active');
}else{
console.log('data not send');
}
};
data[this.inputName] = this.DOMinput.value;
response = com.getRequest(data,this.url,handler);
}
};
that.opt = {}; //свойства по умолчанию
//private //private
$(function () { $(function () {
$waiter = $('#wait-ajax:not(.absolute)').css({'z-index': '8031'}); $waiter = $('#wait-ajax:not(.absolute)').css({'z-index': '8031'});
}); });
// methods // methods
//инициализация общих свойств //инициализация общих свойств
that.init = function (options) { that.init = function (options) {
$.extend(this.opt, options); $.extend(this.opt, options);
var self = this, var self = this,
$visitButtons = $('.'+this.opt.visit.activeClass+', .'+this.opt.visit.passiveClass); $visitButtons = $('.'+this.opt.visit.activeClass+', .'+this.opt.visit.passiveClass);
this.notes = [];
com.opt.addCalendarText = this.opt.addCalendarText;
$('.'+this.opt.note.wrapClass).each(function () { com.opt.removeCalendarText = this.opt.removeCalendarText;
var note = new Note(this,self.opt.note); /**
self.notes.push(note); * visit buttons
}); */
$('.'+this.opt.note.wrapDisabledClass).on('click', function () { $visitButtons.off('click');
$.fancybox.open('#pw-login'); $visitButtons.on('click', function () {
return false; if ($(this).hasClass(self.opt.visit.activeClass)){
});
com.opt.addCalendarText = this.opt.addCalendarText; /**
com.opt.removeCalendarText = this.opt.removeCalendarText; * I plan to visit
/** */
* visit buttons $('.'+self.opt.visit.activeClass).hide().siblings('.'+self.opt.visit.passiveClass).show();
*/
$visitButtons.off('click'); $('#'+self.opt.visit.visitorsListId).append(self.opt.visit.currentHtml);
$visitButtons.on('click', function () { $('#'+self.opt.visit.somebodyId).removeClass("hidden");
if ($(this).hasClass(self.opt.visit.activeClass)){ $('#'+self.opt.visit.nobodyId).addClass("hidden");
/**
* I plan to visit }else{
*/ /**
$('.'+self.opt.visit.activeClass).hide().siblings('.'+self.opt.visit.passiveClass).show(); * refuse to visit
*/
$('#'+self.opt.visit.visitorsListId).append(self.opt.visit.currentHtml); $('.'+self.opt.visit.passiveClass).hide().siblings('.'+self.opt.visit.activeClass).show();
$('#'+self.opt.visit.somebodyId).removeClass("hidden"); $('#'+self.opt.visit.visitorsListId).children(".current").remove();
$('#'+self.opt.visit.nobodyId).addClass("hidden");
if($('#'+self.opt.visit.visitorsListId).children().length == 0){
}else{ $('#'+self.opt.visit.somebodyId).addClass("hidden");
/** $('#'+self.opt.visit.nobodyId).removeClass("hidden");
* refuse to visit }
*/
$('.'+self.opt.visit.passiveClass).hide().siblings('.'+self.opt.visit.activeClass).show(); }
$('#'+self.opt.visit.visitorsListId).children(".current").remove(); return false;
});
if($('#'+self.opt.visit.visitorsListId).children().length == 0){ /**
* advertise form validation
$('#'+self.opt.visit.somebodyId).addClass("hidden"); */
$('#'+self.opt.visit.nobodyId).removeClass("hidden"); $('#'+this.opt.advertise.id).on("submit", function () {
} var formData = $(this).serialize(),
formUrl = $(this).attr("action"),
} $form = $(this),
return false; /**
}); * executes after AJAX get request is complete
/** * @param data - data recieved from server ex
* advertise form validation */
*/ handler = function (data) {
$('#'+this.opt.advertise.id).on("submit", function () { var clearValue = function () {
var formData = $(this).serialize(), $('.err',$form).removeClass("err");
formUrl = $(this).attr("action"), $('.pwf-msg',$form).text('');
$form = $(this), };
/** if (data.success !== true){
* executes after AJAX get request is complete clearValue();
* @param data - data recieved from server ex for (var k in data.errors){
*/ if (data.errors.hasOwnProperty(k)) {
handler = function (data) { $('input[name="'+k+'"]',$form)
var clearValue = function () { .closest(".required").addClass("err")
$('.err',$form).removeClass("err"); .siblings(".pwf-msg").text(data.errors[k]);
$('.pwf-msg',$form).text(''); }
}; }
if (data.success != true){
clearValue(); }else{
for (var k in data.errors){ clearValue();
if (data.errors.hasOwnProperty(k)) {
$('input[name="'+k+'"]',$form)
.closest(".required").addClass("err")
.siblings(".pwf-msg").text(data.errors[k]);
}
}
}else{
clearValue();
dataLayer.push({'event': 'advmemberform'}); dataLayer.push({'event': 'advmemberform'});
$('input:text',$form).val(''); $('input:text',$form).val('');
$.fancybox.close(); $.fancybox.close();
} }
$waiter.hide(); $waiter.hide();
}; };
$waiter.show(); $waiter.show();
com.postRequest(formData,formUrl,handler); com.postRequest(formData,formUrl,handler);
return false; return false;
}); });
/** /**
* event news subscribe form validation * event news subscribe form validation
*/ */
$('#'+this.opt.event_news_subscribe.id).on("submit", function () { $('#'+this.opt.event_news_subscribe.id).on("submit", function () {
var formData = $(this).serialize(), var formData = $(this).serialize(),
formUrl = $(this).attr("action"), formUrl = $(this).attr("action"),
$form = $(this), $form = $(this),
/** /**
* executes after AJAX get request is complete * executes after AJAX get request is complete
* @param data - data recieved from server ex * @param data - data recieved from server ex
*/ */
handler = function (data) { handler = function (data) {
var clearValue = function () { var clearValue = function () {
$('.err',$form).removeClass("err"); $('.err',$form).removeClass("err");
$('.pwf-msg',$form).text(''); $('.pwf-msg',$form).text('');
}; };
if (data.success != true){ if (data.success != true){
clearValue(); clearValue();
for (var k in data.errors){ for (var k in data.errors){
console.log(data.errors.hasOwnProperty(k)); console.log(data.errors.hasOwnProperty(k));
console.log(k); console.log(k);
if (data.errors.hasOwnProperty(k)) { if (data.errors.hasOwnProperty(k)) {
$('input[name="'+k+'"]',$form) $('input[name="'+k+'"]',$form)
.closest(".required").addClass("err") .closest(".required").addClass("err")
.siblings(".pwf-msg").text(data.errors[k]); .siblings(".pwf-msg").text(data.errors[k]);
} }
} }
}else{ }else{
clearValue(); clearValue();
dataLayer.push({'event': 'event-news-subscribe-form'}); dataLayer.push({'event': 'event-news-subscribe-form'});
$('input:text',$form).val(''); $('input:text',$form).val('');
$('p#success').show(); $('p#success').show();
if (data.sent == true) { if (data.sent == true) {
window.location = data.redirect_url; window.location = data.redirect_url;
} else { } else {
window.setTimeout(function () { window.setTimeout(function () {
$.fancybox.close(); $.fancybox.close();
}, 1000); }, 1000);
} }
} }
$waiter.hide(); $waiter.hide();
}; };
$waiter.show(); $waiter.show();
com.postRequest(formData,formUrl,handler); com.postRequest(formData,formUrl,handler);
return false; return false;
}); });
}; };
return that; return that;
}()); }());
} }

@ -1,74 +0,0 @@
var EXPO = EXPO || {}; //isolated namespace
if (EXPO.index) {
console.warn('WARNING: EXPO.eventsFeed is already defined!');
} else {
EXPO.index = (function () {
// variables
var that = {};
//default module setting
that.opt = {};
//dependence's
var com = EXPO.common;
//private
var Note = function (it, opt) {
this.opt = opt;
this.DOMthis = it;
this.DOMbutton = it.querySelector('.'+opt.buttonClass);
this.DOMinput = it.querySelector('.'+opt.inputClass);
this.inputName = this.DOMinput.getAttribute('name');
this.url = this.DOMbutton.getAttribute('href');
this._controller();
};
Note.prototype = {
_init: function () {
},
_controller: function () {
var self = this;
$(this.DOMinput).on('blur', function () {
self.send();
});
$(this.DOMbutton).on('click', function () {
return false;
});
},
send: function () {
var data = {},
response,
self = this,
handler = function (data) {
if (data.success){
console.log('ok');
$(self.DOMbutton).addClass('active');
}else{
console.log('data not send');
}
};
data[this.inputName] = this.DOMinput.value;
response = com.getRequest(data,this.url,handler);
}
};
///////////////////////////
//инициализация общих свойств
that.init = function (options) {
// settings extending
$.extend(this.opt, options);
// begin of initialization
var self = this;
this.notes = [];
$('.'+this.opt.note.wrapClass).each(function () {
var note = new Note(this,self.opt.note);
self.notes.push(note);
});
$('.'+this.opt.note.wrapDisabledClass).on('click', function () {
$.fancybox.open('#pw-login');
return false;
});
};
return that;
}());
}

@ -72,7 +72,7 @@
$('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) { $('div#' + PARENT_ID + ' ul li.cl-item').each(function(index, el) {
$('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove(); $('div.page-body ul.cat-list li.cl-item[data-slug=\'' + $(el).data('slug') + '\']').not(el).remove();
}); });
} };
var insertTops = function (text) { var insertTops = function (text) {
var parent = document.getElementById(PARENT_ID); var parent = document.getElementById(PARENT_ID);

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var t=EXPO.common,n={},o=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return o.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var n,o={},i=this,e=function(t){t.success?(console.log("ok"),$(i.DOMbutton).addClass("active")):console.log("data not send")};o[this.inputName]=this.DOMinput.value,n=t.getRequest(o,this.url,e)}},n.opt={},$(function(){}),n.init=function(n){$.extend(this.opt,n),this.notes=[];var i=this;$("."+this.opt.note.wrapClass).each(function(){var t=new o(this,i.opt.note);i.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText},n}(); var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.list?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.exposition.list=function(){var t=EXPO.common,e={};return e.opt={},$(function(){}),e.init=function(e){$.extend(this.opt,e),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText},e}();

File diff suppressed because one or more lines are too long

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,s=EXPO.common,i={},e=function(t,s){this.opt=s,this.DOMthis=t,this.DOMbutton=t.querySelector("."+s.buttonClass),this.DOMinput=t.querySelector("."+s.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=s.getRequest(i,this.url,o)}},i.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),i.init=function(i){$.extend(this.opt,i);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),s.opt.addCalendarText=this.opt.addCalendarText,s.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),s.postRequest(i,e,n),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)console.log(s.errors.hasOwnProperty(e)),console.log(e),s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==s.sent?window.location=s.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);t.hide()};return t.show(),s.postRequest(i,e,n),!1})},i}(); var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var s,t=EXPO.common,e={};return e.opt={},$(function(){s=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),e.init=function(e){$.extend(this.opt,e);var i=this,o=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,o.off("click"),o.on("click",function(){return $(this).hasClass(i.opt.visit.activeClass)?($("."+i.opt.visit.activeClass).hide().siblings("."+i.opt.visit.passiveClass).show(),$("#"+i.opt.visit.visitorsListId).append(i.opt.visit.currentHtml),$("#"+i.opt.visit.somebodyId).removeClass("hidden"),$("#"+i.opt.visit.nobodyId).addClass("hidden")):($("."+i.opt.visit.passiveClass).hide().siblings("."+i.opt.visit.activeClass).show(),$("#"+i.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+i.opt.visit.visitorsListId).children().length&&($("#"+i.opt.visit.somebodyId).addClass("hidden"),$("#"+i.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(t.success!==!0){e();for(var i in t.errors)t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();s.hide()};return s.show(),t.postRequest(e,i,r),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var e=$(this).serialize(),i=$(this).attr("action"),o=$(this),r=function(t){var e=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=t.success){e();for(var i in t.errors)console.log(t.errors.hasOwnProperty(i)),console.log(i),t.errors.hasOwnProperty(i)&&$('input[name="'+i+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(t.errors[i])}else e(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==t.sent?window.location=t.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);s.hide()};return s.show(),t.postRequest(e,i,r),!1})},e}();

@ -1 +0,0 @@
var EXPO=EXPO||{};EXPO.index?console.warn("WARNING: EXPO.eventsFeed is already defined!"):EXPO.index=function(){var t={};t.opt={};var n=EXPO.common,i=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return i.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},o=this,e=function(t){t.success?(console.log("ok"),$(o.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=n.getRequest(i,this.url,e)}},t.init=function(t){$.extend(this.opt,t);var n=this;this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new i(this,n.opt.note);n.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1})},t}();

@ -3,10 +3,10 @@
{% load static %} {% load static %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Моя лента событий' %}</strong> <strong>{% trans 'Моя лента событий' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
@ -15,42 +15,42 @@
{% endblock %} {% endblock %}
{% if object_list %} {% if object_list %}
{% block head_scripts %} {% block head_scripts %}
{% include "client/includes/banners/tops_head_js.html" %} {% include "client/includes/banners/tops_head_js.html" %}
{% endblock head_scripts %} {% endblock head_scripts %}
{% endif %} {% endif %}
{% block page_body %} {% block page_body %}
<div class="page-body clearfix events-feed-page"> <div class="page-body clearfix events-feed-page">
<div class="events-filter-wrap" id="events-filter-wrap"> <div class="events-filter-wrap" id="events-filter-wrap">
<a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">{% trans 'Фильтрация ленты' %}</a> <a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">{% trans 'Фильтрация ленты' %}</a>
<div class="events-filter" id="events-filter"> <div class="events-filter" id="events-filter">
<section class="col"> <section class="col">
<h2><span id="filter-subject-label" data-default="{% trans 'Тематические фильтры не выбраны' %}" data-selected="{% trans 'Тематика' %}">{% trans 'Тематические фильтры не выбраны' %}</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">{% trans 'Изменить' %}</a>):</h2> <h2><span id="filter-subject-label" data-default="{% trans 'Тематические фильтры не выбраны' %}" data-selected="{% trans 'Тематика' %}">{% trans 'Тематические фильтры не выбраны' %}</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">{% trans 'Изменить' %}</a>):</h2>
<div class="events-filter-box c-select-box"> <div class="events-filter-box c-select-box">
<div class="csb-selected-items " > <div class="csb-selected-items " >
<div class="csb-selected csb-subj-selected dna-template" id="filter-subject-tags"> <div class="csb-selected csb-subj-selected dna-template" id="filter-subject-tags">
<div class="csbs-text ">~~text~~</div> <div class="csbs-text ">~~text~~</div>
<a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a> <a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<section class="col "> <section class="col ">
<h2 class="mt-0"><span id="filter-place-label" data-default="{% trans 'Географические фильтры не выбраны' %}" data-selected="{% trans 'Место проведения' %}">{% trans 'Географические фильтры не выбраны' %}</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">{% trans 'Изменить' %}</a>):</h2> <h2 class="mt-0"><span id="filter-place-label" data-default="{% trans 'Географические фильтры не выбраны' %}" data-selected="{% trans 'Место проведения' %}">{% trans 'Географические фильтры не выбраны' %}</span>: (<a class="change-filter filter-modal-open" href="#filter-pwPlace" id="filter-place-modal-trigger">{% trans 'Изменить' %}</a>):</h2>
<div class="events-filter-box c-select-box"> <div class="events-filter-box c-select-box">
<div class="csb-selected-items" > <div class="csb-selected-items" >
<div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags"> <div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
<div class="csbs-text ">~~text~~</div> <div class="csbs-text ">~~text~~</div>
<a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a> <a class="csbs-del del-on-page" href="javascript:void(0);" data-checkbox-id="~~id~~">x</a>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button> <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
</div> </div>
<form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %} <form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
<div class="modals"> <div class="modals">
<div class="search-modal-overlay" id="filter-modal"> <div class="search-modal-overlay" id="filter-modal">
<div class="search-modal-wrap fancybox-skin"> <div class="search-modal-wrap fancybox-skin">
@ -69,104 +69,104 @@
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="filter-hint-block" id="filter-hint-block"> <div class="filter-hint-block" id="filter-hint-block">
<p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p> <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
</div> </div>
{% if object_list %} {% if object_list %}
{% include 'includes/exposition/exposition_list.html' with object_list=object_list %} {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
{% else %} {% else %}
<p class="message-not-found"> <p class="message-not-found">
<span> <span>
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>
</span> </span>
<span class="message"> <span class="message">
{% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге.<br> Попробуйте укрупнить параметры поиска" %} {% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге.<br> Попробуйте укрупнить параметры поиска" %}
</span> </span>
</p> </p>
{% endif %} {% endif %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script> <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/page.events.feed.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/page.events.feed.min.js' %}"></script>
{% endif %} {% endif %}
<script> <script>
EXPO.events.feed.init({ EXPO.events.feed.init({
bodyId:'events-filter-wrap', bodyId:'events-filter-wrap',
formId: 'filter-block-form', formId: 'filter-block-form',
activeClass:'active', activeClass:'active',
modalTriggerClass:'filter-modal-open', modalTriggerClass:'filter-modal-open',
searchData:'{{ filter_form.data_with_parents|safe }}', searchData:'{{ filter_form.data_with_parents|safe }}',
closerText: "{% trans ' и еще _ позиции' %}", closerText: "{% trans ' и еще _ позиции' %}",
closerTextSingle:"{% trans ' и еще _ позиция' %}", closerTextSingle:"{% trans ' и еще _ позиция' %}",
applyButtonId:'apply-filter-button', applyButtonId:'apply-filter-button',
place: { place: {
id: 'filter-pwPlace', id: 'filter-pwPlace',
selectedItemTemplate: 'filter-csb-selected', selectedItemTemplate: 'filter-csb-selected',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/', ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/', autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/', getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
autoCompleteId: 'filter-place-complete-block', autoCompleteId: 'filter-place-complete-block',
filterInputId: 'filter-place-filter-input', filterInputId: 'filter-place-filter-input',
modalTrigger: 'filter-place-modal-trigger', modalTrigger: 'filter-place-modal-trigger',
selectedItemsContainer: 'filter-csb-selected-items', selectedItemsContainer: 'filter-csb-selected-items',
clearAllButtonClass: 'modal-clear', clearAllButtonClass: 'modal-clear',
applyBtnClass: 'modal-approve', applyBtnClass: 'modal-approve',
tagsBoxId: 'filter-places-tags', tagsBoxId: 'filter-places-tags',
deleteTagClass: 'csbs-del', deleteTagClass: 'csbs-del',
bodyId: 'events-filter-wrap', bodyId: 'events-filter-wrap',
prefix: 'f-p-', prefix: 'f-p-',
deleteId: 'place-tag-remove', deleteId: 'place-tag-remove',
labelId: 'filter-place-label' labelId: 'filter-place-label'
}, },
subject: { subject: {
id: 'filter-pwSubj', id: 'filter-pwSubj',
selectedItemTemplate: 'filter-subj-selected', selectedItemTemplate: 'filter-subj-selected',
autoCompleteId: 'filter-subj-complete-block', autoCompleteId: 'filter-subj-complete-block',
ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/', ajaxUrl: window.location.protocol + '//{{ request.get_host }}/search-form/',
autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/', autoCompleteUrl: window.location.protocol + '//{{ request.get_host }}/search-form/autocomplete/',
filterInputId: 'filter-subj-fliter-input', filterInputId: 'filter-subj-fliter-input',
modalTrigger: 'fiter-subj-modal-trigger', modalTrigger: 'fiter-subj-modal-trigger',
getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/', getParentUrl: window.location.protocol + '//{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer: 'filter-csb-subj-selected-items', selectedItemsContainer: 'filter-csb-subj-selected-items',
subjectTriggerWrapId: 'filter-subj-checks', subjectTriggerWrapId: 'filter-subj-checks',
//switched by default //switched by default
defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'], defaultOn: ['f-s-exhibition-check', 'f-s-conference-check'],
clearAllButtonClass: 'modal-clear', clearAllButtonClass: 'modal-clear',
applyBtnClass: 'modal-approve', applyBtnClass: 'modal-approve',
tagsBoxId: 'filter-subject-tags', tagsBoxId: 'filter-subject-tags',
deleteTagClass: 'csbs-del', deleteTagClass: 'csbs-del',
bodyId: 'events-filter-wrap', bodyId: 'events-filter-wrap',
prefix: 'f-s-', prefix: 'f-s-',
deleteId: 'subject-tag-remove', deleteId: 'subject-tag-remove',
labelId: 'filter-subject-label' labelId: 'filter-subject-label'
}, },
modal:{ modal:{
id:'filter-modal', id:'filter-modal',
wrapClass:'search-modal-wrap', wrapClass:'search-modal-wrap',
size:{ size:{
'filter-pwSubj':{ 'filter-pwSubj':{
width:640, width:640,
height:514 height:514
}, },
'filter-pwPlace':{ 'filter-pwPlace':{
width:640, width:640,
height:460 height:460
} }
} }
}, },
filter: { filter: {
wrapperId:'"events-filter-wrap"', wrapperId:'"events-filter-wrap"',
bodyId:'events-filter', bodyId:'events-filter',
buttonId:'filter-show-button', buttonId:'filter-show-button',
hintId:'filter-hint-block' hintId:'filter-hint-block'
} }
}); });
</script> </script>
</div> </div>
{% endblock %} {% endblock %}

@ -136,12 +136,6 @@
<script> <script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}", addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}" removeCalendarText:"{% trans 'Из расписания' %}"
}); });

@ -3,66 +3,66 @@
{% load thumbnail %} {% load thumbnail %}
{% load template_filters %} {% load template_filters %}
{% block page_body %} {% block page_body %}
<div class="m-article event-page"> <div class="m-article event-page">
<div class="item-wrap event clearfix"> <div class="item-wrap event clearfix">
<aside> <aside>
{% if event.expohit %} {% if event.expohit %}
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
{% if event.canceled %} {% if event.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
{% endif %} {% endif %}
<div class="i-pict"> <div class="i-pict">
{% with obj=event %} {% with obj=event %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
<div class="i-stats"> <div class="i-stats">
{% if event.visitors %} {% if event.visitors %}
<span class="visitors" title="{% trans 'Посетители' %}">{{ event.visitors }}</span> <span class="visitors" title="{% trans 'Посетители' %}">{{ event.visitors }}</span>
{% endif %} {% endif %}
{% if event.members %} {% if event.members %}
<span class="participants" title="{% trans 'Участники' %}">{{ event.members }}</span> <span class="participants" title="{% trans 'Участники' %}">{{ event.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="i-discount"> <div class="i-discount">
{% if event.discount %} {% if event.discount %}
<a class="discount-button" href="#">{% trans 'Скидка' %} -{{ event.discount }}%</a> <a class="discount-button" href="#">{% trans 'Скидка' %} -{{ event.discount }}%</a>
<div class="dsc-text">{{ event.discount_description|safe|linebreaks }}</div> <div class="dsc-text">{{ event.discount_description|safe|linebreaks }}</div>
{% endif %} {% endif %}
</div> </div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<h1 class="i-title"> <h1 class="i-title">
{% if event.main_title %} {% if event.main_title %}
{{ event.name|safe }} - {{ event.main_title|lowfirst|safe }} {{ event.name|safe }} - {{ event.main_title|lowfirst|safe }}
{% else %} {% else %}
{{ event.name|safe }} {{ event.name|safe }}
{% endif %} {% endif %}
</h1> </h1>
</header> </header>
<div class="i-date"> <div class="i-date">
{% with obj=event %} {% with obj=event %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
{% include "client/includes/sharing_block.html" %} {% include "client/includes/sharing_block.html" %}
</div> </div>
{% if event.place %} {% if event.place %}
<div class="i-address"> <div class="i-address">
<header> <header>
<div class="address"> <div class="address">
{{ event.place.adress }} {{ event.place.adress }}
</div> </div>
<div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div> <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
</header> </header>
<div class="i-map"> <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>
<div class="map-canvas" id="map-canvas" data-coords="{{ event.place.address.lat|stringformat:'f' }},{{ event.place.address.lng|stringformat:'f' }}" ></div> <div class="map-canvas" id="map-canvas" data-coords="{{ event.place.address.lat|stringformat:'f' }},{{ event.place.address.lng|stringformat:'f' }}" ></div>
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="i-address"> <div class="i-address">
<header> <header>
@ -71,99 +71,99 @@
</div> </div>
</header> </header>
</div> </div>
{% endif %} {% endif %}
<hr /> <hr />
<div class="i-buttons clearfix"> <div class="i-buttons clearfix">
<div class="ib-main"> <div class="ib-main">
{% with event=event user=user %} {% with event=event user=user %}
{% include 'client/includes/visit_button.html' %} {% include 'client/includes/visit_button.html' %}
{% endwith %} {% endwith %}
{% include 'client/includes/calendar_button.html' with obj=object %} {% include 'client/includes/calendar_button.html' with obj=object %}
{% if request.user.is_admin %} {% if request.user.is_admin %}
<a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a> <a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
{% endif %} {% endif %}
{% if event.photogallery %} {% if event.photogallery %}
<a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a> <a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a>
{% endif %} {% endif %}
</div> </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 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> </div>
<hr /> <hr />
<div class="i-divs clearfix"> <div class="i-divs clearfix">
<div class="i-subj"> <div class="i-subj">
<ul> <ul>
{% with themes=event.theme.all %} {% with themes=event.theme.all %}
{% for theme in themes %} {% for theme in themes %}
<li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.conferences_number }})</a></li> <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.conferences_number }})</a></li>
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</ul> </ul>
</div> </div>
<div class="i-tags"> <div class="i-tags">
{% with tags=event.tag.all %} {% with tags=event.tag.all %}
{% for tag in tags %} {% for tag in tags %}
<a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %} <a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% include 'client/includes/conference/conference_services.html' with event=event %} {% include 'client/includes/conference/conference_services.html' with event=event %}
{% include 'includes/event_steps.html' with event=event %} {% include 'includes/event_steps.html' with event=event %}
{% if event.get_photos %} {% if event.get_photos %}
{% with photos=event.get_photos|slice:"5" %} {% with photos=event.get_photos|slice:"5" %}
<hr /> <hr />
<div class="i-photo-slides"> <div class="i-photo-slides">
<div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой конференции' %}</a></div> <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой конференции' %}</a></div>
<div id="ps-photo-gallery" class="ps-photo-gallery swiper-container"> <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
<ul class="swiper-wrapper"> <ul class="swiper-wrapper">
{% for photo in photos %} {% for photo in photos %}
<li class="swiper-slide"> <li class="swiper-slide">
<img src="{{ photo.get_display_url }}" alt="" /> <img src="{{ photo.get_display_url }}" alt="" />
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<div class="re-controls"> <div class="re-controls">
<a class="prev" href="#">&lt;</a> <a class="prev" href="#">&lt;</a>
<a class="next" href="#">&gt;</a> <a class="next" href="#">&gt;</a>
</div> </div>
</div> </div>
</div> </div>
{% endwith %} {% endwith %}
{% endif %} {% endif %}
<div class="i-event-description"> <div class="i-event-description">
<h2 class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</h2> <h2 class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</h2>
{% if event.description %} {% if event.description %}
<div class="ied-text">{{ event.description|safe }}</div> <div class="ied-text">{{ event.description|safe }}</div>
{% elif default_description %} {% elif default_description %}
<div class="ied-text" style="text-align: justify"> <div class="ied-text" style="text-align: justify">
{{ default_description|safe }} {{ default_description|safe }}
</div> </div>
{% else %} {% else %}
{% include "client/includes/conference/default_description.html" with conf=event %} {% include "client/includes/conference/default_description.html" with conf=event %}
{% endif %} {% endif %}
</div> </div>
<hr /> <hr />
<div class="i-event-additional clearfix"> <div class="i-event-additional clearfix">
<div class="sect-title">{% trans 'Дополнительная информация' %}</div> <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
<ul class="e-docs"> <ul class="e-docs">
{% if event.business_program.exists %} {% if event.business_program.exists %}
<li><a href="{{ event.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li> <li><a href="{{ event.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
{% endif %} {% endif %}
</ul> </ul>
<dl class="add-info"> <dl class="add-info">
{% if event.organiser.all|length > 0 %} {% if event.organiser.all|length > 0 %}
<dt>{% trans 'Организатор' %}:</dt> <dt>{% trans 'Организатор' %}:</dt>
<dd> <dd>
{% with organisers=event.organiser.all %} {% with organisers=event.organiser.all %}
{% for organiser in organisers %} {% for organiser in organisers %}
{{ organiser.name }}<br /> {{ organiser.name }}<br />
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</dd> </dd>
{% else %} {% else %}
{% if event.org %} {% if event.org %}
@ -176,135 +176,135 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if event.web_page %} {% if event.web_page %}
<dt>{% trans 'Веб-сайт' %}:</dt> <dt>{% trans 'Веб-сайт' %}:</dt>
<dd> <dd>
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ event.web_page|base64_encode }}" class="link-encode">{{ event.web_page }}</a> <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> </dd>
{% endif %} {% endif %}
{% if event.get_audience %} {% if event.get_audience %}
<dt>{% trans 'Аудитория' %}:</dt> <dt>{% trans 'Аудитория' %}:</dt>
<dd> <dd>
{{ event.get_audience }} {{ event.get_audience }}
</dd> </dd>
{% endif %} {% endif %}
{% if event.get_periodic %} {% if event.get_periodic %}
<dt>{% trans 'Периодичность' %}:</dt> <dt>{% trans 'Периодичность' %}:</dt>
<dd>{{ event.get_periodic }}</dd> <dd>{{ event.get_periodic }}</dd>
{% endif %} {% endif %}
{% if event.time %} {% if event.time %}
<dt>{% trans 'Время работы' %}:</dt> <dt>{% trans 'Время работы' %}:</dt>
<dd>{{ event.time|safe }}</dd> <dd>{{ event.time|safe }}</dd>
{% endif %} {% endif %}
</dl> </dl>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<hr /> <hr />
{% include 'client/includes/banners/detail_inner.html' %} {% include 'client/includes/banners/detail_inner.html' %}
</div> </div>
{% include "client/includes/article/articles_in_event.html" with event=event news_list=news %} {% include "client/includes/article/articles_in_event.html" with event=event news_list=news %}
<hr /> <hr />
<div class="i-members clearfix"> <div class="i-members clearfix">
<div class="im-participants"> <div class="im-participants">
{% with companies=event.company.all|slice:":6" %} {% with companies=event.company.all|slice:":6" %}
{% if companies %} {% if companies %}
{# есть участники #} {# есть участники #}
<header> <header>
<div class="im-title">{% trans 'Спикеры' %}</div> <div class="im-title">{% trans 'Спикеры' %}</div>
<a class="more" href="{{ event.get_permanent_url }}members/">{% trans 'Все спикеры' %}</a> <a class="more" href="{{ event.get_permanent_url }}members/">{% trans 'Все спикеры' %}</a>
</header> </header>
<ul> <ul>
{% for company in companies %} {% for company in companies %}
<li> <li>
<a href="{{ company.get_permanent_url }}"> <a href="{{ company.get_permanent_url }}">
<span class="imp-pict"> <span class="imp-pict">
{% with obj=company %} {% with obj=company %}
{% include 'includes/show_logo.html' %} {% include 'includes/show_logo.html' %}
{% endwith %} {% endwith %}
</span> </span>
{{ company.name }} {{ company.name }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}
{# нет участников #} {# нет участников #}
<header> <header>
<div class="im-title">{% trans 'Спикеры' %}</div> <div class="im-title">{% trans 'Спикеры' %}</div>
<p>{% trans 'Разместите информацию о ключевых спикерах' %}</p> <p>{% trans 'Разместите информацию о ключевых спикерах' %}</p>
<p><a href="#pw-advertise" class="button icon-up pw-open" >{% trans 'Рекламировать спикера' %}</a></p> <p><a href="#pw-advertise" class="button icon-up pw-open" >{% trans 'Рекламировать спикера' %}</a></p>
</header> </header>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</div> </div>
<div class="im-visitors"> <div class="im-visitors">
{% with visitors=event.users.all|slice:":17" %} {% with visitors=event.users.all|slice:":17" %}
<header> <header>
<div class="im-title">{% trans 'Посетители' %}</div> <div class="im-title">{% trans 'Посетители' %}</div>
</header> </header>
<ul id="visitors-list"> <ul id="visitors-list">
{% if visitors %} {% if visitors %}
{# есть посетители #} {# есть посетители #}
{% for user in visitors %} {% for user in visitors %}
{% if user == request.user %} {% 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> <li class="current"><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
{% else %} {% else %}
<li><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li> <li><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
<a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ event.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a> <a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ event.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>
{% endwith %} {% endwith %}
<p id="nobody" class=" mb-1em {% if event.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p> <p id="nobody" class=" mb-1em {% if event.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
{% with event=event user=user %} {% with event=event user=user %}
{% include 'client/includes/visit_button.html' %} {% include 'client/includes/visit_button.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
<hr/> <hr/>
{% if event.members or event.visitors or event.foundation_year %} {% if event.members or event.visitors or event.foundation_year %}
<div class="e-num-info"> <div class="e-num-info">
<div class="eni-stats"> <div class="eni-stats">
{% if event.members %} {% if event.members %}
<div class="enis-item"><b>{{ event.members }}</b> {% trans 'участников' %}</div> <div class="enis-item"><b>{{ event.members }}</b> {% trans 'участников' %}</div>
{% endif %} {% endif %}
{% if event.visitors %} {% if event.visitors %}
<div class="enis-item"><b>{{ event.visitors }}</b> {% trans 'посетителей' %}</div> <div class="enis-item"><b>{{ event.visitors }}</b> {% trans 'посетителей' %}</div>
{% endif %} {% endif %}
{% if event.foundation_year %} {% if event.foundation_year %}
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ event.foundation_year }}</b> {% trans 'году' %}</div> <div class="eni-founded">{% trans 'Основано в' %} <b>{{ event.foundation_year }}</b> {% trans 'году' %}</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% include 'client/includes/booking_block.html' with city=event.city place=event.place event=event %} {% include 'client/includes/booking_block.html' with city=event.city place=event.place event=event %}
<hr /> <hr />
{% if event.get_nearest_events %} {% if event.get_nearest_events %}
<div class="e-cat"> <div class="e-cat">
<div class="sect-title">{% trans 'Другие конференции, которые могут быть вам интересны' %}</div> <div class="sect-title">{% trans 'Другие конференции, которые могут быть вам интересны' %}</div>
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{% for exp in event.get_nearest_events %} {% for exp in event.get_nearest_events %}
<li class="cl-item"> <li class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a href="{{ exp.get_permanent_url }}"> <a href="{{ exp.get_permanent_url }}">
<div class="cli-pict"> <div class="cli-pict">
{% with obj=exp %} {% with obj=exp %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if exp.quality_label.rsva.is_set %} {% if exp.quality_label.rsva.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div> </div>
@ -319,48 +319,48 @@
<img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a href="{{ exp.get_permanent_url }}">{{ exp.name|safe }}</a></div> <div class="cli-title"><a href="{{ exp.get_permanent_url }}">{{ exp.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ exp.main_title|safe|linebreaks }} {{ exp.main_title|safe|linebreaks }}
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=exp %} {% with obj=exp %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
</div> </div>
<div class="cli-place"> <div class="cli-place">
<a href="{{ exp.country.get_permanent_url }}">{{ exp.country }}</a>, <a href="{{ exp.city.get_permanent_url }}">{{ exp.city }}</a> <a href="{{ exp.country.get_permanent_url }}">{{ exp.country }}</a>, <a href="{{ exp.city.get_permanent_url }}">{{ exp.city }}</a>
{% if exp.place %} {% if exp.place %}
, <a href="{{ exp.place.get_permanent_url }}">{{ exp.place }}</a> , <a href="{{ exp.place.get_permanent_url }}">{{ exp.place }}</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
<li><a class="button more" href="{{ event.get_nearest_events_url|safe }}">{% trans 'Смотреть все' %}</a></li> <li><a class="button more" href="{{ event.get_nearest_events_url|safe }}">{% trans 'Смотреть все' %}</a></li>
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% include 'client/includes/banners/detail_inner_3.html' %} {% include 'client/includes/banners/detail_inner_3.html' %}
<div class="e-cat look-also"> <div class="e-cat look-also">
<div class="sect-title">{% trans 'Смотрите также:' %}</div> <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> <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>
<a href="{{ event.catalog }}country/{{ event.country.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a> <a href="{{ event.catalog }}country/{{ event.country.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
{% if event.theme.all %} {% if event.theme.all %}
<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/country/{{ event.country.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&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 }}/country/{{ event.country.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&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|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a> <a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/city/{{ event.city.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
{% endif %} {% endif %}
</div> </div>
{% endblock %} {% endblock %}
@ -368,36 +368,30 @@
{% endblock %} {% endblock %}
{% block popup %} {% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %} {% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script> <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
{% endif %} {% endif %}
<script> <script>
EXPO.exposition.object.init({ EXPO.exposition.object.init({
visit:{ visit:{
activeClass:"visit", activeClass:"visit",
passiveClass:"unvisit", passiveClass:"unvisit",
currentHtml:'<li class="current"><a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}&nbsp;{% if request.user.company %}({{ request.user.company.name }}){% endif %}</a></li>', currentHtml:'<li class="current"><a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}&nbsp;{% if request.user.company %}({{ request.user.company.name }}){% endif %}</a></li>',
visitorsListId:"visitors-list", visitorsListId:"visitors-list",
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{ advertise:{
wrapClass:'note-wrap', id:"advert-member-form"
wrapDisabledClass:'note-wrap-disabled', },
buttonClass:'note-button', addCalendarText:"{% trans 'В расписание' %}",
inputClass:'note-text' removeCalendarText:"{% trans 'Из расписания' %}"
}, });
advertise:{ </script>
id:"advert-member-form"
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %} {% endblock %}

@ -422,12 +422,6 @@
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{ advertise:{
id:"advert-member-form" id:"advert-member-form"
}, },

@ -583,12 +583,6 @@
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{ advertise:{
id:"advert-member-form" id:"advert-member-form"
}, },

@ -8,106 +8,106 @@
{% endif %} {% endif %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{# START FOR #} {# START FOR #}
{% for result in query %} {% for result in query %}
<li class="cl-item {% if result.object.canceled %}canceled{% endif %}"> <li class="cl-item {% if result.object.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="{{ result.object.get_permanent_url }}"> <a target="_blank" href="{{ result.object.get_permanent_url }}">
{% if result.object.canceled %} {% if result.object.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
{% elif result.object.expohit %} {% elif result.object.expohit %}
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
<div class="cli-pict"> <div class="cli-pict">
{% with obj=result.object %} {% with obj=result.object %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if result.object.quality_label.rsva.is_set %} {% if result.object.quality_label.rsva.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if result.object.quality_label.exporating.is_set %} {% if result.object.quality_label.exporating.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if result.object.quality_label.ufi.is_set %} {% if result.object.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a target="_blank" href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div> <div class="cli-title"><a target="_blank" href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ result.object.main_title|safe }} {{ result.object.main_title|safe }}
</div> </div>
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=result.object %} {% with obj=result.object %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
</div> </div>
{% if result.object.country %} {% if result.object.country %}
<div class="cli-place"> <div class="cli-place">
<a href="{{ result.object.catalog }}country/{{ result.object.country.url }}/">{{ result.object.country }}</a>, <a href="{{ result.object.catalog }}city/{{ result.object.city.url }}/">{{ result.object.city }}</a> <a href="{{ result.object.catalog }}country/{{ result.object.country.url }}/">{{ result.object.country }}</a>, <a href="{{ result.object.catalog }}city/{{ result.object.city.url }}/">{{ result.object.city }}</a>
{% if result.object.place %} {% if result.object.place %}
, <a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a> , <a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
{% include 'client/includes/exposition/services.html' with obj=result.object %} {% include 'client/includes/exposition/services.html' with obj=result.object %}
{% include 'client/includes/calendar_button.html' with obj=result.object %} {% include 'client/includes/calendar_button.html' with obj=result.object %}
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=result.object %} {% include 'client/buttons/booking_button.html' with object=result.object %}
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if result.object.visitors %} {% if result.object.visitors %}
<span class="visitors" title="Посетители">{{ result.object.visitors }}</span> <span class="visitors" title="Посетители">{{ result.object.visitors }}</span>
{% endif %} {% endif %}
{% if result.object.members %} {% if result.object.members %}
<span class="participants" title="Участники">{{ result.object.members }}</span> <span class="participants" title="Участники">{{ result.object.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=result.object %} {% include 'client/includes/exposition/tags.html' with obj=result.object %}
</div> </div>
</footer> </footer>
</li> </li>
{% if not request.is_ajax %} {% if not request.is_ajax %}
{% if forloop.counter == 5 or objects|length < 5 %} {% if forloop.counter == 5 or objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %} {% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %} {% endif %}
@ -115,32 +115,26 @@
{% if forloop.counter == 10 %} {% if forloop.counter == 10 %}
{% include 'client/includes/banners/catalog_inner.html' %} {% include 'client/includes/banners/catalog_inner.html' %}
{%endif %} {%endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{# END FOR #} {# END FOR #}
</ul> </ul>
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script> <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %} {% endif %}
<script> <script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ addCalendarText:"{% trans 'В расписание' %}",
wrapClass:'note-wrap', removeCalendarText:"{% trans 'Из расписания' %}"
wrapDisabledClass:'note-wrap-disabled', });
buttonClass:'note-button', </script>
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %} {% endblock %}

@ -5,114 +5,114 @@
{% if objects %} {% if objects %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{% for obj in objects %} {% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}"> <li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a href="{{ obj.get_permanent_url }}"> <a href="{{ obj.get_permanent_url }}">
{% if obj.canceled %} {% if obj.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
{% else %} {% else %}
{% if obj.expohit %} {% if obj.expohit %}
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
{% endif %} {% endif %}
<div class="cli-pict"> <div class="cli-pict">
{% with obj=obj %} {% with obj=obj %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if obj.quality_label.ufi.is_set %} {% if obj.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div> <div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ obj.main_title|safe }} {{ obj.main_title|safe }}
</div> </div>
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=obj %} {% with obj=obj %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
</div> </div>
{% if obj.country %} {% if obj.country %}
<div class="cli-place"> <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> <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 %} {% if obj.place %}
, <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a> , <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
{% include 'client/includes/exposition/services.html' with obj=obj %} {% include 'client/includes/exposition/services.html' with obj=obj %}
{% include 'client/includes/calendar_button.html' with obj=obj%} {% include 'client/includes/calendar_button.html' with obj=obj%}
{% if request.user.is_admin %} {% if request.user.is_admin %}
<div class="note-wrap"> <div class="note-wrap">
<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a> <a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>
</div> </div>
{% endif %} {% endif %}
<div></div> <div></div>
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=obj %} {% include 'client/buttons/booking_button.html' with object=obj %}
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if obj.visitors %} {% if obj.visitors %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span> <span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %} {% endif %}
{% if obj.members %} {% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span> <span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %} {% include 'client/includes/exposition/tags.html' with obj=obj %}
</div> </div>
</footer> </footer>
</li> </li>
{% if forloop.counter == 8 %} {% if forloop.counter == 8 %}
{% if not NO_EXTERNAL_JS %} {% if not NO_EXTERNAL_JS %}
<!-- Яндекс.Директ --> <!-- Яндекс.Директ -->
<script type="text/javascript"> <script type="text/javascript">
yandex_partner_id = 58151; yandex_partner_id = 58151;
yandex_site_bg_color = 'FFFFFF'; yandex_site_bg_color = 'FFFFFF';
yandex_ad_format = 'direct'; yandex_ad_format = 'direct';
yandex_font_size = 1; yandex_font_size = 1;
yandex_direct_type = 'horizontal'; yandex_direct_type = 'horizontal';
yandex_direct_border_type = 'block'; yandex_direct_border_type = 'block';
yandex_direct_limit = 3; yandex_direct_limit = 3;
yandex_direct_title_font_size = 3; yandex_direct_title_font_size = 3;
yandex_direct_border_radius = true; yandex_direct_border_radius = true;
yandex_direct_links_underline = false; yandex_direct_links_underline = false;
yandex_direct_header_bg_color = 'FEEAC7'; yandex_direct_header_bg_color = 'FEEAC7';
yandex_direct_bg_color = 'FFF9F0'; yandex_direct_bg_color = 'FFF9F0';
yandex_direct_border_color = 'FBE5C0'; yandex_direct_border_color = 'FBE5C0';
yandex_direct_title_color = '666666'; yandex_direct_title_color = '666666';
yandex_direct_url_color = '000000'; yandex_direct_url_color = '000000';
yandex_direct_text_color = '000000'; yandex_direct_text_color = '000000';
yandex_direct_hover_color = 'FF3333'; yandex_direct_hover_color = 'FF3333';
yandex_direct_sitelinks_color = '666666'; yandex_direct_sitelinks_color = '666666';
yandex_direct_favicon = false; yandex_direct_favicon = false;
yandex_no_sitelinks = false; yandex_no_sitelinks = false;
document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>'); document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>');
</script> </script>
{% endif %} {% endif %}
{%endif %} {%endif %}
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}
@ -133,15 +133,9 @@
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %}<script> {% endif %}<script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ addCalendarText:"{% trans 'В расписание' %}",
wrapClass:'note-wrap', removeCalendarText:"{% trans 'Из расписания' %}"
wrapDisabledClass:'note-wrap-disabled', });
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script> </script>
{% endblock %} {% endblock %}

@ -429,12 +429,6 @@
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{ advertise:{
id:"advert-member-form" id:"advert-member-form"
}, },

@ -139,12 +139,6 @@
<script> <script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}", addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}" removeCalendarText:"{% trans 'Из расписания' %}"
}); });

@ -459,12 +459,6 @@
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{ advertise:{
id:"advert-member-form" id:"advert-member-form"
}, },

@ -3,94 +3,94 @@
{% load template_filters %} {% load template_filters %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{# START FOR #} {# START FOR #}
{% for result in query %} {% for result in query %}
<li class="cl-item {% if result.object.canceled %}canceled{% endif %}"> <li class="cl-item {% if result.object.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="{{ result.object.get_permanent_url }}"> <a target="_blank" href="{{ result.object.get_permanent_url }}">
{% if result.object.canceled %} {% if result.object.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
{% elif result.object.expohit %} {% elif result.object.expohit %}
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
<div class="cli-pict"> <div class="cli-pict">
{% with obj=result.object %} {% with obj=result.object %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if result.object.quality_label.ufi.is_set %} {% if result.object.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a target="_blank" href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div> <div class="cli-title"><a target="_blank" href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ result.object.main_title|safe }} {{ result.object.main_title|safe }}
</div> </div>
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=result.object %} {% with obj=result.object %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
</div> </div>
{% if result.object.country %} {% if result.object.country %}
<div class="cli-place"> <div class="cli-place">
<a href="{{ result.object.catalog }}country/{{ result.object.country.url }}/">{{ result.object.country }}</a>, <a href="{{ result.object.catalog }}city/{{ result.object.city.url }}/">{{ result.object.city }}</a> <a href="{{ result.object.catalog }}country/{{ result.object.country.url }}/">{{ result.object.country }}</a>, <a href="{{ result.object.catalog }}city/{{ result.object.city.url }}/">{{ result.object.city }}</a>
{% if result.object.place %} {% if result.object.place %}
, <a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a> , <a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
{% include 'client/includes/exposition/services.html' with obj=result.object %} {% include 'client/includes/exposition/services.html' with obj=result.object %}
{% include 'client/includes/calendar_button.html' with obj=result.object %} {% include 'client/includes/calendar_button.html' with obj=result.object %}
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=result.object %} {% include 'client/buttons/booking_button.html' with object=result.object %}
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if result.object.visitors %} {% if result.object.visitors %}
<span class="visitors" title="Посетители">{{ result.object.visitors }}</span> <span class="visitors" title="Посетители">{{ result.object.visitors }}</span>
{% endif %} {% endif %}
{% if result.object.members %} {% if result.object.members %}
<span class="participants" title="Участники">{{ result.object.members }}</span> <span class="participants" title="Участники">{{ result.object.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=result.object %} {% include 'client/includes/exposition/tags.html' with obj=result.object %}
</div> </div>
</footer> </footer>
</li> </li>
{% if forloop.counter == 5 or objects|length < 5 %} {% if forloop.counter == 5 or objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %} {% include 'client/includes/banners/catalog_inner_2.html' %}
@ -100,30 +100,24 @@
{% include 'client/includes/banners/catalog_inner.html' %} {% include 'client/includes/banners/catalog_inner.html' %}
{%endif %} {%endif %}
{% endfor %} {% endfor %}
{# END FOR #} {# END FOR #}
</ul> </ul>
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script> <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %} {% endif %}
<script> <script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ addCalendarText:"{% trans 'В расписание' %}",
wrapClass:'note-wrap', removeCalendarText:"{% trans 'Из расписания' %}"
wrapDisabledClass:'note-wrap-disabled', });
buttonClass:'note-button', </script>
inputClass:'note-text'
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %} {% endblock %}

@ -211,21 +211,5 @@
</div> </div>
</section> </section>
{% if request.GET.debug == '1' %} <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/2.1.6/jquery.cycle2.min.js" defer></script>
<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 %} {% endblock %}

Loading…
Cancel
Save