From 518533fde01b4374d7769f27753d2218f32e58db Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 7 Feb 2012 13:29:31 +0530
Subject: [PATCH] added sitemap, rss feeds

---
 erpnext/website/doctype/blog/blog.py       |   2 +-
 erpnext/website/doctype/blog/blog.txt      |  96 +++++++++++++--------
 erpnext/website/doctype/blog/template.html |   5 ++
 erpnext/website/page/blog/blog.html        |   8 ++
 images/feed.png                            | Bin 0 -> 691 bytes
 rss.xml                                    |  18 ++++
 sitemap.xml                                |  19 ++++
 version.num                                |   2 +-
 8 files changed, 111 insertions(+), 39 deletions(-)
 create mode 100755 images/feed.png
 create mode 100755 rss.xml
 create mode 100755 sitemap.xml

diff --git a/erpnext/website/doctype/blog/blog.py b/erpnext/website/doctype/blog/blog.py
index 05391eecdeb..c0e70a61004 100644
--- a/erpnext/website/doctype/blog/blog.py
+++ b/erpnext/website/doctype/blog/blog.py
@@ -15,7 +15,7 @@ class DocType():
 		"""save file by its name"""
 		self.doc.name = website.utils.page_name(self.doc.title)
 	
-	def on_update(self):
+	def validate(self):
 		"""write/update 'Page' with the blog"""		
 		p = website.utils.add_page(self.doc.title)
 		
diff --git a/erpnext/website/doctype/blog/blog.txt b/erpnext/website/doctype/blog/blog.txt
index 9e0949203f8..2471c2dfa44 100644
--- a/erpnext/website/doctype/blog/blog.txt
+++ b/erpnext/website/doctype/blog/blog.txt
@@ -5,84 +5,106 @@
 	{
 		'creation': '2012-01-27 12:24:03',
 		'docstatus': 0,
-		'modified': '2012-01-27 12:24:03',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-02-07 12:59:01',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'colour': 'White:FFF',
+		'_last_update': u'1327647244',
+		'colour': u'White:FFF',
 		'doctype': 'DocType',
-		'module': 'Website',
+		'module': u'Website',
 		'name': '__common__',
-		'section_style': 'Simple',
+		'section_style': u'Simple',
 		'show_in_menu': 0,
-		'version': 1
+		'version': 2
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Blog',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0
+		'parent': u'Blog',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'create': 1,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Blog',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'write': 1
+		'parent': u'Blog',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
+		'read': 1
 	},
 
 	# DocType, Blog
 	{
 		'doctype': 'DocType',
-		'name': 'Blog'
+		'name': u'Blog'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'role': 'Website Manager'
+		'create': 1,
+		'doctype': u'DocPerm',
+		'permlevel': 0,
+		'role': u'Website Manager',
+		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'role': 'Blogger'
+		'create': 1,
+		'doctype': u'DocPerm',
+		'permlevel': 0,
+		'role': u'Blogger',
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': u'DocPerm',
+		'permlevel': 1,
+		'role': u'All'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'title',
-		'fieldtype': 'Data',
-		'label': 'Title'
+		'doctype': u'DocField',
+		'fieldname': u'title',
+		'fieldtype': u'Data',
+		'label': u'Title',
+		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'published',
-		'fieldtype': 'Check',
-		'label': 'Published'
+		'doctype': u'DocField',
+		'fieldname': u'published',
+		'fieldtype': u'Check',
+		'label': u'Published',
+		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'content',
-		'fieldtype': 'Code',
-		'label': 'Content'
+		'doctype': u'DocField',
+		'fieldname': u'content',
+		'fieldtype': u'Code',
+		'label': u'Content',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'content_html',
+		'fieldtype': u'Text',
+		'label': u'Preview',
+		'permlevel': 1
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/website/doctype/blog/template.html b/erpnext/website/doctype/blog/template.html
index 8c33d83cae7..f70bacb7287 100644
--- a/erpnext/website/doctype/blog/template.html
+++ b/erpnext/website/doctype/blog/template.html
@@ -8,6 +8,11 @@
 		</div>
 		<div class="web-side-section">
 			<p><a href="#!blog">All Blogs</a></p>
+			<h4>Subscribe</h4>
+			<p>
+				<img src="images/feed.png" style="margin-right: 4px; margin-bottom: -4px">
+				<a href="rss.xml" target="_blank">RSS Feed</a>
+			</p>
 		</div>
 		<div style="clear: both"></div>
 	</div>
diff --git a/erpnext/website/page/blog/blog.html b/erpnext/website/page/blog/blog.html
index f271e030e58..79ea7f0f1f3 100644
--- a/erpnext/website/page/blog/blog.html
+++ b/erpnext/website/page/blog/blog.html
@@ -5,9 +5,17 @@
 		<div class="web-main-section">
 		</div>
 		<div class="web-side-section">
+			<!-- for later
 			<h4>Get Updates</h4>
+			<p>
 			<input name="blog-subscribe">
 			<button class="btn" id="blog-subscribe">Subscribe</button>
+			</p>-->
+			<h4>Subscribe</h4>
+			<p>
+			<img src="images/feed.png" style="margin-right: 4px; margin-bottom: -4px">
+			<a href="rss.xml" target="_blank">RSS Feed</a>
+			</p>
 		</div>
 		<div style="clear: both"></div>
 	</div>
diff --git a/images/feed.png b/images/feed.png
new file mode 100755
index 0000000000000000000000000000000000000000..315c4f4fa62cb720326ba3f54259666ba3999e42
GIT binary patch
literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!MM*?KR2Ufr
z!QE?>bpQb1=l6TxbDZwj&S={?7%qx-u`rsG(Zp`-rh=e^=%((1yvsuf5d=&62Zj)Y
zH&JviNS_F4_Hj|T(1j4$p-!}kixP9&dB4uv^MveG?dGf%sUCoc2!IFxD6wHRA2^dX
zXRVk!-qSfk(jcaUKn#RP48(whfPlJU<Hug}vkOwGp3V`ngzgdvZr|YVHDV-*h$IM+
zx~4V7%px-vdMQX6#4!$^0Gy!M=GTkd{FLe*0(FhRzqc5>pApdrA!TQi_4D+<WqXUp
zIFG)-vu8Q53<wkj!-6s=ClwI`JDdFcF)@%vrWROug^5|7IK|pIZeAoS$uo+IAyGs`
zcZnB2;;DCe<azG)`RYvuSAfOW=q!+B3`>fVoM;3I0gZ8{=Xv~Po;geVA+Em9@0Wq2
zr>OTZEGR05L=gf1T;ucCxq6Q6EgJiH@@-lVaAlQyw`jIF^c=&IVnj|95hHbE_cnt|
zTzZQ?F4Ne@(bH(~&3nM%m)I@ID{@jJ2qZPjr)jhpe9hViOwH5k&|T#EmmL3(vHeUQ
zq^!t^Al6JD;=mHq^Bg?J-8-zG2Od7gZbknG;K9czYjPqG*xjPo0k(c4%lPXTpw(qq
z@aGMnxtFS<B$cBsQSrqaG$t5aBP;3u#D^y-N_H#0`-JP?Q&#LBCz8A~r>(np+2kC}
z7P02O874ZkJH$v#nCUVx$({yDN`IX@o2wyvTD#e`qN`_w5<}$3F+_<RC32)_S{-gU
Z^FN{1(!hf9r0xI!002ovPDHLkV1iHBJ!${|

literal 0
HcmV?d00001

diff --git a/rss.xml b/rss.xml
new file mode 100755
index 00000000000..f69724b493c
--- /dev/null
+++ b/rss.xml
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import cgi, cgitb, os, sys
+cgitb.enable()
+
+# import libs
+sys.path.append('lib/py')
+
+import webnotes
+import webnotes.auth
+
+if __name__=='__main__':
+	webnotes.http_request = webnotes.auth.HTTPRequest()
+	from webnotes.cms import feed
+	xml = feed.generate()
+	print 'Content-Type: text/xml'
+	print
+	print xml
\ No newline at end of file
diff --git a/sitemap.xml b/sitemap.xml
new file mode 100755
index 00000000000..04e565bc574
--- /dev/null
+++ b/sitemap.xml
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+
+import cgi, cgitb, os, sys
+cgitb.enable()
+
+# import libs
+sys.path.append('lib/py')
+
+import webnotes
+import webnotes.auth
+
+if __name__=='__main__':
+	webnotes.http_request = webnotes.auth.HTTPRequest()
+	domain = os.environ.get('HTTP_HOST')
+	protocol = os.environ.get('HTTPS') and 'https://' or 'http://'
+	from webnotes.cms import sitemap
+	print 'Content-Type: text/xml'
+	print
+	print sitemap.generate(protocol + domain + '/')
\ No newline at end of file
diff --git a/version.num b/version.num
index cf7ff50f709..4f36264f98d 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-359
+360
\ No newline at end of file