diff --git a/core/context_processors.py b/core/context_processors.py index d9704ee..8927ed8 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -11,10 +11,10 @@ def breadcrumbs(request): } if crumbs['is_index']: return crumbs - if 'products' in view_name: - crumbs['breadcrumb'] = _product_breadcrumbs(request=request) - elif 'news' in view_name: - crumbs['breadcrumb'] = _news_breadcrumbs(request=request) + # if 'products' in view_name: + # crumbs['breadcrumb'] = _product_breadcrumbs(request=request) + # elif 'news' in view_name: + # crumbs['breadcrumb'] = _news_breadcrumbs(request=request) return crumbs diff --git a/core/templatetags/core_tags.py b/core/templatetags/core_tags.py index c5842ca..73302d1 100644 --- a/core/templatetags/core_tags.py +++ b/core/templatetags/core_tags.py @@ -7,6 +7,7 @@ from mptt.templatetags.mptt_tags import recursetree register = template.Library() + @register.tag def breadcrumb(parser, token): """ @@ -40,7 +41,7 @@ def breadcrumb_url(parser, token): """ bits = token.split_contents() - if len(bits)==2: + if len(bits) == 2: return breadcrumb(parser, token) # Extract our extra title parameter @@ -51,20 +52,22 @@ def breadcrumb_url(parser, token): return UrlBreadcrumbNode(title, url_node) + def breadcrumb_mptt_url(parser, token): return recursetree(parser, token) + class BreadcrumbNode(Node): def __init__(self, vars): """ First var is title, second var is url context variable """ - self.vars = map(Variable,vars) + self.vars = map(Variable, vars) def render(self, context): title = self.vars[0].var - if title.find("'")==-1 and title.find('"')==-1: + if title.find("'") == -1 and title.find('"') == -1: try: val = self.vars[0] title = val.resolve(context) @@ -72,12 +75,12 @@ class BreadcrumbNode(Node): title = '' else: - title=title.strip("'").strip('"') - title=smart_bytes(title) + title = title.strip("'").strip('"') + title = smart_bytes(title) url = None - if len(self.vars)>1: + if len(self.vars) > 1: val = self.vars[1] try: url = val.resolve(context) @@ -96,15 +99,14 @@ class UrlBreadcrumbNode(Node): def render(self, context): title = self.title.var - if title.find("'")==-1 and title.find('"')==-1: + if title.find("'") == -1 and title.find('"') == -1: try: val = self.title title = val.resolve(context) except: title = '' else: - title=title.strip("'").strip('"') - title=smart_bytes(title) + title = title.strip("'").strip('"') url = self.url_node.render(context) return create_crumb(title, url) @@ -114,7 +116,7 @@ def create_crumb(title, url=None): """ Helper function """ - crumb = """
  • %s""" + crumb = """
  • {}""" if url: crumb = crumb.format(url, title) else: diff --git a/templates/common.html b/templates/common.html index 620c04b..8b61773 100644 --- a/templates/common.html +++ b/templates/common.html @@ -115,9 +115,10 @@ {% endif %} - {% if not request.path == '/' %} - {% include 'components/breadcrumbs.html' %} - {% endif %} + {% block right_common_content %} {% endblock right_common_content %} {% if content_contact_us_form %} diff --git a/templates/common_news.html b/templates/common_news.html index 5846dfc..c166d58 100644 --- a/templates/common_news.html +++ b/templates/common_news.html @@ -1,9 +1,14 @@ {% extends 'base.html' %} {% block content %} - {% if not request.path == '/' %} - {% include 'components/breadcrumbs.html' %} - {% endif %} - {% block news_content %} - {% endblock news_content %} +
    +
    + +
    + {% block news_content %} + {% endblock news_content %} +
    {% endblock content %}