diff --git a/front/js/shared/helpers.es6 b/front/js/shared/helpers.es6 index c895b485..125ad472 100644 --- a/front/js/shared/helpers.es6 +++ b/front/js/shared/helpers.es6 @@ -76,14 +76,14 @@ const helpers = (() => { // Ignore ESLintBear (no-unused-vars) const $this = $(this); if ($this.hasClass('less')) { $this.removeClass('less'); - $this.html('Развернуть описание'); + $this.html('Развернуть описание '); $this.prev().toggle(); - $this.prev().prev().fadeToggle('fast'); + $this.prev().prev().fadeToggle(1000); } else { $this.addClass('less'); - $this.html('Свернуть'); + $this.html('Свернуть '); $this.prev().prev().toggle(); - $this.prev().fadeToggle('fast'); + $this.prev().fadeToggle(1000); } return false; diff --git a/front/less/pages/product.less b/front/less/pages/product.less index 7af3563e..1f6f929c 100644 --- a/front/less/pages/product.less +++ b/front/less/pages/product.less @@ -156,6 +156,12 @@ min-height: @height-product-block-pc; width: 355px; }); + + .more-text { + color: @c-text-blue; + text-decoration: none; + font-size: @font-size-base; + } } .product-desc { diff --git a/shopelectro/settings/local.py.dist b/shopelectro/settings/local.py.dist index 7a340a3c..4b8063e0 100644 --- a/shopelectro/settings/local.py.dist +++ b/shopelectro/settings/local.py.dist @@ -8,6 +8,13 @@ USE_CELERY = False # http://bit.ly/sorl-thumbnail-docs THUMBNAIL_DEBUG = True +# https://docs.djangoproject.com/en/1.11/topics/cache/#dummy-caching-for-development +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', + } +} + # to disable django connection pool. # See .base.CONN_MAX_AGE for details CONN_MAX_AGE = 0 diff --git a/shopelectro/views/catalog.py b/shopelectro/views/catalog.py index b84b70c9..9a854362 100644 --- a/shopelectro/views/catalog.py +++ b/shopelectro/views/catalog.py @@ -104,6 +104,7 @@ def get_context_data(self, **kwargs): **product_images, 'group_tags_pairs': self.product.get_params().items(), 'tile_products': tile_products, + 'tile_title': 'Вас может заинтересовать', } def get_images_context_data(self, products) -> dict: diff --git a/templates/layout/tile_products.html b/templates/layout/tile_products.html index 5dcac784..d98f3f41 100644 --- a/templates/layout/tile_products.html +++ b/templates/layout/tile_products.html @@ -6,7 +6,7 @@ {% if tile_products %}
{{ tile_title }}
+{{ tile_title }}
{% for product in tile_products %}{% with description=product.page.display.description %} diff --git a/templates/layout/toggle_content.html b/templates/layout/toggle_content.html index 72790ee6..3896ea74 100644 --- a/templates/layout/toggle_content.html +++ b/templates/layout/toggle_content.html @@ -6,7 +6,9 @@ {{ content|linebreaksbr }} - Развернуть описание + + Развернуть описание + {% else %} {{ content|linebreaksbr }} {% endif %}