From cb809cb8fa154831359c72e80251f64ea97ddbd6 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 19 Jul 2018 14:55:42 +0500
Subject: [PATCH] =?UTF-8?q?LIL-560=20=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D1=83?=
 =?UTF-8?q?=20=C2=AB=D0=A1=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=83=D1=80=D0=BE=D0=BA=C2=BB=20=D0=BF=D0=BE=D0=B4=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=D1=8B=D1=88=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blocks/_schedule_purchased_item.html      | 78 -------------------
 apps/school/templates/blocks/schedule.html    | 69 +---------------
 .../schedule_item.html}                       | 38 +++++----
 .../templates/blocks/schedule_purchased.html  |  4 +-
 .../templates/school/schedules_print.html     | 62 +--------------
 .../templates/summer/schedule_purchased.html  |  4 +-
 web/src/sass/_common.sass                     | 11 ++-
 7 files changed, 41 insertions(+), 225 deletions(-)
 delete mode 100644 apps/school/templates/blocks/_schedule_purchased_item.html
 rename apps/school/templates/{summer/_schedule_purchased_item.html => blocks/schedule_item.html} (70%)

diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html
deleted file mode 100644
index b9d1db1f..00000000
--- a/apps/school/templates/blocks/_schedule_purchased_item.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{% load static %} {% load thumbnail %}
-<div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle{% if not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}">
-  <div class="timing__cell">
-    <div class="timing__info">
-      <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
-        {{ school_schedule }}
-      </div>
-      {% if live_lesson %}
-      <div class="timing__date">{{ live_lesson.date }}</div>
-      {% endif %}
-    </div>
-    <div class="timing__buy">
-      <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-      {% if school_schedule.weekday in school_schedules_purchased %}
-        {% if live_lesson and live_lesson.title %}
-          {% include './open_lesson.html' %}
-        {% endif %}
-      {% else %}
-        {% include './day_pay_btn.html' %}
-      {% endif %}
-    </div>
-    {% comment %}
-    <!-- это нужно чтобы в попапе продления школы всегда знать какие дни выбраны(куплены) -->
-    {% endcomment %}
-    {% if school_schedule.weekday in school_schedules_purchased %}
-    <span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span>
-    {% endif %}
-  </div>
-  <div class="timing__cell">
-    <div class="timing__preview">
-      {% thumbnail live_lesson.cover.image "70x70" crop="center" as im %}
-      <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
-      {% empty %}
-      <img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px" />
-      {% endthumbnail %}
-    </div>
-  </div>
-  <div class="timing__cell">
-    <div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
-      <span class="bold">{{ live_lesson.title }}</span>
-      {% endif %}
-    </div>
-    <div class="timing__content">
-    {% if live_lesson and live_lesson.short_description %}
-      {{ live_lesson.short_description }}
-    {% else %}
-      {{ school_schedule.description }}
-    {% endif %}
-    </div>
-    <div class="timing__more">
-      <div class="timing__head">Материалы</div>
-      <div class="timing__row">
-        <div class="timing__text">
-          {{ school_schedule.materials }}
-        </div>
-      </div>
-      {% if school_schedule.schoolschedule_images.exists %}
-      <div class="timing__head">Результаты прошлых уроков</div>
-      <div class="timing__works gallery">
-        {% for image in school_schedule.schoolschedule_images.all %}
-        {% thumbnail image.img.image "48x48" crop="center" as im %}
-        <a class="timing__work" href="{{ image.img.image.url }}">
-          <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
-        </a>
-        {% endthumbnail %}
-        {% endfor %}
-      </div>
-      {% endif %}
-    </div>
-  </div>
-  <div class="timing__cell">
-    <button class="timing__toggle">
-      <svg class="icon icon-arrow-down">
-        <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
-      </svg>
-    </button>
-  </div>
-</div>
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 2e4c6457..5f088511 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -6,74 +6,7 @@
     <div class="timing js-timing">
       <div class="timing__week">
         {% for school_schedule in school_schedules %}
-        {% with current_live_lesson=school_schedule.current_live_lesson %}
-        <div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle">
-          <div class="timing__cell">
-            <div class="timing__info">
-              <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
-                {{ school_schedule }}
-              </div>
-              {% if current_live_lesson %}
-              <!--<div class="timing__date">{{ current_live_lesson.date }}</div>-->
-              {% endif %}
-            </div>
-            <div class="timing__buy">
-              <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-              <!--{% include './pay_btn.html' %}-->
-            </div>
-          </div>
-          <div class="timing__cell">
-            <div class="timing__preview">
-              {% thumbnail current_live_lesson.cover.image "70x70" crop="center" as im %}
-              <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
-              {% empty %}
-              <img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px"/>
-              {% endthumbnail %}
-            </div>
-          </div>
-          <div class="timing__cell">
-            <div class="timing__title">{{ school_schedule.title }}
-              {% if current_live_lesson and current_live_lesson.title %}
-                , <span class="bold">{{ current_live_lesson.title }}</span>
-              {% endif %}
-            </div>
-            <div class="timing__content">
-              {% if live_lesson %}
-                {{ live_lesson.short_description }}
-              {% else %}
-                {{ school_schedule.description }}
-              {% endif %}
-            </div>
-            <div class="timing__more">
-              <div class="timing__head">Материалы</div>
-              <div class="timing__row">
-                <div class="timing__text">
-                  {{ school_schedule.materials }}
-                </div>
-              </div>
-              {% if school_schedule.schoolschedule_images.exists %}
-              <div class="timing__head">Результаты прошлых уроков</div>
-              <div class="timing__works gallery">
-                {% for image in school_schedule.schoolschedule_images.all %}
-                {% thumbnail image.img.image "48x48" crop="center" as im %}
-                <a class="timing__work" href="{{ image.img.image.url }}">
-                  <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
-                </a>
-                {% endthumbnail %}
-                {% endfor %}
-              </div>
-              {% endif %}
-            </div>
-          </div>
-          <div class="timing__cell">
-            <button class="timing__toggle">
-              <svg class="icon icon-arrow-down">
-                <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
-              </svg>
-            </button>
-          </div>
-        </div>
-        {% endwith %}
+          {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
         {% endfor %}
       </div>
       <div class="timing__foot">
diff --git a/apps/school/templates/summer/_schedule_purchased_item.html b/apps/school/templates/blocks/schedule_item.html
similarity index 70%
rename from apps/school/templates/summer/_schedule_purchased_item.html
rename to apps/school/templates/blocks/schedule_item.html
index 0e86ccba..0cafb9f3 100644
--- a/apps/school/templates/summer/_schedule_purchased_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@@ -1,21 +1,23 @@
 {% load static %} {% load thumbnail %}
-<div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle{% if not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}">
+<div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle {% if print %}open{% endif %} {% if purchased and not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}">
   <div class="timing__cell timing__cell--info">
     <div class="timing__info">
       <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
         {{ school_schedule }}
       </div>
-      {% if live_lesson %}
+      {% if purchased and live_lesson %}
       <div class="timing__date">{{ live_lesson.date }}</div>
       {% endif %}
+      <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
       <div class="timing__buy">
-        <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-        {% if school_schedule.weekday in school_schedules_purchased %}
-          {% if live_lesson and live_lesson.title %}
-            {% include './open_lesson.html' %}
+        {% if purchased %}
+          {% if school_schedule.weekday in school_schedules_purchased %}
+            {% if live_lesson and live_lesson.title %}
+              {% include './open_lesson.html' %}
+            {% endif %}
+          {% else %}
+            {% include './day_pay_btn.html' %}
           {% endif %}
-        {% else %}
-          {% include './day_pay_btn.html' %}
         {% endif %}
       </div>
     </div>
@@ -36,7 +38,7 @@
           {% endthumbnail %}
         </div>
     </div>
-    <div class="timing__cell timing__cell--content">
+    <div class="timing__cell timing__cell--content" {% if print %}style="flex: 1 0 0;"{% endif %}>
       <div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
         <span class="bold">{{ live_lesson.title }}</span>
         {% endif %}
@@ -51,11 +53,19 @@
       <div class="timing__more">
         <div class="timing__head">Материалы</div>
         <div class="timing__row">
-          <div class="timing__text">
-            {{ school_schedule.materials }}
-          </div>
+          {% if print %}
+            <div class="timing__col" style="flex: 0 0 100%;">
+              <div class="timing__text">
+                {{ school_schedule.materials }}
+              </div>
+            </div>
+          {% else %}
+            <div class="timing__text">
+              {{ school_schedule.materials }}
+            </div>
+          {% endif %}
         </div>
-        {% if school_schedule.schoolschedule_images.exists %}
+        {% if not print and school_schedule.schoolschedule_images.exists %}
         <div class="timing__head">Результаты прошлых уроков</div>
         <div class="timing__works gallery">
           {% for image in school_schedule.schoolschedule_images.all %}
@@ -69,6 +79,7 @@
         {% endif %}
       </div>
     </div>
+    {% if not print %}
     <div class="timing__cell timing__cell--toggle">
       <button class="timing__toggle">
         <svg class="icon icon-arrow-down">
@@ -76,5 +87,6 @@
         </svg>
       </button>
     </div>
+    {% endif %}
   </div>
 </div>
diff --git a/apps/school/templates/blocks/schedule_purchased.html b/apps/school/templates/blocks/schedule_purchased.html
index 7f8f035d..5d1a5827 100644
--- a/apps/school/templates/blocks/schedule_purchased.html
+++ b/apps/school/templates/blocks/schedule_purchased.html
@@ -41,10 +41,10 @@
             {% for school_schedule in school_schedules %}
             {% if is_previous %}
             {% if school_schedule.previous_live_lesson in live_lessons  %}
-            {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson %}
+            {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson purchased=True %}
             {% endif %}
             {% else %}
-            {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %}
+            {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
             {% endif %}
             {% endfor %}
             {% endif %}
diff --git a/apps/school/templates/school/schedules_print.html b/apps/school/templates/school/schedules_print.html
index 25aca06e..66c936cb 100644
--- a/apps/school/templates/school/schedules_print.html
+++ b/apps/school/templates/school/schedules_print.html
@@ -11,70 +11,16 @@
   <link rel="stylesheet" media="all" href={% static "app.css" %}>
 </head>
 
-<body onload="window.print()">
+<body onload="setTimeout(window.print, 1000)">
   <div class="outer js-outer">
     <div class="section" id="schedule">
       <div class="section__center center center_md">
         <div class="title title_center">Расписание</div>
         <div class="timing js-timing">
           <div class="timing__week">
-            {% for school_schedule in school_schedules %} {% with current_live_lesson=school_schedule.current_live_lesson %}
-            <div class="timing__item {% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item open">
-              <div class="timing__cell">
-                <div class="timing__info">
-                  <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
-                    {{ school_schedule }}
-                  </div>
-                  {% if current_live_lesson %}
-                  <!--<div class="timing__date">{{ current_live_lesson.date }}</div>-->
-                  {% endif %}
-                </div>
-                <div class="timing__buy">
-                  <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
-                </div>
-              </div>
-              <div class="timing__cell">
-                <div class="timing__preview">
-                  {% thumbnail current_live_lesson.cover.image "70x70" crop="center" as im %}
-                  <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" /> {% empty %}
-                  <img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px" /> {% endthumbnail %}
-                </div>
-              </div>
-              <div class="timing__cell">
-                <div class="timing__title">{{ school_schedule.title }}{% if current_live_lesson %},
-                  <span class="bold">{{ current_live_lesson.title }}</span>
-                  {% endif %}
-                </div>
-                <div class="timing__content">
-                  {% if live_lesson %}
-                    {{ live_lesson.short_description }}
-                  {% else %}
-                    {{ school_schedule.description }}
-                  {% endif %}
-                </div>
-                <div class="timing__more">
-                  <div class="timing__head">Материалы</div>
-                  <div class="timing__row">
-                    <div class="timing__col" style="flex: 0 0 100%;">
-                      <div class="timing__text">
-                        {{ school_schedule.materials }}
-                      </div>
-                    </div>
-                  </div>
-                  <!--{% if school_schedule.schoolschedule_images.exists %}-->
-                  <!--<div class="timing__head">Результаты прошлых уроков</div>-->
-                  <!--<div class="timing__works gallery">-->
-                    <!--{% for image in school_schedule.schoolschedule_images.all %} {% thumbnail image.img.image "48x48" crop="center" as im %}-->
-                    <!--<a class="timing__work" href="{{ image.img.image.url }}">-->
-                      <!--<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />-->
-                    <!--</a>-->
-                    <!--{% endthumbnail %} {% endfor %}-->
-                  <!--</div>-->
-                  <!--{% endif %}-->
-                </div>
-              </div>
-            </div>
-            {% endwith %} {% endfor %}
+            {% for school_schedule in school_schedules %}
+              {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson print=True %}
+            {% endfor %}
           </div>
         </div>
       </div>
diff --git a/apps/school/templates/summer/schedule_purchased.html b/apps/school/templates/summer/schedule_purchased.html
index 63e963fd..e327fc96 100644
--- a/apps/school/templates/summer/schedule_purchased.html
+++ b/apps/school/templates/summer/schedule_purchased.html
@@ -41,10 +41,10 @@
             {% for school_schedule in school_schedules %}
             {% if is_previous %}
             {% if school_schedule.previous_live_lesson in live_lessons  %}
-            {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson %}
+            {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson purchased=True %}
             {% endif %}
             {% else %}
-            {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %}
+            {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
             {% endif %}
             {% endfor %}
             {% endif %}
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 8386a037..f9cee7ff 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -3782,6 +3782,7 @@ a.grey-link
     +m
       display: flex
       flex-direction: row
+      width: 100%
   &__day
     position: relative
     margin: 10px 0 5px
@@ -3807,20 +3808,22 @@ a.grey-link
       margin: -3px 0 0 auto
   &__buy
     +m
-      display: flex
-      margin-left: 20px
+      flex: 1 0 0
+      text-align: right
   &__time
     margin: 15px 0
     opacity: .5
     +m
-      width: 90px
-      margin: 0
+      margin: -1px 15px
+      font-size: 12px;
   &__btn
     margin-right: -60px
     padding-left: 20px
     padding-right: 20px
     white-space: nowrap
     letter-spacing: 1px
+    +m
+        margin-right: 0
   &__pic
     display: block
     width: 100%