diff --git a/templates/bootstrap/forms/cart_checkout.html b/templates/bootstrap/forms/cart_checkout.html index 4cc2169..2dd41cf 100644 --- a/templates/bootstrap/forms/cart_checkout.html +++ b/templates/bootstrap/forms/cart_checkout.html @@ -1,10 +1,25 @@ - - - - - $Title$ - - -$END$ - - +{% load crispy_forms_field %} + +{% spaceless %} +
+ +
+ {% if field.label %} + {{ field.label }}{% if field.field.required %}*{% endif %} + {% endif %} +
+
+
+ {{ field }} + {% if field.field.help_text %} + + {% endif %} +
+ {% if field.errors %} +
+ {{ field.errors|safe }} +
+ {% endif %} +
+
+{% endspaceless %} diff --git a/templates/cart/cart.html b/templates/cart/cart.html index d2d921c..8ed69fd 100644 --- a/templates/cart/cart.html +++ b/templates/cart/cart.html @@ -10,7 +10,7 @@
-
+
Товар
@@ -22,12 +22,13 @@
Сумма
+
{% for offer in offer_items %}
-
+
@@ -39,20 +40,30 @@
-
+
-
+
Цена
{{ offer.get_price_with_discount }} {{ offer.currency.sign }}
-
+
Количество
{{ request.cart|get_cart_offer_amount:offer}}
-
+
Сумма
{{ request.cart|calculate_price:offer }} {{ offer.currency.sign }}
+
+
Действие
+
+
+ {% csrf_token %} + + +
+
+
diff --git a/templates/cart/checkout.html b/templates/cart/checkout.html index 21f5da2..2529931 100644 --- a/templates/cart/checkout.html +++ b/templates/cart/checkout.html @@ -1 +1,15 @@ {% extends 'base.html' %} +{% load crispy_forms_tags %} + +{% block content %} +
+
+
Оформление заказа
+
+
+ {% crispy form %} +
+
+
+
+{% endblock content %} diff --git a/templates/cart/confirm.html b/templates/cart/confirm.html index 21f5da2..0cb3237 100644 --- a/templates/cart/confirm.html +++ b/templates/cart/confirm.html @@ -1 +1,6 @@ {% extends 'base.html' %} +{% block content %} +
+ Спасибо за заказ. Наши менеджеры скоро с вами свяжуться :)) +
+{% endblock content %} diff --git a/templates/cart/discount_list.html b/templates/cart/discount_list.html index e69de29..fe16a12 100644 --- a/templates/cart/discount_list.html +++ b/templates/cart/discount_list.html @@ -0,0 +1,34 @@ +{% extends 'base.html' %} + +{% block content %} + +
+
+
{{ title }}
+
+
+ {% for discount in object_list %} +
+
+
Cashback с каждой покупки!
+
+

It is a long established fact that a reader will be distracted by the readable + content of a page when looking at its layout. The point of using Lorem Ipsum is + that it has a more-or-less normal distribution of letters, as opposed to using + 'Content here, content here', making it look like readable English. Many desktop + publishing packages and web page editors now use Lorem Ipsum as their default + model text, and a search for 'lorem ipsum' will uncover many web sites still in + their infancy. Various versions have evolved over the years, sometimes by + accident, sometimes on purpose (injected humour and the like).

+
+
+ {% empty %} +
+ Сегодня скидок не будет. Приходите завтра :)) +
+ {% endfor %} +
+
+
+
+{% endblock content %} diff --git a/templates/common.html b/templates/common.html index 9d89336..620c04b 100644 --- a/templates/common.html +++ b/templates/common.html @@ -115,7 +115,7 @@
{% endif %} - {% if not is_index %} + {% if not request.path == '/' %} {% include 'components/breadcrumbs.html' %} {% endif %} {% block right_common_content %} diff --git a/templates/common_news.html b/templates/common_news.html index cc54c66..5846dfc 100644 --- a/templates/common_news.html +++ b/templates/common_news.html @@ -1,5 +1,9 @@ -{% extends 'base.html'%} +{% extends 'base.html' %} {% block content %} - {% include 'components/breadcrumbs.html' %} -{% endblock content%} + {% if not request.path == '/' %} + {% include 'components/breadcrumbs.html' %} + {% endif %} + {% block news_content %} + {% endblock news_content %} +{% endblock content %} diff --git a/templates/components/breadcrumbs.html b/templates/components/breadcrumbs.html index 8c07802..93eab0e 100644 --- a/templates/components/breadcrumbs.html +++ b/templates/components/breadcrumbs.html @@ -1,4 +1,3 @@ -{% load mptt_tags %}
  • diff --git a/templates/components/footer.html b/templates/components/footer.html index 866d628..a7ccee6 100644 --- a/templates/components/footer.html +++ b/templates/components/footer.html @@ -10,9 +10,9 @@
    diff --git a/templates/components/header.html b/templates/components/header.html index e9cbb67..230a88b 100644 --- a/templates/components/header.html +++ b/templates/components/header.html @@ -18,7 +18,7 @@ Новости
  • - Акции + Акции
  • О компании diff --git a/templates/emails/html/admin_order_request.html b/templates/emails/html/admin_order_request.html index 6853a94..63136b6 100644 --- a/templates/emails/html/admin_order_request.html +++ b/templates/emails/html/admin_order_request.html @@ -1,12 +1,16 @@ {% extends 'email_base.html' %} {% block title %} - Вам пришел заказ + У вас новый заказ {% endblock title %} {% block email_body %}
    -

    Пользователь {{ order.user.profile.full_name|default_if_none:order.user.username }} сделал вам заказ

    +

    + Пользователь + {{ order.user.profile.full_name|default_if_none:order.user.username }} + сделал вам заказ +

    Заказ № {{ order.order_code }}

    @@ -14,17 +18,19 @@ diff --git a/templates/emails/txt/admin_order_request.txt b/templates/emails/txt/admin_order_request.txt index 50447c6..84d847f 100644 --- a/templates/emails/txt/admin_order_request.txt +++ b/templates/emails/txt/admin_order_request.txt @@ -1,17 +1,17 @@ ===================================================================== - Запрос на обратную связь от пользователя + Вам пришел заказ ===================================================================== ---------------------------------------------------------------------- -Пользователь {{ name }} отправил вам запрос по продукту {{ subject }}. +Пользователь {{ order.user.profile.full_name|default_if_none:order.user.username }} сделал вам заказ.\n -Чтобы связаяться для уточнения информации. -Используйте следующий почтовый ящик {{ email }} для ответа. +Заказ № {{ order.order_code }}.\n -{% if phone %} - Либо используйте мобильный номер телефона {{ phone }} . -{% endif %} +{% for buying in order.buyings_set %} + Товар: {{ buying.offer.product.name }}\n + Колличество: {{ buying.amount }}.\n +{% endfor %} ---------------------------------------------------------------------- diff --git a/templates/pinax/blog/blog_list.html b/templates/pinax/blog/blog_list.html index 21f5da2..0c150a6 100644 --- a/templates/pinax/blog/blog_list.html +++ b/templates/pinax/blog/blog_list.html @@ -1 +1,30 @@ -{% extends 'base.html' %} +{% extends 'common_news.html' %} +{% load static %} + +{% block news_content %} +
    {{ "Новости" }}
    + +
    + {% for news in object_list %} +
    +
    + {% if news.image_set.primary_image %} +
    +
    {{ news.title }}
    +
    + {% endif %} +
    +
    +
    + {{ news.title }} +
    +
    + {{ news.teaser_html|safe }} +
    +
    +
    +
    +
    + {% endfor %} +
    +{% endblock news_content %} diff --git a/templates/pinax/blog/blog_post.html b/templates/pinax/blog/blog_post.html index 63f5b1e..fdc7091 100644 --- a/templates/pinax/blog/blog_post.html +++ b/templates/pinax/blog/blog_post.html @@ -1,172 +1,19 @@ -{% extends 'base.html' %} +{% extends 'common_news.html' %} {% block content %} -
    Новости
    +
    {{ object.title }}
    -
    -
    -
    -
    -
    -
    Новость 1
    -
    -

    It is a long established fact that a reader will be distracted by the - readable - content of a page when looking at its layout. The point of using Lorem - Ipsum is - that - it has a more-or-less normal distribution of letters, as opposed to - using - 'Content - here, content here', making it look like readable English. Many desktop - publishing - packages and web page editors now use Lorem Ipsum as their default model - text, - and a - search for 'lorem ipsum' will uncover many web sites still in their - infancy. - Various - versions have evolved over the years, sometimes by accident, sometimes - on - purpose - (injected humour and the like).

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Новость 1
    -
    -

    It is a long established fact that a reader will be distracted by the - readable - content of a page when looking at its layout. The point of using Lorem - Ipsum is - that - it has a more-or-less normal distribution of letters, as opposed to - using - 'Content - here, content here', making it look like readable English. Many desktop - publishing - packages and web page editors now use Lorem Ipsum as their default model - text, - and a - search for 'lorem ipsum' will uncover many web sites still in their - infancy. - Various - versions have evolved over the years, sometimes by accident, sometimes - on - purpose - (injected humour and the like).

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Новость 1
    -
    -

    It is a long established fact that a reader will be distracted by the - readable - content of a page when looking at its layout. The point of using Lorem - Ipsum is - that - it has a more-or-less normal distribution of letters, as opposed to - using - 'Content - here, content here', making it look like readable English. Many desktop - publishing - packages and web page editors now use Lorem Ipsum as their default model - text, - and a - search for 'lorem ipsum' will uncover many web sites still in their - infancy. - Various - versions have evolved over the years, sometimes by accident, sometimes - on - purpose - (injected humour and the like).

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Новость 1
    -
    -

    It is a long established fact that a reader will be distracted by the - readable - content of a page when looking at its layout. The point of using Lorem - Ipsum is - that - it has a more-or-less normal distribution of letters, as opposed to - using - 'Content - here, content here', making it look like readable English. Many desktop - publishing - packages and web page editors now use Lorem Ipsum as their default model - text, - and a - search for 'lorem ipsum' will uncover many web sites still in their - infancy. - Various - versions have evolved over the years, sometimes by accident, sometimes - on - purpose - (injected humour and the like).

    -
    + {% if object.image_set.primary_image %} +
    +
    {{ object.title }}
    -
    -
    -
    -
    -
    -
    -
    -
    + {% endif %}
    -
    Новость 1
    -

    It is a long established fact that a reader will be distracted by the - readable - content of a page when looking at its layout. The point of using Lorem - Ipsum is - that - it has a more-or-less normal distribution of letters, as opposed to - using - 'Content - here, content here', making it look like readable English. Many desktop - publishing - packages and web page editors now use Lorem Ipsum as their default model - text, - and a - search for 'lorem ipsum' will uncover many web sites still in their - infancy. - Various - versions have evolved over the years, sometimes by accident, sometimes - on - purpose - (injected humour and the like).

    +

    {{ object.description }}

    diff --git a/templates/products/product_detail.html b/templates/products/product_detail.html index c1a8f04..080b2a1 100644 --- a/templates/products/product_detail.html +++ b/templates/products/product_detail.html @@ -2,11 +2,17 @@ {% load static %} {% load core_tags %} {% load products_filters %} +{% load mptt_tags %} {% block breacrumbs %} {% breadcrumb_url 'Каталог' 'products:product_list' %} -{# {% breadcrumb_mptt_url product.get_ancestors %}#} -{# {% breadcrum_url product.name 'products:product_details' product.get_path %}#} + {% recursetree product.parent.get_ancestors %} +
  • {{ node.name }}
    • + {% if not node.is_leaf_node %} + {{ children }} + {% endif %} + {% endrecursetree %} + {% breadcrumb_url product.name 'products:product_details' product.get_path %} {% endblock breacrumbs %} {% block right_common_content %} @@ -22,7 +28,7 @@
      {% for product_image in product.productimage_set.get_all_images %} -
    • {{ product_image.name }}
      • +
    • {{ product_image.name }}
      • {% endfor %}
    @@ -49,28 +55,30 @@ {% endif %}
    -
    -
    - {% csrf_token %} - -
    - Количество -
    - - -
    + {% if request.user.is_authenticated %} +
    +
    + {% csrf_token %} + +
    + Количество +
    + + +
    + {% endif %}
    Описание
    - {% if product.description > 0 %} - {{ product.description|apply_desc_preview }} + {% if product.description|length > 0 %} + {{ product.description|apply_desc_preview|safe }} {% else %} У данного товара описание отсутсвует {% endif %}
    - {% if product.description > 0 %} + {% if product.description|length > 0 %} Читать полностью @@ -89,7 +97,7 @@
    - {{ product.description }} + {{ product.description|safe }}
    diff --git a/templates/products/product_list.html b/templates/products/product_list.html index 2d2adeb..fd98ae0 100644 --- a/templates/products/product_list.html +++ b/templates/products/product_list.html @@ -4,11 +4,19 @@ {% load core_tags %} {% load products_filters %} {% load product_tags %} +{% load mptt_tags %} {% block breadcrums %} {% breadcrumb_url 'Каталог' 'products:product_list' %} - {% if the_product_category.get_ancestors.exists %}{% endif %} + {% 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 %} {% endblock breadcrums %} @@ -84,6 +92,7 @@
    + {% if request.user.is_authenticated %}
    {% csrf_token %} @@ -92,6 +101,7 @@
    + {% endif %} {% empty %}
    - - - - + + + + {% for buying in order.buyings_set %} - + {% endfor %} @@ -34,6 +40,9 @@
    - Товар - Колличество
    + Товар + Колличество
    {{ buying.offer.product.name }}{{ buying.offer.product.name }} + {{ buying.amount }}
    + {% if order.comment %} + Комментарий: {{ order.comment }} + {% endif %}

    С уважением, Администрация сайта {{ site.name }}