update core app

remotes/origin/HEAD
Max Yakovenko 8 years ago
parent 663af1fd11
commit 4e0dd34e67
  1. 8
      core/context_processors.py
  2. 6
      core/templatetags/core_tags.py
  3. 7
      templates/common.html
  4. 11
      templates/common_news.html

@ -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

@ -7,6 +7,7 @@ from mptt.templatetags.mptt_tags import recursetree
register = template.Library()
@register.tag
def breadcrumb(parser, token):
"""
@ -51,9 +52,11 @@ 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):
"""
@ -104,7 +107,6 @@ class UrlBreadcrumbNode(Node):
title = ''
else:
title = title.strip("'").strip('"')
title=smart_bytes(title)
url = self.url_node.render(context)
return create_crumb(title, url)
@ -114,7 +116,7 @@ def create_crumb(title, url=None):
"""
Helper function
"""
crumb = """<li><a href='%s'>%s</a></span>"""
crumb = """<li><a href='{}'>{}</a></span>"""
if url:
crumb = crumb.format(url, title)
else:

@ -115,9 +115,10 @@
</div>
{% endif %}
{% if not request.path == '/' %}
{% include 'components/breadcrumbs.html' %}
{% endif %}
<ul class="breadcrumbs">
{% block breadcrumbs %}
{% endblock breadcrumbs %}
</ul>
{% block right_common_content %}
{% endblock right_common_content %}
{% if content_contact_us_form %}

@ -1,9 +1,14 @@
{% extends 'base.html' %}
{% block content %}
{% if not request.path == '/' %}
{% include 'components/breadcrumbs.html' %}
{% endif %}
<div class="col-12">
<div class="row">
<ul class="breadcrumbs">
{% block breadcrumbs %}
{% endblock breadcrumbs %}
</ul>
</div>
{% block news_content %}
{% endblock news_content %}
</div>
{% endblock content %}

Loading…
Cancel
Save