diff --git a/templates/pinax/blog/blog_list.html b/templates/pinax/blog/blog_list.html index 0c150a6..05fd165 100644 --- a/templates/pinax/blog/blog_list.html +++ b/templates/pinax/blog/blog_list.html @@ -26,5 +26,34 @@ {% endfor %} + {% if paginator.num_pages > 1 %} + {% spaceless %} + + {% endspaceless %} + {% endif %} {% endblock news_content %} diff --git a/templates/pinax/blog/blog_post.html b/templates/pinax/blog/blog_post.html index fdc7091..2dcd5b3 100644 --- a/templates/pinax/blog/blog_post.html +++ b/templates/pinax/blog/blog_post.html @@ -1,19 +1,22 @@ {% extends 'common_news.html' %} {% block content %} -
{{ object.title }}
-
-
-
- {% if object.image_set.primary_image %} -
-
{{ object.title }}
-
- {% endif %} -
-
-
-

{{ object.description }}

+
Вернуться к списку
+
+
{{ object.title }}
+
+
+
+ {% if object.image_set.primary_image %} +
+
{{ object.title }}
+
+ {% endif %} +
+
+
+

{{ object.description }}

+
diff --git a/templates/products/product_detail.html b/templates/products/product_detail.html index 080b2a1..84a6205 100644 --- a/templates/products/product_detail.html +++ b/templates/products/product_detail.html @@ -4,7 +4,8 @@ {% load products_filters %} {% load mptt_tags %} -{% block breacrumbs %} +{% block breadcrumbs %} + {% breadcrumb_url 'Главная страница' 'index:index' %} {% breadcrumb_url 'Каталог' 'products:product_list' %} {% recursetree product.parent.get_ancestors %}
  • {{ node.name }}
    • @@ -12,8 +13,9 @@ {{ children }} {% endif %} {% endrecursetree %} + {% breadcrumb_url product.parent.name 'products:product_details' product.parent.get_path %} {% breadcrumb_url product.name 'products:product_details' product.get_path %} -{% endblock breacrumbs %} +{% endblock breadcrumbs %} {% block right_common_content %}
    {{ product.name }}
    @@ -61,7 +63,7 @@ {% csrf_token %}
    - Количество + Количество
    diff --git a/templates/products/product_list.html b/templates/products/product_list.html index fd98ae0..599c8bb 100644 --- a/templates/products/product_list.html +++ b/templates/products/product_list.html @@ -7,18 +7,21 @@ {% load mptt_tags %} -{% block breadcrums %} +{% block breadcrumbs %} + {% breadcrumb_url 'Главная страница' 'index:index' %} {% breadcrumb_url 'Каталог' 'products:product_list' %} - {% if the_product_category.get_ancestors.exists %} - {% recursetree the_product_category.get_ancestors %} -
  • {{ node.name }}
    • - {% if not node.is_leaf_node %} - {{ children }} - {% endif %} - {% endrecursetree %} + {% if the_product_category %} + {% if the_product_category.get_ancestors.exists %} + {% recursetree the_product_category.get_ancestors %} +
  • {{ node.name }}
    • + {% if not node.is_leaf_node %} + {{ children }} + {% endif %} + {% endrecursetree %} + {% endif %} + {% breadcrumb_url the_product_category.name 'products:product_list' the_product_category.get_path %} {% endif %} - {% breadcrumb_url the_product_category.name 'products:product_list' the_product_category.get_path %} -{% endblock breadcrums %} +{% endblock breadcrumbs %} {% block extra_left_menu_items %} {% if left_product_filter_formset %} @@ -54,109 +57,112 @@ {% crispy product_sort_form %}
    - {% for product in object_list %} -
    - -
    - {% if product.productimage_set.get_default_image %} -
    - {{ product.name }} + {% for product in object_list %} +
    + +
    + {% if product.productimage_set.get_default_image %} +
    + {{ product.name }} +
    + {% endif %} +
    +
    + {{ product.name }}
    +
    +
    + +
    +
    +
    + {{ product.offer.get_price_with_discount }}{{ product.offer.currency.sign }}
    +
    +
      +
    • Артикул:{{ product.offer.vendor_code }}
      • +
    • НДС:{{ product.offer.account_nds|apply_nds_status }}
      • +
    • Платформа:{{ product.platform }}
      • +
    • Тип поставки:{{ product.offer.supply_type.name }}
      • +
    • Срок поставки:{{ product.offer.supply_type.get_formatted_desc }}
      • +
    • Примечание:{{ product.offer.note }}
      • +
    +
    - {% endif %} -
    -
    - {{ product.name }}
    -
    -
    - +
    + {% if request.user.is_authenticated %} +
    + + {% csrf_token %} + + +
    -
    - {{ product.offer.get_price_with_discount }}{{ product.offer.currency.sign }}
    -
    -
      -
    • Артикул:{{ product.offer.vendor_code }}
      • -
    • НДС:{{ product.offer.account_nds|apply_nds_status }}
      • -
    • Платформа:{{ product.platform }}
      • -
    • Тип поставки:{{ product.offer.supply_type.name }}
      • -
    • Срок поставки:{{ product.offer.supply_type.get_formatted_desc }}
      • -
    • Примечание:{{ product.offer.note }}
      • -
    -
    -
    + {% endif %}
    - {% if request.user.is_authenticated %} -
    -
    - {% csrf_token %} - - - -
    + {% empty %} +
    + На данный момент товары отсутсвуют, зайдите позже :))
    - {% endif %} -
    - {% empty %} -
    - На данный момент товары отсутсвуют, зайдите позже :)) -
    - {% endfor %} - {% if paginator.num_pages > 1 %} - {% spaceless %} - - {% endspaceless %} - {% endif %} + {% endspaceless %} + {% endif %}
    {% endblock right_common_content %}