From e2c46af6a2c4919be98339ea572d1f0c96835af9 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 30 Jul 2019 22:14:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=B1=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=80=20=D0=BD=D0=B5=20=D0=B4=D0=BE=D0=BB=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D1=80=D0=BE=D0=BA=D1=80=D1=83=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/templates/blocks/banner.html  | 73 ++++++++-------------------
 project/templates/blocks/banners.html | 36 ++-----------
 2 files changed, 26 insertions(+), 83 deletions(-)

diff --git a/project/templates/blocks/banner.html b/project/templates/blocks/banner.html
index ccf8f7e5..f047c2cf 100644
--- a/project/templates/blocks/banner.html
+++ b/project/templates/blocks/banner.html
@@ -1,62 +1,31 @@
-{% if banner %}
-<div class="banner {% if banner.color %}banner_colored{% endif %} {% if banner.future_date %}banner_countdown{% endif %}"
-     data-banner="{{banner.id}}" style="display: none; background-color: {{ banner.color|default:'white' }};">
-  <div class="banner__bg" style="
-        {% if not request.user_agent.is_mobile or banner.future_date %}
-        background-image: url({{ banner.image.url }});
-        {% endif %}
-        {% if request.user_agent.is_mobile and banner.future_date %}
-        opacity: 0.7;
-        {% endif %}
-        {% if banner.stretch_image %}
-        background-position: center;
-        background-size: cover;
-        {% else %}
-        background-position: center bottom;
-        {% endif %}"></div>
-  {% if request.user_agent.is_mobile %}
-    {% if not banner.future_date %}
-    <a href="{{ banner.url }}" class="banner__image-wrap">
-      <img class="banner__image" src="{{ banner.image.url }}" />
-    </a>
-    {% endif %}
-  <div class="banner__content">
-    <div class="banner__content-center">
+<div class="banner"
+     data-banner="{{banner.id}}" style="display: none;
+    background: {{ banner.color|default:'white' }};
+    {% if banner.color2 %}
+    background: -moz-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
+    background: -webkit-gradient(left top, right bottom, color-stop(0%, {{ banner.color }}), color-stop(100%, {{ banner.color2 }}));
+    background: -webkit-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
+    background: -o-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
+    background: -ms-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
+    background: linear-gradient(135deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='{{ banner.color }}', endColorstr='{{ banner.color2 }}', GradientType=1 );
+    {% endif %}">
+    <div class="banner__content">
       <div class="banner__text-column">
-        <div class="banner__text">{{ banner.text }}</div>
-        {% if not banner.future_date %}
+        <div class="banner__text">{{ banner.text|safe }}</div>
+        {% if banner.url %}
         <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
         {% endif %}
       </div>
-      {% if banner.future_date %}
-      <div class="banner__countdown-column">
-        <div>
+      <div class="banner__image-column">
+        <img src="{{ banner.image.url }}"/>
+
+        {% if banner.future_date %}
+        <div class="banner__countdown-wrap">
           <div class="banner__countdown-title">До конца акции осталось</div>
           <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
         </div>
-        <div>
-          <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
-        </div>
-      </div>
-      {% endif %}
-    </div>
-  </div>
-  {% else %}
-  <div class="banner__content">
-    <div class="banner__content-center">
-      <div class="banner__text-column">
-        <div class="banner__text">{{ banner.text }}</div>
-        <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
-      </div>
-      {% if banner.future_date %}
-      <div class="banner__countdown-column">
-        <div class="banner__countdown-title">До конца акции осталось</div>
-        <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
+        {% endif %}
       </div>
-      {% endif %}
     </div>
-  </div>
-  {% endif %}
-  <a href="#" class="banner__hide">Скрыть{% if not request.user_agent.is_mobile %} баннер{% endif %}</a>
 </div>
-{% endif %}
diff --git a/project/templates/blocks/banners.html b/project/templates/blocks/banners.html
index 4c3df84d..ed3f0e55 100644
--- a/project/templates/blocks/banners.html
+++ b/project/templates/blocks/banners.html
@@ -1,3 +1,4 @@
+{% if banners|length > 1 %}
 <swiper class="banners" :options="{
   effect: 'slide',
   speed: 700,
@@ -9,38 +10,11 @@
   }}">
   {% for banner in banners %}
   <swiper-slide>
-    <div class="banner"
-     data-banner="{{banner.id}}" style="display: none;
-        background: {{ banner.color|default:'white' }};
-        {% if banner.color2 %}
-        background: -moz-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -webkit-gradient(left top, right bottom, color-stop(0%, {{ banner.color }}), color-stop(100%, {{ banner.color2 }}));
-        background: -webkit-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -o-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: -ms-linear-gradient(-45deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        background: linear-gradient(135deg, {{ banner.color }} 0%, {{ banner.color2 }} 100%);
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='{{ banner.color }}', endColorstr='{{ banner.color2 }}', GradientType=1 );
-        {% endif %}">
-        <div class="banner__content">
-          <div class="banner__text-column">
-            <div class="banner__text">{{ banner.text }}</div>
-            {% if banner.url %}
-            <a href="{{ banner.url }}" class="banner__link">{{ banner.button_text }}</a>
-            {% endif %}
-          </div>
-          <div class="banner__image-column">
-            <img src="{{ banner.image.url }}"/>
-
-            {% if banner.future_date %}
-            <div class="banner__countdown-wrap">
-              <div class="banner__countdown-title">До конца акции осталось</div>
-              <countdown date="{{ banner.future_date|date:'Y-m-d H:i:s' }}"></countdown>
-            </div>
-            {% endif %}
-          </div>
-        </div>
-    </div>
+    {% include 'templates/blocks/banner.html' %}
   </swiper-slide>
   {% endfor %}
   <div class="swiper-pagination" slot="pagination"></div>
 </swiper>
+{% else %}
+  {% include 'templates/blocks/banner.html' with banner=banners.0 %}
+{% endif %}