[hot] login fix in base.html

frappe/public/js/frappe/misc/utils.js

@@ -465,7 +465,7 @@ frappe.utils = {
 
 		frappe.utils.if_notify_permitted(function() {
 			var notify = new Notify(subject, {
-			    body: body,
+			    body: body.replace(/<[^>]*>/g, ""),
 			    notifyClick: onclick
 			});
 			notify.show();
@@ -475,7 +475,7 @@ frappe.utils = {
 	set_title: function(title) {
 		frappe._original_title = title;
 		if(frappe._title_prefix) {
-			title = frappe._title_prefix + " " + title;
+			title = frappe._title_prefix + " " + title.replace(/<[^>]*>/g, "");
 		}
 		document.title = title;
 	},

frappe/public/js/lib/microtemplate.js

@@ -7,11 +7,15 @@ frappe.template.compile = function(str, name) {
 	if(str.indexOf("'")!==-1) {
 		console.warn("Warning: Single quotes (') may not work in templates");
 	}
+
+	// repace jinja style tags
+	str = str.replace(/{{/g, "{%=").replace(/}}/g, "%}");
+
 	if(!frappe.template.compiled[key]) {
 		fn_str = "var p=[],print=function(){p.push.apply(p,arguments)};" +
 
 	        // Introduce the data as local variables using with(){}
-	        "with(obj){p.push('" +
+	        "with(obj){\np.push('" +
 
 	        // Convert the template into pure JavaScript
 	        str
@@ -19,7 +23,7 @@ frappe.template.compile = function(str, name) {
 	          .split("{%").join("\t")
 	          .replace(/((^|%})[^\t]*)'/g, "$1\r")
 	          .replace(/\t=(.*?)%}/g, "',$1,'")
-	          .split("\t").join("');")
+	          .split("\t").join("');\n")
 	          .split("%}").join("\np.push('")
 	          .split("\r").join("\\'")
 	      + "');}return p.join('');";

frappe/templates/base.html

@@ -89,6 +89,10 @@
 			</div>
 		</div>
 	</div>
+	<!-- js should be loaded in body! -->
+	{%- for link in web_include_js %}
+	<script type="text/javascript" src="{{ link|with_leading_slash }}"></script>
+	{%- endfor -%}
 
 	{%- block script %}
 		<script data-html-block="script">
@@ -102,10 +106,5 @@
 		</script>
 	{%- endblock -%}
     {%- block body_include %}{{ body_include or "" }}{% endblock -%}
-
-	<!-- js should be loaded in body! -->
-	{%- for link in web_include_js %}
-	<script type="text/javascript" src="{{ link|with_leading_slash }}"></script>
-	{%- endfor -%}
 </body>
 </html>