Merge branch 'master' of github.com:webnotes/erpnext into edge

website/doctype/style_settings/style_settings.py

@@ -53,13 +53,15 @@ class DocType:
 				del self.doc.fields[f]
 	
 	def validate_colors(self):
-		if self.doc.page_background==self.doc.page_text:
-			webnotes.msgprint(_("Page text and background is same color. Please change."),
-				raise_exception=1)
+		if (self.doc.page_background or self.doc.page_text) and \
+			self.doc.page_background==self.doc.page_text:
+				webnotes.msgprint(_("Page text and background is same color. Please change."),
+					raise_exception=1)
 
-		if self.doc.top_bar_background==self.doc.top_bar_foreground:
-			webnotes.msgprint(_("Top Bar text and background is same color. Please change."),
-				raise_exception=1)
+		if (self.doc.top_bar_background or self.doc.top_bar_foreground) and \
+			self.doc.top_bar_background==self.doc.top_bar_foreground:
+				webnotes.msgprint(_("Top Bar text and background is same color. Please change."),
+					raise_exception=1)
 
 	
 	def prepare(self):

website/helpers/blog.py

@@ -83,7 +83,7 @@ def add_comment(args=None):
 	
 	# notify commentors 
 	commentors = [d[0] for d in webnotes.conn.sql("""select comment_by from tabComment where
-		comment_doctype='Blog' and comment_docname=%s and
+		comment_doctype='Blog Post' and comment_docname=%s and
 		ifnull(unsubscribed, 0)=0""", args.get('comment_docname'))]
 	
 	blog = webnotes.conn.sql("""select * from `tabBlog Post` where name=%s""", 

website/templates/js/blog.js

@@ -64,7 +64,9 @@ var blog = {
 				b.comment_text = '1 comment.'
 			} else {
 				b.comment_text = b.comments + ' comments.'
-			} 
+			}
+			
+			b.page_name = encodeURIComponent(b.page_name);
 			
 			$(repl('<div class="row">\
 					<div class="span1">\

website/templates/js/blog_page.js

@@ -36,7 +36,7 @@ $(document).ready(function() {
 			comment_by: $("[name='comment_by']").val(),
 			comment: $("[name='comment']").val(),
 			cmd: "website.helpers.blog.add_comment",
-			comment_doctype: "Blog",
+			comment_doctype: "Blog Post",
 			comment_docname: "{{ name }}",
 			page_name: "{{ page_name }}",
 			_type: "POST"