update core app

core/context_processors.py

@@ -11,10 +11,10 @@ def breadcrumbs(request):
     }
     if crumbs['is_index']:
         return crumbs
-    if 'products' in view_name:
+    # if 'products' in view_name:
-        crumbs['breadcrumb'] = _product_breadcrumbs(request=request)
+    #     crumbs['breadcrumb'] = _product_breadcrumbs(request=request)
-    elif 'news' in view_name:
+    # elif 'news' in view_name:
-        crumbs['breadcrumb'] = _news_breadcrumbs(request=request)
+    #     crumbs['breadcrumb'] = _news_breadcrumbs(request=request)
     return crumbs
 
 

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 = title.strip("'").strip('"')
-            title=smart_bytes(title)
+            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 = 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:

templates/common.html

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

templates/common_news.html

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