From 8e2fe978485789b30a5e1a62f9ae89672dd8d9b7 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Sun, 29 Apr 2018 10:56:16 +0300
Subject: [PATCH] LIL-439. Fix blocks position on main page & blocks content

---
 project/templates/blocks/about.html | 24 +++++++++++++++++++++++-
 project/templates/blocks/arts.html  | 28 ----------------------------
 project/templates/blocks/promo.html | 16 ----------------
 project/templates/lilcity/main.html |  3 +--
 4 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html
index 3fc738b7..66116c55 100644
--- a/project/templates/blocks/about.html
+++ b/project/templates/blocks/about.html
@@ -1,7 +1,6 @@
 {% load static %}
 <div class="section section_school" id="about">
   <div class="section__center center">
-    <div class="title title_center">Lil City School</div>
     <div class="text text_only_curve">
       <img class="text__curve text__curve_one" src="{% static 'img/curve-1.svg' %}" width="320">
     </div>
@@ -43,5 +42,28 @@
         <div class="school__text">пропущенные дни</div>
       </div>
     </div>
+    <div class="letsgo">
+      {% if is_purchased %}
+      <a
+        {% if not user.is_authenticated %}
+        data-popup=".js-popup-auth"
+        {% else %}
+        data-popup=".js-popup-buy"
+        {% endif %}
+        class="main__btn btn"
+        href="#"
+        >ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате</a>
+      {% else %}
+      <a
+        {% if not user.is_authenticated %}
+        data-popup=".js-popup-auth"
+        {% else %}
+        data-popup=".js-popup-buy"
+        {% endif %}
+        class="main__btn btn"
+        href="#"
+        >купить доступ от {{ min_school_price }} руб./месяц</a>
+      {% endif %}
+    </div>
   </div>
 </div>
diff --git a/project/templates/blocks/arts.html b/project/templates/blocks/arts.html
index 15942d98..1206b363 100644
--- a/project/templates/blocks/arts.html
+++ b/project/templates/blocks/arts.html
@@ -1,11 +1,6 @@
 {% load static %}
 <div class="section section_arts">
   <div class="section__center center">
-    <div class="title title_center">Первая онлайн-школа креативного мышления для детей! 5+</div>
-    <div class="text text_arts">
-      <p>Каждый день, с понедельника по пятницу в 17:00 по&nbsp;московскому времени мы встречаемся в прямом эфире по пяти предметам:</p>
-      <img class="text__curve text__curve_two" src="{% static 'img/curve-2.svg' %}" width="211">
-    </div>
     <div class="arts">
       <div class="arts__col">
         <div class="arts__item" style="background-image: url({% static 'img/art1.png' %});">
@@ -33,28 +28,5 @@
         </div>
       </div>
     </div>
-    <div class="letsgo">
-      {% if is_purchased %}
-      <a
-        {% if not user.is_authenticated %}
-        data-popup=".js-popup-auth"
-        {% else %}
-        data-popup=".js-popup-buy"
-        {% endif %}
-        class="main__btn btn"
-        href="#"
-        >ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате</a>
-      {% else %}
-      <a
-        {% if not user.is_authenticated %}
-        data-popup=".js-popup-auth"
-        {% else %}
-        data-popup=".js-popup-buy"
-        {% endif %}
-        class="main__btn btn"
-        href="#"
-        >купить доступ от {{ min_school_price }} руб./месяц</a>
-      {% endif %}
-    </div>
   </div>
 </div>
diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html
index 073ce2e9..d953b603 100644
--- a/project/templates/blocks/promo.html
+++ b/project/templates/blocks/promo.html
@@ -34,22 +34,6 @@
       {% endif %}
       <a class="main__btn btn btn_white" href="{% url 'school:school' %}">подробнее</a>
     </div>
-    {% comment %} <div class="main__foot">
-      <a class="main__go" href="#">
-        <svg class="icon icon-prev">
-          <use xlink:href="{% static 'img/sprite.svg' %}#icon-prev"></use>
-        </svg>
-      </a>
-      <nav class="main__nav">
-        <a class="main__link" href="{% url 'school:school' %}">онлайн-школа</a>
-        <a class="main__link" href="{% url 'courses' %}">видеокурсы</a>
-      </nav>
-      <a class="main__go" href="#">
-        <svg class="icon icon-next">
-          <use xlink:href="{% static 'img/sprite.svg' %}#icon-next"></use>
-        </svg>
-      </a>
-    </div> {% endcomment %}
   </div>
   <div class="main__socials">
     <a class="main__social" href="{{ config.SERVICE_INSTAGRAM_URL }}">
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html
index 8f4d4b38..a994b3cb 100644
--- a/project/templates/lilcity/main.html
+++ b/project/templates/lilcity/main.html
@@ -4,9 +4,8 @@
 {% block content %}
   {% include "templates/blocks/promo.html" %}
   {% include "templates/blocks/messages.html" %}
-  {% include "templates/blocks/about.html" %}
-  {% include "templates/blocks/advantages.html" %}
   {% include "templates/blocks/arts.html" %}
+  {% include "templates/blocks/about.html" %}
   {% include "templates/blocks/last_courses.html" %}
   {% include "templates/blocks/gallery.html" %}
   {% include "templates/blocks/game.html" %}