From 609223f8d9430a7225ab10881cd7be91dd4bb863 Mon Sep 17 00:00:00 2001
From: duker33 <duker33@gmail.com>
Date: Thu, 2 May 2019 15:24:35 +0300
Subject: [PATCH] #838  Fix breadcrumbs microdata urls (#839)

* #838  Fix breadcrumbs microdata urls

* #838  Fix crumbs list

* #fix  Grade refarm dep to 0.5.11

* #838  Preserve crumbs classes to keep tests
---
 requirements.txt                              |  2 +-
 templates/catalog/catalog.html                |  2 +-
 templates/catalog/category.html               |  2 +-
 templates/catalog/product.html                |  2 +-
 templates/pages/breadcrumbs.html              | 25 ++++++-----
 .../pages/breadcrumbs_with_siblings.html      | 42 +++++++++----------
 6 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 42c63ef4..e4f40fbf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,4 +25,4 @@ sorl-thumbnail==12.5.0
 python-telegram-bot==11.1.0
 sentry-sdk==0.7.2
 https://github.com/selwin/django-user_agents/archive/master.zip
-https://github.com/fidals/refarm-site/archive/0.5.10.zip
+https://github.com/fidals/refarm-site/archive/0.5.11.zip
diff --git a/templates/catalog/catalog.html b/templates/catalog/catalog.html
index 86e20c5f..00224611 100644
--- a/templates/catalog/catalog.html
+++ b/templates/catalog/catalog.html
@@ -4,7 +4,7 @@
 {% load pages_extras %}
 
 {% block content %}
-  {% breadcrumbs_with_siblings page %}
+  {% breadcrumbs_with_siblings page '' BASE_URL %}
   <h1>{{ page.display.h1 }}</h1>
 
   <div class="container container-fluid">
diff --git a/templates/catalog/category.html b/templates/catalog/category.html
index abf4dac8..a1a94c9f 100644
--- a/templates/catalog/category.html
+++ b/templates/catalog/category.html
@@ -4,7 +4,7 @@
 {% load se_extras %}
 
 {% block content %}
-  {% breadcrumbs_with_siblings page %}
+  {% breadcrumbs_with_siblings page '' BASE_URL %}
   <h1 class="category-title" data-name="{{ category.name }}">{{ page.display.h1|capfirst }}</h1>
 
   <div class="row overflow-anchor-control">
diff --git a/templates/catalog/product.html b/templates/catalog/product.html
index c5c3f37a..47153df0 100644
--- a/templates/catalog/product.html
+++ b/templates/catalog/product.html
@@ -21,7 +21,7 @@
             href="https://schema.org/{{ product.in_stock | yesno:'InStock,PreOrder' }}">
     </div>
 
-    {% breadcrumbs_with_siblings page %}
+    {% breadcrumbs_with_siblings page '' BASE_URL %}
     <h1 class="product-h1" itemprop="name">{{ product.page.display.h1 }}</h1>
     <span class="product-article">Арт. {{ product.vendor_code }}</span>
 
diff --git a/templates/pages/breadcrumbs.html b/templates/pages/breadcrumbs.html
index 82d5ae5f..ea5eb5b3 100644
--- a/templates/pages/breadcrumbs.html
+++ b/templates/pages/breadcrumbs.html
@@ -2,20 +2,19 @@
 
 <div class="hidden-xs hidden-sm breadcrumbs-wrapper"
      itemscope itemtype="https://schema.org/BreadcrumbList">
-  {% for name, slug in crumbs_list %}
-    <span class="breadcrumbs-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-      {% if slug %}
-        <a href="{{ slug }}" itemscope itemtype="https://schema.org/Thing" itemprop="item"
-           class="breadcrumbs-link">
-          <span itemprop="name">{{ name }}</span>
-        </a>
+  {% for name, url in crumbs_list %}
+      {% if url %}
+        <span class="breadcrumbs-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+          <a href="{{ base_url }}{{ url }}" itemprop="item" class="breadcrumbs-link">
+            <span itemprop="name">{{ name }}</span>
+          </a>
+        </span>
+        <meta itemprop="position" content="{{ forloop.counter }}">
+        {% if not forloop.last %}
+          <span class="breadcrumbs-separator">{{ separator }}</span>
+        {% endif %}
       {% else %}
-        <span itemprop="name">{{ name }}</span>
+        <span class="breadcrumbs-item" >{{ name }}</span>
       {% endif %}
-      <meta itemprop="position" content="{{ forloop.counter }}">
-      {% if not forloop.last %}
-        <span class="breadcrumbs-separator">{{ separator }}</span>
-      {% endif %}
-    </span>
   {% endfor %}
 </div>
diff --git a/templates/pages/breadcrumbs_with_siblings.html b/templates/pages/breadcrumbs_with_siblings.html
index e6fbcf84..d42fe76e 100644
--- a/templates/pages/breadcrumbs_with_siblings.html
+++ b/templates/pages/breadcrumbs_with_siblings.html
@@ -2,33 +2,33 @@
 
 <div class="hidden-xs hidden-sm breadcrumbs-wrapper"
      itemscope itemtype="https://schema.org/BreadcrumbList">
-  {% for name, slug, siblings in crumbs_list %}
-    <span class="breadcrumbs-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-      {% if slug %}
-        <a href="{{ slug }}" itemscope itemtype="https://schema.org/Thing" itemprop="item"
-           class="breadcrumbs-link">
-          <span itemprop="name">{{ name }}</span>
-        </a>
-      {% else %}
-        <span itemprop="name">{{ name }}</span>
-      {% endif %}
+  {% for name, url, siblings in crumbs_list %}
+      {% if url %}
+        <span class="breadcrumbs-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+          <a href="{{ base_url }}{{ url }}" itemprop="item" class="breadcrumbs-link">
+             class="breadcrumbs-link">
+            <span itemprop="name">{{ name }}</span>
+          </a>
 
-      {% if siblings %}
-        <ul class="breadcrumbs-siblings-links list-white">
-          {% for sibling_page in siblings %}
-            <li>
-              <a href="{{ sibling_page.url }}" class="list-white-link">
-                {{ sibling_page.menu_title }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
+          {% if siblings %}
+            <ul class="breadcrumbs-siblings-links list-white">
+              {% for sibling_page in siblings %}
+                <li>
+                  <a href="{{ sibling_page.url }}" class="list-white-link">
+                    {{ sibling_page.menu_title }}
+                  </a>
+                </li>
+              {% endfor %}
+            </ul>
+          {% endif %}
+        </span>
+      {% else %}
+        <span class="breadcrumbs-item">{{ name }}</span>
       {% endif %}
 
       <meta itemprop="position" content="{{ forloop.counter }}">
       {% if not forloop.last %}
         <span class="breadcrumbs-separator">{{ separator }}</span>
       {% endif %}
-    </span>
   {% endfor %}
 </div>