-
+
{{ post.title }}
BY {{ post.full_name }} {{ frappe.format_date(post.published_on) }} {{ post.blog_category }} {{ post.comment_text }}
{{ post.content }}
diff --git a/frappe/templates/includes/blog/blogger.html b/frappe/templates/includes/blog/blogger.html index 816fe11b34..ca45578464 100644 --- a/frappe/templates/includes/blog/blogger.html +++ b/frappe/templates/includes/blog/blogger.html @@ -1,6 +1,6 @@
-
+
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index ed813ad277..860a45a3d3 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -125,22 +125,25 @@ def has_gravatar(email):
or frappe.flags.in_test):
# no gravatar if via upload
# since querying gravatar for every item will be slow
- return
+ return ''
gravatar_url = "https://secure.gravatar.com/avatar/{hash}?d=404&s=200".format(hash=md5.md5(email).hexdigest())
try:
res = requests.get(gravatar_url)
- if res.status_code==404:
- return ''
- else:
+ if res.status_code==200:
return gravatar_url
+ else:
+ return ''
except requests.exceptions.ConnectionError:
return ''
def get_gravatar(email):
gravatar_url = has_gravatar(email)
+
if not gravatar_url:
- return Identicon(email).base64()
+ gravatar_url = Identicon(email).base64()
+
+ return gravatar_url
def get_traceback():
"""
diff --git a/frappe/website/context.py b/frappe/website/context.py
index de75863617..8a5d3919a0 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -14,7 +14,13 @@ def get_context(path, args=None):
context.update(args)
context = build_context(context)
- context["path"] = path
+
+ if frappe.local.request:
+ # for (remove leading slash)
+ # path could be overriden in render.resolve_from_map
+ context["path"] = frappe.local.request.path[1:]
+ else:
+ context["path"] = path
# set using frappe.respond_as_web_page
if hasattr(frappe.local, 'response') and frappe.local.response.get('context'):
@@ -76,19 +82,19 @@ def build_context(context):
def add_sidebar_data(context):
from frappe.utils.user import get_fullname_and_avatar
-
+
context.my_account_list = frappe.get_all('Portal Menu Item',
fields=['title', 'route', 'reference_doctype'], filters={'enabled': 1}, order_by='idx asc')
for item in context.my_account_list:
if item.reference_doctype:
item.count = len(frappe.templates.pages.list.get(item.reference_doctype).get('result'))
-
-
+
+
info = get_fullname_and_avatar(frappe.session.user)
context["fullname"] = info.fullname
context["user_image"] = info.avatar
-
+
def add_metatags(context):
tags = context.get("metatags")