Merge branch 'master' of gitlab.com:lilschool/site into feature/bonus-payment

apps/school/templates/blocks/schedule_item.html

@@ -6,9 +6,6 @@
     <div class="timing__info">
       <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
         {{ school_schedule }}
-        {% if not is_purchased and request.user_agent.is_mobile and school_schedule.trial_lesson %}
-        <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson|safe }}">Пробный урок</a>
-        {% endif %}
       </div>
       {% if is_purchased and live_lesson %}
       <div class="timing__date">{% if request.user_agent.is_mobile %}{{ live_lesson.date|date:"j b" }}{% else %}{{ live_lesson.date|date:"j E" }}{% endif %}</div>
@@ -20,11 +17,13 @@
             {% include './open_lesson.html' %}
           {% endif %}
         {% else %}
+          {% comment %}
           {% if not is_purchased_future and is_drawing_camp %}
             {% include './day_pay_btn.html' %}
           {% endif %}
+          {% endcomment %}
         {% endif %}
-        {% if not is_purchased and not request.user_agent.is_mobile and school_schedule.trial_lesson %}
+        {% if not is_purchased and school_schedule.trial_lesson %}
         <a class="timing__trial-lesson js-video-modal" href="#" data-trial-lesson="1" data-video-url="{{ school_schedule.trial_lesson|safe }}">Пробный урок</a>
         {% endif %}
       </div>

apps/school/templates/summer/buy.html

@@ -2,12 +2,13 @@
   <div class="section__center center text-center">
       <a
         {% if not is_purchased_future %}
-          data-popup=".js-popup-buy"
+          href="{% url 'packages' %}"
+        {% else %}
+          href="#"
         {% endif %}
           class="main__btn btn"
-          href="#"
         >
-        {% if not is_purchased and not is_purchased_future %}Купить доступ от {{ min_school_price }} руб./месяц{% endif %}
+        {% if not is_purchased and not is_purchased_future %}Узнать стоимость{% endif %}
         {% if is_purchased_future and not is_purchased %}ваша подписка начинается {{school_purchased_future.date_start}}{% endif %}
         {% if is_purchased %}ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате{% endif %}
       </a>

project/templates/blocks/header.html

@@ -30,13 +30,13 @@
               ГЛАВНАЯ
             </a>
           </div>
-          <!-- <div class="header__group">
+          <div class="header__group">
             <a class="header__section {% active_link 'school:school' %}" href="{% url 'school:school' %}">
               ОНЛАЙН-ШКОЛА {% if online or livelesson.is_online %}
               <div class="header__dot"></div>
               {% endif %}
             </a>
-          </div> -->
+          </div>
 
           <!--<div class="header__group">-->
             <!--<a class="header__section {% active_link 'school:drawing-camp' %}" href="{% url 'school:drawing-camp' %}">-->
@@ -45,11 +45,11 @@
               <!--{% endif %}-->
             <!--</a>-->
           <!--</div>-->
-          <div class="header__group">
+          <!--<div class="header__group">-->
-            <a class="header__section {% active_link 'school:free-lessons' %}" href="{% url 'school:free-lessons' %}">
+            <!--<a class="header__section {% active_link 'school:free-lessons' %}" href="{% url 'school:free-lessons' %}">-->
-              БЕСПЛАТНЫЕ УРОКИ
+              <!--БЕСПЛАТНЫЕ УРОКИ-->
-            </a>
+            <!--</a>-->
-          </div>
+          <!--</div>-->
           <div class="header__group">
             <a class="header__section header__section_sub js-header-section {% active_link 'courses' %}" href="{% url 'courses' %}">ВИДЕО-КУРСЫ</a>
             <div class="header__list js-header-list">

web/src/sass/_common.sass

@@ -4362,9 +4362,7 @@ a.grey-link
     display: inline-block
     margin-top: 10px
     +m
-      position: absolute;
+      margin-top: 0
-      width: 120px;
-      margin-top: 6px;
   &__time
     margin: 15px 0
     opacity: .5