diff --git a/.gitignore b/.gitignore index bd43984b..48f1c69c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,16 @@ *~ *.egg-info *.doc +# jetbrains data .idea/ media/ media logs/ Thumbs.db -npm-debug.log /proj/local.py - +# gulp node_modules +npm-debug.log \ No newline at end of file diff --git a/templates/client/package.json b/templates/client/package.json new file mode 100644 index 00000000..aab78596 --- /dev/null +++ b/templates/client/package.json @@ -0,0 +1,30 @@ +{ + "name": "kotzilla", + "version": "0.0.0", + "description": "", + "main": "gulpfile.js", + "dependencies": { + "gulp": "~3.9.0" + }, + "devDependencies": { + "connect": "~3.4.0", + "gulp-concat": "~2.6.0", + "gulp-livereload": "~3.8.1", + "gulp": "~3.9.0", + "gulp-stylus": "~2.1.0", + "gulp-uglify": "~1.4.1", + "gulp-jade": "~1.1.0", + "gulp-imagemin": "~2.3.0", + "gulp-csso": "~1.0.0", + "gulp-myth": "~1.0.3", + "gulp-rename": "~1.2.2", + "gulp-autoprefixer": "~3.0.2", + "gulp-cssmin": "~0.1.7", + "gulp-newer": "~0.5.1" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "BSD-2-Clause" +} diff --git a/templates/client/service/participation.html b/templates/client/service/participation.html index 864c5179..d6e5efc3 100644 --- a/templates/client/service/participation.html +++ b/templates/client/service/participation.html @@ -55,7 +55,7 @@
-
{% csrf_token %} + {% csrf_token %}
diff --git a/templates/client/service/remotely.html b/templates/client/service/remotely.html index 65a7787d..1a7e3a42 100644 --- a/templates/client/service/remotely.html +++ b/templates/client/service/remotely.html @@ -58,7 +58,7 @@
- {% csrf_token %} + {% csrf_token %}
diff --git a/templates/client/service/tickets.html b/templates/client/service/tickets.html index 94f2b6c3..63372e45 100644 --- a/templates/client/service/tickets.html +++ b/templates/client/service/tickets.html @@ -51,7 +51,7 @@
- {% csrf_token %} + {% csrf_token %}
diff --git a/templates/client/service/tour.html b/templates/client/service/tour.html index 8a58e0b0..393a0e77 100644 --- a/templates/client/service/tour.html +++ b/templates/client/service/tour.html @@ -53,7 +53,7 @@
- {% csrf_token %} + {% csrf_token %}
diff --git a/templates/client/service/translator.html b/templates/client/service/translator.html index adcb4285..c0236e37 100644 --- a/templates/client/service/translator.html +++ b/templates/client/service/translator.html @@ -51,7 +51,7 @@
{% comment %}{{ form.errors }}{% endcomment %} - {% csrf_token %} + {% csrf_token %}
diff --git a/templates/client/static_client/css/vendor.css b/templates/client/static_client/css/vendor.css index 2daa3034..64743fb6 100644 --- a/templates/client/static_client/css/vendor.css +++ b/templates/client/static_client/css/vendor.css @@ -2809,4 +2809,3 @@ html[dir="rtl"] .select2-container-multi .select2-choices li height: 100px; overflow: scroll; } - diff --git a/templates/client/static_client/js/_modules/block.common.js b/templates/client/static_client/js/_modules/block.common.js index 7c1becea..c8f0f3c7 100644 --- a/templates/client/static_client/js/_modules/block.common.js +++ b/templates/client/static_client/js/_modules/block.common.js @@ -93,7 +93,12 @@ if (EXPO.common){ $.fancybox.close(true); $.fancybox('#'+EXPO.common.opt.successRegisterId); }else{ - + if($(self.DOM).attr('id') == 'log_form'){ + dataLayer.push({'event': 'logform'}); + } + if($(self.DOM).attr('id') == 'end-reg-form'){ + dataLayer.push({'event': 'endregform'}); + } window.location.reload(); } }else{ diff --git a/templates/client/static_client/js_min/_modules/block.common.min.js b/templates/client/static_client/js_min/_modules/block.common.min.js index 338162e4..e348fbda 100644 --- a/templates/client/static_client/js_min/_modules/block.common.min.js +++ b/templates/client/static_client/js_min/_modules/block.common.min.js @@ -1 +1 @@ -var EXPO=EXPO||{};EXPO.common?console.warn("WARNING: EXPO.common is already defined!"):EXPO.common=function(){var e,t={},s=function(e,t){return(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector).call(e,t)};t.opt={};var r=function(e){this.fields=[],this.allIsClear=!1,this.ajaxUrl=e.getAttribute("action"),this.DOM=e,this._initFields(),this._eventController()};return r.prototype={_eventController:function(){var e=this;this.DOM.addEventListener?this.DOM.addEventListener("submit",function(t){return e.validate(),t.preventDefault(),!1},!1):this.DOM.attachEvent&&this.DOM.attachEvent("onsubmit",function(t){return e.validate(),t.preventDefault(),!1})},_initFields:function(){},validate:function(){var t,s=this,r=$(s.DOM).serialize(),a={},o="err-message-box",i=s.DOM.querySelector("."+o),n=i.innerHTML,l=function(r){var o,l;if(t=r,s.unHighlightFields(),t.success)i&&EXPO.common.removeClass(i,"active"),$(s.DOM).attr("id")==EXPO.common.opt.registerFormId?(o=$("#"+EXPO.common.opt.successRegisterId),l=$.trim($("#id_email",s.DOM).val()),$("."+EXPO.common.opt.resendLetterClass,o).attr("data-email",l),$.fancybox.close(!0),$.fancybox("#"+EXPO.common.opt.successRegisterId)):window.location.reload();else{EXPO.common.removeClass(i,"active"),a={},s.fields=[];for(var c in t.errors)t.errors.hasOwnProperty(c)&&("__all__"!=c?(a={name:c,id:"id_"+c,errorText:t.errors[c]},s.fields.push(a)):i&&(EXPO.common.addClass(i,"active"),n.indexOf(t.errors[c])<0&&i.insertAdjacentHTML("beforeend",t.errors[c]+" ")));s.highliteFields()}e.hide()};s.unHighlightFields(),e.show(),EXPO.common.postRequest(r,s.ajaxUrl,l)},highliteFields:function(){for(var e,t,s=0;s").attr("class","error").append(s);r.parent().addClass("required err").prepend(a)}))};"post"==o?$.post(s,a,i):$.get(s,a,i)}),$("form.simple-validate-register").on("submit",function(e){e.preventDefault();var t=$(this),s=t.attr("action"),r=$(this).serialize(),a=t.attr("method"),o=$("#pw-reg-complete"),i=$(".resend-letter",o),n=$.trim($("#id_email",t).val()),l=function(e){e.success?(dataLayer.push({event:"regform"}),$(".error",t).remove(),$(".required.err",t).removeClass("required err"),$("input:text",t).val(""),$(".pwf-line .msg-help",t).each(function(){var e=$(this),t=e.attr("data-default");""!=$.trim(t)&&e.html("").text(t)}),i.attr("data-email",n),$.fancybox.close(!0),$.fancybox("#pw-reg-complete")):($(".error",t).remove(),$(".required.err",t).removeClass("required err"),$(".pwf-line .msg-help",t).each(function(){var e=$(this),t=e.attr("data-default");""!=$.trim(t)&&e.html("").text(t)}),$.each(e.errors,function(e,s){var r=$("#id_"+e,t),a=$("
").attr("class","error").append(s),o=r.closest(".pwf-line").find(".msg-help");r.parent().addClass("required err"),o.attr("data-default",o.text()),o.text("").prepend(a)}))};"post"==a?$.post(s,r,l):$.get(s,r,l)})}),$(function(){$.fancybox.helpers.overlay.overlay=$('
').appendTo("body"),$.fn.customRadioCheck=function(){return $(this).each(function(){function e(){if("radio"==s){var e=t.attr("name"),r=$('input[type="radio"]').filter('[name="'+e+'"]');r.each(function(){var e=$(this).closest(".custom-radio");e.removeClass("checked"),$(this).is(":checked")&&e.addClass("checked")})}else t.prop("checked")?a.addClass("checked"):a.removeClass("checked");t.trigger("blur")}var t=$(this),s=t.attr("type"),r=t.closest("label"),a=t.wrap("").parent();r.addClass("custom-radio-check"),e(),t.on("change",e)})},$("input[type='checkbox'], input[type='radio']").customRadioCheck()}),function(e){e.fn.inlineStyle=function(t){var s,r=this.attr("style");return r&&r.split(";").forEach(function(r){var a=r.split(":");e.trim(a[0])===t&&(s=a[1])}),s}}(jQuery),t.init=function(t){$.extend(this.opt,t);var s,r=this,a=this.opt.addCalendarClass,o=this.opt.removeCalendarClass,i=this.opt.addCalendarText,n=this.opt.removeCalendarText,l=r.opt.staticValidation.errorClass,c=r.opt.staticValidation.containerClass;r.opt.staticValidation.blobClass;$(function(){s=$("."+l),e=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"}),$("body").on("click","."+a+", ."+o,function(e){i=r.opt.addCalendarText,n=r.opt.removeCalendarText,e.preventDefault();var t=$(this),s=t.attr("href");$.get(s,function(e){e.not_authorized?$.fancybox.open("#"+r.opt.loginModalId):e.success&&(e["in"]?t.removeClass(a).addClass(o).text(n):t.removeClass(o).addClass(a).text(i))})}),s.length&&s.find("input:text").on("keyup",function(){""!=$.trim($(this).val())?$(this).closest("."+l).removeClass(l):$(this).closest("."+c).addClass(l)});for(var t=0;t=0;)r=r.replace(" "+s+" "," ");e.className=r.replace(/^\s+|\s+$/g," ")}return e},t.closest=function(e,s){for(var r=function(s){return t.hasClass(e,s)};e;){if(r(s))return e;e=e.parentNode}},t.children=function(e,t){for(var r,a=[],r=0,o=e.childNodes.length;o>r;++r)s(e.childNodes[r],t)&&a.push(e.childNodes[r]);return a},t.postRequest=function(e,t,s){e||(e=""),$.ajax({type:"POST",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},t.getRequest=function(e,t,s){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},t.Modal=function(e){var t=this;this.id,this.opt=e,this.DOMwrap=document.getElementById(e.id),this.DOM=this.DOMwrap.querySelector("."+e.wrapClass),$(".modal-close",this.DOM).on("click",function(){t.close()}),$(".modals > *").on("click",function(e){$(e.target.parentNode).find(t.DOMwrap).length&&t.close()})},t.Modal.prototype={pullData:function(e){this.id=e.substr(1),$(e).show().siblings().hide(),this.refresh()},open:function(){$(this.DOMwrap).fadeIn(),t.addClass(document.body,"ov-hidden")},close:function(){$(this.DOMwrap).fadeOut(),t.removeClass(document.body,"ov-hidden")},refresh:function(){var e=this;e.DOM.style.width=e.opt.size[e.id].width+"px",e.DOM.style.minHeight=e.opt.size[e.id].height+"px",e.DOM.style.marginLeft=-(e.opt.size[e.id].width/2)+"px",e.DOM.style.marginTop=-(e.opt.size[e.id].height/2)+"px"}},t.SEOhide={seoContent:{},seoHrefs:{},decode:function(e){for(var t=$("["+e+"]"),s=0,r=t.length;r>s;s++){var a=t.eq(s),o=a.attr("data-hash");switch(a.data("type")){case"href":a.attr("href",Base64.decode(this.seoHrefs[o]));break;case"content":a.replaceWith(Base64.decode(this.seoContent[o]))}}}},t.nl2br=function(e,t){var s=t||"undefined"==typeof t?"
":"
";return(e+"").replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g,"$1"+s+"$2")},t}(); \ No newline at end of file +var EXPO=EXPO||{};EXPO.common?console.warn("WARNING: EXPO.common is already defined!"):EXPO.common=function(){var e,t={},r=function(e,t){return(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector).call(e,t)};t.opt={};var s=function(e){this.fields=[],this.allIsClear=!1,this.ajaxUrl=e.getAttribute("action"),this.DOM=e,this._initFields(),this._eventController()};return s.prototype={_eventController:function(){var e=this;this.DOM.addEventListener?this.DOM.addEventListener("submit",function(t){return e.validate(),t.preventDefault(),!1},!1):this.DOM.attachEvent&&this.DOM.attachEvent("onsubmit",function(t){return e.validate(),t.preventDefault(),!1})},_initFields:function(){},validate:function(){var t,r=this,s=$(r.DOM).serialize(),a={},o="err-message-box",i=r.DOM.querySelector("."+o),n=i.innerHTML,l=function(s){var o,l;if(t=s,r.unHighlightFields(),t.success)i&&EXPO.common.removeClass(i,"active"),$(r.DOM).attr("id")==EXPO.common.opt.registerFormId?(o=$("#"+EXPO.common.opt.successRegisterId),l=$.trim($("#id_email",r.DOM).val()),$("."+EXPO.common.opt.resendLetterClass,o).attr("data-email",l),$.fancybox.close(!0),$.fancybox("#"+EXPO.common.opt.successRegisterId)):("log_form"==$(r.DOM).attr("id")&&dataLayer.push({event:"logform"}),"end-reg-form"==$(r.DOM).attr("id")&&dataLayer.push({event:"endregform"}),window.location.reload());else{EXPO.common.removeClass(i,"active"),a={},r.fields=[];for(var c in t.errors)t.errors.hasOwnProperty(c)&&("__all__"!=c?(a={name:c,id:"id_"+c,errorText:t.errors[c]},r.fields.push(a)):i&&(EXPO.common.addClass(i,"active"),n.indexOf(t.errors[c])<0&&i.insertAdjacentHTML("beforeend",t.errors[c]+" ")));r.highliteFields()}e.hide()};r.unHighlightFields(),e.show(),EXPO.common.postRequest(s,r.ajaxUrl,l)},highliteFields:function(){for(var e,t,r=0;r").attr("class","error").append(r);s.parent().addClass("required err").prepend(a)}))};"post"==o?$.post(r,a,i):$.get(r,a,i)}),$("form.simple-validate-register").on("submit",function(e){e.preventDefault();var t=$(this),r=t.attr("action"),s=$(this).serialize(),a=t.attr("method"),o=$("#pw-reg-complete"),i=$(".resend-letter",o),n=$.trim($("#id_email",t).val()),l=function(e){e.success?(dataLayer.push({event:"regform"}),$(".error",t).remove(),$(".required.err",t).removeClass("required err"),$("input:text",t).val(""),$(".pwf-line .msg-help",t).each(function(){var e=$(this),t=e.attr("data-default");""!=$.trim(t)&&e.html("").text(t)}),i.attr("data-email",n),$.fancybox.close(!0),$.fancybox("#pw-reg-complete")):($(".error",t).remove(),$(".required.err",t).removeClass("required err"),$(".pwf-line .msg-help",t).each(function(){var e=$(this),t=e.attr("data-default");""!=$.trim(t)&&e.html("").text(t)}),$.each(e.errors,function(e,r){var s=$("#id_"+e,t),a=$("
").attr("class","error").append(r),o=s.closest(".pwf-line").find(".msg-help");s.parent().addClass("required err"),o.attr("data-default",o.text()),o.text("").prepend(a)}))};"post"==a?$.post(r,s,l):$.get(r,s,l)})}),$(function(){$.fancybox.helpers.overlay.overlay=$('
').appendTo("body"),$.fn.customRadioCheck=function(){return $(this).each(function(){function e(){if("radio"==r){var e=t.attr("name"),s=$('input[type="radio"]').filter('[name="'+e+'"]');s.each(function(){var e=$(this).closest(".custom-radio");e.removeClass("checked"),$(this).is(":checked")&&e.addClass("checked")})}else t.prop("checked")?a.addClass("checked"):a.removeClass("checked");t.trigger("blur")}var t=$(this),r=t.attr("type"),s=t.closest("label"),a=t.wrap("").parent();s.addClass("custom-radio-check"),e(),t.on("change",e)})},$("input[type='checkbox'], input[type='radio']").customRadioCheck()}),function(e){e.fn.inlineStyle=function(t){var r,s=this.attr("style");return s&&s.split(";").forEach(function(s){var a=s.split(":");e.trim(a[0])===t&&(r=a[1])}),r}}(jQuery),t.init=function(t){$.extend(this.opt,t);var r,s=this,a=this.opt.addCalendarClass,o=this.opt.removeCalendarClass,i=this.opt.addCalendarText,n=this.opt.removeCalendarText,l=s.opt.staticValidation.errorClass,c=s.opt.staticValidation.containerClass;s.opt.staticValidation.blobClass;$(function(){r=$("."+l),e=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"}),$("body").on("click","."+a+", ."+o,function(e){i=s.opt.addCalendarText,n=s.opt.removeCalendarText,e.preventDefault();var t=$(this),r=t.attr("href");$.get(r,function(e){e.not_authorized?$.fancybox.open("#"+s.opt.loginModalId):e.success&&(e["in"]?t.removeClass(a).addClass(o).text(n):t.removeClass(o).addClass(a).text(i))})}),r.length&&r.find("input:text").on("keyup",function(){""!=$.trim($(this).val())?$(this).closest("."+l).removeClass(l):$(this).closest("."+c).addClass(l)});for(var t=0;t=0;)s=s.replace(" "+r+" "," ");e.className=s.replace(/^\s+|\s+$/g," ")}return e},t.closest=function(e,r){for(var s=function(r){return t.hasClass(e,r)};e;){if(s(r))return e;e=e.parentNode}},t.children=function(e,t){for(var s,a=[],s=0,o=e.childNodes.length;o>s;++s)r(e.childNodes[s],t)&&a.push(e.childNodes[s]);return a},t.postRequest=function(e,t,r){e||(e=""),$.ajax({type:"POST",url:t,data:e,success:function(e){return"function"!=typeof r?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),r(e),void 0)}})},t.getRequest=function(e,t,r){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof r?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),r(e),void 0)}})},t.Modal=function(e){var t=this;this.id,this.opt=e,this.DOMwrap=document.getElementById(e.id),this.DOM=this.DOMwrap.querySelector("."+e.wrapClass),$(".modal-close",this.DOM).on("click",function(){t.close()}),$(".modals > *").on("click",function(e){$(e.target.parentNode).find(t.DOMwrap).length&&t.close()})},t.Modal.prototype={pullData:function(e){this.id=e.substr(1),$(e).show().siblings().hide(),this.refresh()},open:function(){$(this.DOMwrap).fadeIn(),t.addClass(document.body,"ov-hidden")},close:function(){$(this.DOMwrap).fadeOut(),t.removeClass(document.body,"ov-hidden")},refresh:function(){var e=this;e.DOM.style.width=e.opt.size[e.id].width+"px",e.DOM.style.minHeight=e.opt.size[e.id].height+"px",e.DOM.style.marginLeft=-(e.opt.size[e.id].width/2)+"px",e.DOM.style.marginTop=-(e.opt.size[e.id].height/2)+"px"}},t.SEOhide={seoContent:{},seoHrefs:{},decode:function(e){for(var t=$("["+e+"]"),r=0,s=t.length;s>r;r++){var a=t.eq(r),o=a.attr("data-hash");switch(a.data("type")){case"href":a.attr("href",Base64.decode(this.seoHrefs[o]));break;case"content":a.replaceWith(Base64.decode(this.seoContent[o]))}}}},t.nl2br=function(e,t){var r=t||"undefined"==typeof t?"
":"
";return(e+"").replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g,"$1"+r+"$2")},t}(); \ No newline at end of file