-
+
-
-
- {% for image in product.images.all() %}
- {% set im = image.image|thumbnail("80x80") %}
- {% set im_big = image.image|thumbnail("398x398") %}
- 
+
+
+
+
-
+ {% for image in product.images.all() %}
+ {% set im = image.image|thumbnail("80x80") %}
+ {% set im_big = image.image|thumbnail("398x398") %}
+
{% endfor %}
@@ -38,51 +38,54 @@
{% set variant = product.variations.filter(in_stock__gt=0).order_by('price').first() %} {% if not variant %} - {% set variant = product.variations.order_by('price').first() %} + {% set variant = product.variations.order_by('price').first() %} {% endif %}
-
+ + {% endfor %} + +
+ {% set variant = product.variations.filter(in_stock__gt=0).order_by('price').first() %} {% if not variant %} - {% set variant = product.variations.order_by('price').first() %} + {% set variant = product.variations.order_by('price').first() %} {% endif %}
Варианты товара:
{# TODO: Предусмотреть если всего один вариант#} -+ + {% endfor %} + +
-
-
-
+
++
+
+
-
+-
-
-
- Итого: {{ product.min_price() }} ₸
-
-
- {# TODO: Сделать кнопку заказать#}
- Добавить в корзину
+
+
+
+ Итого: {{ product.min_price() }} ₸
+
+
+ {# TODO: Сделать кнопку заказать#}
+ Добавить в корзину
-
- Товара нет в наличии
-
+
+ Товара нет в наличии
+ {{ product.description|linebreaks|safe }}
+
{% endblock %}
diff --git a/main/__pycache__/__init__.cpython-34.pyc b/main/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index 443cff8..0000000
Binary files a/main/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/main/__pycache__/admin.cpython-34.pyc b/main/__pycache__/admin.cpython-34.pyc
deleted file mode 100644
index 09f6c70..0000000
Binary files a/main/__pycache__/admin.cpython-34.pyc and /dev/null differ
diff --git a/main/__pycache__/models.cpython-34.pyc b/main/__pycache__/models.cpython-34.pyc
deleted file mode 100644
index 0658c3b..0000000
Binary files a/main/__pycache__/models.cpython-34.pyc and /dev/null differ
diff --git a/main/__pycache__/views.cpython-34.pyc b/main/__pycache__/views.cpython-34.pyc
deleted file mode 100644
index 1d3274b..0000000
Binary files a/main/__pycache__/views.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0001_initial.cpython-34.pyc b/main/migrations/__pycache__/0001_initial.cpython-34.pyc
deleted file mode 100644
index 2109d03..0000000
Binary files a/main/migrations/__pycache__/0001_initial.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0002_auto_20150328_1422.cpython-34.pyc b/main/migrations/__pycache__/0002_auto_20150328_1422.cpython-34.pyc
deleted file mode 100644
index b15c7d6..0000000
Binary files a/main/migrations/__pycache__/0002_auto_20150328_1422.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0003_auto_20150328_1428.cpython-34.pyc b/main/migrations/__pycache__/0003_auto_20150328_1428.cpython-34.pyc
deleted file mode 100644
index 2dd4c63..0000000
Binary files a/main/migrations/__pycache__/0003_auto_20150328_1428.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0004_auto_20150328_1429.cpython-34.pyc b/main/migrations/__pycache__/0004_auto_20150328_1429.cpython-34.pyc
deleted file mode 100644
index bcdc276..0000000
Binary files a/main/migrations/__pycache__/0004_auto_20150328_1429.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0005_auto_20150328_1452.cpython-34.pyc b/main/migrations/__pycache__/0005_auto_20150328_1452.cpython-34.pyc
deleted file mode 100644
index 9d88be9..0000000
Binary files a/main/migrations/__pycache__/0005_auto_20150328_1452.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/0006_auto_20150328_1507.cpython-34.pyc b/main/migrations/__pycache__/0006_auto_20150328_1507.cpython-34.pyc
deleted file mode 100644
index 7a94b19..0000000
Binary files a/main/migrations/__pycache__/0006_auto_20150328_1507.cpython-34.pyc and /dev/null differ
diff --git a/main/migrations/__pycache__/__init__.cpython-34.pyc b/main/migrations/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index ae0cdff..0000000
Binary files a/main/migrations/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/static/less/_.css b/static/less/_.css
index d7019b9..f4a93d8 100644
--- a/static/less/_.css
+++ b/static/less/_.css
@@ -922,3 +922,8 @@ table.table-cart input {
ul.messages {
display: none;
}
+.product-description {
+ margin-top: 40px;
+ padding-top: 20px;
+ border-top: 1px #ddd solid;
+}
diff --git a/static/less/_.less b/static/less/_.less
index 49d80b2..36c9fe3 100644
--- a/static/less/_.less
+++ b/static/less/_.less
@@ -118,11 +118,11 @@ span.yellow {
* with disabling the responsiveness.
*/
-/* Account for fixed navbar */
+ /* Account for fixed navbar */
-body,
-.navbar-static-top,
-.navbar-fixed-bottom {
+ body,
+ .navbar-static-top,
+ .navbar-fixed-bottom {
min-width: 970px;
}
@@ -146,8 +146,8 @@ body,
* grid system, and navbar.
*/
-/* Reset the container */
-.container {
+ /* Reset the container */
+ .container {
width: 970px;
max-width: none !important;
}
@@ -758,4 +758,10 @@ table.table-cart {
ul.messages {
display: none;
+}
+
+.product-description{
+ margin-top: 40px;
+ padding-top: 20px;
+ border-top: 1px #ddd solid;
}
\ No newline at end of file
diff --git a/store/__pycache__/__init__.cpython-34.pyc b/store/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index c8287e3..0000000
Binary files a/store/__pycache__/__init__.cpython-34.pyc and /dev/null differ
diff --git a/store/__pycache__/admin.cpython-34.pyc b/store/__pycache__/admin.cpython-34.pyc
deleted file mode 100644
index 6854295..0000000
Binary files a/store/__pycache__/admin.cpython-34.pyc and /dev/null differ
diff --git a/store/__pycache__/cart.cpython-34.pyc b/store/__pycache__/cart.cpython-34.pyc
deleted file mode 100644
index e5013d4..0000000
Binary files a/store/__pycache__/cart.cpython-34.pyc and /dev/null differ
diff --git a/store/__pycache__/models.cpython-34.pyc b/store/__pycache__/models.cpython-34.pyc
deleted file mode 100644
index 7976fe4..0000000
Binary files a/store/__pycache__/models.cpython-34.pyc and /dev/null differ
diff --git a/store/__pycache__/urls.cpython-34.pyc b/store/__pycache__/urls.cpython-34.pyc
deleted file mode 100644
index eeb549d..0000000
Binary files a/store/__pycache__/urls.cpython-34.pyc and /dev/null differ
diff --git a/store/__pycache__/views.cpython-34.pyc b/store/__pycache__/views.cpython-34.pyc
deleted file mode 100644
index c666446..0000000
Binary files a/store/__pycache__/views.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0001_initial.cpython-34.pyc b/store/migrations/__pycache__/0001_initial.cpython-34.pyc
deleted file mode 100644
index 7d9f467..0000000
Binary files a/store/migrations/__pycache__/0001_initial.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0002_auto_20150329_0506.cpython-34.pyc b/store/migrations/__pycache__/0002_auto_20150329_0506.cpython-34.pyc
deleted file mode 100644
index 42c709a..0000000
Binary files a/store/migrations/__pycache__/0002_auto_20150329_0506.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0003_auto_20150506_0553.cpython-34.pyc b/store/migrations/__pycache__/0003_auto_20150506_0553.cpython-34.pyc
deleted file mode 100644
index 1c96a36..0000000
Binary files a/store/migrations/__pycache__/0003_auto_20150506_0553.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0004_auto_20150506_1004.cpython-34.pyc b/store/migrations/__pycache__/0004_auto_20150506_1004.cpython-34.pyc
deleted file mode 100644
index f9dc508..0000000
Binary files a/store/migrations/__pycache__/0004_auto_20150506_1004.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0005_auto_20150511_1617.cpython-34.pyc b/store/migrations/__pycache__/0005_auto_20150511_1617.cpython-34.pyc
deleted file mode 100644
index b02bb1e..0000000
Binary files a/store/migrations/__pycache__/0005_auto_20150511_1617.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0006_auto_20150514_1123.cpython-34.pyc b/store/migrations/__pycache__/0006_auto_20150514_1123.cpython-34.pyc
deleted file mode 100644
index db57364..0000000
Binary files a/store/migrations/__pycache__/0006_auto_20150514_1123.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0007_auto_20150515_0902.cpython-34.pyc b/store/migrations/__pycache__/0007_auto_20150515_0902.cpython-34.pyc
deleted file mode 100644
index bc5cbbf..0000000
Binary files a/store/migrations/__pycache__/0007_auto_20150515_0902.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0008_auto_20150526_1017.cpython-34.pyc b/store/migrations/__pycache__/0008_auto_20150526_1017.cpython-34.pyc
deleted file mode 100644
index 5f53b98..0000000
Binary files a/store/migrations/__pycache__/0008_auto_20150526_1017.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/0009_auto_20150526_1021.cpython-34.pyc b/store/migrations/__pycache__/0009_auto_20150526_1021.cpython-34.pyc
deleted file mode 100644
index 813b7a4..0000000
Binary files a/store/migrations/__pycache__/0009_auto_20150526_1021.cpython-34.pyc and /dev/null differ
diff --git a/store/migrations/__pycache__/__init__.cpython-34.pyc b/store/migrations/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index a29c0b4..0000000
Binary files a/store/migrations/__pycache__/__init__.cpython-34.pyc and /dev/null differ