Merge branch 'edge' of github.com:webnotes/erpnext into edge
diff --git a/website/doctype/website_settings/website_settings.js b/website/doctype/website_settings/website_settings.js
index cbed609..a02c3b2 100644
--- a/website/doctype/website_settings/website_settings.js
+++ b/website/doctype/website_settings/website_settings.js
@@ -41,4 +41,14 @@
this.fieldobj.refresh_options(get_parent_options('top_bar_items'));
});
}
-});
\ No newline at end of file
+});
+
+cur_frm.cscript.set_banner_from_image = function(doc) {
+ if(!doc.banner_image) {
+ msgprint(wn._("Select a Banner Image first."));
+ }
+ var src = doc.banner_image;
+ if(src.indexOf("/")==-1) src = "files/" + src;
+ cur_frm.set_value("banner_html", "<a href='/'><img src='"+ src
+ +"'></a>");
+}
\ No newline at end of file
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 5bc4f71..a39144c 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:11",
"docstatus": 0,
- "modified": "2013-03-12 11:17:11",
+ "modified": "2013-03-13 16:25:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -79,6 +79,20 @@
"label": "Banner"
},
{
+ "description": "Select an image of approx width 150px with a transparent background for best results.",
+ "doctype": "DocField",
+ "fieldname": "banner_image",
+ "fieldtype": "Select",
+ "label": "Banner Image",
+ "options": "attach_files:"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "set_banner_from_image",
+ "fieldtype": "Button",
+ "label": "Set Banner from Image"
+ },
+ {
"description": "Banner is above the Top Menu Bar.",
"doctype": "DocField",
"fieldname": "banner_html",
diff --git a/website/utils.py b/website/utils.py
index b38d2b3..c7fe2f6 100644
--- a/website/utils.py
+++ b/website/utils.py
@@ -46,6 +46,8 @@
"writers": "website.helpers.blog.get_writers_args"
}
+no_cache = "message"
+
def render(page_name):
"""render html page"""
try:
@@ -68,10 +70,12 @@
# load from cache, if auto cache clear is falsy
if not (hasattr(conf, 'auto_cache_clear') and conf.auto_cache_clear or 0):
- html = webnotes.cache().get_value("page:" + page_name)
- from_cache = True
+ if not page_name in no_cache:
+ html = webnotes.cache().get_value("page:" + page_name)
+ from_cache = True
if not html:
+ webnotes.connect()
html = load_into_cache(page_name)
from_cache = False