diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html index a3df270c..7bc7e6d7 100644 --- a/apps/school/templates/blocks/_schedule_purchased_item.html +++ b/apps/school/templates/blocks/_schedule_purchased_item.html @@ -40,21 +40,18 @@ {{ live_lesson.title }} {% endif %} +
{% if live_lesson %} -
{{ live_lesson.short_description }}
+ {{ live_lesson.short_description }} + {% else %} + {{ school_schedule.description }} {% endif %} +
Материалы
-
-
-

{{ school_schedule.description }}

-
-
-
-
- {{ school_schedule.materials }} -
+
+ {{ school_schedule.materials }}
{% if school_schedule.schoolschedule_images.exists %} diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html index 62f254f8..be8830ec 100644 --- a/apps/school/templates/blocks/schedule.html +++ b/apps/school/templates/blocks/schedule.html @@ -32,25 +32,23 @@
-
{{ 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 %}
Материалы
-
-
-

{{ school_schedule.description }}

-
-
-
-
- {{ school_schedule.materials }} -
+
+ {{ school_schedule.materials }}
{% if school_schedule.schoolschedule_images.exists %} diff --git a/apps/school/templates/school/schedules_print.html b/apps/school/templates/school/schedules_print.html index 18e3256e..fc7fbb2a 100644 --- a/apps/school/templates/school/schedules_print.html +++ b/apps/school/templates/school/schedules_print.html @@ -19,7 +19,7 @@
{% for school_schedule in school_schedules %} {% with current_live_lesson=school_schedule.current_live_lesson %} -
+
@@ -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 }} diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index ba11ed8e..a3113787 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -30,7 +30,7 @@ {% comment %} {% endcomment %} - +