diff --git a/apps/user/admin.py b/apps/user/admin.py index 63398df0..50915f33 100644 --- a/apps/user/admin.py +++ b/apps/user/admin.py @@ -12,7 +12,8 @@ User = get_user_model() class UserAdmin(BaseUserAdmin): fieldsets = ( (None, {'fields': ('username', 'password')}), - (_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo')}), + (_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo',)}), + ('Teacher', {'fields': ('show_in_mainpage', 'trial_lesson', 'instagram_hashtag',)}), ('Facebook Auth data', {'fields': ('fb_id', 'fb_data', 'is_email_proved')}), (_('Permissions'), {'fields': ('role', 'is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions', 'show_in_mainpage')}), diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index 65620d6d..455f7120 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -1,5 +1,5 @@
-
+
diff --git a/project/templates/blocks/counters.html b/project/templates/blocks/counters.html index 9fa50c6d..2fc03840 100644 --- a/project/templates/blocks/counters.html +++ b/project/templates/blocks/counters.html @@ -1,7 +1,7 @@ {% load static %} {% load ruplural from plural %} -
+
diff --git a/project/templates/blocks/online_school.html b/project/templates/blocks/online_school.html index d8420bb1..5e7807dc 100644 --- a/project/templates/blocks/online_school.html +++ b/project/templates/blocks/online_school.html @@ -1,4 +1,4 @@ -
+
Процесс
diff --git a/project/templates/blocks/partners.html b/project/templates/blocks/partners.html index 34e25e3c..16b3e26d 100644 --- a/project/templates/blocks/partners.html +++ b/project/templates/blocks/partners.html @@ -1,5 +1,5 @@ {% load static %} -
+
Наши партнеры
diff --git a/project/templates/blocks/reviews.html b/project/templates/blocks/reviews.html index 683cdb63..af4e8a80 100644 --- a/project/templates/blocks/reviews.html +++ b/project/templates/blocks/reviews.html @@ -1,5 +1,5 @@ {% load static %} -
+
diff --git a/project/templates/blocks/students.html b/project/templates/blocks/students.html index 3992f40e..6237cd43 100644 --- a/project/templates/blocks/students.html +++ b/project/templates/blocks/students.html @@ -1,5 +1,5 @@
-
+
Наши ученики – многократные призеры международных конкурсов
diff --git a/project/templates/blocks/teachers.html b/project/templates/blocks/teachers.html index 7dcb5bec..de8444f8 100644 --- a/project/templates/blocks/teachers.html +++ b/project/templates/blocks/teachers.html @@ -1,6 +1,6 @@ {% load static %}
-
+ {% cycle '' '
' %} {% if forloop.last and not forloop.counter|divisibleby:'2' %} +
+
+
+ +
+
+
+
+ Хотите в команду Lil School? +
+
+ Любите развивать детей, развиваться сами и хотите зарабатывать на любимом деле?

+ Оставьте заявку +
+
+
{% endif %} {% endfor %}
-
-
Если хотите к нам в команду, то отправьте нам заявку
-
diff --git a/project/templates/blocks/video.html b/project/templates/blocks/video.html index e41abde1..d3ff6b8c 100644 --- a/project/templates/blocks/video.html +++ b/project/templates/blocks/video.html @@ -1,4 +1,4 @@ -
+
Попробуйте бесплатно
diff --git a/project/templates/lilcity/home.html b/project/templates/lilcity/home.html index 47691b84..f9173e21 100644 --- a/project/templates/lilcity/home.html +++ b/project/templates/lilcity/home.html @@ -10,7 +10,8 @@ {% endif %} {% endblock ogdescription %} -{% block title %}School LIL.CITY{% endblock title %} +{% block title %}Lil School{% endblock title %} +{% block body_attr %}class="main-page"{% endblock body_attr %} {% block content %} {% include "templates/blocks/messages.html" %} {% include "templates/blocks/about.html" %} diff --git a/project/templates/lilcity/layer.html b/project/templates/lilcity/layer.html index 35be48c0..14293298 100644 --- a/project/templates/lilcity/layer.html +++ b/project/templates/lilcity/layer.html @@ -108,7 +108,7 @@ {% include "templates/blocks/mixpanel.html" %} {% block layer_head %}{% endblock layer_head %} - + {% block layer_body %} {% endblock layer_body %} diff --git a/project/views.py b/project/views.py index 557c6b6c..58524407 100644 --- a/project/views.py +++ b/project/views.py @@ -98,6 +98,9 @@ class IndexView(TemplateView): review_images = list(map(str, range(1, 107))) shuffle(review_images) + teachers = User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True) + if teachers.count() % 2 == 0: + teachers = teachers[:teachers.count() - 1] context.update({ 'banners': Banner.get_for_page(Banner.PAGE_INDEX), @@ -117,7 +120,7 @@ class IndexView(TemplateView): 'min_school_price': SchoolSchedule.objects.aggregate(Min('month_price'))['month_price__min'], 'school_schedules': SchoolSchedule.objects.filter(weekday__in=DrawingCampPayment.WEEKDAYS, is_camp=True), 'school_schedules_purchased': DrawingCampPayment.WEEKDAYS if camp_payment_exists else [], - 'teachers': User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True), + 'teachers': teachers, 'works_count': Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES).count() * 7, 'subscription_ends': camp_payment.latest('date_end').date_end if camp_payment_exists else None, 'subscription_ends_humanize': camp_payment.latest('date_end').date_end_humanize if camp_payment_exists else None, diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 910a33b0..287d251f 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -996,6 +996,8 @@ a[name] border-radius: 10px box-shadow: 0 11px 20px 0 rgba(0, 0, 0, 0.1) + &_main + padding: 80px 0 &_gray background: $bg &_pink-light @@ -1718,21 +1720,14 @@ a.grey-link height: 80px &__title margin-bottom: 5px - font-family: 'ProximaNova-Regular', sans-serif - font-size: 20px - letter-spacing: 2px - +fb font-size: 20px - letter-spacing: 2px + font-family: 'ProximaNova-Regular', sans-serif + letter-spacing: normal + flex: 1 +t font-size: 12px - letter-spacing: 2px +m display: block - &-name - flex: 1 - & .btn - margin: 10px 0 &__social margin-top: 15px .social__item @@ -1740,10 +1735,12 @@ a.grey-link font-size: 20px +fb &__content - font-size: 15px + font-size: 14px line-height: (22/16) &__right-column flex: 1 + & .btn + margin-top: 10px .toggle font-size: 14px @@ -1995,7 +1992,7 @@ a.grey-link flex-wrap: wrap &__item margin: 0 10px 20px - flex: 0 0 calc(16.66% - 20px) + flex: 0 0 calc(20% - 20px) text-align: center height: 160px +m