LIL-508 block expanded

apps/school/templates/blocks/_schedule_purchased_item.html

@@ -40,9 +40,13 @@
       <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">

apps/school/templates/blocks/schedule.html

@@ -32,13 +32,18 @@
             </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>
+            <div class="timing__content">
+              {% if live_lesson %}
+                {{ live_lesson.short_description }}
+              {% else %}
+                {{ school_schedule.description }}
               {% endif %}
             </div>
-            {% if current_live_lesson %}
-            <div class="timing__content">{{ current_live_lesson.short_description }}</div>
-            {% endif %}
             <div class="timing__more">
               <div class="timing__head">Материалы</div>
               <div class="timing__row">

apps/school/templates/school/schedules_print.html

@@ -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 %}
-                {% endif %}
+                    {{ 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 }}