diff --git a/py/core/doctype/page/page.txt b/py/core/doctype/page/page.txt
index 2c0805c56d..b9e7f57739 100644
--- a/py/core/doctype/page/page.txt
+++ b/py/core/doctype/page/page.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-04-02 16:01:07',
+ 'creation': '2012-05-10 13:55:07',
'docstatus': 0,
- 'modified': '2012-05-07 12:17:01',
+ 'modified': '2012-07-12 11:37:24',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -99,15 +99,6 @@
'label': u'Title'
},
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'web_page',
- 'fieldtype': u'Select',
- 'label': u'Web Page',
- 'options': u'No\nYes'
- },
-
# DocField
{
'doctype': u'DocField',
diff --git a/py/webnotes/cms/__init__.py b/py/webnotes/cms/__init__.py
index 42a9706412..2d0f7b04dc 100644
--- a/py/webnotes/cms/__init__.py
+++ b/py/webnotes/cms/__init__.py
@@ -1,11 +1,3 @@
-
-def page_name(title):
- """truncated page name"""
- import re
- name = title.lower()
- name = re.sub('[~!@#$%^&*()<>,."\']', '', name)
- return '-'.join(name.split()[:4])
-
def get_home_page(user=None):
"""get home page for user"""
if not user:
diff --git a/py/webnotes/cms/base.html b/py/webnotes/cms/base.html
deleted file mode 100644
index 20f2c4ec40..0000000000
--- a/py/webnotes/cms/base.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- {% block title %}{% endblock %}
-
-
-
-
-
-
-
-
-
- {% block header %}
- {% endblock %}
-
-
-
-
- {% block body %}
- {% endblock %}
-
\ No newline at end of file
diff --git a/py/webnotes/cms/feed.py b/py/webnotes/cms/feed.py
index a8f4446a3d..f1fdf6e583 100644
--- a/py/webnotes/cms/feed.py
+++ b/py/webnotes/cms/feed.py
@@ -50,15 +50,13 @@ def generate():
"""generate rss feed"""
import webnotes, os
from webnotes.model.doc import Document
- import webnotes.utils
host = (os.environ.get('HTTPS') and 'https://' or 'http://') + os.environ.get('HTTP_HOST')
items = ''
blog_list = webnotes.conn.sql("""\
select
- cache.name as name, cache.html as content,
- cache.modified as modified,
+ cache.name as name, cache.modified as modified,
blog.creation as published, blog.title as title
from `tabWeb Cache` cache, `tabBlog` blog
where cache.doc_type = 'Blog' and blog.page_name = cache.name
@@ -66,7 +64,9 @@ def generate():
for blog in blog_list:
blog['link'] = host + '/' + blog['name'] + '.html'
- blog['content'] = webnotes.utils.escape_html((blog.get('content') or ''))
+
+ blog['content'] = get_content(blog['name'])
+
items += rss_item % blog
modified = max((blog['modified'] for blog in blog_list))
@@ -78,4 +78,19 @@ def generate():
'modified': modified,
'items': items,
'link': host + '/blog.html'
- }).encode('utf-8', 'ignore')
\ No newline at end of file
+ }).encode('utf-8', 'ignore')
+
+def get_content(page_name):
+ import website.web_cache
+ content = website.web_cache.get_html(page_name)
+
+ import webnotes.utils
+
+ content = content.split("")
+ content = len(content) > 1 and content[1] or content[0]
+
+ content = content.split("")
+ content = content[0]
+
+ content = webnotes.utils.escape_html(content)
+ return content
\ No newline at end of file
diff --git a/py/webnotes/cms/make.py b/py/webnotes/cms/make.py
index 2944d85bf2..4863886d03 100644
--- a/py/webnotes/cms/make.py
+++ b/py/webnotes/cms/make.py
@@ -21,7 +21,6 @@ def make_web_core():
import webnotes
home_page = webnotes.cms.get_home_page('Guest')
- #get_obj('Page', home_page).write_cms_page()
# js/wn-web.js and css/wn-web.css
write_web_js_css(home_page)