diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html index 8abb6de7..7bc7e6d7 100644 --- a/apps/school/templates/blocks/_schedule_purchased_item.html +++ b/apps/school/templates/blocks/_schedule_purchased_item.html @@ -40,9 +40,13 @@ {{ live_lesson.title }} {% endif %} +
{% if live_lesson %} -
{{ live_lesson.short_description }}
+ {{ live_lesson.short_description }} + {% else %} + {{ school_schedule.description }} {% endif %} +
Материалы
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html index acbc4f39..be8830ec 100644 --- a/apps/school/templates/blocks/schedule.html +++ b/apps/school/templates/blocks/schedule.html @@ -32,13 +32,18 @@
-
{{ school_schedule.title }}{% if current_live_lesson %}, - {{ current_live_lesson.title }} +
{{ school_schedule.title }} + {% if current_live_lesson and current_live_lesson.title %} + , {{ current_live_lesson.title }} + {% endif %} +
+
+ {% if live_lesson %} + {{ live_lesson.short_description }} + {% else %} + {{ school_schedule.description }} {% endif %}
- {% if current_live_lesson %} -
{{ current_live_lesson.short_description }}
- {% endif %}
Материалы
diff --git a/apps/school/templates/school/schedules_print.html b/apps/school/templates/school/schedules_print.html index da398b45..fc7fbb2a 100644 --- a/apps/school/templates/school/schedules_print.html +++ b/apps/school/templates/school/schedules_print.html @@ -45,17 +45,16 @@ {{ current_live_lesson.title }} {% endif %}
- {% if current_live_lesson %} -
{{ current_live_lesson.short_description }}
- {% endif %} +
+ {% if live_lesson %} + {{ live_lesson.short_description }} + {% else %} + {{ school_schedule.description }} + {% endif %} +
Материалы
- - - - -
{{ school_schedule.materials }}