added blog settings and metadata
diff --git a/website/doctype/blog_post/blog_post.py b/website/doctype/blog_post/blog_post.py
index 1664b4f..ff6cc99 100644
--- a/website/doctype/blog_post/blog_post.py
+++ b/website/doctype/blog_post/blog_post.py
@@ -74,13 +74,15 @@
# temp fields
from webnotes.utils import global_date_format, get_fullname
self.doc.full_name = get_fullname(self.doc.owner)
- self.doc.updated = global_date_format(self.doc.creation)
+ self.doc.updated = global_date_format(self.doc.published_on)
self.doc.content_html = self.doc.content
if self.doc.blogger:
self.doc.blogger_info = webnotes.doc("Blogger", self.doc.blogger).fields
if self.doc.blogger_info.avatar and not "/" in self.doc.blogger_info.avatar:
self.doc.blogger_info.avatar = "files/" + self.doc.blogger_info.avatar
+ self.doc.description = self.doc.blog_intro or self.doc.content[:140]
+
self.doc.categories = webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
self.doc.texts = {
diff --git a/website/doctype/style_settings/style_settings.py b/website/doctype/style_settings/style_settings.py
index 434f4b5..ba003ae 100644
--- a/website/doctype/style_settings/style_settings.py
+++ b/website/doctype/style_settings/style_settings.py
@@ -39,6 +39,9 @@
from webnotes.sessions import clear_cache
clear_cache('Guest')
+
+ from website.utils import clear_cache
+ clear_cache()
for f in ["small_font_size", "at_import", "heading_text_style"]:
if f in self.doc.fields:
diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt
index 861ac86..eed7d2b 100644
--- a/website/doctype/web_page/web_page.txt
+++ b/website/doctype/web_page/web_page.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-27 16:31:21",
+ "creation": "2013-02-12 13:19:11",
"docstatus": 0,
- "modified": "2013-02-12 09:33:47",
+ "modified": "2013-03-11 17:41:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,18 +24,16 @@
"permlevel": 0
},
{
- "create": 1,
+ "amend": 0,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Web Page",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
"read": 1,
"report": 1,
"role": "Website Manager",
- "submit": 0,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -86,6 +84,13 @@
"options": "Website Slideshow"
},
{
+ "description": "Description for page header.",
+ "doctype": "DocField",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "label": "Description"
+ },
+ {
"description": "Content in markdown format that appears on the main side of your page",
"doctype": "DocField",
"fieldname": "main_section",
@@ -143,6 +148,17 @@
"print_hide": 1
},
{
- "doctype": "DocPerm"
+ "cancel": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "write": 1
+ },
+ {
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "write": 0
}
]
\ No newline at end of file
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index ec57105..de2a337 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -127,9 +127,11 @@
return content
def get_blog_template_args():
- return {
+ args = {
"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
}
+ args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
+ return args
def get_writers_args():
bloggers = webnotes.conn.sql("""select * from `tabBlogger`
@@ -138,10 +140,13 @@
if blogger.avatar and not "/" in blogger.avatar:
blogger.avatar = "files/" + blogger.avatar
- return {
+ args = {
"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
+ }
+
+ args.update(webnotes.doc("Blog Settings", "Blog Settings").fields)
+ return args
\ No newline at end of file
diff --git a/website/page/website_home/website_home.js b/website/page/website_home/website_home.js
index bb3d14f..e112207 100644
--- a/website/page/website_home/website_home.js
+++ b/website/page/website_home/website_home.js
@@ -37,6 +37,12 @@
description: wn._("Categorize blog posts."),
doctype:"Blog Category"
},
+ {
+ label: wn._("Blog Settings"),
+ description: wn._("Write titles and introductions to your blog."),
+ doctype:"Blog Settings",
+ route: "Form/Blog Settings"
+ },
]
},
diff --git a/website/templates/html/base.html b/website/templates/html/base.html
index fa01f8a..2719f8d 100644
--- a/website/templates/html/base.html
+++ b/website/templates/html/base.html
@@ -19,6 +19,9 @@
<link rel="icon" href="app/images/favicon.ico" type="image/x-icon">
{% endif %}
+ {% if description %}
+ <meta name="description" content="{{ description }}">
+ {% endif %}
{% block header %}
{% endblock %}
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html
index e605a12..270d427 100644
--- a/website/templates/html/blog_page.html
+++ b/website/templates/html/blog_page.html
@@ -9,14 +9,17 @@
{% endblock %}
{% block content %}
-<div class="span12">
- <h2>{{ title }}</h2>
+<div class="span12" itemscope itemtype="http://schema.org/BlogPost">
+ <h2 itemprop="name headline">{{ title }}</h2>
<!-- begin blog content -->
<div class="help" style="color: #aaa">
- {{ blogger_info and blogger_info.full_name or full_name }} / {{ updated }}</div>
+ <span itemprop="author">{{ blogger_info and blogger_info.full_name or full_name }}</span> /
+ <span itemprop="dateCreated">{{ updated }}</span></div>
<br>
+ <div itemprop="articleBody">
{{ content_html }}
+ </div>
<!-- end blog content -->
{% if blogger_info %}
<hr />
diff --git a/website/templates/html/blogger.html b/website/templates/html/blogger.html
index eab371e..e18f86a 100644
--- a/website/templates/html/blogger.html
+++ b/website/templates/html/blogger.html
@@ -1,7 +1,7 @@
<div class="row">
<div class="span2">
<div class="avatar avatar-large">
- <img src="{{ blogger_info.avatar }}" />
+ <img itemprop="thumbnailUrl" src="{{ blogger_info.avatar }}" />
</div>
</div>
<div class="span10">
diff --git a/website/templates/html/comment.html b/website/templates/html/comment.html
index 1323e09..27baaad 100644
--- a/website/templates/html/comment.html
+++ b/website/templates/html/comment.html
@@ -3,12 +3,15 @@
it is to be included in the blog/blog.html template
#}
-{% for comment in comment_list %}
-<div class="comment-row">
- <div class="comment-title">
- {{ comment.comment_by_fullname }} - {{ comment.comment_date }}:
+<div itemscope itemtype="http://schema.org/UserComments">
+ {% for comment in comment_list %}
+ <div class="comment-row">
+ <div class="comment-title">
+ <span itemprop="name" class="author">{{ comment.comment_by_fullname }}</span> /
+ <span itemprop="commentTime">{{ comment.comment_date }}</span>:
+ </div>
+ <p class="comment-content" itemprop="commentText">{{ comment.comment }}</p>
+ <hr>
</div>
- <p class="comment-content">{{ comment.comment }}</p>
- <hr>
-</div>
-{% endfor %}
\ No newline at end of file
+ {% endfor %}
+</div>
\ No newline at end of file
diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js
index 91d3ead..61e1b65 100644
--- a/website/templates/js/blog.js
+++ b/website/templates/js/blog.js
@@ -25,11 +25,11 @@
})
if(get_url_arg("by_name")) {
- $("#blog-title").html("Posts by " + get_url_arg("by_name"));
+ $("#blot-subtitle").html("Posts by " + get_url_arg("by_name")).toggle(true);
}
if(get_url_arg("category")) {
- $("#blog-title").html("Posts filed under " + get_url_arg("category"));
+ $("#blot-subtitle").html("Posts filed under " + get_url_arg("category")).toggle(true);
}
});
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index cfdd536..df258e1 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -12,7 +12,11 @@
{% block content %}
<div class="span12">
- <h2 id="blog-title">Blog</h2>
+ <h2 id="blog-title">{{ blog_title }}</h2>
+ {% if blog_introduction %}
+ <p>{{ blog_introduction }}</p>
+ {% endif %}
+ <h3 id="blot-subtitle" style="display:none;"></h3>
<br>
<div class="progress progress-striped active">
<div class="bar" style="width: 100%;"></div>
diff --git a/website/templates/pages/writers.html b/website/templates/pages/writers.html
index 0ae8549..bba3749 100644
--- a/website/templates/pages/writers.html
+++ b/website/templates/pages/writers.html
@@ -5,6 +5,9 @@
{% block content %}
<div class="span12">
<h2 id="blog-title">Blog Writers</h2>
+ {% if writers_introduction %}
+ <p>{{ writers_introduction }}</p>
+ {% endif %}
<hr>
{% for blogger_info in bloggers %}
{% include "html/blogger.html" %}