From 1dd330177db22e6f8f33168b4f219e05edfd1220 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 8 Mar 2013 11:00:18 +0530
Subject: [PATCH] added writers page

---
 website/doctype/blog_category/blog_category.py |  8 +++++++-
 website/helpers/blog.py                        | 15 +++++++++++++++
 website/templates/html/blog_footer.html        |  3 ++-
 website/templates/html/blog_page.html          | 14 +-------------
 website/templates/html/blogger.html            | 13 +++++++++++++
 website/templates/pages/writers.html           | 14 ++++++++++++++
 website/utils.py                               |  3 ++-
 7 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 website/templates/html/blogger.html
 create mode 100644 website/templates/pages/writers.html

diff --git a/website/doctype/blog_category/blog_category.py b/website/doctype/blog_category/blog_category.py
index 928aa9ff9f..c8c369c4c0 100644
--- a/website/doctype/blog_category/blog_category.py
+++ b/website/doctype/blog_category/blog_category.py
@@ -5,4 +5,10 @@ import webnotes
 
 class DocType:
 	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+		self.doc, self.doclist = d, dl
+		
+	def on_update(self):
+		# for blog footer
+		from website.utils import clear_cache
+		clear_cache()
+		
\ No newline at end of file
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index 69aa62156e..d90c85aad0 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import webnotes
 import website.utils
+from webnotes import _
 
 @webnotes.whitelist(allow_guest=True)
 def get_blog_list(start=0, by=None, category=None):
@@ -121,4 +122,18 @@ def get_blog_content(blog_page_name):
 def get_blog_template_args():
 	return {
 		"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
+	}
+	
+def get_writers_args():
+	bloggers = webnotes.conn.sql("select * from `tabBlogger` order by full_name", as_dict=1)
+	for blogger in bloggers:
+		if blogger.avatar and not "/" in blogger.avatar:
+			blogger.avatar = "files/" + blogger.avatar
+		
+	return {
+		"bloggers": bloggers,
+		"texts": {
+			"all_posts_by": _("All posts by")
+		},
+		"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
 	}
\ No newline at end of file
diff --git a/website/templates/html/blog_footer.html b/website/templates/html/blog_footer.html
index 81b92ab0c5..e439d14729 100644
--- a/website/templates/html/blog_footer.html
+++ b/website/templates/html/blog_footer.html
@@ -1,6 +1,5 @@
 <div class="span12">
 	<hr />
-	<p><a href="blog">Show posts by everyone</a></p>
 	{% if categories %}
 	<h5>Explore posts by categories</h5>
 	<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
@@ -8,5 +7,7 @@
 		<li><a href="blog?category={{ category }}">{{ category }}</a> 
 		{% if not loop.last %}<span class="divider">/</span>{% endif %}</li>
 	{% endfor %}
+	<br><br>
 	{% endif %}
+	<p>Show posts by <a href="blog">everyone</a>. Meet the <a href="writers">writers</a> of this blog</p>
 </div>
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html
index e669642a11..e605a12248 100644
--- a/website/templates/html/blog_page.html
+++ b/website/templates/html/blog_page.html
@@ -20,19 +20,7 @@
 	<!-- end blog content -->
 	{% if blogger_info %}
 	<hr />
-	<div class="row">
-		<div class="span2">
-			<div class="avatar avatar-large">
-				<img src="{{ blogger_info.avatar }}" />
-			</div>
-		</div>
-		<div class="span10">
-			<h4>{{ blogger_info.full_name }}</h4>
-			<p>{{ blogger_info.bio }}</p>
-			<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
-				{{ texts.all_posts_by }} {{ blogger_info.full_name }}</a></p>
-		</div>
-	</div>
+	{% include "html/blogger.html" %}
 	{% endif %}
 	<hr>
 	<h3>{{ texts.comments }}</h3><br>
diff --git a/website/templates/html/blogger.html b/website/templates/html/blogger.html
new file mode 100644
index 0000000000..eab371e45b
--- /dev/null
+++ b/website/templates/html/blogger.html
@@ -0,0 +1,13 @@
+<div class="row">
+	<div class="span2">
+		<div class="avatar avatar-large">
+			<img src="{{ blogger_info.avatar }}" />
+		</div>
+	</div>
+	<div class="span10">
+		<h4>{{ blogger_info.full_name }}</h4>
+		<p style="color: #999">{{ blogger_info.bio }}</p>
+		<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
+			{{ texts.all_posts_by }} {{ blogger_info.full_name }}</a></p>
+	</div>
+</div>
\ No newline at end of file
diff --git a/website/templates/pages/writers.html b/website/templates/pages/writers.html
new file mode 100644
index 0000000000..0ae8549f97
--- /dev/null
+++ b/website/templates/pages/writers.html
@@ -0,0 +1,14 @@
+{% extends "html/page.html" %}
+
+{% set title="Blog Writers" %}
+
+{% block content %}
+<div class="span12">
+	<h2 id="blog-title">Blog Writers</h2>
+	<hr>
+	{% for blogger_info in bloggers %}
+	{% include "html/blogger.html" %}	
+	{% endfor %}
+</div>
+{% include 'html/blog_footer.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/website/utils.py b/website/utils.py
index eac9f0e2fa..a9569b4722 100644
--- a/website/utils.py
+++ b/website/utils.py
@@ -42,7 +42,8 @@ page_map = {
 page_settings_map = {
 	"about": "About Us Settings",
 	"contact": "Contact Us Settings",
-	"blog": "website.helpers.blog.get_blog_template_args"
+	"blog": "website.helpers.blog.get_blog_template_args",
+	"writers": "website.helpers.blog.get_writers_args"
 }
 
 def render(page_name):