Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!38

apps/school/templates/blocks/_schedule_purchased_item.html

@@ -40,23 +40,20 @@
       <span class="bold">{{ live_lesson.title }}</span>
       {% endif %}
     </div>
+    <div class="timing__content">
     {% if live_lesson %}
-    <div class="timing__content">{{ live_lesson.short_description }}</div>
+      {{ 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">
-          <div class="timing__text">
-            <p>{{ school_schedule.description }}</p>
-          </div>
-        </div>
-        <div class="timing__col">
         <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">

apps/school/templates/blocks/schedule.html

@@ -32,27 +32,25 @@
             </div>
           </div>
           <div class="timing__cell">
-            <div class="timing__title">{{ school_schedule.title }}{% if current_live_lesson %},
+            <div class="timing__title">{{ school_schedule.title }}
-              <span class="bold">{{ current_live_lesson.title }}</span>
+              {% if current_live_lesson and current_live_lesson.title %}
+                , <span class="bold">{{ current_live_lesson.title }}</span>
               {% endif %}
             </div>
-            {% if current_live_lesson %}
+            <div class="timing__content">
-            <div class="timing__content">{{ current_live_lesson.short_description }}</div>
+              {% 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">
-                  <div class="timing__text">
-                    <p>{{ school_schedule.description }}</p>
-                  </div>
-                </div>
-                <div class="timing__col">
                 <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">

apps/school/templates/school/schedules_print.html

@@ -19,7 +19,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 not current_live_lesson %} timing__item_bg{% endif %} js-timing-item open">
+            <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 %}">
@@ -45,17 +45,16 @@
                   <span class="bold">{{ current_live_lesson.title }}</span>
                   {% endif %}
                 </div>
-                {% if current_live_lesson %}
+                <div class="timing__content">
-                <div class="timing__content">{{ current_live_lesson.short_description }}</div>
+                  {% 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">-->
-                      <!--<div class="timing__text">-->
-                        <!--<p>{{ school_schedule.description }}</p>-->
-                      <!--</div>-->
-                    <!--</div>-->
                     <div class="timing__col" style="flex: 0 0 100%;">
                       <div class="timing__text">
                         {{ school_schedule.materials }}

project/templates/lilcity/index.html

@@ -30,7 +30,7 @@
     {% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
 
     <meta name="csrf-token" content="{{ csrf_token }}">
-    <link rel="stylesheet" media="all" href={% static "app.css" %}?3>
+    <link rel="stylesheet" media="all" href={% static "app.css" %}?4>
     <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
     <script>
         var viewportmeta = document.querySelector('meta[name="viewport"]');

web/src/sass/_common.sass

@@ -3839,7 +3839,7 @@ a.grey-link
     +fb
   &__row
     display: flex
-    margin: 0 -15px 20px
+    margin: 0 0 20px
     +t
       display: block
   &__col