EXPO-111

templates/client/includes/exposition/exposition_object.html

@@ -4,7 +4,7 @@
 {% load template_filters %}
 
 {% block page_body %}
-    <div class="m-article">
+    <div class="m-article event-page">
         <div class="item-wrap event clearfix">
             <aside>
                 {% if exposition.expohit %}
@@ -281,6 +281,10 @@
 
 
     <hr/>
+	{% if exposition.area %}
+	{% else %}
+		<p class="title"> <i class="fa fa-bar-chart">&nbsp;</i>Статистика</p>
+	{% endif %}
     <div class="e-num-info">
 
         {% if exposition.area %}
@@ -291,6 +295,7 @@
 
             </div>
         </div>
+
         {% endif %}
 
         <div class="eni-stats">
@@ -397,19 +402,6 @@
 			somebodyId:"somebody",
 			nobodyId:"nobody"
 		},
-        visitButton:{
-            class:'visit',
-            wrapId:'secondary-visit',
-            template:'<a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}</a>',
-            visitorsListId:'visitors-list'
-
-        },
-        unvisitButton:{
-            class:'unvisit',
-            wrapId:'secondary-visit',
-            template:'<a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}</a>',
-            visitorsListId:'visitors-list'
-        },
         note:{
             wrapClass:'note-wrap',
             wrapDisabledClass:'note-wrap-disabled',

templates/client/static_client/css/main.css

@@ -13449,3 +13449,17 @@ hr + .rq-note {
 			font-size: 14px;
 			color: #d80000;
 		}
+
+/***********************\
+ # Страница Ивента
+\***********************/
+
+	.event-page .title{
+		font-family: 'dindisplay_pro', sans-serif;
+		font-size: 23px;
+		line-height: 24px;
+		margin: 0 0 12px;
+	}
+	.event-page .title .fa{
+		font-size: 0.8em;
+	}

templates/client/static_client/js/_modules/page.exposition.object.js

@@ -56,14 +56,9 @@ if (EXPO.exposition.object){
 		that.init = function (options) {
 			$.extend(this.opt, options);
 			var self = this,
-				$visitorsWrap = $(document.getElementById(self.opt.visitButton.visitorsListId)),
-				$secondaryList = $(document.getElementById(self.opt.visitButton.wrapId)),
 				$visitButtons = $('.'+this.opt.visit.activeClass+', .'+this.opt.visit.passiveClass);
 			this.notes = [];
 
-			if(!$visitorsWrap.children().length){
-				$secondaryList.show();
-			}
 			$('.'+this.opt.note.wrapClass).each(function () {
 				var note = new Note(this,self.opt.note);
 				self.notes.push(note);
@@ -100,8 +95,6 @@ if (EXPO.exposition.object){
 
 					if($('#'+self.opt.visit.visitorsListId).children().length == 0){
 
-						$('#'+self.opt.visit.somebodyId).removeClass("hidden");
-						$('#'+self.opt.visit.nobodyId).addClass("hidden");
 						$('#'+self.opt.visit.somebodyId).addClass("hidden");
 						$('#'+self.opt.visit.nobodyId).removeClass("hidden");
 					}

templates/client/static_client/js_min/_modules/page.exposition.object.min.js

@@ -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=EXPO.common,i={},s=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return s.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 i,s={},o=this,e=function(t){t.success?(console.log("ok"),$(o.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,i=t.getRequest(s,this.url,e)}},i.opt={},i.init=function(i){$.extend(this.opt,i);var o=this,e=$(document.getElementById(o.opt.visitButton.visitorsListId)),n=$(document.getElementById(o.opt.visitButton.wrapId)),a=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],e.children().length||n.show(),$("."+this.opt.note.wrapClass).each(function(){var t=new s(this,o.opt.note);o.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,a.off("click"),a.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).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden"),$("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!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 t=EXPO.common,i={},s=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return s.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 i,s={},o=this,e=function(t){t.success?(console.log("ok"),$(o.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,i=t.getRequest(s,this.url,e)}},i.opt={},i.init=function(i){$.extend(this.opt,i);var o=this,e=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new s(this,o.opt.note);o.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,e.off("click"),e.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})},i}();