From ef8ae14582be81435aab3b6714914104bec639a4 Mon Sep 17 00:00:00 2001
From: Modulos <modulos@protonmail.com>
Date: Wed, 12 Apr 2017 11:17:03 +0200
Subject: [PATCH 1/3] Change border-color if contact field is empty
The conact modals where moved in seperated templates. Further to
evaluate the form without reloading the page some ajax was added.
---
alplora/static/alplora/js/form.js | 12 +++
alplora/templates/alplora/contact.html | 42 ++++++++++
.../templates/alplora/contact_success.html | 21 +++++
alplora/templates/alplora/index.html | 76 ++++---------------
alplora/urls.py | 3 +-
alplora/views.py | 22 +++---
6 files changed, 104 insertions(+), 72 deletions(-)
create mode 100644 alplora/static/alplora/js/form.js
create mode 100644 alplora/templates/alplora/contact.html
create mode 100644 alplora/templates/alplora/contact_success.html
diff --git a/alplora/static/alplora/js/form.js b/alplora/static/alplora/js/form.js
new file mode 100644
index 00000000..0e91b172
--- /dev/null
+++ b/alplora/static/alplora/js/form.js
@@ -0,0 +1,12 @@
+/*!
+ * jQuery Form Plugin
+ * version: 4.2.1
+ * Requires jQuery v1.7 or later
+ * Copyright 2017 Kevin Morris
+ * Copyright 2006 M. Alsup
+ * Project repository: https://github.com/jquery-form/form
+ * Dual licensed under the MIT and LGPLv3 licenses.
+ * https://github.com/jquery-form/form#license
+ */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){"use strict";function b(b){var c=b.data;b.isDefaultPrevented()||(b.preventDefault(),a(b.target).closest("form").ajaxSubmit(c))}function c(b){var c=b.target,d=a(c);if(!d.is("[type=submit],[type=image]")){var e=d.closest("[type=submit]");if(0===e.length)return;c=e[0]}var f=c.form;if(f.clk=c,"image"===c.type)if(void 0!==b.offsetX)f.clk_x=b.offsetX,f.clk_y=b.offsetY;else if("function"==typeof a.fn.offset){var g=d.offset();f.clk_x=b.pageX-g.left,f.clk_y=b.pageY-g.top}else f.clk_x=b.pageX-c.offsetLeft,f.clk_y=b.pageY-c.offsetTop;setTimeout(function(){f.clk=f.clk_x=f.clk_y=null},100)}function d(){if(a.fn.ajaxSubmit.debug){var b="[jquery.form] "+Array.prototype.join.call(arguments,"");window.console&&window.console.log?window.console.log(b):window.opera&&window.opera.postError&&window.opera.postError(b)}}var e={};e.fileapi=void 0!==a('<input type="file">').get(0).files,e.formdata=void 0!==window.FormData;var f=!!a.fn.prop;a.fn.attr2=function(){if(!f)return this.attr.apply(this,arguments);var a=this.prop.apply(this,arguments);return a&&a.jquery||"string"==typeof a?a:this.attr.apply(this,arguments)},a.fn.ajaxSubmit=function(b,c,g,h){function i(c){var d,e,f=a.param(c,b.traditional).split("&"),g=f.length,h=[];for(d=0;d<g;d++)f[d]=f[d].replace(/\+/g," "),e=f[d].split("="),h.push([decodeURIComponent(e[0]),decodeURIComponent(e[1])]);return h}function j(c){for(var d=new FormData,e=0;e<c.length;e++)d.append(c[e].name,c[e].value);if(b.extraData){var f=i(b.extraData);for(e=0;e<f.length;e++)f[e]&&d.append(f[e][0],f[e][1])}b.data=null;var g=a.extend(!0,{},a.ajaxSettings,b,{contentType:!1,processData:!1,cache:!1,type:l||"POST"});b.uploadProgress&&(g.xhr=function(){var c=a.ajaxSettings.xhr();return c.upload&&c.upload.addEventListener("progress",function(a){var c=0,d=a.loaded||a.position,e=a.total;a.lengthComputable&&(c=Math.ceil(d/e*100)),b.uploadProgress(a,d,e,c)},!1),c}),g.data=null;var h=g.beforeSend;return g.beforeSend=function(a,c){b.formData?c.data=b.formData:c.data=d,h&&h.call(this,a,c)},a.ajax(g)}function k(c){function e(a){var b=null;try{a.contentWindow&&(b=a.contentWindow.document)}catch(a){d("cannot get iframe.contentWindow document: "+a)}if(b)return b;try{b=a.contentDocument?a.contentDocument:a.document}catch(c){d("cannot get iframe.contentDocument: "+c),b=a.document}return b}function g(){function b(){try{var a=e(q).readyState;d("state = "+a),a&&"uninitialized"===a.toLowerCase()&&setTimeout(b,50)}catch(a){d("Server abort: ",a," (",a.name,")"),h(2),w&&clearTimeout(w),w=void 0}}var c=o.attr2("target"),f=o.attr2("action"),g=o.attr("enctype")||o.attr("encoding")||"multipart/form-data";x.setAttribute("target",n),l&&!/post/i.test(l)||x.setAttribute("method","POST"),f!==k.url&&x.setAttribute("action",k.url),k.skipEncodingOverride||l&&!/post/i.test(l)||o.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"}),k.timeout&&(w=setTimeout(function(){v=!0,h(1)},k.timeout));var i=[];try{if(k.extraData)for(var j in k.extraData)k.extraData.hasOwnProperty(j)&&(a.isPlainObject(k.extraData[j])&&k.extraData[j].hasOwnProperty("name")&&k.extraData[j].hasOwnProperty("value")?i.push(a('<input type="hidden" name="'+k.extraData[j].name+'">',z).val(k.extraData[j].value).appendTo(x)[0]):i.push(a('<input type="hidden" name="'+j+'">',z).val(k.extraData[j]).appendTo(x)[0]));k.iframeTarget||p.appendTo(A),q.attachEvent?q.attachEvent("onload",h):q.addEventListener("load",h,!1),setTimeout(b,15);try{x.submit()}catch(a){var m=document.createElement("form").submit;m.apply(x)}}finally{x.setAttribute("action",f),x.setAttribute("enctype",g),c?x.setAttribute("target",c):o.removeAttr("target"),a(i).remove()}}function h(b){if(!r.aborted&&!F){if(E=e(q),E||(d("cannot access response document"),b=2),1===b&&r)return r.abort("timeout"),void y.reject(r,"timeout");if(2===b&&r)return r.abort("server abort"),void y.reject(r,"error","server abort");if(E&&E.location.href!==k.iframeSrc||v){q.detachEvent?q.detachEvent("onload",h):q.removeEventListener("load",h,!1);var c,f="success";try{if(v)throw"timeout";var g="xml"===k.dataType||E.XMLDocument||a.isXMLDoc(E);if(d("isXml="+g),!g&&window.opera&&(null===E.body||!E.body.innerHTML)&&--G)return d("requeing onLoad callback, DOM not available"),void setTimeout(h,250);var i=E.body?E.body:E.documentElement;r.responseText=i?i.innerHTML:null,r.responseXML=E.XMLDocument?E.XMLDocument:E,g&&(k.dataType="xml"),r.getResponseHeader=function(a){return{"content-type":k.dataType}[a.toLowerCase()]},i&&(r.status=Number(i.getAttribute("status"))||r.status,r.statusText=i.getAttribute("statusText")||r.statusText);var j=(k.dataType||"").toLowerCase(),l=/(json|script|text)/.test(j);if(l||k.textarea){var n=E.getElementsByTagName("textarea")[0];if(n)r.responseText=n.value,r.status=Number(n.getAttribute("status"))||r.status,r.statusText=n.getAttribute("statusText")||r.statusText;else if(l){var o=E.getElementsByTagName("pre")[0],s=E.getElementsByTagName("body")[0];o?r.responseText=o.textContent?o.textContent:o.innerText:s&&(r.responseText=s.textContent?s.textContent:s.innerText)}}else"xml"===j&&!r.responseXML&&r.responseText&&(r.responseXML=H(r.responseText));try{D=J(r,j,k)}catch(a){f="parsererror",r.error=c=a||f}}catch(a){d("error caught: ",a),f="error",r.error=c=a||f}r.aborted&&(d("upload aborted"),f=null),r.status&&(f=r.status>=200&&r.status<300||304===r.status?"success":"error"),"success"===f?(k.success&&k.success.call(k.context,D,"success",r),y.resolve(r.responseText,"success",r),m&&a.event.trigger("ajaxSuccess",[r,k])):f&&(void 0===c&&(c=r.statusText),k.error&&k.error.call(k.context,r,f,c),y.reject(r,"error",c),m&&a.event.trigger("ajaxError",[r,k,c])),m&&a.event.trigger("ajaxComplete",[r,k]),m&&!--a.active&&a.event.trigger("ajaxStop"),k.complete&&k.complete.call(k.context,r,f),F=!0,k.timeout&&clearTimeout(w),setTimeout(function(){k.iframeTarget?p.attr("src",k.iframeSrc):p.remove(),r.responseXML=null},100)}}}var i,j,k,m,n,p,q,r,t,u,v,w,x=o[0],y=a.Deferred();if(y.abort=function(a){r.abort(a)},c)for(j=0;j<s.length;j++)i=a(s[j]),f?i.prop("disabled",!1):i.removeAttr("disabled");k=a.extend(!0,{},a.ajaxSettings,b),k.context=k.context||k,n="jqFormIO"+(new Date).getTime();var z=x.ownerDocument,A=o.closest("body");if(k.iframeTarget?(p=a(k.iframeTarget,z),u=p.attr2("name"),u?n=u:p.attr2("name",n)):(p=a('<iframe name="'+n+'" src="'+k.iframeSrc+'" />',z),p.css({position:"absolute",top:"-1000px",left:"-1000px"})),q=p[0],r={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(b){var c="timeout"===b?"timeout":"aborted";d("aborting upload... "+c),this.aborted=1;try{q.contentWindow.document.execCommand&&q.contentWindow.document.execCommand("Stop")}catch(a){}p.attr("src",k.iframeSrc),r.error=c,k.error&&k.error.call(k.context,r,c,b),m&&a.event.trigger("ajaxError",[r,k,c]),k.complete&&k.complete.call(k.context,r,c)}},m=k.global,m&&0==a.active++&&a.event.trigger("ajaxStart"),m&&a.event.trigger("ajaxSend",[r,k]),k.beforeSend&&k.beforeSend.call(k.context,r,k)===!1)return k.global&&a.active--,y.reject(),y;if(r.aborted)return y.reject(),y;(t=x.clk)&&(u=t.name)&&!t.disabled&&(k.extraData=k.extraData||{},k.extraData[u]=t.value,"image"===t.type&&(k.extraData[u+".x"]=x.clk_x,k.extraData[u+".y"]=x.clk_y));var B=a("meta[name=csrf-token]").attr("content"),C=a("meta[name=csrf-param]").attr("content");C&&B&&(k.extraData=k.extraData||{},k.extraData[C]=B),k.forceSync?g():setTimeout(g,10);var D,E,F,G=50,H=a.parseXML||function(a,b){return window.ActiveXObject?(b=new ActiveXObject("Microsoft.XMLDOM"),b.async="false",b.loadXML(a)):b=(new DOMParser).parseFromString(a,"text/xml"),b&&b.documentElement&&"parsererror"!==b.documentElement.nodeName?b:null},I=a.parseJSON||function(a){return window.eval("("+a+")")},J=function(b,c,d){var e=b.getResponseHeader("content-type")||"",f=("xml"===c||!c)&&e.indexOf("xml")>=0,g=f?b.responseXML:b.responseText;return f&&"parsererror"===g.documentElement.nodeName&&a.error&&a.error("parsererror"),d&&d.dataFilter&&(g=d.dataFilter(g,c)),"string"==typeof g&&(("json"===c||!c)&&e.indexOf("json")>=0?g=I(g):("script"===c||!c)&&e.indexOf("javascript")>=0&&a.globalEval(g)),g};return y}if(!this.length)return d("ajaxSubmit: skipping submit process - no element selected"),this;var l,m,n,o=this;"function"==typeof b?b={success:b}:"string"==typeof b||b===!1&&arguments.length>0?(b={url:b,data:c,dataType:g},"function"==typeof h&&(b.success=h)):void 0===b&&(b={}),l=b.method||b.type||this.attr2("method"),m=b.url||this.attr2("action"),n="string"==typeof m?a.trim(m):"",n=n||window.location.href||"",n&&(n=(n.match(/^([^#]+)/)||[])[1]),b=a.extend(!0,{url:n,success:a.ajaxSettings.success,type:l||a.ajaxSettings.type,iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},b);var p={};if(this.trigger("form-pre-serialize",[this,b,p]),p.veto)return d("ajaxSubmit: submit vetoed via form-pre-serialize trigger"),this;if(b.beforeSerialize&&b.beforeSerialize(this,b)===!1)return d("ajaxSubmit: submit aborted via beforeSerialize callback"),this;var q=b.traditional;void 0===q&&(q=a.ajaxSettings.traditional);var r,s=[],t=this.formToArray(b.semantic,s,b.filtering);if(b.data){var u=a.isFunction(b.data)?b.data(t):b.data;b.extraData=u,r=a.param(u,q)}if(b.beforeSubmit&&b.beforeSubmit(t,this,b)===!1)return d("ajaxSubmit: submit aborted via beforeSubmit callback"),this;if(this.trigger("form-submit-validate",[t,this,b,p]),p.veto)return d("ajaxSubmit: submit vetoed via form-submit-validate trigger"),this;var v=a.param(t,q);r&&(v=v?v+"&"+r:r),"GET"===b.type.toUpperCase()?(b.url+=(b.url.indexOf("?")>=0?"&":"?")+v,b.data=null):b.data=v;var w=[];if(b.resetForm&&w.push(function(){o.resetForm()}),b.clearForm&&w.push(function(){o.clearForm(b.includeHidden)}),!b.dataType&&b.target){var x=b.success||function(){};w.push(function(c,d,e){var f=arguments,g=b.replaceTarget?"replaceWith":"html";a(b.target)[g](c).each(function(){x.apply(this,f)})})}else b.success&&(a.isArray(b.success)?a.merge(w,b.success):w.push(b.success));if(b.success=function(a,c,d){for(var e=b.context||this,f=0,g=w.length;f<g;f++)w[f].apply(e,[a,c,d||o,o])},b.error){var y=b.error;b.error=function(a,c,d){var e=b.context||this;y.apply(e,[a,c,d,o])}}if(b.complete){var z=b.complete;b.complete=function(a,c){var d=b.context||this;z.apply(d,[a,c,o])}}var A=a("input[type=file]:enabled",this).filter(function(){return""!==a(this).val()}),B=A.length>0,C="multipart/form-data",D=o.attr("enctype")===C||o.attr("encoding")===C,E=e.fileapi&&e.formdata;d("fileAPI :"+E);var F,G=(B||D)&&!E;b.iframe!==!1&&(b.iframe||G)?b.closeKeepAlive?a.get(b.closeKeepAlive,function(){F=k(t)}):F=k(t):F=(B||D)&&E?j(t):a.ajax(b),o.removeData("jqxhr").data("jqxhr",F);for(var H=0;H<s.length;H++)s[H]=null;return this.trigger("form-submit-notify",[this,b]),this},a.fn.ajaxForm=function(e,f,g,h){if(("string"==typeof e||e===!1&&arguments.length>0)&&(e={url:e,data:f,dataType:g},"function"==typeof h&&(e.success=h)),e=e||{},e.delegation=e.delegation&&a.isFunction(a.fn.on),!e.delegation&&0===this.length){var i={s:this.selector,c:this.context};return!a.isReady&&i.s?(d("DOM not ready, queuing ajaxForm"),a(function(){a(i.s,i.c).ajaxForm(e)}),this):(d("terminating; zero elements found by selector"+(a.isReady?"":" (DOM not ready)")),this)}return e.delegation?(a(document).off("submit.form-plugin",this.selector,b).off("click.form-plugin",this.selector,c).on("submit.form-plugin",this.selector,e,b).on("click.form-plugin",this.selector,e,c),this):this.ajaxFormUnbind().on("submit.form-plugin",e,b).on("click.form-plugin",e,c)},a.fn.ajaxFormUnbind=function(){return this.off("submit.form-plugin click.form-plugin")},a.fn.formToArray=function(b,c,d){var f=[];if(0===this.length)return f;var g,h=this[0],i=this.attr("id"),j=b||void 0===h.elements?h.getElementsByTagName("*"):h.elements;if(j&&(j=a.makeArray(j)),i&&(b||/(Edge|Trident)\//.test(navigator.userAgent))&&(g=a(':input[form="'+i+'"]').get(),g.length&&(j=(j||[]).concat(g))),!j||!j.length)return f;a.isFunction(d)&&(j=a.map(j,d));var k,l,m,n,o,p,q;for(k=0,p=j.length;k<p;k++)if(o=j[k],(m=o.name)&&!o.disabled)if(b&&h.clk&&"image"===o.type)h.clk===o&&(f.push({name:m,value:a(o).val(),type:o.type}),f.push({name:m+".x",value:h.clk_x},{name:m+".y",value:h.clk_y}));else if((n=a.fieldValue(o,!0))&&n.constructor===Array)for(c&&c.push(o),l=0,q=n.length;l<q;l++)f.push({name:m,value:n[l]});else if(e.fileapi&&"file"===o.type){c&&c.push(o);var r=o.files;if(r.length)for(l=0;l<r.length;l++)f.push({name:m,value:r[l],type:o.type});else f.push({name:m,value:"",type:o.type})}else null!==n&&void 0!==n&&(c&&c.push(o),f.push({name:m,value:n,type:o.type,required:o.required}));if(!b&&h.clk){var s=a(h.clk),t=s[0];m=t.name,m&&!t.disabled&&"image"===t.type&&(f.push({name:m,value:s.val()}),f.push({name:m+".x",value:h.clk_x},{name:m+".y",value:h.clk_y}))}return f},a.fn.formSerialize=function(b){return a.param(this.formToArray(b))},a.fn.fieldSerialize=function(b){var c=[];return this.each(function(){var d=this.name;if(d){var e=a.fieldValue(this,b);if(e&&e.constructor===Array)for(var f=0,g=e.length;f<g;f++)c.push({name:d,value:e[f]});else null!==e&&void 0!==e&&c.push({name:this.name,value:e})}}),a.param(c)},a.fn.fieldValue=function(b){for(var c=[],d=0,e=this.length;d<e;d++){var f=this[d],g=a.fieldValue(f,b);null===g||void 0===g||g.constructor===Array&&!g.length||(g.constructor===Array?a.merge(c,g):c.push(g))}return c},a.fieldValue=function(b,c){var d=b.name,e=b.type,f=b.tagName.toLowerCase();if(void 0===c&&(c=!0),c&&(!d||b.disabled||"reset"===e||"button"===e||("checkbox"===e||"radio"===e)&&!b.checked||("submit"===e||"image"===e)&&b.form&&b.form.clk!==b||"select"===f&&b.selectedIndex===-1))return null;if("select"===f){var g=b.selectedIndex;if(g<0)return null;for(var h=[],i=b.options,j="select-one"===e,k=j?g+1:i.length,l=j?g:0;l<k;l++){var m=i[l];if(m.selected&&!m.disabled){var n=m.value;if(n||(n=m.attributes&&m.attributes.value&&!m.attributes.value.specified?m.text:m.value),j)return n;h.push(n)}}return h}return a(b).val().replace(/\r?\n/g,"\r\n")},a.fn.clearForm=function(b){return this.each(function(){a("input,select,textarea",this).clearFields(b)})},a.fn.clearFields=a.fn.clearInputs=function(b){var c=/^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i;return this.each(function(){var d=this.type,e=this.tagName.toLowerCase();c.test(d)||"textarea"===e?this.value="":"checkbox"===d||"radio"===d?this.checked=!1:"select"===e?this.selectedIndex=-1:"file"===d?/MSIE/.test(navigator.userAgent)?a(this).replaceWith(a(this).clone(!0)):a(this).val(""):b&&(b===!0&&/hidden/.test(d)||"string"==typeof b&&a(this).is(b))&&(this.value="")})},a.fn.resetForm=function(){return this.each(function(){var b=a(this),c=this.tagName.toLowerCase();switch(c){case"input":this.checked=this.defaultChecked;case"textarea":return this.value=this.defaultValue,!0;case"option":case"optgroup":var d=b.parents("select");return d.length&&d[0].multiple?"option"===c?this.selected=this.defaultSelected:b.find("option").resetForm():d.resetForm(),!0;case"select":return b.find("option").each(function(a){if(this.selected=this.defaultSelected,this.defaultSelected&&!b[0].multiple)return b[0].selectedIndex=a,!1}),!0;case"label":var e=a(b.attr("for")),f=b.find("input,select,textarea");return e[0]&&f.unshift(e[0]),f.resetForm(),!0;case"form":return("function"==typeof this.reset||"object"==typeof this.reset&&!this.reset.nodeType)&&this.reset(),!0;default:return b.find("form,input,label,select,textarea").resetForm(),!0}})},a.fn.enable=function(a){return void 0===a&&(a=!0),this.each(function(){this.disabled=!a})},a.fn.selected=function(b){return void 0===b&&(b=!0),this.each(function(){var c=this.type;if("checkbox"===c||"radio"===c)this.checked=b;else if("option"===this.tagName.toLowerCase()){var d=a(this).parent("select");b&&d[0]&&"select-one"===d[0].type&&d.find("option").selected(!1),this.selected=b}})},a.fn.ajaxSubmit.debug=!1});
+//# sourceMappingURL=jquery.form.min.js.map
diff --git a/alplora/templates/alplora/contact.html b/alplora/templates/alplora/contact.html
new file mode 100644
index 00000000..ae6202c2
--- /dev/null
+++ b/alplora/templates/alplora/contact.html
@@ -0,0 +1,42 @@
+{% load i18n %}
+<div class="modal-dialog" role="document">
+<div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="exampleModalLabel">{% trans 'New message'%}</h4>
+ </div>
+ <form novalidate method="post" action="{% url 'alplora:contact'%}" id="contact_form">
+ <div class="modal-body">
+ {% csrf_token %}
+ {{ form.non_field_errors }}
+ <div class="form-group text-left">
+ <label for="recipient-name" class="control-label ">{% trans 'Name:'%}</label>
+ <input type="text" class="form-control" {%if form.name.errors%}
+ style="border-color: red" {%endif%} name="name" placeholder="{% trans 'What is your name ?'%}" id="recipient-name" required>
+ {{ form.name.errors|striptags }}
+ </div>
+ <div class="form-group text-left">
+ <label for="recipient-name" class="control-label ">{% trans 'From:'%}</label>
+ <input type="text" class="form-control" {%if form.email.errors%}
+ style="border-color: red" {%endif%}name="email" placeholder="{% trans 'You email'%}" id="recipient-name" required>
+ {{ form.email.errors|striptags}}
+ </div>
+ <div class="form-group text-left">
+ <label for="message-text" class="control-label ">{% trans 'Message:'%}</label>
+ <textarea class="form-control" {%if form.message.errors %} style =
+ "border-color: red" {%endif%} name="message" placeholder="{% trans 'Leave us your message'%}" id="message-text" required></textarea>
+ {{ form.message.errors|striptags}}
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Close'%}</button>
+ <button type="submit" class="btn btn-warning">{% trans 'Send message'%}</button>
+ </div>
+ </form>
+</div>
+</div>
+ <script>
+ $('#contact_form').ajaxForm({
+ target: '#modal', success: function(response) { }
+ });
+ </script>
diff --git a/alplora/templates/alplora/contact_success.html b/alplora/templates/alplora/contact_success.html
new file mode 100644
index 00000000..563b2e89
--- /dev/null
+++ b/alplora/templates/alplora/contact_success.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title">{% trans "Message Sent" %}</h4>
+ </div>
+ <div class="modal-body">
+ <p>{% trans "Thank you, we will contact you as soon as possible" %}</p>
+ </div>
+ <div class="modal-footer text-center">
+ <button type="submit" class="btn btn-primary" data-dismiss="modal">Ok</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dialog -->
+ <script>
+ // close the modal after 3 seconds
+ setTimeout(function() {
+ $('#modal').modal('hide');
+ }, 3000);
+</script>
diff --git a/alplora/templates/alplora/index.html b/alplora/templates/alplora/index.html
index bc706fd0..678f7b73 100644
--- a/alplora/templates/alplora/index.html
+++ b/alplora/templates/alplora/index.html
@@ -53,7 +53,6 @@
</script>
-
<div class="page-loader">
<div class="loader">
<div class="circle circle-1"></div>
@@ -419,7 +418,9 @@
<h1>{% trans 'How do I get Alplora?'%}</h1>
<h3>{% trans 'Click the button below and leave us your contact.'%}<p></p>{% trans 'Team Alplora will contact you and visit you with tracking device. '%}</h3>
<hr class="intro-divider">
- <a href="#howitworks" class="btn btn-default btn-lg"><i class="#Services"></i> <span class="network-name" data-toggle="modal" data-target="#exampleModal" >{% trans 'Contact'%}</span></a>
+ <a href="{% url 'alplora:contact' %}" data-toggle="modal" data-target="#modal" class="btn btn-default
+ btn-lg"><i class="#Services"></i> <span
+ class="network-name" >{% trans 'Contact'%}</span></a>
</ul>
</div>
@@ -429,60 +430,9 @@
</div>
<!-- CONTACT FORM MODAL -->
- <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" style="color:black;">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="exampleModalLabel">{% trans 'New message'%}</h4>
- </div>
- <form method="POST" action="">
- <div class="modal-body">
- {% csrf_token %}
- {{ form.non_field_errors }}
-
- <div class="form-group text-left">
- <label for="recipient-name" class="control-label ">{% trans 'Name:'%}</label>
- <input type="text" class="form-control" name="name" placeholder="{% trans 'What is your name ?'%}" id="recipient-name" required>
- </div>
- <div class="form-group text-left">
- <label for="recipient-name" class="control-label ">{% trans 'From:'%}</label>
- <input type="text" class="form-control" name="email" placeholder="{% trans 'You email'%}" id="recipient-name" required>
- {{ form.email.errors|striptags}}
- </div>
- <div class="form-group text-left">
- <label for="message-text" class="control-label ">{% trans 'Message:'%}</label>
- <textarea class="form-control" name="message" placeholder="{% trans 'Leave us your message'%}" id="message-text" required></textarea>
- </div>
-
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Close'%}</button>
- <button type="submit" class="btn btn-warning">{% trans 'Send message'%}</button>
- </div>
- </form>
- </div>
- </div>
+ <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" style="color:black;">
</div>
- <!-- SUCCESS MODAL MESSAGE -->
- <div class="modal fade bs-example-modal-sm" style="color:black;" id="request-success-message" tabindex="-1" role="dialog">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title">{% trans "Message Sent" %}</h4>
- </div>
- <div class="modal-body">
- <p>{% trans "Thank you, we will contact you as soon as possible" %}</p>
- </div>
- <div class="modal-footer text-center">
- <button type="submit" class="btn btn-primary" data-dismiss="modal">Ok</button>
- </div>
- </div><!-- /.modal-content -->
- </div><!-- /.modal-dialog -->
- </div><!-- /.modal -->
-
<!-- /.container -->
</div>
@@ -560,6 +510,7 @@
<script src="{% static 'alplora/js/main.js' %}"></script>
+ <script src="{% static 'alplora/js/form.js' %}"></script>
<link rel="stylesheet" href="/static/debug_toolbar/css/print.css" type="text/css" media="print">
<link rel="stylesheet" href="/static/debug_toolbar/css/toolbar.css" type="text/css">
@@ -572,14 +523,15 @@
<script src="/static/debug_toolbar/js/toolbar.js"></script>
<script type="text/javascript">
- window.onload=function(){
- var hash = window.location.hash.substr(1);
- if (hash == 'requestformsuccess'){
- $('#request-success-message').modal('show');
- }
-
- };
+$('#modal').on('show.bs.modal', function (event) {
+ var modal = $(this)
+ $.ajax({
+ url: "{% url 'alplora:contact' %}",
+ context: document.body
+ }).done(function(response) {
+ modal.html(response);
+ });
+});
</script>
-
</body>
</html>
diff --git a/alplora/urls.py b/alplora/urls.py
index a84884c4..f792f13f 100644
--- a/alplora/urls.py
+++ b/alplora/urls.py
@@ -1,11 +1,12 @@
from django.conf.urls import url
-from .views import IndexView, LoginView
+from .views import IndexView, LoginView, ContactView
urlpatterns = [
url(r'^/?$', IndexView.as_view(), name='index'),
url(r'/login/', LoginView.as_view(), name='login'),
+ url(r'/contact', ContactView.as_view(), name='contact'),
# url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'),
# url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'),
]
diff --git a/alplora/views.py b/alplora/views.py
index 5c6bacd2..ba249887 100644
--- a/alplora/views.py
+++ b/alplora/views.py
@@ -5,13 +5,12 @@ from django.utils.translation import ugettext_lazy as _
from django.views.generic.edit import FormView
from django.contrib import messages
from django.core.urlresolvers import reverse_lazy, reverse
+from django.shortcuts import render
from utils.forms import ContactUsForm
-class IndexView(FormView):
+class IndexView(TemplateView):
template_name = "alplora/index.html"
- form_class = ContactUsForm
- success_message = _('Message Successfully Sent')
def get_context_data(self, *args, **kwargs):
context = super(IndexView, self).get_context_data(**kwargs)
@@ -19,17 +18,22 @@ class IndexView(FormView):
context.update(languages)
return context
- def get_success_url(self):
- success_url = reverse('alplora:index')
- success_url += "#requestformsuccess"
- return success_url
+class ContactView(FormView):
+ template_name = 'alplora/contact.html'
+ form_class = ContactUsForm
+ success_message = _('Message Successfully Sent')
+
+ def get_context_data(self, *args, **kwargs):
+ context = super(ContactView, self).get_context_data(**kwargs)
+ languages = getlanguages()
+ context.update(languages)
+ return context
def form_valid(self, form):
form.save()
form.send_email(email_to='info@alplora.ch')
messages.add_message(self.request, messages.SUCCESS, self.success_message)
- return super(IndexView, self).form_valid(form)
-
+ return render(self.request, 'alplora/contact_success.html', {})
class LoginView(TemplateView):
template_name = "alplora/login.html"
From c9be516e9b8b4685278c9cd0dc0da90019d09286 Mon Sep 17 00:00:00 2001
From: Modulos <modulos@protonmail.com>
Date: Wed, 12 Apr 2017 12:30:29 +0200
Subject: [PATCH 2/3] Remove author from blog_item
---
.../ungleich/djangocms_blog/includes/blog_item.html | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
index 37b3ced8..4a708d41 100644
--- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
+++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
@@ -16,18 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
- Posted
- {% if post.author %}
- by
- <!-- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}"> -->
- {% if post.author.get_full_name %}
- {{ post.author.get_full_name }}
- {% else %}
- {{ post.author }}
- {% endif %}
- <!-- </a> -->
- {% endif %}
- on {{ post.date_published|date:"DATE_FORMAT" }}
+ Posted on {{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">
From 32f52c17917453ce20a07f5d45ab2ae25942fa36 Mon Sep 17 00:00:00 2001
From: Modulos <modulos@protonmail.com>
Date: Thu, 27 Apr 2017 03:25:14 +0200
Subject: [PATCH 3/3] Remove author from blog posts
---
.../djangocms_blog/_header_post_detail.html | 15 ++-------------
.../templates/digitalglarus/post_detail.html | 13 +------------
.../djangocms_blog/includes/blog_item.html | 13 +------------
3 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/cms_templates/djangocms_blog/_header_post_detail.html b/cms_templates/djangocms_blog/_header_post_detail.html
index 669de5bc..2fa8697e 100644
--- a/cms_templates/djangocms_blog/_header_post_detail.html
+++ b/cms_templates/djangocms_blog/_header_post_detail.html
@@ -17,21 +17,10 @@
{% render_model post "abstract" "" "" 'truncatewords_html:10' %}
</h2>
<span class="meta">
- Posted
- {% if post.author %}
- by
- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">
- {% if post.author.get_full_name %}
- {{ post.author.get_full_name }}
- {% else %}
- {{ post.author }}
- {% endif %}
- </a>
- {% endif %}
- on {{ post.date_published|date:"DATE_FORMAT" }}
+ Posted on {{ post.date_published|date:"DATE_FORMAT" }}
</span>
</div>
</div>
</div>
</div>
-</header>
\ No newline at end of file
+</header>
diff --git a/digitalglarus/templates/digitalglarus/post_detail.html b/digitalglarus/templates/digitalglarus/post_detail.html
index f59cec48..90ba0384 100644
--- a/digitalglarus/templates/digitalglarus/post_detail.html
+++ b/digitalglarus/templates/digitalglarus/post_detail.html
@@ -16,18 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
- Posted
- {% if post.author %}
- by
- <!-- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}"> -->
- {% if post.author.get_full_name %}
- {{ post.author.get_full_name }}
- {% else %}
- {{ post.author }}
- {% endif %}
- <!-- </a> -->
- {% endif %}
- on {{ post.date_published|date:"DATE_FORMAT" }}
+ Posted on {{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">
diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
index 37b3ced8..4a708d41 100644
--- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
+++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
@@ -16,18 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
- Posted
- {% if post.author %}
- by
- <!-- <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}"> -->
- {% if post.author.get_full_name %}
- {{ post.author.get_full_name }}
- {% else %}
- {{ post.author }}
- {% endif %}
- <!-- </a> -->
- {% endif %}
- on {{ post.date_published|date:"DATE_FORMAT" }}
+ Posted on {{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">