nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 13:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into edge

Browse Source 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
This commit is contained in:
Anand Doshi
2013-02-21 11:09:43 +05:30
parent 8867cc2381 1c36697556
commit 59d8a76e60
36 changed files with 1595 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
website/utils.py
View File

@@ -162,7 +162,7 @@ def prepare_args(page_name):
if not args:
return False
args.update(get_outer_env())
get_outer_env(page_name, args)
return args
@@ -203,7 +203,10 @@ def get_source_doc(page_name):
return None, None
def get_outer_env():
def get_outer_env(page_name, args):
from webnotes.utils import get_request_site_address
from urllib import quote
all_top_items = webnotes.conn.sql("""\
select * from `tabTop Bar Item`
where parent='Website Settings' and parentfield='top_bar_items'
@@ -242,16 +245,23 @@ def get_outer_env():
'int':int
})
args.update(ret)
settings = webnotes.doc("Website Settings", "Website Settings")
for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon"]:
for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon",
"facebook_share", "google_plus_one", "twitter_share", "linked_in_share", "twitter_share_via"]:
if k in settings.fields:
ret[k] = settings.fields[k]
args[k] = settings.fields.get(k)
if not ret.brand_html:
ret.brand_html = "ERPNext"
if not ret.top_bar_background:
ret.top_bar_background = "Black"
return ret
if not args.brand_html:
args.brand_html = "ERPNext"
if not args.top_bar_background:
args.top_bar_background = "Black"
args.url = quote(get_request_site_address(full_address=True), "")
args.encoded_title = quote(args.title or "", "")
return args
def get_home_page():
doc_name = webnotes.conn.get_value('Website Settings', None, 'home_page')