remotes/origin/editis_13-01-19
gzbender 7 years ago
parent 270ed7249f
commit b1176d99ab
  1. 2
      project/templates/blocks/about.html
  2. 31
      project/templates/blocks/partners.html
  3. 6
      project/views.py
  4. BIN
      web/src/img/gamma.png
  5. 14
      web/src/sass/_common.sass

@ -20,7 +20,7 @@
</div>
<div class="school school_main">
<div class="school__col">
<div class="school__preview">{{ users_count }}</div>
<div class="school__preview">> 12000</div>
<div class="school__title">учеников</div>
<div class="school__text">прошли обучение в&nbsp;Lil&nbsp;School</div>
</div>

@ -8,32 +8,35 @@
Скидка 15% по промокоду у наших партнеров
</div>
<div class="partners">
<a target="_blank" class="partners__item" href="https://www.mann-ivanov-ferber.ru/tag/sasha-kru/">
<img class="partners__pic" src="{% static 'img/mif.jpg' %}">
</a>
<a target="_blank" class="partners__item" href="https://artkvartal.ru">
<img class="partners__pic" src="{% static 'img/artkvartal.png' %}">
</a>
<a target="_blank" class="partners__item" href="http://www.pinkbus.ru/">
<img class="partners__pic" src="{% static 'img/pinkbus.jpg' %}">
</a>
<a target="_blank" class="partners__item" href="http://joviland.ru/lil-school/">
<img class="partners__pic" src="{% static 'img/jovi.png' %}">
</a>
</div>
<div class="partners partners_promocodes">
<div class="partners__item">
<a target="_blank" href="https://www.mann-ivanov-ferber.ru/tag/sasha-kru/">
<img class="partners__pic" src="{% static 'img/mif.jpg' %}">
</a>
<div class="partners__item-promocode">LIL</div>
</div>
<div class="partners__item">
<a target="_blank" href="https://artkvartal.ru">
<img class="partners__pic" src="{% static 'img/artkvartal.png' %}">
</a>
<div class="partners__item-promocode">LILCITY</div>
</div>
<div class="partners__item">
<a target="_blank" href="http://www.pinkbus.ru/">
<img class="partners__pic" src="{% static 'img/pinkbus.jpg' %}">
</a>
<div class="partners__item-promocode">LILCITY</div>
</div>
<div class="partners__item">
<a target="_blank" href="http://joviland.ru/lil-school/">
<img class="partners__pic" src="{% static 'img/jovi.png' %}">
</a>
<div class="partners__item-promocode">LILCITY</div>
</div>
<div class="partners__item">
<a target="_blank" href="http://artgamma.ru/">
<img class="partners__pic" src="{% static 'img/gamma.png' %}">
</a>
</div>
</div>
</div>
</div>

@ -10,7 +10,7 @@ from paymentwall.pingback import Pingback
from apps.course.models import Course
from apps.school.models import SchoolSchedule
from apps.payment.models import SchoolPayment, UserGiftCertificate
from apps.payment.models import SchoolPayment, UserGiftCertificate, Payment
User = get_user_model()
@ -88,7 +88,6 @@ class IndexView(TemplateView):
review_images = list(map(str, range(1, 107)))
shuffle(review_images)
users_count = User.objects.filter(role=User.USER_ROLE).count()
context.update({
'review_images': review_images,
@ -106,8 +105,7 @@ class IndexView(TemplateView):
'school_schedules': SchoolSchedule.objects.all(),
'school_schedules_purchased': set(school_schedules_purchased),
'teachers': User.objects.filter(role=User.TEACHER_ROLE, show_in_mainpage=True),
'users_count': users_count,
'works_count': int(users_count * 3.2),
'works_count': Payment.objects.filter(status__in=Payment.PW_PAID_STATUSES).count() * 5,
'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None,
'subscription_ends_humanize': school_payment.filter(add_days=False).first().date_end_humanize if school_payment_exists else None,

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

@ -1843,14 +1843,18 @@ a.grey-link
justify-content: center
+m
margin: 0 -5px -10px
flex-wrap: wrap
&__item
margin: 0 10px 20px
flex: 0 0 calc(16.66% - 20px)
text-align: center
height: 160px
+m
margin: 0 5px 10px
flex: 0 0 calc(25% - 10px)
&_promocodes &__item
text-align: center;
flex: 0 0 100px
& a
height: 120px
display: flex
&__item-promocode
border: 1px solid #333;
display: inline-block;
@ -1860,8 +1864,8 @@ a.grey-link
letter-spacing: 2px;
text-transform: uppercase;
&__pic
display: block
width: 100%
max-width: 100%
object-fit: contain
.switch
display: block

Loading…
Cancel
Save