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

config.json

@@ -130,7 +130,7 @@
 			},
 			"writers": {
 				"template": "app/website/templates/pages/writers",
-				"args_method": "website.helpers.blog.get_writers_args"
+				"args_method": "website.doctype.blogger.blogger.get_writers_args"
 			},
 			"profile": {
 				"no_cache": true,

website/doctype/blogger/blogger.py

@@ -5,6 +5,7 @@
 
 from __future__ import unicode_literals
 import webnotes
+from webnotes import _
 
 class DocType:
 	def __init__(self, d, dl):
@@ -23,3 +24,18 @@ class DocType:
 				b.doc.blogger = self.doc.name
 				b.save()
 				
+def get_writers_args():
+	bloggers = webnotes.conn.sql("""select * from `tabBlogger` 
+	 	where ifnull(posts,0) > 0 and ifnull(disabled,0)=0 
+		order by posts desc""", as_dict=1)
+		
+	args = {
+		"bloggers": bloggers,
+		"texts": {
+			"all_posts_by": _("All posts by")
+		},
+		"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
+	}
+	
+	args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
+	return args

website/doctype/blogger/blogger.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-25 16:00:51", 
   "docstatus": 0, 
-  "modified": "2013-07-05 14:27:34", 
+  "modified": "2013-08-30 16:35:24", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -39,6 +39,12 @@
   "doctype": "DocType", 
   "name": "Blogger"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "disabled", 
+  "fieldtype": "Check", 
+  "label": "Disabled"
+ }, 
  {
   "description": "Will be used in url (usually first name).", 
   "doctype": "DocField", 

website/helpers/blog.py

@@ -119,18 +119,3 @@ def get_blog_template_args():
 	}
 	args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
 	return args
-	
-def get_writers_args():
-	bloggers = webnotes.conn.sql("""select * from `tabBlogger` 
-	 	order by posts desc""", as_dict=1)
-		
-	args = {
-		"bloggers": bloggers,
-		"texts": {
-			"all_posts_by": _("All posts by")
-		},
-		"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
-	}
-	
-	args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
-	return args

website/templates/css/blog_page.css

@@ -1,8 +1,4 @@
 	<style>
-		[itemprop="articleBody"] {
-			font-size: 120%;
-		}
-	
 		.comment-title {
 			color:#777;
 		}