From 770e7938d94e745891ff47b3d2af44d5f5cad6a7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 11 Mar 2013 18:30:05 +0530 Subject: [PATCH] added footer subscribe and blog settings --- website/doctype/blog_settings/__init__.py | 0 .../doctype/blog_settings/blog_settings.py | 8 ++ .../doctype/blog_settings/blog_settings.txt | 61 ++++++++++++ website/helpers/blog.py | 9 +- website/helpers/blog_feed.py | 2 +- website/templates/html/footer.html | 66 +++++++++++++ website/templates/html/navbar.html | 57 +++++++++++ website/templates/html/outer.html | 97 +------------------ 8 files changed, 198 insertions(+), 102 deletions(-) create mode 100644 website/doctype/blog_settings/__init__.py create mode 100644 website/doctype/blog_settings/blog_settings.py create mode 100644 website/doctype/blog_settings/blog_settings.txt create mode 100644 website/templates/html/footer.html create mode 100644 website/templates/html/navbar.html diff --git a/website/doctype/blog_settings/__init__.py b/website/doctype/blog_settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/website/doctype/blog_settings/blog_settings.py b/website/doctype/blog_settings/blog_settings.py new file mode 100644 index 0000000000..928aa9ff9f --- /dev/null +++ b/website/doctype/blog_settings/blog_settings.py @@ -0,0 +1,8 @@ +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/website/doctype/blog_settings/blog_settings.txt b/website/doctype/blog_settings/blog_settings.txt new file mode 100644 index 0000000000..09740eb78f --- /dev/null +++ b/website/doctype/blog_settings/blog_settings.txt @@ -0,0 +1,61 @@ +[ + { + "creation": "2013-03-11 17:48:16", + "docstatus": 0, + "modified": "2013-03-11 17:48:16", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "description": "Blog Settings", + "doctype": "DocType", + "issingle": 1, + "module": "Website", + "name": "__common__" + }, + { + "doctype": "DocField", + "name": "__common__", + "parent": "Blog Settings", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { + "create": 1, + "doctype": "DocPerm", + "name": "__common__", + "parent": "Blog Settings", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "role": "Website Manager", + "write": 1 + }, + { + "doctype": "DocType", + "name": "Blog Settings" + }, + { + "doctype": "DocField", + "fieldname": "blog_title", + "fieldtype": "Data", + "label": "Blog Title" + }, + { + "doctype": "DocField", + "fieldname": "blog_introduction", + "fieldtype": "Small Text", + "label": "Blog Introduction" + }, + { + "doctype": "DocField", + "fieldname": "writers_introduction", + "fieldtype": "Small Text", + "label": "Writers Introduction" + }, + { + "doctype": "DocPerm" + } +] \ No newline at end of file diff --git a/website/helpers/blog.py b/website/helpers/blog.py index de2a3373ae..5ee3451956 100644 --- a/website/helpers/blog.py +++ b/website/helpers/blog.py @@ -99,10 +99,8 @@ def add_comment(args=None): return comment_html @webnotes.whitelist(allow_guest=True) -def add_subscriber(): +def add_subscriber(name, email_id): """add blog subscriber to lead""" - full_name = webnotes.form_dict.get('your_name') - email = webnotes.form_dict.get('your_email_address') name = webnotes.conn.sql("""select name from tabLead where email_id=%s""", email) from webnotes.model.doc import Document @@ -114,14 +112,13 @@ def add_subscriber(): if not lead.source: lead.source = 'Blog' lead.unsubscribed = 0 lead.blog_subscriber = 1 - lead.lead_name = full_name + lead.lead_name = name lead.email_id = email lead.save() - + def get_blog_content(blog_page_name): import website.utils content = website.utils.get_html(blog_page_name) - content = split_blog_content(content) import webnotes.utils content = webnotes.utils.escape_html(content) return content diff --git a/website/helpers/blog_feed.py b/website/helpers/blog_feed.py index 19fc5d8ec6..c59a419fc6 100644 --- a/website/helpers/blog_feed.py +++ b/website/helpers/blog_feed.py @@ -59,7 +59,7 @@ def generate(): blog_list = webnotes.conn.sql("""\ select page_name as name, modified, creation, title from `tabBlog Post` where ifnull(published,0)=1 - order by creation desc, modified desc, name asc limit 100""", as_dict=1) + order by creation desc, modified desc, name asc limit 20""", as_dict=1) for blog in blog_list: blog.link = host + '/' + blog.name + '.html' diff --git a/website/templates/html/footer.html b/website/templates/html/footer.html new file mode 100644 index 0000000000..19aeabef65 --- /dev/null +++ b/website/templates/html/footer.html @@ -0,0 +1,66 @@ + diff --git a/website/templates/html/navbar.html b/website/templates/html/navbar.html new file mode 100644 index 0000000000..5a30c6a6f1 --- /dev/null +++ b/website/templates/html/navbar.html @@ -0,0 +1,57 @@ + + diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index e582d0a9ce..9c8cd9f8d4 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -5,106 +5,13 @@
- - + {% include "html/navbar.html" %}
{% block content %} {% endblock %}
- + {% include "html/footer.html" %} {% endblock %} \ No newline at end of file