Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/config.json b/config.json
index 5412b01..ef5a164 100644
--- a/config.json
+++ b/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,
diff --git a/website/doctype/blogger/blogger.py b/website/doctype/blogger/blogger.py
index b35b8ee..9cb4a44 100644
--- a/website/doctype/blogger/blogger.py
+++ b/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 @@
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
\ No newline at end of file
diff --git a/website/doctype/blogger/blogger.txt b/website/doctype/blogger/blogger.txt
index e2b4367..1486c01 100644
--- a/website/doctype/blogger/blogger.txt
+++ b/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"
},
@@ -40,6 +40,12 @@
"name": "Blogger"
},
{
+ "doctype": "DocField",
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "label": "Disabled"
+ },
+ {
"description": "Will be used in url (usually first name).",
"doctype": "DocField",
"fieldname": "short_name",
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index f8f7a42..3f6d94f 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -119,18 +119,3 @@
}
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
\ No newline at end of file
diff --git a/website/templates/css/blog_page.css b/website/templates/css/blog_page.css
index ffa45b4..8f56cd2 100644
--- a/website/templates/css/blog_page.css
+++ b/website/templates/css/blog_page.css
@@ -1,8 +1,4 @@
<style>
- [itemprop="articleBody"] {
- font-size: 120%;
- }
-
.comment-title {
color:#777;
}