Merge branch 'master' of github.com:webnotes/erpnext into customer-login

website/css/website.css

@@ -18,14 +18,6 @@ img {
 	padding-bottom: 30px;
 }
 
-.outer {
-	padding: 0px 20px;
-}
-
-.navbar {
-	margin: 0px -20px;
-}
-
 .banner {
 	margin-top: 20px;
 	padding: 0px 20px;
@@ -56,6 +48,7 @@ img {
 
 div.web-footer {
 	padding-top: 10px;
+	padding-bottom: 20px;
 }
 
 .web-footer-menu ul {

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;
 		}

website/templates/html/blog_footer.html

@@ -2,7 +2,7 @@
 	<hr />
 	{% if categories %}
 	<h5>Explore posts by categories</h5>
-	<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
+	<ul class="breadcrumb" style="background-color: transparent; padding-left: 20px;">
 	{% for category in categories %}
 		<li><a href="blog?category={{ category }}">{{ category }}</a> 
 	{% endfor %}

website/templates/html/outer.html

@@ -1,6 +1,7 @@
 {% extends "lib/templates/base.html" %}
 
 {% block body %}
+	{% include "app/website/templates/html/navbar.html" %}
 	<div class="container">
 		<div class="pull-right" style="margin:4px;" id="user-tools">
 			{% if shopping_cart_enabled -%}
@@ -22,7 +23,6 @@
 			<div class="col-md-12">{{ banner_html }}</div>
 		</div>{% endif %}
 		<div class="outer">
-			{% include "app/website/templates/html/navbar.html" %}
 			<div class="content row" id="page-{{ name }}" style="display: block;">
 			{%- block content -%}
 			{%- endblock -%}

website/templates/js/contact.js

@@ -27,7 +27,7 @@ $(document).ready(function() {
 			message: message,
 			callback: function(r) {
 				if(r.status==="okay") {
-					msgprint(r.message or "Sent")
+					msgprint(r.message || "Thank you for your message.")
 				} else {
 					msgprint("There were errors");
 					console.log(r.exc);

website/templates/pages/contact.html

@@ -32,7 +32,7 @@
 			</p>
 		</div>
 		{% if obj.doc.address %}
-		<div class="col-md-3 col-md-offset-1 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
+		<div class="col-md-3 col-md-offset-1 alert alert-warning" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
 			<h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4>
 			{% if obj.address.address_line1 %}
 				<span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br>