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

templates/client/includes/services.html

@@ -4,7 +4,7 @@
 	<nav>
 		<ul>
 			<li><a href="/service/translator/">{% trans 'Переводчики' %}</a></li>
-			<li><a href="/service/tickets/">{% trans 'Билеты на выставки' %}</a></li>
+			{% comment %}<li><a href="/service/tickets/">{% trans 'Билеты на выставки' %}</a></li>{% endcomment %}
 			<li><a href="/service/remote/">{% trans 'Заочное посещение' %}</a></li>
 			<li><a href="/service/participation/">{% trans 'Участие в выставках' %}</a></li>
             <li><a href="/service/visit/">{% trans 'Посещение выставки' %}</a></li>

templates/client/popups/register.html

@@ -6,7 +6,7 @@
 				<div class="pw-title">{% trans 'Регистрация' %}</div>
 			</header>
 			<div class="pw-body clearfix">
-				<form method="post" class="pw-form pw-form validate"  id="reg_form" action="/register/">{% csrf_token %}
+				<form method="post" class="pw-form pw-form simple-validate-register reg-form"  id="reg_form" action="/register/">{% csrf_token %}
 					<div class="pwf-line">
 						<div class="pwf-field">
                             <input id="id_first_name" maxlength="30" name="first_name" placeholder="{% trans 'Имя' %}" type="text">

templates/client/static_client/css/main.css

@@ -558,8 +558,8 @@ a.l-button.ico:before {
 }*/
 
 .header-body .header-top .ht-side {
-	width: 470px;
-	margin-right: -470px;
+	width: 510px;
+	margin-right: -510px;
 	float: right;
 }
 
@@ -1864,6 +1864,7 @@ button:hover,
 
 .pw-reg .pw-form button{
 	width: 265px;
+	cursor: pointer;
 }
 
 button[class *= "icon-"]:before {
@@ -3732,6 +3733,7 @@ form.s-message {
 	color: #ff6600;
 	padding-left: 20px;
 	display: none;
+	max-width: 234px;
 }
 
 .pwf-msg .msg-help:before {
@@ -13447,6 +13449,15 @@ hr + .rq-note {
 	}
 	/*.add-event-page .date-to-date*/
 
+/************************\
+# registration form
+\***********************/
+
+ .reg-form .msg-help .error{
+	 color: #d80000;
+ }
+
+
 /************************\
 # completion of registration modal
 \***********************/

templates/client/static_client/js/_modules/block.common.js

@@ -208,6 +208,59 @@ if (EXPO.common){
 					$.get(url, formData, callback);
 				}
 			});
+			/**
+			 * registration form requires a special form of error messages
+			 */
+			$('form.simple-validate-register').on('submit', function(e){
+				e.preventDefault();
+				var $form = $(this),
+					url = $form.attr('action'),
+					formData = $(this).serialize(),
+					method = $form.attr("method"),
+					callback = function (data) {
+						if (data.success){
+							$.fancybox.close();
+
+							$(".error", $form).remove();
+							$(".required.err", $form).removeClass("required err");
+							$("input:text", $form).val('');
+							$(".pwf-line .msg-help",$form).each(function () {
+								var $this = $(this),
+									defaultT = $this.attr("data-default");
+								if($.trim(defaultT) != ''){
+									$this.html('').text(defaultT);
+								}
+							});
+
+						}
+						else{
+							// delete previous error messages
+							$(".error", $form).remove();
+							$(".required.err", $form).removeClass("required err");
+							$(".pwf-line .msg-help",$form).each(function () {
+								var $this = $(this),
+									defaultT = $this.attr("data-default");
+								if($.trim(defaultT) != ''){
+									$this.html('').text(defaultT);
+								}
+							});
+
+							$.each(data.errors, function (index, value) {
+								var $input = $("#id_"+index, $form),
+									$error = $("<div/>").attr("class", "error").append(value),
+									$msg = $input.closest(".pwf-line").find(".msg-help");
+								$input.parent().addClass('required err');
+								$msg.attr("data-default", $msg.text());
+								$msg.text('').prepend($error);
+							})
+						}
+					};
+				if(method == "post"){
+					$.post(url, formData, callback);
+				}else{
+					$.get(url, formData, callback);
+				}
+			});
 
 		});
 //private

templates/client/static_client/js/_modules/page.profile.calendar.js

@@ -89,6 +89,7 @@ if (EXPO.profile.calendar) {
 
 						self.currentDay =currentDay;
 						if (result) {
+							result--;
 							result--;
 							offset = onestep * result * width;
 						} else {

templates/client/static_client/js_min/_modules/page.profile.calendar.min.js

@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){$("#btn_delete").on("click",function(t){t.preventDefault();var e=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),o=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),l=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),n={expo:JSON.stringify(e),conf:JSON.stringify(s),seminar:JSON.stringify(o),webinar:JSON.stringify(l)};$.get("/profile/calendar/remove/",n,function(t){t.success&&location.reload()})})}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),o=$("#"+this.opt.calenadrId),l=(o.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),n=$("#"+this.opt.scrollRightId),c=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,a=function(){var t,s,o=0,l=0,n=e.opt.cellWidth,c=$("#"+e.opt.calenadrId),i=c.find("."+e.opt.daysClass+" td."+e.opt.currentDayClass).index(),r=e.opt.cellsToScroll,a=c.find("."+e.opt.daysClass+" td").length;return i>0?(i++,t=a/r,s=a/i,l=Math.floor(t)-Math.floor(s),e.currentDay=i,l?(l--,o=r*l*n):o=0):(e.currentDay=0,o=0),o};this.$leftScroll=l,this.$rightScroll=n,this.currentOffset=a(),this.scrollStep=r,this.$scrollBox=s,this.$messages=[],this.stepWidth=e.opt.cellsToScroll*e.opt.cellWidth,$(function(){c.each(function(){var t=parseInt($(this).offset().left,10),s=$(".message",$(this));t?t-=312:t+=312,$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&(s.width(e.stepWidth),0>t&&s.css({marginLeft:Math.abs(t+e.stepWidth)+"px"}),e.$messages.push(s)):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass+":even").addClass("grey")}),$(window).load(function(){e.calendarWidth=e.opt.cellWidth*o.find("."+e.opt.daysClass+" td").length,s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+e.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1},callbacks:{onScroll:function(){e.$leftScroll.off("click").one("click",function(){e.scrollLeft(e)}),e.$rightScroll.off("click").one("click",function(){e.scrollRight(e)})}}}),e.$leftScroll.one("click",function(){e.scrollLeft(e)}),e.$rightScroll.one("click",function(){e.scrollRight(e)})}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(n.hide(),l.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(n.show(),l.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t.scrollRight=function(t){return t||(t=this),t.currentOffset+t.stepWidth<t.calendarWidth?(t.currentOffset+=t.scrollStep,console.log("!!! right scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","-="+t.scrollStep),t.offsetMessages()):t.$rightScroll.one("click",function(){t.scrollRight(t)}),!1},t.scrollLeft=function(t){return t||(t=this),t.currentOffset>=t.stepWidth?(t.currentOffset-=t.scrollStep,console.log("!!! left scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","+="+t.scrollStep),t.offsetMessages(t)):t.$leftScroll.one("click",function(){t.scrollLeft(t)}),!1},t.offsetMessages=function(t){t||(t=this);for(var e=0;e<t.$messages.length;e++){var s=t.$messages[e].parent().width(),o=parseInt(t.$messages[e].parent().offset().left,10);o?o-=312:o+=312,s>t.stepWidth&&0>o&&t.$messages[e].css({marginLeft:Math.abs(o+t.stepWidth)+"px"})}},t}();
+var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){$("#btn_delete").on("click",function(t){t.preventDefault();var e=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),o=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),l=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),n={expo:JSON.stringify(e),conf:JSON.stringify(s),seminar:JSON.stringify(o),webinar:JSON.stringify(l)};$.get("/profile/calendar/remove/",n,function(t){t.success&&location.reload()})})}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),o=$("#"+this.opt.calenadrId),l=(o.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),n=$("#"+this.opt.scrollRightId),c=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,a=function(){var t,s,o=0,l=0,n=e.opt.cellWidth,c=$("#"+e.opt.calenadrId),i=c.find("."+e.opt.daysClass+" td."+e.opt.currentDayClass).index(),r=e.opt.cellsToScroll,a=c.find("."+e.opt.daysClass+" td").length;return i>0?(i++,t=a/r,s=a/i,l=Math.floor(t)-Math.floor(s),e.currentDay=i,l?(l--,l--,o=r*l*n):o=0):(e.currentDay=0,o=0),o};this.$leftScroll=l,this.$rightScroll=n,this.currentOffset=a(),this.scrollStep=r,this.$scrollBox=s,this.$messages=[],this.stepWidth=e.opt.cellsToScroll*e.opt.cellWidth,$(function(){c.each(function(){var t=parseInt($(this).offset().left,10),s=$(".message",$(this));t?t-=312:t+=312,$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&(s.width(e.stepWidth),0>t&&s.css({marginLeft:Math.abs(t+e.stepWidth)+"px"}),e.$messages.push(s)):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass+":even").addClass("grey")}),$(window).load(function(){e.calendarWidth=e.opt.cellWidth*o.find("."+e.opt.daysClass+" td").length,s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+e.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1},callbacks:{onScroll:function(){e.$leftScroll.off("click").one("click",function(){e.scrollLeft(e)}),e.$rightScroll.off("click").one("click",function(){e.scrollRight(e)})}}}),e.$leftScroll.one("click",function(){e.scrollLeft(e)}),e.$rightScroll.one("click",function(){e.scrollRight(e)})}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(n.hide(),l.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(n.show(),l.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t.scrollRight=function(t){return t||(t=this),t.currentOffset+t.stepWidth<t.calendarWidth?(t.currentOffset+=t.scrollStep,console.log("!!! right scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","-="+t.scrollStep),t.offsetMessages()):t.$rightScroll.one("click",function(){t.scrollRight(t)}),!1},t.scrollLeft=function(t){return t||(t=this),t.currentOffset>=t.stepWidth?(t.currentOffset-=t.scrollStep,console.log("!!! left scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","+="+t.scrollStep),t.offsetMessages(t)):t.$leftScroll.one("click",function(){t.scrollLeft(t)}),!1},t.offsetMessages=function(t){t||(t=this);for(var e=0;e<t.$messages.length;e++){var s=t.$messages[e].parent().width(),o=parseInt(t.$messages[e].parent().offset().left,10);o?o-=312:o+=312,s>t.stepWidth&&0>o&&t.$messages[e].css({marginLeft:Math.abs(o+t.stepWidth)+"px"})}},t}();