#971,969 Seo fixes from 25.09.19 (#972)

* #971 Fix contacts page styles * #971 Fix tile-about text about accums * #971 Fix subcategories sorting * #971 Add "Add to cart" button for the product tile * #971 Rm doubled data from the product microdata * #971 Subtask top menu subcategories sorting * #971 Fix search icon in header * #971 Grade refarm to 0.7.2
fidals · Sep 28, 2019 · 77991fd · 77991fd · 0pdd · Sep 28, 2019
1 parent ea63381
commit 77991fd
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 46 deletions.
diff --git a/front/less/pages/category.less b/front/less/pages/category.less
@@ -175,6 +175,15 @@
     cursor: pointer;
     text-decoration: none;
   }
+
+  .btn-category-buy {
+    height: 44px;
+    float: right;
+    font-size: @f-size-base + 3;
+    padding: 6px 10px;
+    margin-left: 5px;
+    width: 105px;
+  }
 }
 
 .product-card-desc {
@@ -260,7 +269,6 @@
 
       .order {
         bottom: 3px;
-        position: absolute;
         right: 15px;
         width: 200px;
       }
@@ -297,18 +305,8 @@
   }
 });
 
-.btn {
-  &-category-buy {
-    height: 44px;
-    float: right;
-    font-size: @f-size-base + 3;
-    padding: 6px 10px;
-    margin-left: 5px;
-  }
-
-  &-load-more {
-    margin: 5px auto 25px;
-  }
+.btn-load-more {
+  margin: 5px auto 25px;
 }
 
 // ================================================================

diff --git a/front/less/pages/contacts.less b/front/less/pages/contacts.less
@@ -9,7 +9,6 @@
   & .text {
     background-color: white;
     padding: 55px 0 0 40px;
-    width: 45%;
 
     .Q(@xs; {
       margin: 0 auto;
@@ -20,6 +19,8 @@
     .Q(@md; {
       display: inline-block;
       vertical-align: top;
+      width: 45%;
+      padding-left: 0px;
     });
 
     & ul.items {

diff --git a/front/less/pages/main.less b/front/less/pages/main.less
@@ -1,6 +1,23 @@
 @import "../common/variables";
 @import "../common/utilities/mixins";
 
+.index-page .product-card {
+  &-text {
+    padding-bottom: 15px;
+
+    .input-group {
+      display: none;
+    }
+
+    .btn-category-buy {
+      height: 44px;
+      font-size: @f-size-base + 3;
+      margin: 5px 6% 0 6%;
+      width: 88%;
+    }
+  }
+}
+
 .page-front {
   margin: -20px 0 0;
 
@@ -365,7 +382,6 @@
   &-description {
     .sub-plate;
     font-size: @f-size-base - 2;
-    height: 150px;
     padding: 5px 12px;
   }
 

diff --git 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.7.1.zip
+https://github.com/fidals/refarm-site/archive/0.7.2.zip
diff --git a/shopelectro/tests/tests_views.py b/shopelectro/tests/tests_views.py
@@ -480,6 +480,38 @@ class Category(ViewsTestCase):
 
     fixtures = ['dump.json']
 
+    def get_url(
+        self,
+        category: models.Category = None,
+        tags: models.TagQuerySet = None,
+        sorting: int = None,
+        query_string: dict = None,
+    ):
+        category = category or self.category
+        return reverse_catalog_url(
+            'category', {'slug': category.page.slug}, tags, sorting, query_string,
+        )
+
+    def get_page(self, *args, **kwargs):
+        return self.client.get(self.get_category_url(*args, **kwargs))
+
+    def get_soup(self, *args, **kwargs) -> BeautifulSoup:
+        category_page = self.get_page(*args, **kwargs)
+        return BeautifulSoup(
+            category_page.content.decode('utf-8'),
+            'html.parser'
+        )
+
+    def test_subcategories_presented(self):
+        child = models.Category.objects.active().exclude(parent=None).first()
+        category = child.parent
+        soup = self.get_soup(category)
+        db_names = list(category.get_children().values_list('name', flat=True))
+        soup_names = [
+            t.text.strip() for t in soup.find_all(class_='subcategory-list-link')
+        ]
+        self.assertEqual(db_names, soup_names)
+
     def test_page_db_template_with_special_chars(self):
         """
         DB template works with many cyrillic chars in string.

diff --git a/templates/catalog/category.html b/templates/catalog/category.html
@@ -9,7 +9,7 @@ <h1 class="category-title" data-name="{{ category.name }}">{{ page.display.h1|ca
 
   <div class="row overflow-anchor-control">
     <div class="col-md-3 category-left-block">
-      {% include 'catalog/category_children.html' with category=category tags=tags only %}
+      {% include 'catalog/category_children.html' with children=children only %}
 
       {% include 'catalog/category_tags.html' with group_tags_pairs=group_tags_pairs request=request only %}
 

diff --git a/templates/catalog/category_children.html b/templates/catalog/category_children.html
@@ -1,6 +1,6 @@
-{% if not category.is_leaf_node %}
+{% if children %}
   <ul class="subcategory-list list-unstyled">
-    {% for child in category.get_children_sorted_by_position %}
+    {% for child in children %}
       <li class="subcategory-list-item">
         <a class="subcategory-list-link" href="{{ child.url }}">
           {{ child.name }}

diff --git a/templates/catalog/product.html b/templates/catalog/product.html
@@ -14,7 +14,8 @@
         {% endif %}
       {% endwith %}
     </p>
-    <div itemprop="offers" itemscope itemtype="https://schema.org/Offer" class="hide">
+    <div class="hidden" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
+      <a href="{{ product.url }}" itemprop="url"></a>
       <span itemprop="price">{{ product.price|humanize_price }}</span>
       <span itemprop="priceCurrency">RUB</span>
       <link itemprop="availability"

diff --git a/templates/catalog/product_feedback.html b/templates/catalog/product_feedback.html
@@ -70,6 +70,7 @@ <h4>У этого товара пока нет отзывов.</h4>
                  data-id="{{ feedback.id }}" title="Удалить отзыв"></i>
             {% endif %}
             <div class="rating-review" itemprop="review" itemscope="" itemtype="https://schema.org/Review">
+              <meta itemprop="itemReviewed" content="1">
               <meta itemprop="author" content="{{ feedback.name }}">
               <meta itemprop="datePublished" content="2016-10-24T17:36:04Z">
               <div class="rating-review-rating" itemprop="reviewRating" itemscope="" itemtype="https://schema.org/Rating">

diff --git a/templates/index/product_thumbnail.html b/templates/index/product_thumbnail.html
@@ -12,5 +12,5 @@
   {% placeholder_image_url as image_url %}
     <img src="{{ image_url }}"
         class="img-centered img-responsive"
-        alt="{% get_img_alt product.page %}" itemprop="image">
+        alt="{% get_img_alt product.page %}">
 {% endif %}
diff --git a/templates/index/tile_about.html b/templates/index/tile_about.html
@@ -40,10 +40,7 @@
               <path d="M52.748 2.06801C52.748 0.92576 51.8222 0 50.68 0H36.8932C35.751 0 34.8252 0.92576 34.8252 2.06801V4.13603H52.748V2.06801Z" fill="#2B6988"/>
             </svg>
           </div>
-          <div class="text">
-            Делаем блоки питания под заказ — паяем аккумуляторы любого типоразмера, емкости
-            и конфигурации
-          </div>
+          <div class="text">Паяем аккумуляторные сборки</div>
         </div>
       </div>
       <div class="col-xs-12 col-md-3 tile-item">

diff --git a/templates/layout/header.html b/templates/layout/header.html
@@ -97,7 +97,7 @@
                     </div>
 
                     <div class="col-md-1">
-                      <button type="submit" class="btn btn-blue btn-search fa fa-search" id="search-submit"></button>
+                      <button type="submit" class="btn btn-blue btn-search" id="search-submit"><i class=" fa fa-search"></i></button>
                     </div>
                   </div>
                 </form>
@@ -110,7 +110,7 @@
           </div>
         </div>
 
-        {% comment %}Cache for a day{% endcomment %}
+        {# Cache for a day #}
         {% cache 86400 categories_menu %}
           <div class="nav-category-wrapper hidden-xs hidden-sm">
             <ul class="nav-category list-unstyled">
@@ -154,6 +154,7 @@
             </a>
             {% if root.get_children %}
               <ul class="mobile-catalog-sub-list list-unstyled" style="display: none">
+                {# @todo #971:60m  Sort top menu subcategories by name #}
                 {% for child in root.get_children %}
                   <li>
                     <a class="mobile-catalog-sub-link" href="{{ child.url }}">

diff --git a/templates/layout/tile_products.html b/templates/layout/tile_products.html
@@ -5,37 +5,43 @@
 {% load thumbnail %}
 
 {% if tile_products %}
-  <div itemscope itemtype="https://schema.org/Product" class="stuff-top">
+  <div class="stuff-top">
     <p class="stuff-top-title">{{ tile_title }}</p>
     {% for product in tile_products %}
-      <p class="hidden" itemprop="description">
-        {% with description=product.page.display.description %}
-          {% if description %}
-            {{ description }}
-          {% else %}
-            {{ product.name }}
-          {% endif %}
-        {% endwith %}
-      </p>
-      <div class="stuff-top-item">
-        <a href="{{ product.url }}" class="stuff-top-img js-browse-product" itemprop="url">
+      <div class="stuff-top-item index-page product-card">
+        <a href="{{ product.url }}" class="stuff-top-img js-browse-product">
           {% with image=product_images|get_item:product.id %}
             {% include 'index/product_thumbnail.html' with image=image dimensions='x174' only %}
           {% endwith %}
         </a>
 
-        <div class="stuff-top-description">
+        {% comment %}
+          @todo #971:60m  Remove product tile cards code doubling.
+           Both in html templates and styles.
+        {% endcomment %}
+        <div class="stuff-top-description product-card-text">
           <div class="stuff-top-wrap">
             <a class="stuff-top-name js-browse-product"
-               href="{{ product.url }}" itemprop="name">
+               href="{{ product.url }}">
               {{ product.name }}
             </a>
           </div>
-          <div itemprop="offers" itemscope itemtype="https://schema.org/Offer" class="stuff-top-price-new">
-            <link itemprop="availability" href="https://schema.org/InStock">
-            <meta itemprop="description" content="{{ product.page.display.description }}">
-            <meta itemprop="priceCurrency" content="RUB" />
-            <span itemprop="price">{{ product.price|humanize_price }}</span> руб
+          <div  class="stuff-top-price-new">
+            <span>{{ product.price|humanize_price }}</span> руб
+          </div>
+          <div class="js-order order row">
+            {% comment %}
+              The input below should have type "number" by it's semantic.
+              But Firefox worked bad with our custom increase/decrease buttons.
+              On of the comments at #952 contains illustrating screen.
+            {% endcomment %}
+            <input class="col-xs-4 input-number category-prods-count js-product-count js-touchspin"
+                   type="text" value="1">
+            <button class="btn btn-blue btn-category-buy js-product-to-cart"
+                    data-product-id="{{ product.id }}" data-product-price="{{ product.price }}"
+                    data-product-name="{{ product.name }}">
+              В корзину
+            </button>
           </div>
         </div>
       </div>