Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-588
gzbender
8 years ago
commit
455aad5a25
46 changed files with 469 additions and 416 deletions
@ -0,0 +1,17 @@ |
||||
from django.contrib.auth.backends import ModelBackend |
||||
from django.contrib.auth import get_user_model |
||||
|
||||
User = get_user_model() |
||||
|
||||
|
||||
class CaseInsensitiveModelBackend(ModelBackend): |
||||
|
||||
def authenticate(self, request, username=None, password=None, **kwargs): |
||||
if username is None: |
||||
username = kwargs.get(User.USERNAME_FIELD) |
||||
try: |
||||
user = User.objects.get(**{f'{User.USERNAME_FIELD}__iexact': username}) |
||||
if user.check_password(password) and self.user_can_authenticate(user): |
||||
return user |
||||
except User.DoesNotExist: |
||||
return None |
||||
@ -1,5 +1,6 @@ |
||||
{% for cat in category_items %} |
||||
<div class="select__option js-select-option{% if category and category.0 == cat.title %} active{% endif %}" data-category-option data-category-name="{{ cat.title }}" data-category-url="{% url 'courses' %}?category={{ cat.title }}"> |
||||
<div class="select__option js-select-option{% if category == cat.id %} active{% endif %}" |
||||
data-category-option data-category-name="{{ cat.title }}" data-category-url="{% url 'courses' %}?category={{ cat.id }}"> |
||||
<div class="select__title">{{ cat.title }}</div> |
||||
</div> |
||||
{% endfor %} |
||||
@ -1,78 +0,0 @@ |
||||
{% load static %} {% load thumbnail %} |
||||
<div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle{% if not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}"> |
||||
<div class="timing__cell"> |
||||
<div class="timing__info"> |
||||
<div class="timing__day{% if school_schedule.is_online %} active{% endif %}"> |
||||
{{ school_schedule }} |
||||
</div> |
||||
{% if live_lesson %} |
||||
<div class="timing__date">{{ live_lesson.date }}</div> |
||||
{% endif %} |
||||
</div> |
||||
<div class="timing__buy"> |
||||
<div class="timing__time">{{ school_schedule.start_at }} (МСК)</div> |
||||
{% if school_schedule.weekday in school_schedules_purchased %} |
||||
{% if live_lesson and live_lesson.title %} |
||||
{% include './open_lesson.html' %} |
||||
{% endif %} |
||||
{% else %} |
||||
{% include './day_pay_btn.html' %} |
||||
{% endif %} |
||||
</div> |
||||
{% comment %} |
||||
<!-- это нужно чтобы в попапе продления школы всегда знать какие дни выбраны(куплены) --> |
||||
{% endcomment %} |
||||
{% if school_schedule.weekday in school_schedules_purchased %} |
||||
<span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span> |
||||
{% endif %} |
||||
</div> |
||||
<div class="timing__cell"> |
||||
<div class="timing__preview"> |
||||
{% thumbnail live_lesson.cover.image "70x70" crop="center" as im %} |
||||
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" /> |
||||
{% empty %} |
||||
<img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px" /> |
||||
{% endthumbnail %} |
||||
</div> |
||||
</div> |
||||
<div class="timing__cell"> |
||||
<div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %}, |
||||
<span class="bold">{{ live_lesson.title }}</span> |
||||
{% endif %} |
||||
</div> |
||||
<div class="timing__content"> |
||||
{% if live_lesson and live_lesson.short_description %} |
||||
{{ 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__text"> |
||||
{{ school_schedule.materials }} |
||||
</div> |
||||
</div> |
||||
{% if school_schedule.schoolschedule_images.exists %} |
||||
<div class="timing__head">Результаты прошлых уроков</div> |
||||
<div class="timing__works gallery"> |
||||
{% for image in school_schedule.schoolschedule_images.all %} |
||||
{% thumbnail image.img.image "48x48" crop="center" as im %} |
||||
<a class="timing__work" href="{{ image.img.image.url }}"> |
||||
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/> |
||||
</a> |
||||
{% endthumbnail %} |
||||
{% endfor %} |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
<div class="timing__cell"> |
||||
<button class="timing__toggle"> |
||||
<svg class="icon icon-arrow-down"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use> |
||||
</svg> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
@ -1,4 +1,4 @@ |
||||
<a |
||||
class="timing__btn btn btn_light" |
||||
href="{% url 'school:lesson-detail' live_lesson.id %}" |
||||
>смотреть урок</a> |
||||
>подробнее</a> |
||||
|
||||
@ -0,0 +1,87 @@ |
||||
{% extends "templates/lilcity/index.html" %} {% load static %} {% load thumbnail %} {% block content %} |
||||
<div class="section"> |
||||
<div class="section__center center"> |
||||
<div class="profile"> |
||||
<div class="profile__ava ava"> |
||||
{% thumbnail user.photo "120x120" crop="center" as im %} |
||||
<img class="ava__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" /> |
||||
{% empty %} |
||||
<img class="ava__pic" src="{% static 'img/user_default.jpg' %}" width="120px" height="120px" /> |
||||
{% endthumbnail %} |
||||
</div> |
||||
<div class="profile__wrap"> |
||||
<div class="profile__name">{{ user.get_full_name }}</div> |
||||
<div class="profile__share share share_sm"> |
||||
<div class="share__list"> |
||||
{% if user.facebook %} |
||||
<a class="share__item" href="{{ user.facebook }}"> |
||||
<svg class="icon icon-share-facebook"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use> |
||||
</svg> |
||||
</a> |
||||
{% endif %} {% if user.instagram %} |
||||
<a class="share__item" href="{{ user.instagram }}"> |
||||
<svg class="icon icon-share-instagram"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-instagram"></use> |
||||
</svg> |
||||
</a> |
||||
{% endif %} {% if user.twitter %} |
||||
<a class="share__item" href="{{ user.twitter }}"> |
||||
<svg class="icon icon-share-twitter"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use> |
||||
</svg> |
||||
</a> |
||||
{% endif %} {% if user.google %} |
||||
<a class="share__item" href="{{ user.google }}"> |
||||
<svg class="icon icon-share-google"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use> |
||||
</svg> |
||||
</a> |
||||
{% endif %} {% if user.pinterest %} |
||||
<a class="share__item" href="{{ user.pinterest }}"> |
||||
<svg class="icon icon-share-pinterest"> |
||||
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use> |
||||
</svg> |
||||
</a> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="profile__content"> |
||||
{% if user.about %} |
||||
{{ user.about }} |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
|
||||
<div class="section section_pink-light section_tabs"> |
||||
<div class="section__center center"> |
||||
<div class="tabs js-tabs"> |
||||
<div class="tabs__nav"> |
||||
<button class="tabs__btn js-tabs-btn {% if not owner %}active{% endif %}">ОПУБЛИКОВАННЫЕ |
||||
<span class="mobile-hide">КУРСЫ</span> |
||||
</button> |
||||
</div> |
||||
<div class="tabs__container"> |
||||
<div class="tabs__item js-tabs-item" style="display: block;"> |
||||
<div class="courses courses_scroll"> |
||||
<div class="courses__list"> |
||||
{% if published.exists %} |
||||
{% include "course/course_items.html" with course_items=published %} |
||||
{% else %} |
||||
<div class="center center_xs"> |
||||
<div class="done"> |
||||
<div class="done__title title">Нет опубликованных курсов!</div> |
||||
</div> |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% endblock content %} |
||||
|
After Width: | Height: | Size: 33 KiB |
Loading…
Reference in new issue