From c32d601c730880a49af765e6b1a68aeafd8070f7 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 7 Mar 2014 15:49:29 +0530
Subject: [PATCH] cms: cleaned up sidebar

---
 frappe/templates/generators/blog_post.html |  2 +-
 frappe/templates/includes/sidebar.html     |  2 +-
 frappe/website/sitemap.py                  | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/frappe/templates/generators/blog_post.html b/frappe/templates/generators/blog_post.html
index cc293fffe7..5f1e125b8a 100644
--- a/frappe/templates/generators/blog_post.html
+++ b/frappe/templates/generators/blog_post.html
@@ -8,7 +8,7 @@
 <article class="blog-content" itemscope itemtype="http://schema.org/BlogPost">
 	<!-- begin blog content -->
 	<div class="help" style="color: #aaa">
-		<span itemprop="author">{{ blogger_info and blogger_info.full_name or full_name }}</span> / 
+		<span itemprop="author">{{ blogger_info and blogger_info.full_name or full_name }}</span>, 
 		<span itemprop="dateCreated">{{ updated }}</span></div>
 	<br>
 	<div itemprop="articleBody">
diff --git a/frappe/templates/includes/sidebar.html b/frappe/templates/includes/sidebar.html
index 20451a87e8..375fd5e1d8 100644
--- a/frappe/templates/includes/sidebar.html
+++ b/frappe/templates/includes/sidebar.html
@@ -2,7 +2,7 @@
 {%- for child in children -%}
 <div class="sidebar-item">
 	<i class="icon-fixed-width 
-	{% if child.rgt - child.lft != 1 and not loop.first %}icon-chevron-right{% endif %}" 
+	{% if (child.lft != None) and (child.rgt - child.lft != 1) and (not loop.first) %}icon-chevron-right{% endif %}" 
 	style="margin-left: -17px; color: #ddd;"></i>
 	<a href="{{ child.name }}" class="no-decoration {% if child.name == pathname %}active{% endif %}">
 		{{ child.page_title }}
diff --git a/frappe/website/sitemap.py b/frappe/website/sitemap.py
index 71c054fc8c..bf99cc9ffc 100644
--- a/frappe/website/sitemap.py
+++ b/frappe/website/sitemap.py
@@ -44,13 +44,6 @@ def build_sitemap_options(path):
 		set_sidebar_items(sitemap_options, sitemap_options.pathname, home_page)
 		if not sitemap_options.children:
 			set_sidebar_items(sitemap_options, sitemap_options.parent_website_route, home_page)
-			
-			if path != home_page:
-				sitemap_options.children = [frappe.doc("Website Route", 
-					sitemap_options.parent_website_route).fields] + sitemap_options.children
-		else:
-			if path != home_page:
-				sitemap_options.children = [sitemap_options] + sitemap_options.children
 
 	# determine templates to be used
 	if not sitemap_options.base_template_path:
@@ -81,3 +74,6 @@ def set_sidebar_items(sitemap_options, pathname, home_page):
 					and t1.docname = t2.name
 					order by t2.{sort_by} {sort_order}""".format(**website_template.fields), 
 						pathname, as_dict=True)
+						
+			sitemap_options.children = [frappe.doc("Website Route", pathname).fields] + sitemap_options.children
+