Merge branch 'dev' into 'master'

Dev

See merge request !431

.gitignore

@@ -3,6 +3,7 @@
 # use glob syntax. 
 syntax: glob 
 
+logs/
 docs/_build 
 .idea 
 .DS_Store 
@@ -19,7 +20,6 @@ build
 __pycache__
 
 /csv/article/
-/static/
 /media/
 config_app/settings/prod.env
 
@@ -37,4 +37,5 @@ coverage.xml
 
 # Celery
 celerybeat-schedule
-/config_app/settings/dev.env
+/config_app/settings/local.env
+

Envoy.blade.php

@@ -29,11 +29,16 @@ echo '{{ $new_release_dir }}'
 
 @task('create_symlinks', ['on' => 'localhost'])
 echo '>> Создание симлинков'
-@if ($branch)
+ln -s {{ $app_dir }}/configs/master/ssl {{ $new_release_dir }}/ssl
-    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/prod.env
+@if ($branch == 'master')
-    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/dev.env
+    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/local.env
+    ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
+@endif
+@if ($branch == 'dev')
+    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/local.env
     ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
 @endif
+ln -nfs {{ $app_dir }}/logs/{{ $branch }} {{ $new_release_dir }}/logs
 @endtask
 
 @task('install_req', ['on' => 'localhost'])
@@ -45,10 +50,18 @@ echo '>> Подтягиваем зависимости'
 @endtask
 
 @task('run_tests', ['on' => 'localhost'])
-echo '>> Запускаем миграции тесты'
+echo '>> Запускаем тесты'
+@if ($branch)
+    cd {{ $new_release_dir }}
+    source /env/bin/activate && python manage.py test
+@endif
+@endtask
+
+@task('run_migrate', ['on' => 'localhost'])
+echo '>> Запускаем миграции'
 @if ($branch)
     cd {{ $new_release_dir }}
-    source /env/bin/activate && python manage.py migrate && python manage.py test
+    source /env/bin/activate && python manage.py migrate
 @endif
 @endtask
 

access/management/commands/set_tokens.py

@@ -0,0 +1,42 @@
+import csv
+import jwt
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Добавляет 1 или нескольких юзеров в  указанные группы'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--from',
+            type=str,
+            dest='from',
+            help='Файл подгрузки данных'
+        )
+        parser.add_argument(
+            '--to',
+            type=str,
+            dest='to',
+            help='Файл выгрузки'
+        )
+
+    def handle(self, *args, **options):
+        from_path = options['from']
+        to_path = options['to']
+        with open(from_path) as f:
+            with open(to_path, 'w') as out_f:
+                fw = csv.writer(out_f)
+                fr = csv.reader(f, delimiter=';')
+                for row in fr:
+                    email = row[0]
+                    course_token = row[1]
+                    period = row[2]
+                    payload = {
+                        'period': period,
+                        'course_token': course_token,
+                        'email': email.lower(),
+                    }
+                    token = jwt.encode(payload, settings.COURSE_PROGRESS_SECRET_KEY, algorithm='HS256').decode("utf-8")
+                    url = "https://go.skillbox.ru/api/v1/progress/progress_token/?token=%s" % str(token)
+                    fw.writerow([email.lower(), url])

access/middleware.py

@@ -41,7 +41,12 @@ class UpdateActivity(object):
     def process_request(request):
         if not request.user.is_anonymous:
             user_activity = UserActivity.objects.get(owner=request.user)
-            ip = request.META.get('REMOTE_ADDR', None)
+            x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+            if x_forwarded_for:
+                ip = x_forwarded_for.split(',')[0]
+            else:
+                ip = request.META.get('REMOTE_ADDR')
+
             if user_activity.ip_list is None:
                 user_activity.ip_list = []
 

access/models/other.py

@@ -53,6 +53,13 @@ class Account(models.Model):
     def __str__(self):
         return self.owner.email
 
+    def get_phone(self):
+        try:
+            return '' if self.phone is None else ('' if self.phone.national_number else \
+            (self.phone.national_number if self.phone.country_code is None else str(self.phone)))
+        except AttributeError:
+            return self.phone
+
     class Meta:
         verbose_name = 'Дополнительная информация о пользователе'
         verbose_name_plural = 'Дополнительная информация о пользователе'

access/models/user.py

@@ -5,7 +5,7 @@ import uuid
 from django.conf import settings
 from django.contrib.auth.base_user import BaseUserManager, AbstractBaseUser
 from django.contrib.auth.models import Group, PermissionsMixin
-from django.core.mail import send_mail
+from django.core.mail import send_mail, EmailMessage
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
@@ -70,18 +70,20 @@ class CustomUserManager(BaseUserManager):
                                            hash=''.join(random.choice(string.ascii_letters) for x in range(15)))
             body = {
                 "subject": 'Спасибо за регистрацию',
-                "message": '''
+                "body": '''
                         Вы были успешны зарегистрированны на портале go.skillbox.ru
-                        ваш пароль %s
+                        ваш пароль (он будет дествителен после активации по ссылке) %s 
                         для подтверждения регистрации перейдите по ссылке
                         %s/api/v1/users/registration/?hash=%s''' % (password, settings.DOMAIN, invite.hash),
                 "from_email": 'robo@skillbox.ru',
-                "recipient_list": [user.email],
+                "to": [user.email],
+                "bcc": [settings.SUPPORT_EMAIL],
             }
 
-            send_mail(
+            msg = EmailMessage(
                 **body
             )
+            msg.send()
         return user
 
     def create_user(self, email, **extra_fields):

access/serializers.py

@@ -1,14 +1,14 @@
 from django.contrib.auth import get_user_model
 from rest_framework import serializers
-from rest_framework.generics import get_object_or_404
 
 from access.models.other import Account
 from achievements.serialers import DiplomaSerializer, AchievementsSerializer
-from progress.serializers import ProgressSerializer
+from progress.serializers import SecureProgressSerializer, SupportProgressSerializer
-
+from django.utils import timezone
 
 class AccountSerializer(serializers.ModelSerializer):
     gender = serializers.SerializerMethodField()
+    phone = serializers.SerializerMethodField()
 
     class Meta:
         model = Account
@@ -18,17 +18,21 @@ class AccountSerializer(serializers.ModelSerializer):
     def get_gender(self):
         return self.get_gender_display()
 
+    @staticmethod
+    def get_phone(self):
+        return self.get_phone()
+
 
 class UserSelfSerializer(serializers.ModelSerializer):
     account = serializers.SerializerMethodField()
     groups = serializers.SerializerMethodField()
-    progress = serializers.SerializerMethodField()
+    progresses = serializers.SerializerMethodField()
     diplomas = serializers.SerializerMethodField()
     achievements = serializers.SerializerMethodField()
 
     class Meta:
         model = get_user_model()
-        fields = ('out_key', 'email', 'first_name', 'last_name', 'progress', 'achievements',
+        fields = ('out_key', 'email', 'first_name', 'last_name', 'progresses', 'achievements',
                   'account', 'groups', 'is_staff', 'is_superuser', 'diplomas', 'is_active')
 
     @staticmethod
@@ -48,8 +52,9 @@ class UserSelfSerializer(serializers.ModelSerializer):
         return [group.name for group in self.groups.all()]
 
     @staticmethod
-    def get_progress(self):
+    def get_progresses(self):
-        return [ProgressSerializer(i).data for i in self.progress_set.all()]
+        return [SecureProgressSerializer(i).data for i in
+                self.progress_set.filter(is_freeze=False).exclude(exp_date__lt=timezone.now())]
 
 
 class UserProfileSerializer(serializers.ModelSerializer):
@@ -85,7 +90,7 @@ class UserSearchSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_phone(self):
-        return None if self.account.phone is None else self.account.phone.raw_input
+        return self.account.get_phone()
 
     @staticmethod
     def get_pay(self):
@@ -104,26 +109,20 @@ class UserSearchSerializer(serializers.ModelSerializer):
         return self.useractivity.last_request
 
 
-class UserEmailSerializer(serializers.Serializer):
+class UserProgressSearchSerializer(serializers.ModelSerializer):
-    """
+    phone = serializers.SerializerMethodField()
-    Serializer for set new password to the student in admin area by manager.
+    progresses = serializers.SerializerMethodField()
-    """
+
-    email = serializers.EmailField()
+    class Meta:
-
+        model = get_user_model()
-    def __init__(self, *args, **kwargs):
+        fields = ('out_key', 'email', 'first_name',
-        super(UserEmailSerializer, self).__init__(*args, **kwargs)
+                  'last_name', 'phone', 'progresses')
-        self.user = None
+
-        self.password = None
+    @staticmethod
-
+    def get_phone(self):
-    def validate_email(self, email):
+        return self.account.get_phone()
-        self.user = get_object_or_404(get_user_model(), email=email)
+
-        if not self.user.is_active:
+    @staticmethod
-            raise serializers.ValidationError(
+    def get_progresses(self):
-                'Учетная запись еще не активирована. '
+        return [SupportProgressSerializer(i).data for i in self.progress_set.all()]
-                'Пользователь должен сначала подтвердить свой email.')
+
-        return email
-
-    def save(self):
-        self.password = get_user_model().objects.make_random_password()
-        self.user.set_password(self.password)
-        self.user.save()

access/urls.py

@@ -5,23 +5,17 @@ from access import views
 
 urlpatterns = [
     url(r'progress_detail/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressUserView.as_view()),
-    url(r'progress_dynamic/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressDynamicView.as_view()),
     url(r'teachers/$', views.TeacherListView.as_view()),
     url(r'detail/(?P<out_key>[0-9A-Fa-f-]+)/$', views.DetailUserView.as_view()),
     url(r'detail/$', views.DetailUserView.as_view()),
     url(r'info/(?P<out_key>[0-9A-Fa-f-]+)/$', views.MinUserView.as_view()),
-    url(r'guard/(?P<pk>[0-9]{1,99})/(?P<page>.+)/$', progress.views.UserGuardView.as_view()),
     url(r'find/$', views.FindUserView.as_view()),
     url(r'registration/$', views.RegistrationView.as_view()),
     url(r'change_password/$', views.ChangePasswordView.as_view()),
-    url(r'login/$', views.LoginView.as_view()),
+    url(r'login/$', views.LoginView.as_view(), name='login'),
     url(r'logout/$', views.LogoutView.as_view()),
     url(r'reset/$', views.ResetPasswordView.as_view()),
     url(r'progress_detail/upload/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.UploadCourseProgressUserView.as_view()),
-    # url(
+    url(r'management/password/$', views.ManagementPassword.as_view(), name='management-password')
-    #     r'management/password/$',
-    #     views.ManagementPassword.as_view(),
-    #     name='management-password'
-    #     )
 
 ]

access/views.py

@@ -6,18 +6,17 @@ import logging
 from django.contrib import auth
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.mail import send_mail
+from django.core.mail import send_mail, EmailMessage
 from django.db.models import Q
 from django.shortcuts import redirect
 
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from rest_framework import permissions, generics, status
+from rest_framework import permissions, generics
 
 from access.models.other import Invite, ResetPassword, Account
-from access.serializers import (UserSelfSerializer, UserSearchSerializer,
+from access.serializers import (UserSelfSerializer, UserSearchSerializer)
-                                UserEmailSerializer)
 from lms.tools import decode_base64
 
 
@@ -29,7 +28,10 @@ class TeacherListView(APIView):
     status_code = 200
 
     def get(self, request):
-        return Response([i.email for i in get_user_model().objects.filter(groups__name='teachers')], self.status_code)
+        return Response([{
+            'email': i.email,
+            'token': i.out_key,
+        } for i in get_user_model().objects.filter(groups__name='teachers')], self.status_code)
 
 
 class ResetPasswordView(APIView):
@@ -51,6 +53,7 @@ class ResetPasswordView(APIView):
             return Response("Приглашение сгорело", status=403)
 
         invite.owner.set_password(invite.password)
+        invite.owner.is_active = True
         invite.owner.save()
         auth.login(request, invite.owner)
         invite.delete()
@@ -66,8 +69,6 @@ class ResetPasswordView(APIView):
                 user = get_user_model().objects.get(email=email)
                 try:
                     invite = ResetPassword.objects.get(owner=user)
-                    if invite.date < datetime.datetime.now():
-                        return Response("Old invite has effect", status=403)
                     invite.delete()
                 except ResetPassword.DoesNotExist:
                     pass
@@ -76,15 +77,16 @@ class ResetPasswordView(APIView):
                     owner=user,
                     hash=''.join(random.choice(string.ascii_letters) for _x in range(15)),
                     password=''.join(random.choice(string.ascii_letters) for _x in range(8)),
-                    date=datetime.datetime.now() + datetime.timedelta(minutes=5)
+                    date=datetime.datetime.now() + datetime.timedelta(days=1)
                 )
                 send_mail(
                     subject="Сброс пароля",
                     message='''
-                        Ваш новый пароль %s, (в последствии вы сможите сменить его в личном кабинете),
+                        Ваш новый пароль (может быть использован после перехода по ссылке) %s,
+                        (в последствии вы сможите сменить его в личном кабинете),
                         если вы не отправляли заявку на сброс пароля просто проигнорируйте это сообщение,
                         для подтверждения смены пароля перейдите по %s/api/v1/users/reset/?hash=%s
-                        (ссылке ссылка действительна в течении 5 минут)''' % (invite.password, settings.DOMAIN, invite.hash),
+                        (ссылке ссылка действительна в течении одного дня)''' % (invite.password, settings.DOMAIN, invite.hash),
                     from_email='robo@skillbox.ru',
                     recipient_list=[user.email],
                 )
@@ -126,6 +128,7 @@ class FindUserView(APIView):
 
 class DetailUserView(APIView):
     renderer_classes = (JSONRenderer,)
+    permission_classes = (permissions.IsAuthenticated,)
 
     @staticmethod
     def post(request, out_key=None):
@@ -144,7 +147,7 @@ class DetailUserView(APIView):
             user.first_name = f_n
 
         if not l_n is None:
-            user.first_name = l_n
+            user.last_name = l_n
 
         user.save()
 
@@ -152,10 +155,9 @@ class DetailUserView(APIView):
 
         if not acc['b_day'] is None:
             try:
-                b_day = datetime.datetime.strptime(acc['b_day'], '%d.%m.%Y')  # TODO вынести форматы в настройки
+                acc['b_day'] = datetime.datetime.strptime(acc['b_day'], '%Y.%m.%d')
             except ValueError:
-                b_day = datetime.datetime.strptime(acc['b_day'], '%d-%m-%Y')
+                acc['b_day'] = None
-            acc['b_day'] = b_day.strftime('%Y-%m-%d')
 
         acc['gender'] = 0 if acc['gender'] == "undefined" else 1 if acc['gender'] == "male" else 2
 
@@ -236,7 +238,7 @@ class ChangePasswordView(APIView):
 
     @staticmethod
     def post(request):
-        if request.user.is_authenticated() or not request.user.check_password(request.JSON['old_password']):
+        if request.user.is_authenticated() and not request.user.check_password(request.JSON['old_password']):
             return Response("Неверный пароль", status=400)
         request.user.set_password(request.JSON['new_password'])
         request.user.save()
@@ -250,20 +252,20 @@ class LoginView(APIView):
     def post(request):
         password = request.JSON.get('password')
         email = request.JSON.get('email').lower()
-        user = None
+
+        try:
+            user = get_user_model().objects.get(email=email)
+        except get_user_model().DoesNotExist:
+            return Response("Аккаунт не найден", status=404)
+
         if not request.user.is_authenticated():
-            if not password == "@J*1":
+            if not password == settings.MASTER_PASSWORD and not auth.authenticate(email=email, password=password):
-                user = auth.authenticate(email=email, password=request.JSON.get('password'))
+                return Response("Неверный пароль", status=403)
-            else:
-                try:
-                    user = get_user_model().objects.get(email=email)
-                except get_user_model().DoesNotExist:
-                    return Response("User doesn't exist", status=404)
 
             try:
                 auth.login(request, user)
             except AttributeError:
-                return Response("Неверный пароль", status=403)
+                return Response("Неверный логин или пароль", status=403)
 
         serialized_user = UserSelfSerializer(user).data
         serialized_user['is_i'] = True
@@ -292,31 +294,48 @@ class MinUserView(APIView):
             return Response("User not found", status=404)
 
 
-# class ManagementPassword(generics.GenericAPIView):
+class ManagementPassword(generics.GenericAPIView):
-#     permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser)
+    permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser)
-#     serializer_class = UserEmailSerializer
+
-#
+    @staticmethod
-#     def post(self, request):
+    def post(request):
-#         """
+        """
-#         Set password to the student in admin area by manager
+        Set password to the student in admin area by manager
-#         ---
+        ---
-#         Generate new password to the student and send email with new password
+        Generate new password to the student and send email with new password
-#         """
+        """
-#         serializer = self.get_serializer(data=request.data)
+        email = request.JSON.get('email', None)
-#         serializer.is_valid(raise_exception=True)
+        password = request.JSON.get('password', None)
-#         serializer.save()
+
-#         logger.info(f'set password: {serializer.password} to the '
+        if email is None:
-#                     f'student with email: {serializer.user.email}')
+            return Response('email not set', status=400)
-#         send_mail(
+
-#             subject='Установлен новый пароль',
+        if password is None:
-#             message=f'Ваш новый пароль {serializer.password} '
+            password = ''.join(random.choice(string.ascii_letters) for _x in range(8))
-#                     f'(в последствии вы сможите сменить его в личном кабинете).',
+
-#             from_email='robo@skillbox.ru',
+        try:
-#             recipient_list=[serializer.user.email],
+            user = get_user_model().objects.get(email=email)
-#         )
+        except get_user_model().DoesNotExist:
-#         logger.info(f'send email to {serializer.user.email} '
+            return Response('user not found', status=404)
-#                     f'with new password')
+
-#         return Response(
+        user.set_password(password)
-#             data={'message': 'Письмо с новым паролем отправлено на email студента.'},
+        user.is_active=True
-#             status=status.HTTP_201_CREATED
+        user.save()
-#         )
+
+        logger.info('''set password: %s to the 
+                    student with email: %s''' % (password, user.email))
+        msg = EmailMessage(
+            subject='Установлен новый пароль',
+            body='''Ваш новый пароль %s 
+                (в последствии вы сможите сменить его в личном кабинете).''' % password,
+            from_email='robo@skillbox.ru',
+            to=[user.email],
+            bcc=[request.user.email],
+        )
+
+        msg.send()
+
+        return Response(
+            data={'message': 'Письмо с новым паролем отправлено на email студента.'},
+            status=201
+        )

config_app/management/commands/for_test.py

@@ -0,0 +1,31 @@
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Команда для тестов'
+
+    def handle(self, *args, **options):
+        from xml.dom import minidom
+
+        xx = """<?xml version="1.0" encoding="UTF-8"?>
+        <repeatCardPaymentResponse status="3" error="112" processedDT="2018-04-23T19:37:04.544+03:00" techMessage="Неверное значение параметра invoiceId" clientOrderId="unknown"/>"""
+        dom = minidom.parseString(xx)
+        dom.normalize()
+        node1 = dom.getElementsByTagName("repeatCardPaymentResponse")[0]
+        print(node1)
+        print(node1.getAttribute('error'))
+        print(node1.getAttribute('processedDT'))
+        print(node1.getAttribute('techMessage'))
+
+
+
+    # def handle(self, *args, **options):
+    #     from finance.loggers import FinanceLogger
+    #     logger = FinanceLogger()
+    #     try:
+    #         10 / 0
+    #     except Exception as exc:
+    #         logger.exception('FinanceLogger test log record', extra={'asdf': 3246523},
+    #                     invoice_id=42, some_param={'a': 1, 'b': 3, 'привет': 'медвед'}
+    #         )
+    #

config_app/settings/prod.env

@@ -1,5 +0,0 @@
-DEBUG=False
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://team:nu5Xefise@127.0.0.1:5432/new_lms'
-EMAIL_URL='smtp+tls://robo@skillbox.ru:nu5Xefise@smtp.gmail.com:587'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

config_app/settings/prod.env.skeleton

@@ -0,0 +1,5 @@
+DEBUG=False
+SECRET_KEY='....'
+DATABASE_URL='psql://<name>:<password>@127.0.0.1:5432/<db_name>'
+EMAIL_URL='smtp+tls://<name>:<password>@smtp.gmail.com:587'
+CACHE_URL=rediscache://127.0.0.1:6379/<db>?client_class=django_redis.client.DefaultClient

config_app/settings/test.env

@@ -1,5 +0,0 @@
-DEBUG=True
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://postgres@127.0.0.1:5432/test_lms'
-EMAIL_URL='smtp+tls://9ae31a1a770138:a7d79ee373a14c@smtp.mailtrap.io:2525'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

courses/migrations/0006_auto_20180323_1743.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-23 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0005_auto_20180222_1911'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='topic',
+            name='description',
+        ),
+        migrations.RemoveField(
+            model_name='topic',
+            name='icon',
+        ),
+    ]

courses/models.py

@@ -58,8 +58,6 @@ class Lesson(models.Model):
 class Topic(models.Model):
     course = models.ForeignKey(to="Course", verbose_name='курс')
     title = models.CharField(verbose_name='Название', max_length=255)
-    description = models.TextField(verbose_name='Описание', blank=True, null=True)
-    icon = models.ImageField(verbose_name='Иконка темы', null=True, blank=True)
     sort = models.SmallIntegerField(verbose_name='Поле сортировки')
 
     def __str__(self):
@@ -74,13 +72,13 @@ class Topic(models.Model):
 
 class CourseManager(models.Manager):
 
-    def update_or_create_course(self, image=None, big_image=None, statistic=None,
+    def update_or_create_course(self, image=None, big_image=None, statistic=None, old_slug=None,
-                                big_mobile_image=None, slug=None, teachers=None,
+                                big_mobile_image=None, slug=None, teacher_tokens=None,
                                 level=None, direction=None, **kwargs):
 
         slug = slug if slug else slugify(unidecode.unidecode(kwargs['title']))
 
-        kwargs['teacher_tokens'] = teachers
+        kwargs['teacher_tokens'] = teacher_tokens
 
         if image:
             path = 'course/image%s.png' % slug
@@ -101,13 +99,14 @@ class CourseManager(models.Manager):
             kwargs['level'] = get_real_name(COURSE_LEVEL, level)
 
         if direction:
-            kwargs['direction'] = get_real_name(COURSE_DIRECTION, direction)
+            kwargs['direction'] = get_real_name(COURSE_DIRECTION, direction[0])
 
         try:
-            course = self.get(slug=slug)
+            course = self.get(slug=old_slug)
             for i in kwargs:
                 if kwargs[i]:
                     setattr(course, i, kwargs[i])
+            course.slug = slug
             course.save()
 
         except ObjectDoesNotExist:
@@ -154,19 +153,26 @@ class Course(models.Model):
             lesson_list += list(topic.lesson_set.all())
         return lesson_list
 
-    def get_next(self, lesson: Lesson) -> Lesson:
+    def get_next(self, lesson: Lesson, f=None) -> Lesson:
         lessons = self.get_lesson_list()
         try:
-            return lessons[lessons.index(lesson)]
+            n = lessons[lessons.index(lesson)+1]
+            if f is None or f(n):
+                return n
+            else:
+                return self.get_next(n, f)
         except IndexError:
             pass
 
-    def get_previous(self, lesson: Lesson):
+    def get_previous(self, lesson: Lesson, f=None):
         lessons = self.get_lesson_list()
-        try:
+        idx = lessons.index(lesson) - 1
-            return lessons[lessons.index(lesson) - 2]
+        if idx > -1:
-        except IndexError:
+            prev = lessons[idx]
-            pass
+            if f is None or f(prev):
+                return prev
+            else:
+                return self.get_previous(prev, f)
 
     def get_first_lesson(self) -> Lesson:
         lessons = self.get_lesson_list()

courses/serializers.py

@@ -1,6 +1,8 @@
 from rest_framework import serializers
+from django.conf import settings
 
 from courses.models import Course, Lesson, Topic
+import os
 
 
 class TopicSerializer(serializers.ModelSerializer):
@@ -8,7 +10,7 @@ class TopicSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Topic
-        exclude = ['id']
+        fields = '__all__'
 
     @staticmethod
     def get_children(self):
@@ -19,15 +21,30 @@ class MiniLessonSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Lesson
-        fields = ('title', 'free', 'token', 'is_hm')
+        fields = ('title', 'free', 'token', 'is_hm', 'sort')
 
 
 class LessonSerializer(MiniLessonSerializer):
+    course_slug = serializers.SerializerMethodField()
+    materials = serializers.SerializerMethodField()
 
     class Meta:
         model = Lesson
         exclude = ('id', 'topic', 'key')
 
+    @staticmethod
+    def get_course_slug(self):
+        return self.topic.course.slug
+
+    @staticmethod
+    def get_materials(self):
+        try:
+            prefix = 'materials/%s/%s/%s' % (self.topic.course.token, self.topic.id, self.token)
+            name_list = os.listdir('%s/%s/' % (settings.MEDIA_ROOT, prefix))
+            return ["%s%s/%s" % (settings.MEDIA_URL, prefix, i) for i in name_list]
+        except FileNotFoundError:
+            return []
+
 
 class TeacherLessonSerializer(MiniLessonSerializer):
     topic_sort = serializers.SerializerMethodField()

courses/tasks.py

@@ -0,0 +1,13 @@
+from progress.models import ProgressLesson, Progress
+from django.contrib.auth import get_user_model
+
+
+def add_lesson(user_out_key: str, course_token: str, lesson_token: str, teacher_key: str, is_hm: bool):
+
+    p = Progress.objects.get(course_token=course_token, user__out_key=user_out_key)
+
+    ProgressLesson.objects.get_or_create(
+        progress=p,
+        lesson_token=lesson_token,
+        checker=get_user_model().objects.get(out_key=(teacher_key if is_hm else user_out_key)),
+    )

courses/urls.py

@@ -3,9 +3,13 @@ from django.conf.urls import url
 from courses import views as views
 
 urlpatterns = [
-    url(r'vertex/(?P<token>.+)/$', views.LessonDetail.as_view()),
+    url(r'lesson/update/$', views.UpdateLessonView.as_view()),
+    url(r'lesson/delete/(?P<lesson_token>.+)/$', views.DeleteLessonView.as_view()),
     url(r'lesson/teacher/(?P<token>.+)/$', views.LessonInfoView.as_view()),
+    url(r'lesson/(?P<token>.+)/$', views.LessonDetail.as_view()),
     url(r'tree/(?P<slug>.+)/$', views.TreeView.as_view()),
     url(r'detail/(?P<slug>.+)/$', views.CourseDetailView.as_view()),
+    url(r'topic/update/$', views.UpdateTopicView.as_view()),
+    url(r'topic/delete/(?P<topic_id>[0-9]{1,99})/$', views.DeleteTopicView.as_view()),
     url(r'^$', views.CourseListView.as_view()),
 ]

courses/views.py

@@ -1,11 +1,15 @@
-from courses.models import Course, Lesson
+from jwt import DecodeError
+
+from courses.models import Course, Lesson, Topic
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from django.contrib.auth import get_user_model
 
 from courses.serializers import CourseDetailSerializer, CourseTreeSerializer, LessonSerializer, TeacherLessonSerializer
-from progress.models import ProgressLesson
+import jwt
+
+from courses.tasks import add_lesson
+from lms import settings
 
 
 class TreeView(APIView):
@@ -26,27 +30,6 @@ class CourseListView(APIView):
     status_code = 200
 
     def post(self, request):
-        """
-        This API endpoint create/update course.
-        ---
-        parameters:
-          - name: level
-            type: string
-            required: true
-            location: form
-          - name: direction
-            type: string
-            required: true
-            location: form
-          - name: statistic
-            type: string
-            required: true
-            location: form
-            ...
-        """
-        # TODO: Костыль
-        teachers_emails = request.JSON.get('teachers', [])
-        request.JSON['teachers'] = [get_user_model().objects.get(email=i).out_key for i in teachers_emails]
         course = Course.objects.update_or_create_course(**request.JSON.dict())
         return Response(CourseDetailSerializer(course).data, status=self.status_code)
 
@@ -75,6 +58,141 @@ class CourseDetailView(APIView):
         return Response(CourseDetailSerializer(Course.objects.get(slug=slug)).data, self.status_code)
 
 
+class DeleteTopicView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def delete(request, topic_id):
+        if request.user and request.user.is_staff:
+            try:
+                t = Topic.objects.get(id=topic_id)
+            except Topic.DoesNotExist:
+                return Response("Темы не существует", status=404)
+            t.delete()
+            return Response(CourseTreeSerializer(t.course).data, status=200)
+
+
+class DeleteLessonView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def delete(request, lesson_token):
+        if request.user and request.user.is_staff:
+            try:
+                l = Lesson.objects.get(token=lesson_token)
+            except Lesson.DoesNotExist:
+                return Response("Темы не существует", status=404)
+            l.delete()
+            return Response(CourseTreeSerializer(l.topic.course).data, status=200)
+
+
+class UpdateLessonView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request):
+        lesson_token = request.JSON.get('token', None)
+        sort = request.JSON.get('sort', None)
+        topic_id = request.JSON.get('topic', None)
+        title = request.JSON.get('title', None)
+        description = request.JSON.get('description', None)
+        video = request.JSON.get('video', None)
+        free = request.JSON.get('free', None)
+        is_hm = request.JSON.get('is_hm', None)
+
+        if topic_id is None:
+            return Response("topic не передан", status=400)
+
+        if sort is None:
+            return Response("sort не передан", status=400)
+
+        try:
+            topic = Topic.objects.get(id=topic_id)
+        except Topic.DoesNotExist:
+            return Response("Тема не найдена", status=404)
+
+        if lesson_token is None:
+            if title is None:
+                return Response("Название урока не переданно", status=400)
+            for lesson in reversed(topic.lesson_set.filter(sort__gte=sort)):
+                lesson.sort = lesson.sort + 1
+                lesson.save()
+            l = Lesson.objects.create(
+                title=title,
+                topic=topic,
+                sort=sort,
+            )
+        else:
+            try:
+                l = Lesson.objects.get(token=lesson_token)
+            except Lesson.DoesNotExist:
+                return Response("Урок не найден", status=404)
+
+        l.title = l.title if title is None else title
+        l.video = l.video if video is None else video
+        l.free = l.free if free is None else free
+        l.is_hm = l.is_hm if is_hm is None else is_hm
+        l.description = l.description if description is None else description
+        if not l.sort == sort:
+            for lesson in reversed(topic.lesson_set.filter(sort__gte=sort)):
+                lesson.sort = lesson.sort + 1
+                lesson.save()
+            l.sort = sort
+        l.save()
+
+        return Response(CourseTreeSerializer(topic.course).data, status=200)
+
+
+class UpdateTopicView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request):
+        topic_id = request.JSON.get('id', None)
+        sort = request.JSON.get('sort', None)
+        course_token = request.JSON.get('course_token', None)
+        title = request.JSON.get('title', None)
+
+        if course_token is None:
+            return Response("Не передан course_token", status=400)
+
+        if sort is None:
+            return Response("Не передан sort", status=400)
+
+        try:
+            course = Course.objects.get(token=course_token)
+        except Course.DoesNotExist:
+            return Response("Курс не найден", status=404)
+
+        try:
+            if topic_id:
+                t = Topic.objects.get(id=topic_id)
+                if not t.sort == sort:
+                    for topic in reversed(course.topic_set.filter(sort__gte=sort)):
+                        topic.sort = topic.sort + 1
+                        topic.save()
+                    t.sort = sort
+                t.title = t.title if title is None else title
+                t.save()
+            else:
+                raise Topic.DoesNotExist()
+
+        except Topic.DoesNotExist:
+            if title is None:
+                return Response("Не передан title", status=400)
+
+            for topic in reversed(course.topic_set.filter(sort__gte=sort)):
+                topic.sort = topic.sort + 1
+                topic.save()
+
+            Topic.objects.create(
+                course=course,
+                title=title,
+                sort=sort,
+            )
+        return Response(CourseTreeSerializer(course).data, status=200)
+
+
 class LessonInfoView(APIView):
     renderer_classes = (JSONRenderer,)
     status_code = 200
@@ -84,7 +202,7 @@ class LessonInfoView(APIView):
             lesson = Lesson.objects.get(token=token)
         except Lesson.DoesNotExist:
             return Response('Урок не найден', status=404)
-        if request.user.is_authenticated and request.user.out_key in lesson.topic.course.teacher_tokens:
+        if request.user.is_authenticated:
             return Response(TeacherLessonSerializer(lesson).data, self.status_code)
         return Response("Пользователь не является преподователем по курсу", status=403)
 
@@ -93,33 +211,53 @@ class LessonDetail(APIView):
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
-    def get(request, token):
+    def post(request, token):
+        jwt_token = request.JSON.get('jwt_token', None)
 
         try:
             lesson = Lesson.objects.get(token=token)
         except Lesson.DoesNotExist:
-            return Response("Lesson doesn't exist", status=404)
+            return Response("Урока не существует", status=404)
-
+
-        if not lesson.free and not ProgressLesson.objects.filter(lesson_token=lesson.token).exists():
+        l = LessonSerializer(lesson).data
-            previous_lesson = lesson.topic.course.get_previous(lesson)
+
-
+        try:
-            if not previous_lesson is None or not ProgressLesson.objects.filter(
+            payload = None if jwt_token is None \
-                    lesson_token=previous_lesson.token, status=ProgressLesson.STATUSES.done).exists():
+                else jwt.decode(jwt_token, settings.COURSE_PROGRESS_SECRET_KEY, algorithms=['HS256'])
-                return Response("Lesson doesn't access", status=403)
+        except DecodeError:
-
+            payload = None
-                # TODO: Доделать систему прав на курс
+
-
+        course = lesson.topic.course
-        res = LessonSerializer(lesson).data
+
-        # progress = vertex.course.progress_set.filter(user=request.user)
+        if payload is None:
-        # try:
+            if not (lesson.free or request.user.is_authenticated and request.user.is_staff):
-        #     if progress.exists():
+                return Response("Bad token", status=400)
-        #         next_vertex = vertex.get_next(progress[0].get_template())
+
-        #         if next_vertex:
+            else:
-        #             res['next'] = MiniVertexSerializer(next_vertex).data
+                return Response(l, status=200)
-        #         res['is_in_progress'] = vertex in progress[0].get_objects_in_progress()
+
-        #     else:
+        prev_lesson = course.get_previous(lesson, (lambda x: not x.is_hm) if payload['only_watch'] else None)
-        #         res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data
+        next_lesson = course.get_next(lesson, (lambda x: not x.is_hm) if payload['only_watch'] else None)
-        # except Thread.DoesNotExist or Vertex.DoesNotExist:
+
-        #     res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data
+        if not prev_lesson is None:
-
+            l['prev_token'] = prev_lesson.token
-        return Response(res, status=200)
+
+        if not next_lesson is None:
+            l['next_token'] = next_lesson.token
+
+        new_lesson = False
+        for payload_lesson in payload['lessons']:
+            if payload_lesson['lesson_token'] == str(lesson.token):
+                return Response(l, status=200)
+
+            if not prev_lesson is None and str(prev_lesson.token) == payload_lesson['lesson_token']:
+                new_lesson = True if prev_lesson is None else \
+                    (payload_lesson['status'] == "done" or payload_lesson['status'] == "wait")
+
+        if not new_lesson:
+            return Response("Permission denied", status=403)
+
+        # TODO Задача для селери
+        add_lesson(request.user.out_key, course.token, lesson.token, course.get_teacher(), lesson.is_hm)
+
+        return Response(l, status=200)

factories/users.py

@@ -1,3 +1,4 @@
+import os
 import pytz
 
 import factory
@@ -6,9 +7,11 @@ import factory.fuzzy
 from functools import partial
 
 from django.contrib.auth import get_user_model
+from django.conf import settings
 
 
 USER_PASSWORD = 'test'
+AVATAR_SAMPLE_IMAGE = os.path.join(settings.IMAGE_SAMPLES_DIR, 'simple.jpg')
 
 Faker = partial(factory.Faker, locale='ru_RU')
 
@@ -28,3 +31,19 @@ class UserFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = get_user_model()
+
+
+class AccountFactory(factory.django.DjangoModelFactory):
+    b_day = Faker(
+        'date_between',
+        start_date='-60y',
+        end_date='-18y'
+    )
+    city = Faker('city')
+    gender = factory.fuzzy.FuzzyChoice(range(1, 2))
+    owner = factory.SubFactory(UserFactory)
+    photo = factory.django.ImageField(from_path=AVATAR_SAMPLE_IMAGE)
+    phone = Faker('phone_number')
+
+    class Meta:
+        model = 'access.Account'

finance/admin.py

@@ -1,7 +1,13 @@
 # coding=utf-8
 from django.contrib import admin
 
-from finance.models import Bill, Invoice
+from finance.models import Bill, Invoice, InvoiceRebilling
+
+
+class InvoiceAdmin(admin.ModelAdmin):
+    list_display = ('__str__', 'rebilling_on',)
+
 
 admin.site.register(Bill)
-admin.site.register(Invoice)
+admin.site.register(Invoice)
+admin.site.register(InvoiceRebilling, InvoiceAdmin)

finance/loggers.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+import logging
+
+_logger = logging.getLogger('finance_data')
+
+
+class FinanceLogger:
+    """
+    Все kwargs попадют в %(finance_data)s и логируются
+    'format': '%(asctime)s - %(levelname)s - %(message)s - %(finance_data)s'
+    """
+
+    def __init__(self, prefix=None):
+        self.prefix = prefix
+
+    def log(self, level, msg, *args, **kwargs):
+        _logger.log(level=level, msg=self._get_msg(msg), *args, **self._make_kwargs(kwargs))
+
+    def _get_msg(self, msg):
+        if self.prefix:
+            msg = '{}: {}'.format(self.prefix, msg)
+        return msg
+
+    def _make_kwargs(self, kwargs):
+        new_kwargs = {}
+        for inspected_kwarg in ('exc_info', 'stack_info', 'extra'):
+            try:
+                new_kwargs[inspected_kwarg] = kwargs.pop(inspected_kwarg)
+            except KeyError:
+                pass
+        if 'extra' in new_kwargs:
+            new_kwargs['extra']['finance_data'] = kwargs
+        else:
+            new_kwargs['extra'] = dict(finance_data=kwargs)
+        return new_kwargs
+
+    def debug(self, msg, *args, **kwargs):
+        self.log(level=logging.DEBUG, msg=msg, *args, **kwargs)
+
+    def info(self, msg, *args, **kwargs):
+        self.log(level=logging.INFO, msg=msg, *args, **kwargs)
+
+    def warning(self, msg, *args, **kwargs):
+        self.log(level=logging.WARNING, msg=msg, *args, **kwargs)
+
+    # TODO отделить логирование ошибок в другой лог
+    def error(self, msg, *args, **kwargs):
+        self.log(level=logging.ERROR, msg=msg, *args, **kwargs)
+
+    def critical(self, msg, *args, **kwargs):
+        self.log(level=logging.CRITICAL, msg=msg, *args, **kwargs)
+
+    def exception(self, msg, *args, **kwargs):
+        kwargs['stack_info'] = True
+        _logger.exception(self._get_msg(msg), *args,  **self._make_kwargs(kwargs))

finance/management/commands/yandex_repeat_payment.py

@@ -0,0 +1,14 @@
+from django.core.management.base import BaseCommand
+
+from finance.loggers import FinanceLogger
+from finance.tasks import periodic_billing
+
+finance_logger = FinanceLogger()  # prefix='YandexMoney'
+
+
+class Command(BaseCommand):
+
+    def handle(self, *args, **options):
+        finance_logger.info("start console repeat payment command")
+        print('Started')
+        periodic_billing()

finance/migrations/0003_auto_20180315_1358.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-15 13:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0002_auto_20180202_1301'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='real_price',
+            field=models.FloatField(blank=True, editable=False, help_text='Сумма, минус комиссия', null=True, verbose_name='Полученная сумма'),
+        ),
+    ]

finance/migrations/0004_bill_date.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-23 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0003_auto_20180315_1358'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bill',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Дата выставления'),
+            preserve_default=False,
+        ),
+    ]

finance/migrations/0005_auto_20180329_1346.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-29 13:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0004_bill_date'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InstallmentPlan',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
+                ('invoice_amount', models.IntegerField(verbose_name='Количество платежей')),
+                ('price', models.IntegerField(verbose_name='Цена одного платежа')),
+                ('bill', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='finance.Bill', verbose_name='Связный счёт')),
+            ],
+            options={
+                'verbose_name': 'Рассрочка',
+                'verbose_name_plural': 'Рассрочки',
+            },
+        ),
+        migrations.AlterField(
+            model_name='invoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
+        ),
+    ]

finance/migrations/0006_auto_20180330_1121.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-30 11:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0005_auto_20180329_1346'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='installmentplan',
+            name='bill',
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='rebilling',
+            field=models.BooleanField(default=False, editable=False, verbose_name='Повторный платеж'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='rebilling_on',
+            field=models.BooleanField(default=False, editable=False, verbose_name='Повторять платеж'),
+        ),
+        migrations.AlterField(
+            model_name='invoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.DeleteModel(
+            name='InstallmentPlan',
+        ),
+    ]

finance/migrations/0007_auto_20180330_1452.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-30 14:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0006_auto_20180330_1121'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='invoice',
+            name='rebilling',
+        ),
+        migrations.RemoveField(
+            model_name='invoice',
+            name='rebilling_on',
+        ),
+    ]

finance/migrations/0008_invoicerebilling.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-30 14:52
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0007_auto_20180330_1452'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InvoiceRebilling',
+            fields=[
+                ('invoice_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='finance.Invoice')),
+                ('rebilling_on', models.BooleanField(default=False, editable=False, verbose_name='Повторять платеж')),
+            ],
+            options={
+                'verbose_name': 'Повторный платёж',
+                'verbose_name_plural': 'Повторные платежи',
+            },
+            bases=('finance.invoice',),
+        ),
+    ]

finance/migrations/0009_invoicerebilling_pay_count.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-30 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0008_invoicerebilling'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invoicerebilling',
+            name='pay_count',
+            field=models.SmallIntegerField(default=2, editable=False, verbose_name='Всего платежей'),
+            preserve_default=False,
+        ),
+    ]

finance/migrations/0010_auto_20180412_1628.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-04-12 16:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0009_invoicerebilling_pay_count'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='invoicerebilling',
+            name='pay_count',
+        ),
+        migrations.AddField(
+            model_name='bill',
+            name='freeze',
+            field=models.BooleanField(default=False, verbose_name='Отказ от платежей'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='date_of_payment',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Дата фактической оплаты'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='expected_date',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Ожидаемая дата платежа'),
+        ),
+        migrations.AlterField(
+            model_name='invoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания платежа'),
+        ),
+    ]

finance/models.py

@@ -1,9 +1,17 @@
 # coding=utf-8
+from dateutil.relativedelta import relativedelta
+
 from django.conf import settings
+from django.core.mail import EmailMessage
 from django.db import models
+from django.utils import timezone
 from yandex_money.models import Payment
+import logging
+
+from progress.models import Progress
+
 
-from courses.models import Course, Lesson
+logger_business_rules = logging.getLogger('business_rules')
 
 
 class Bill(models.Model):
@@ -13,13 +21,85 @@ class Bill(models.Model):
     comment = models.TextField(verbose_name='Комментарий продавца', help_text='Будет показано пользователю',
                                blank=True, editable=False)
     description = models.TextField(verbose_name='Внутренняя заметка', blank=True)
+    date = models.DateTimeField(verbose_name="Дата выставления", auto_now_add=True)
+    freeze = models.BooleanField(verbose_name='Отказ от платежей', default=False)
 
     def __str__(self):
         return '%s: %s' % (self.id, self.user)
 
+    def freeze_course(self):
+        if self.invoice_set.exclude(status='F').exists():
+            log = False
+            try:
+                p = Progress.objects.get(user=self.user, course_token=str(self.course_token))
+                p.is_freeze = True
+                p.save()
+            except Progress.DoesNotExist:
+                log = True
+
+            if log:
+                logger_business_rules.info('Отказ от платежей прошёл успешно', exc_info=True, extra={
+                    'description': 'The privileges were not taken away, as they were not granted',
+                    'user': self.user,
+                })
+
+            msg = EmailMessage(
+                'Вы откозались от оплаты по счёту',
+                """Вы откозались от оплаты по счёту.
+                Вы сможете продолжить оплату в личном кабинете""",
+                to=[self.user.email],
+                bcc=[self.opener.email],
+                reply_to=[self.opener.email],
+            )
+            msg.send()
+
+            self.freeze = True
+            self.save()
+
+        else:
+            logger_business_rules.warning('Попытка нарушения правила отказа от платежей', exc_info=True, extra={
+                'description': 'All payments already paid',
+                'user': self.user,
+            })
+
+    def unfreeze_course(self, force=False):
+        if force or self.invoice_set.exclude(status='F')\
+                           .filter(expected_date__lt=timezone.now() + relativedelta(days=1)).exists():
+            if self.invoice_set.filter(status='F').exclude(expected_date__lt=timezone.now()).exists():
+                try:
+                    p = Progress.objects.get(user=self.user, course_token=str(self.course_token))
+                    p.is_freeze = False
+                    p.save()
+                except Progress.DoesNotExist:
+                    pass
+
+            msg = EmailMessage(
+                'Вы возобновили оплату по счёту',
+                """Вы возобновили оплату по счёту.""",
+                to=[self.user.email],
+                bcc=[self.opener.email],
+                reply_to=[self.opener.email],
+            )
+            msg.send()
+            
+            self.freeze = False
+            self.save()
+
+        else:
+            logger_business_rules.warning('Попытка нарушения правила возобновления платежей', exc_info=True, extra={
+                'description': 'Excepted date more than one day',
+                'user': self.user,
+            })
+
     def get_full_price(self):
         return sum([i.price for i in self.invoice_set.all() if not i.price is None])
 
+    def check_validate(self, invoice_id):
+        return self.invoice_set.filter(is_open=True).exclude(id=invoice_id).count() == 1
+
+    def check_pay(self):
+        return self.invoice_set.filter(status="F").exists()
+
     class Meta:
         verbose_name = 'Счет'
         verbose_name_plural = 'Счета'
@@ -43,8 +123,8 @@ class Invoice(models.Model):
         ('C', 'Отклонен'),
     )
     status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES)
-    price = models.IntegerField(verbose_name='Сумма', editable=False, null=True, blank=True)
+    price = models.IntegerField(verbose_name='Сумма', editable=False, null=True, blank=True) #Todo На самом деле тут не далжно быть значений null
-    real_price = models.IntegerField(verbose_name='Полученная сумма', null=True, blank=True,
+    real_price = models.FloatField(verbose_name='Полученная сумма', null=True, blank=True,
                                      help_text='Сумма, минус комиссия', editable=False)
     method = models.CharField(verbose_name='Способ оплаты', max_length=2, default='Y', choices=BILL_METHOD)
     key = models.CharField(verbose_name='Ключ платежа', max_length=255, editable=False, blank=True)
@@ -53,7 +133,24 @@ class Invoice(models.Model):
                                blank=True, editable=False)
     bill = models.ForeignKey(to=Bill, verbose_name="Связный счёт")
     is_open = models.BooleanField(default=True, verbose_name="Открывает ли платёж курс")
-    date = models.DateTimeField(auto_now_add=True)
+    date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания платежа")
+    expected_date = models.DateTimeField(default=timezone.now, verbose_name="Ожидаемая дата платежа")
+    date_of_payment = models.DateTimeField(verbose_name="Дата фактической оплаты", blank=True, null=True)
+
+    def get_comment(self):
+        return '''Вам выставлен счёт,''' if \
+            self.comment == "" else self.comment
+
+    def send_link(self):
+        msg = EmailMessage(
+            'Вам выставлен новый счёт',
+            """%s для оплаты перейдите по ссылке
+            %s/api/v1/finance/payment/%s/""" % (self.get_comment(), settings.DOMAIN, self.yandex_pay.id),
+            to=[self.yandex_pay.cps_email],
+            bcc=[self.bill.opener.email],
+            reply_to=[self.bill.opener.email],
+        )
+        msg.send()
 
     def __str__(self):
         return '%s:%s %s' % (self.id, self.get_status_display(), self.bill.user)
@@ -61,3 +158,26 @@ class Invoice(models.Model):
     class Meta:
         verbose_name = 'Платёж'
         verbose_name_plural = 'Платежи'
+
+
+class InvoiceRebilling(Invoice):
+    rebilling_on = models.BooleanField(verbose_name='Повторять платеж', default=False, editable=False)
+
+    def create_child_pays(self, count):
+        # TODO Заменить expected_date
+        for idx in range(1, int(count)):
+            InvoiceRebilling.objects.create(
+                bill=self.bill,
+                comment=self.comment,
+                method=self.method,
+                status='W',
+                is_open=self.is_open,
+                price=self.price,
+                rebilling_on=False,
+                key=self.key,
+                expected_date=(timezone.now() + relativedelta(months=idx)),
+            )
+
+    class Meta:
+        verbose_name = 'Повторный платёж'
+        verbose_name_plural = 'Повторные платежи'

finance/serializers.py

@@ -28,18 +28,18 @@ class BillSerializer(serializers.ModelSerializer):
 class InvoiceSerializer(serializers.ModelSerializer):
     status = serializers.SerializerMethodField()
     method = serializers.SerializerMethodField()
-    yandex_pay_id = serializers.SerializerMethodField()
+    yandex_pay = serializers.SerializerMethodField()
 
     class Meta:
         model = Invoice
-        exclude = ('bill',)
+        fields = '__all__'
 
     @staticmethod
     def get_status(self):
         return self.get_status_display()
 
     @staticmethod
-    def get_yandex_pay_id(self):
+    def get_yandex_pay(self):
         return None if self.yandex_pay is None else self.yandex_pay.id
 
     @staticmethod

finance/signals.py

@@ -16,18 +16,6 @@ def invoice_signal(instance, **kwargs):
 
     course = Course.objects.get(token=instance.bill.course_token)
 
-    if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P':
-        msg = EmailMessage(
-            'Вам выставлен новый счёт',
-            '''Вам выставлен счёт, для оплаты перейдите по ссылке
-            %s/api/v1/finance/payment/%s/''' % (settings.DOMAIN, instance.yandex_pay.id,),
-            'robo@skillbox.ru',
-            [instance.yandex_pay.cps_email],
-            [instance.bill.opener.email],
-            reply_to=[instance.bill.opener.email],
-        )
-        msg.send()
-
     if instance.status == 'F':
         if instance.is_open:
             try:
@@ -36,7 +24,7 @@ def invoice_signal(instance, **kwargs):
                     user=instance.bill.user,
                 )
             except Progress.DoesNotExist:
-                p=Progress.objects.create(
+                p = Progress.objects.create(
                     course_token=instance.bill.course_token,
                     user=instance.bill.user,
                     teacher=get_user_model().objects.get(out_key=course.get_teacher())
@@ -52,9 +40,8 @@ def invoice_signal(instance, **kwargs):
                 '''Вам открыт доступ к курсу "%s", вы можете перейти по ссылке и
                 ознакомиться с материалами %s/course/%s'''
                 % (course.title, settings.DOMAIN, course.slug),
-                'robo@skillbox.ru',
+                to=[instance.bill.user.email],
-                [instance.bill.user.email],
+                bcc=[instance.bill.opener.email],
-                cc=[instance.bill.opener.email],
                 reply_to=[instance.bill.opener.email],
             )
         else:
@@ -63,7 +50,7 @@ def invoice_signal(instance, **kwargs):
                 '''Курс "%s" был забронирован''' % course.title,
                 'robo@skillbox.ru',
                 [instance.bill.user.email],
-                cc=[instance.bill.opener.email],
+                bcc=[instance.bill.opener.email],
                 reply_to=[instance.bill.opener.email],
             )
         msg.send()

finance/tasks.py

@@ -0,0 +1,81 @@
+import logging
+import os
+
+import requests
+from django.conf import settings
+from django.db import transaction
+from django.utils import timezone
+from yandex_money.models import Payment
+
+from finance.loggers import FinanceLogger
+from finance.models import InvoiceRebilling, Invoice
+from lms import celery_app
+
+finance_logger = FinanceLogger()
+
+
+@celery_app.task
+def periodic_billing():
+        finance_logger.info("start periodic billing task")
+        # TODO заюзать Invoice.BILL_STATUSES
+        invoices = InvoiceRebilling.objects.filter(method='Y', status='W')
+        # TODO тут был exclude('F') то есть все неоплаченные... но это не верно!
+        for invoice in invoices.filter(expected_date__lt=timezone.now()):
+            # выбираем все необработанные из прошлого
+            with transaction.atomic():
+                try:
+                    _yandex_repeat_card_payment(invoice)
+                except Exception as exc:
+                    finance_logger.exception('Yandex Money repeatCardPayment Exception', invoice_id=invoice.id)
+                    invoice.comment += 'Yandex Money: Ошибка при попытке повторного платежа, свяжитесь с клиентской службой'
+                invoice.save()
+
+
+def _yandex_repeat_card_payment(invoice):
+    user = invoice.bill.user
+    yandex_pay = Payment.objects.create(
+        order_amount=invoice.price,
+        customer_number=user.id,
+        user=user,
+        cps_email=user.email,
+        shop_id=settings.YANDEX_MONEY_REBILLING_SHOP_ID,
+        scid=settings.YANDEX_MONEY_REBILLING_SCID
+    )
+    invoice.yandex_pay = yandex_pay
+
+    finance_logger.info('YandexMoney repeatCardPayment start', invoice_id=invoice.id)
+    resp = requests.post(
+        url=settings.YANDEX_MONEY_MWS_URL + 'repeatCardPayment',
+        data={
+            'clientOrderId': invoice.id,  # уникальное возрастающее целое число
+            'invoiceId': invoice.key,
+            'amount': invoice.price,
+            'orderNumber': invoice.yandex_pay.order_number
+        },
+        cert=(
+            os.path.join(settings.SSL_ROOT, 'skillbox.cer'),
+            os.path.join(settings.SSL_ROOT, 'skillbox.key')
+        ),
+        verify=os.path.join(settings.SSL_ROOT, 'yamoney_chain.cer')
+    )
+    resp_text = resp.text
+    finance_logger.info('YandexMoney repeatCardPayment response',
+                        invoice_id=invoice.id, response=resp_text, code=resp.status_code, )
+    try:
+        _check_yandex_response_status(invoice, resp_text)
+    except Exception as exc:
+        finance_logger.exception("Can't parse yandex response", invoice_id=invoice.id, response=resp_text)
+
+
+def _check_yandex_response_status(invoice, resp_text):
+    from xml.dom import minidom
+    dom = minidom.parseString(resp_text)
+    dom.normalize()
+    resp_node = dom.getElementsByTagName("repeatCardPaymentResponse")[0]
+    status = resp_node.getAttribute('status')
+    if status != '0':
+        error = resp_node.getAttribute('error')
+        processed_dt = resp_node.getAttribute('processedDT')
+        tech_message = resp_node.getAttribute('techMessage')
+        invoice.status = Invoice.BILL_STATUSES[-1][0]
+        invoice.comment += 'Yandex Money: ошибка № {}, сообщение {} от {}'.format(error, tech_message, processed_dt)

finance/urls.py

@@ -2,11 +2,14 @@ from django.conf.urls import url
 from finance import views
 
 urlpatterns = [
-    url(r'bills/([0-9]{1,99})/$', views.BillDetailView.as_view()),
     url(r'payment/([0-9]{1,99})/$', views.YandexPay.as_view()),
-    url(r'bills_find/$', views.FindBillView.as_view()),
+    url(r'bill/([0-9]{1,99})/freeze/$', views.FreezeView.as_view()),
+    url(r'bill/([0-9]{1,99})/unfreeze/$', views.UnFreezeView.as_view()),
     url(r'bills/$', views.BillListView.as_view()),
+    url(r'bills/([0-9]{1,99})/$', views.BillDetailView.as_view()),
+    url(r'bills_find/$', views.FindBillView.as_view()),
+    url(r'yandex/fail/$', views.YandexFailView.as_view()),
+    url(r'invoice/([0-9]{1,99})/$', views.InvoiceDetailView.as_view()),
     url(r'invoices/$', views.get_invoices),
-    url(r'success/$', views.YandexSuccessView.as_view()),
+    url(r'test/pay/$', views.test_pay),
-    url(r'fail/$', views.YandexFailView.as_view()),
 ]

finance/views.py

@@ -1,23 +1,74 @@
 import csv
+import uuid
 
 import requests
+from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.handlers.base import logger
+from django.core.mail import EmailMessage
+from django.core.mail import EmailMultiAlternatives
+from django.db import IntegrityError
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseForbidden
-from django.shortcuts import redirect
+from django.shortcuts import redirect, render_to_response
+from django.template.loader import render_to_string
+from django.utils import timezone
+from django.utils.html import strip_tags
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from yandex_money.models import Payment
-from django.conf import settings
 
 from courses.api import CourseParamsApi
-from finance.models import Bill, Invoice
+from courses.models import Course
+from finance.loggers import FinanceLogger
+from finance.models import Bill, Invoice, InvoiceRebilling
 from finance.serializers import BillSerializer, InvoiceSerializer
 from lms.global_decorators import transaction_decorator
 from lms.tools import get_real_name
 
+finance_logger = FinanceLogger()  # prefix='YandexMoney'
+
+
+def test_pay(request):
+    return render_to_response('yandex/test_pay.html', context={
+        'shop_id': settings.YANDEX_MONEY_SHOP_ID,
+        'sc_id': settings.YANDEX_MONEY_TEST_SCID,
+        'order_number': str(uuid.uuid4())[:12],
+        'user_email': request.user.email if request.user.is_authenticated else 'user@domain.com'
+})
+
+
+class FreezeView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request, pk):
+        try:
+            bill = Bill.objects.get(id=pk)
+        except Bill.DoesNotExist:
+            return Response("Счёт не найден", status=404)
+
+        if request.user.is_authenticated and request.user.email == bill.user.email:
+            bill.freeze_course()
+            return Response(status=204)
+        return Response("Permission denied", status=403)
+
+
+class UnFreezeView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request, pk):
+        try:
+            bill = Bill.objects.get(id=pk)
+        except Bill.DoesNotExist:
+            return Response("Счёт не найден", status=404)
+
+        if request.user.is_authenticated and request.user.email == bill.user.email:
+            bill.unfreeze_course()
+            return Response(status=204)
+        return Response("Permission denied", status=403)
+
 
 class BillListView(APIView):
     renderer_classes = (JSONRenderer,)
@@ -35,52 +86,164 @@ class BillListView(APIView):
     def post(self, request):
         if request.user.is_authenticated and (request.user.groups.filter(name__in=['managers','lead_managers']).exists()
                                               or request.user.is_superuser):
-            bill = request.JSON.get('bill')
+            user = get_user_model().objects.get(email=request.JSON.get('user'))
-            children = request.JSON.get('children', [])
+            opener = get_user_model().objects.get(email=request.JSON.get('opener'))
-            bill_kwarg = dict()
+            description = request.JSON.get('description', None)
-
+            comment = request.JSON.get('comment', None)
-            if bill:
+            course_token = request.JSON.get('course_token', None)
-                bill_kwarg['user'] = get_user_model().objects.get(email=bill['user'])
+
-                bill_kwarg['opener'] = get_user_model().objects.get(email=bill['opener'])
+            if course_token is None:
-                bill_kwarg['description'] = bill['description']
+                return Response("Идентификатор курса не передан", status=400)
-                bill_kwarg['comment'] = bill['comment']
+
-                bill_kwarg['course_token'] = bill['course_token']
+            try:
-
+                bill_obj = Bill.objects.get(user=user, course_token=course_token)
-                bill_obj, is_create = Bill.objects.update_or_create(**bill_kwarg)
+            except Bill.DoesNotExist:
-                invoices = bill_obj.invoice_set.all()
+                try:
-
+                    bill_obj = Bill.objects.create(user=user, course_token=course_token)
-                for i in children:
+                except IntegrityError:
-                    i['method'] = get_real_name(elem=i['method'], array=Invoice.BILL_METHOD)
+                    return Response("У пользователя уже есть счёт на этот курс", status=400)
-                    i['status'] = get_real_name(elem=i['status'], array=Invoice.BILL_STATUSES)
+
-                    i['bill'] = bill_obj
+            bill_obj.opener = bill_obj.opener if opener is None else opener
-                    i['yandex_pay'] = None
+            bill_obj.description = bill_obj.description if description is None else description
-                    invoice, _is_create = Invoice.objects.update_or_create(**i)
+            bill_obj.comment = bill_obj.comment if comment is None else comment
-                    if i['method'] == 'Y':
+            bill_obj.save()
-                        yandex_pay, _is_create = Payment.objects.get_or_create(
+
-                            order_amount=i['price'],
+            return Response(bill_obj.id, status=200)
-                            order_number=invoice.id,
+
-                            shop_amount=invoice.real_price,
+        return Response("Ошибка доступа, возможно вы разлогинились из другой вкладки браузера", status=403)
-                            customer_number=bill_obj.user.id,
+
-                            user=bill_obj.user,
+
-                            cps_email=bill_obj.user.email,
+class InvoiceDetailView(APIView):
-                        )
+    renderer_classes = (JSONRenderer,)
-                        invoice.yandex_pay = yandex_pay
+
-                        invoice.save()
+    @staticmethod
-
+    def delete(request, invoice_id):
-                    invoices = [j for j in invoices if not j.id == invoice.id]
+
-
+        try:
-                [i.delete() for i in invoices]
+            i = Invoice.objects.get(id=invoice_id)
-
+            if not i.status == "F" and not (i.bill.check_pay() and i.is_open):
-                res = {
+                i.delete()
-                    "bill": BillSerializer(bill_obj).data,
+        except Invoice.DoesNotExist:
-                    "children": [InvoiceSerializer(i).data for i in bill_obj.invoice_set.all()],
+            pass
+
+        return Response(status=204)
+
+    @staticmethod
+    def post(request, invoice_id):
+        if request.user.is_authenticated and (request.user.groups.filter(name__in=['managers','lead_managers']).exists()
+                                              or request.user.is_superuser):
+            invoice_id = int(invoice_id)
+            bill_id = request.JSON.get('bill', None)
+            is_open = request.JSON.get('is_open', None)
+            method = request.JSON.get('method', None)
+            status = request.JSON.get('status', None)
+            price = request.JSON.get('price', None)
+            comment = request.JSON.get('comment', None)
+            real_price = request.JSON.get('real_price', None)
+            pay_count = int(request.JSON.get('pay_count', '1'))
+
+            if bill_id is None:
+                return Response("Не передан id счёта", status=400)
+
+            if is_open is None or method is None or status is None or price is None:
+                return Response("Не передан один из пораметров is_open, method, status, price", status=400)
+
+            try:
+                bill = Bill.objects.get(id=bill_id)
+            except Bill.DoesNotExist:
+                return Response('Не найден счёт с id=%s' % bill_id, status=404)
+
+            method = get_real_name(elem=method[0], array=Invoice.BILL_METHOD)
+            status = get_real_name(elem=status[0], array=Invoice.BILL_STATUSES)
+
+            if bill.check_validate(invoice_id) and is_open:
+                return Response("Уже есть платёж открывающий курс", status=400)
+
+            if pay_count > 1:
+                invoice = InvoiceRebilling.objects.create(
+                    bill=bill,
+                    method=method,
+                    status=status,
+                    is_open=is_open,
+                    rebilling_on=True,
+                )
+
+            else:
+                try:
+                    invoice = Invoice.objects.get(id=invoice_id)
+                except Invoice.DoesNotExist:
+                    if not invoice_id == 0:
+                        return Response("Платёж не найден", status=404)
+
+                    if bill.check_pay():
+                        return Response(
+                            "Нельзя добавить новый платёж, так как один из платежей по счёту уже оплачен", status=400)
+                    invoice = Invoice.objects.create(
+                        bill=bill,
+                        method=method,
+                        status=status,
+                        is_open=is_open,
+                    )
+
+            if invoice.status == "F":
+                return Response(InvoiceSerializer(invoice).data, status=200)
+
+            invoice.real_price = None
+            invoice.method = method
+            invoice.status = status
+
+            if invoice.status == "F":
+                #  TODO это никогда не выполнится
+                invoice.real_price = invoice.real_price if real_price is None else real_price
+
+            if bill.check_pay() and (invoice.price < price):
+                return Response("""Нельзя менять стоимость по счёту в большую сторону, 
+                                   когда один из платежей оплачен""", status=400)
+
+            invoice.price = price
+            invoice.is_open = is_open
+            invoice.comment = comment
+
+            if pay_count > 1:
+                invoice.create_child_pays(pay_count)
+
+            if invoice.method == 'Y' and invoice.yandex_pay is None:
+                yandex_pay = Payment(
+                    order_amount=invoice.price,
+                    shop_amount=0,
+                    customer_number=bill.user.id,
+                    user=bill.user,
+                    cps_email=bill.user.email,
+                )
+                if pay_count > 1:
+                    yandex_pay.shop_id = settings.YANDEX_MONEY_REBILLING_SHOP_ID
+                    yandex_pay.scid = settings.YANDEX_MONEY_REBILLING_SCID
+                yandex_pay.save()
+                invoice.yandex_pay = yandex_pay
+                invoice.send_link()
+
+                context = {
+                    'user_email': invoice.bill.user.email,
+                    'opener_full_name': invoice.bill.opener.get_full_name(),
+                    'course_title': Course.objects.get(token=invoice.bill.course_token).title,
+                    'date': str(invoice.date),
+                    'price': invoice.price,
                 }
 
-                return Response(res, status=200)
+                subject, to = 'Выставлен новый счёт', invoice.bill.opener.email
+
+                html_content = render_to_string('mail/sales/back_set_bill.html', context)
+                text_content = strip_tags(html_content)
+
+                msg = EmailMultiAlternatives(subject, text_content, to=[to], bcc=['dmitry.dolya@skillbox.ru'])
+                msg.attach_alternative(html_content, "text/html")
+                msg.send()
+
+            invoice.save()
 
-            return Response("Bill not set", status=400)
+            return Response(InvoiceSerializer(invoice).data, status=200)
 
-        return Response("Course detail access only for manager users", status=403)
+        return Response("Invoice detail access only for manager users", status=403)
 
 
 class BillDetailView(APIView):
@@ -121,7 +284,9 @@ class FindBillView(APIView):
 
             if key:
                 res = Bill.objects.filter(
-                    Q(opener__email__contains=key.lower()) | Q(user__email__contains=key.lower())
+                    Q(opener__email__contains=key.lower())
+                    | Q(user__email__contains=key.lower())
+                    | Q(id__contains=key)
                 )
 
             else:
@@ -144,6 +309,10 @@ class YandexPay(APIView):
     def get(request, pk):
         try:
             pay = Payment.objects.get(id=pk)
+            try:
+                inv = InvoiceRebilling.objects.get(yandex_pay=pay)
+            except InvoiceRebilling.DoesNotExist:
+                inv = None
             r = requests.post('https://money.yandex.ru/eshop.xml', data={
                 'shopId': pay.shop_id,
                 'scid': pay.scid,
@@ -151,9 +320,25 @@ class YandexPay(APIView):
                 'customerNumber': pay.customer_number,
                 'orderNumber': pay.order_number,
                 'cps_email': pay.cps_email,
+                'rebillingOn': False if inv is None else inv.rebilling_on,
                 'shopSuccessURL': settings.YANDEX_MONEY_SUCCESS_URL,
                 'shopFailURL': settings.YANDEX_MONEY_FAIL_URL,
             })
+
+            try:
+                msg = EmailMessage(
+                    'Пользователь перешёл на страницу оплаты.',
+                    '''Пользователь "%s" перешёл на страницу оплаты курса "%s".'''
+                    % (pay.invoice.bill.user.email, Course.objects.get(token=pay.invoice.bill.course_token).title),
+                    'robo@skillbox.ru',
+                    [pay.invoice.bill.opener.email],
+                    bcc=['dmitry.dolya@skillbox.ru'],
+                )
+
+                msg.send()
+            except Exception as exc:
+                finance_logger.exception('YandexPay: Email not sended')
+
             return redirect(r.url)
 
         except Payment.DoesNotExist:
@@ -172,8 +357,8 @@ def get_invoices(request):
     file_name = file_name + "__to_%s" % date_to if date_to else file_name
 
     invoices = Invoice.objects.filter(method="Y", status="F")
-    invoices = invoices.filter(date__lt=date_to) if date_to else invoices
+    invoices = invoices.filter(yandex_pay__performed_datetime__lt=date_to) if date_to else invoices
-    invoices = invoices.filter(date__gte=date_from) if date_from else invoices
+    invoices = invoices.filter(yandex_pay__performed_datetime__gte=date_from) if date_from else invoices
 
     response = HttpResponse(content_type='text/csv')
     response['Content-Disposition'] = 'attachment; filename="%s.csv"' % file_name
@@ -184,8 +369,8 @@ def get_invoices(request):
     for i in invoices.order_by('-date'):
         course_api = CourseParamsApi(i.bill.course_token)
         writer.writerow([
-            i.date.date(),
+            i.yandex_pay.performed_datetime.date(),
-            i.date.time(),
+            i.yandex_pay.performed_datetime.time(),
             i.bill.user.email,
             i.bill.user.get_full_name(),
             course_api.get_slug_and_title()['title'],
@@ -197,13 +382,113 @@ def get_invoices(request):
     return response
 
 
-class YandexSuccessView(APIView):
+class YandexCheckView(APIView):
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
-    def get(request):
+    def post(request):
-        logger.error('YandexSuccessView: {}'.format(request))
+        data = dict()
-        return Response(status=204)
+        #  TODO заюзать url.parse https://goo.gl/s8Ygos
+        for i in request.body.decode('utf-8').split('&'):
+            key = i.split('=')[0]
+            val = i.split('=')[1]
+            data[key] = val
+
+        finance_logger.info('Проверка платежа запрос', request=data)
+
+        order_number = data['orderNumber']
+        try:
+            pay = Payment.objects.get(order_number=order_number)
+        except Payment.DoesNotExist:
+            finance_logger.error('Ошибка проверки платежа', exc_info=True,
+                                 request="Payment with id=%s not found" % order_number)
+            return Response(status=204)
+
+        if not pay.status == Payment.STATUS.PROCESSED:
+            finance_logger.error('Ошибка проверки платежа',
+                                 order_number=order_number,
+                                 request="Payment with id=%s have status %s" % (order_number, pay.status))
+            return Response(status=204)
+
+        if not pay.shop_id == int(data['shopId']):
+            finance_logger.error('Ошибка проверки платежа',
+                                 request="ShopId=%s not match" % (data['shopId'],))
+            return Response(status=204)
+
+        if not pay.scid == int(data['scid']):
+            finance_logger.error('Ошибка проверки платежа',
+                                 request="scid=%s not match" % (data['scid'],))
+            return Response(status=204)
+
+        if not pay.order_amount == float(data['orderSumAmount']):
+            finance_logger.error('Ошибка проверки платежа',
+                request="Expected amount is %s received amount is %s" % (pay.order_amount, data['orderSumAmount']))
+            return Response(status=204)
+
+        now = timezone.now()
+        pay.performed_datetime = now.isoformat()
+        pay.save()
+
+        xml_res = """<checkOrderResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
+        """ % (pay.performed_datetime, str(data['invoiceId']), str(pay.shop_id))
+
+        finance_logger.info('Проверка платежа ответ', response=xml_res)
+
+        return HttpResponse(xml_res, content_type='application/xml')
+
+
+class YandexAvisoView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request):
+        data = dict()
+        for i in request.body.decode('utf-8').split('&'):
+            key = i.split('=')[0]
+            val = i.split('=')[1]
+            data[key] = val
+
+        finance_logger.info('Подтверждение платежа запрос', request=data)
+
+        order_number = data['orderNumber']
+        try:
+            pay = Payment.objects.get(order_number=order_number)
+        except Payment.DoesNotExist:
+            finance_logger.error('Ошибка подтверждения платежа', exc_info=True,
+                                 request="Payment with invoice_id=%s not found" % order_number)
+            return Response(status=204)
+
+        pay.shop_amount = data['shopSumAmount']
+        pay.status = Payment.STATUS.SUCCESS
+        now = timezone.now()
+        pay.performed_datetime = now.isoformat()
+        pay.save()
+        InvoiceRebilling.objects.filter(bill=pay.invoice.bill).update(key=data['invoiceId'])
+        xml_res = """<paymentAvisoResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
+                """ % (pay.performed_datetime, str(data['invoiceId']), str(pay.shop_id))
+
+        finance_logger.info('Подтверждение платежа ответ', response=xml_res)
+
+        context = {
+            'user_email': pay.invoice.bill.user.email,
+            'opener_full_name': pay.invoice.bill.opener.get_full_name(),
+            'course_title': Course.objects.get(token=pay.invoice.bill.course_token).title,
+            'date': str(pay.invoice.date),
+            'price': pay.invoice.price,
+            'finish_date': pay.performed_datetime,
+        }
+
+        subject, to = 'Счёт оплачен', pay.invoice.bill.opener.email
+
+        html_content = render_to_string('mail/sales/pay_access.html', context)
+        text_content = strip_tags(html_content)
+
+        msg = EmailMultiAlternatives(
+            subject, text_content, to=[to], bcc=['dmitry.dolya@skillbox.ru', 'vera.procenko@skillbox.ru'])
+        msg.attach_alternative(html_content, "text/html")
+        msg.send()
+
+        return HttpResponse(xml_res, content_type='application/xml')
 
 
 class YandexFailView(APIView):
@@ -211,5 +496,71 @@ class YandexFailView(APIView):
 
     @staticmethod
     def get(request):
-        logger.error('YandexFailView: {}'.format(request))
+        data = dict()
-        return Response(status=204)
+        for i in request.body.decode('utf-8').split('&'):
+            key = i.split('=')[0]
+            val = i.split('=')[1]
+            data[key] = val
+
+        finance_logger.error('YandexFailView', data=data)
+
+        return redirect(to=settings.DOMAIN)
+
+
+class DemoYandexCheckView(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def post(request):
+        # Деалем допущение, что customerNumber=abc1111111 иначе всё плохо
+        data = dict()
+        try:
+            for i in request.body.decode('utf-8').split('&'):
+                key = i.split('=')[0]
+                val = i.split('=')[1]
+                data[key] = val
+
+            finance_logger.info('Проверка демо платежа запрос', request=data)
+
+        except IndexError:
+            finance_logger.exception("Непредвиденная ошибка проверки тестогого платежа")
+            return Response(status=204)
+
+        now = timezone.now()
+        try:
+            if data['customerNumber'] == "abc000":
+                xml_res = """<checkOrderResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
+                    """ % (now.isoformat(), str(data['invoiceId']), str(data['shopId']))
+            else:
+                xml_res = """<checkOrderResponse performedDatetime="%s" code="100" invoiceId="%s" shopId="%s"
+                message="Неверный номер ордера"/>""" % (now.isoformat(), str(data['invoiceId']), str(data['shopId']))
+                finance_logger.warning("Ошибка проверки тестового платежа", response=xml_res)
+            return HttpResponse(xml_res, content_type='application/xml')
+        except KeyError:
+            finance_logger.exception('Ошибка в данных checkYandex')
+            return Response(status=204)
+
+
+class DemoYandexAvisoView(APIView):
+
+    @staticmethod
+    def post(request):
+        finance_logger.info('Начало тестирования avisoYandex')
+        data = dict()
+        for i in request.body.decode('utf-8').split('&'):
+            key = i.split('=')[0]
+            val = i.split('=')[1]
+            data[key] = val
+
+        now = timezone.now()
+        if float(data['orderSumAmount']) < 1001:
+            xml_res = """<paymentAvisoResponse performedDatetime="%s" code="0" invoiceId="%s" shopId="%s"/>
+                """ % (now.isoformat(), str(data['invoiceId']), str(data['shopId']))
+            finance_logger.info('Подтверждение демо платежа ответ', response=xml_res)
+
+        else:
+            xml_res = """<paymentAvisoResponse performedDatetime="%s" code="100" invoiceId="%s" shopId="%s"
+            message="Нам не позволяет совесть принять от вас более 1000 рублей"/
+            >""" % (now.isoformat(), str(data['invoiceId']), str(data['shopId']))
+            finance_logger.warning("Ошибка подтверждения тестогого платежа", response=xml_res)
+        return HttpResponse(xml_res, content_type='application/xml')

lms/celery.py

@@ -3,6 +3,8 @@ import os
 from celery import Celery
 from raven import Client
 from raven.contrib.celery import register_signal, register_logger_signal
+from celery.schedules import crontab
+
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'lms.settings')
@@ -13,11 +15,19 @@ app.config_from_object('django.conf:settings', namespace='CELERY')
 
 app.autodiscover_tasks()
 
-client = Client('http://caaea487274f4e23a9107862484c79f3:3d463ad4717942508536f7a659921950@sentry.skillbox.ru/3')
+client = Client('http://caaea487274f4e23a9107862484c79f3:3d463ad4717942508536f7a659921950@sentry.skillbox.ru/7')
 register_logger_signal(client)
 register_signal(client)
 
+app.conf.beat_schedule = {
+    'periodic_billing': {
+        # 'schedule': crontab(day_of_month='1', hour='1', minute='1'),  # заглушка на время отладки
+        'schedule': crontab(minute='0', hour='*/3',),
+        'task': 'finance.tasks.periodic_billing'
+    }
+}
+
 
 @app.task(bind=True)
 def debug_task(self):
-    print('Request: {0!r}'.format(self.request))
+    print('Request: {0!r}'.format(self.request))

lms/settings.py

@@ -5,27 +5,21 @@ import raven
 import environ
 import socket
 
+
 root = environ.Path(__file__) - 2
 env = environ.Env()
 
-MOD = os.environ.get('MOD', 'Dev')
-DEBUG = os.environ.get('DEBUG', 'False')
-
-if MOD == 'Test':
-    environ.Env.read_env(str(root) + '/config_app/settings/test.env')
-
-elif MOD == 'Dev':
-    environ.Env.read_env(str(root) + '/config_app/settings/dev.env')
 
-elif MOD == 'Prod':
+environ.Env.read_env(str(root) + '/config_app/settings/local.env')
-    environ.Env.read_env(str(root) + '/config_app/settings/prod.env')
 
-else:
+MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1')
-    raise ImportError('no such environ ' + MOD)
 
 EMAIL_CONFIG = env.email_url('EMAIL_URL',)
 vars().update(EMAIL_CONFIG)
 
+#TODO: Ответственый работник, который ставится в копию ко многим рассылкам, костыль
+SUPPORT_EMAIL = 'anastasiya.katyuhina@skillbox.ru'
+
 BROKER_URL = 'amqp://guest:guest@localhost:5672//'
 CELERY_RESULT_BACKEND = 'django-db'
 CELERY_CACHE_BACKEND = 'django-cache'
@@ -50,10 +44,17 @@ DOMAIN = 'https://go.skillbox.ru'
 
 YANDEX_MONEY_DEBUG = False
 YANDEX_MONEY_SCID = '149639'
+YANDEX_MONEY_TEST_SCID = '558146'
 YANDEX_MONEY_SHOP_ID = '157133'
+
+#Todo костыль на рассрочку
+YANDEX_MONEY_REBILLING_SCID = '723030'
+YANDEX_MONEY_REBILLING_SHOP_ID = '199287'
+
 YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise'
-YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/fail/' % DOMAIN
+YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/yandex/fail/' % DOMAIN
-YANDEX_MONEY_SUCCESS_URL = '%s/api/v1/finance/success/' % DOMAIN
+YANDEX_MONEY_SUCCESS_URL = '%s/' % DOMAIN
+YANDEX_MONEY_MWS_URL = 'https://penelope.yamoney.ru/webservice/mws/api/'
 # информировать о случаях, когда модуль вернул Яндекс.Кассе ошибку
 YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True
 # Application definition
@@ -65,6 +66,8 @@ DATABASES = {
     'default': env.db(),
 }
 
+COURSE_PROGRESS_SECRET_KEY = "!gf?s3@4Hr5#J#&%Kfr@56s"
+
 SESSION_ENGINE = 'redis_sessions.session'
 CELERY_EMAIL_CHUNK_SIZE = 1
 
@@ -119,7 +122,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     #'access.middleware.CheckPerm',
     'access.middleware.RequestToApi',
-    # 'access.middleware.UpdateActivity',
+    'access.middleware.UpdateActivity',
 ]
 
 REST_FRAMEWORK = {
@@ -185,6 +188,8 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 STATIC_URL = '/static/'
 
+SSL_ROOT = os.path.join(BASE_DIR, 'ssl')
+
 RAVEN_CONFIG = {
     'dsn': 'http://1a09557dbd144e52af4b14bea569c114:fbb5dfaa39e64f02a1b4cc7ac665d7d7@sentry.skillbox.ru/7'
 }
@@ -201,31 +206,51 @@ LOGGING = {
             'format': '%(levelname)s %(asctime)s %(module)s '
                       '%(process)d %(thread)d %(message)s'
         },
+        'finance_data_formatter': {
+            'format': '%(asctime)s - %(levelname)s - %(message)s - %(finance_data)s'
+        },
     },
     'handlers': {
         'sentry': {
-            'level': 'WARNING', # To capture more than ERROR, change to WARNING, INFO, etc.
+            'level': 'WARNING',  # To capture more than ERROR, change to WARNING, INFO, etc.
             'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
             'tags': {'custom-tag': 'x'},
         },
-        'yandex_money': {
+        'finance_data': {
             'level': 'DEBUG',
             'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-            'tags': {'custom-tag': 'yandex'},
+            'tags': {'custom-tag': 'yandex'},  # TODO переделать на finance_data
+        },
+        'finance_data_file': {
+            'level': 'INFO',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(BASE_DIR, 'logs', 'finance_data.log'),
+            'maxBytes': 1024 * 1024 * 10,
+            'formatter': 'finance_data_formatter'
+        },
+        'business_rules': {
+            'level': 'DEBUG',
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
+            'tags': {'custom-tag': 'business_rules'},
         },
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
             'formatter': 'verbose'
-        }
+        },
     },
     'loggers': {
         '': {
             'level': 'WARNING',
             'handlers': ['sentry'],
         },
-        'yandex_money': {
+        'finance_data': {
-            'handlers': ['yandex_money'],
+            'handlers': ['finance_data', 'finance_data_file', ],
+            'level': 'DEBUG',
+            'propagate': False
+        },
+        'business_rules': {
+            'handlers': ['business_rules'],
             'level': 'DEBUG',
             'propagate': False
         },
@@ -250,3 +275,5 @@ SWAGGER_SETTINGS = {
     'JSON_EDITOR': True,
     'DOC_EXPANSION': 'list'
 }
+
+IMAGE_SAMPLES_DIR = os.path.join(BASE_DIR, 'tests', 'fixtures', 'images')

lms/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.views.static import serve
-from yandex_money.views import CheckOrderFormView, NoticeFormView
+from finance.views import YandexCheckView, YandexAvisoView, DemoYandexCheckView, DemoYandexAvisoView
 
 from django.conf import settings
 
@@ -10,7 +10,9 @@ urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^media/(?P<path>.*)/$', serve, {'document_root': settings.MEDIA_ROOT}),
     url(r'^static/(?P<path>.*)/$', serve, {'document_root': settings.STATIC_ROOT}),
-    url(r'^wallet/pay/check/$', CheckOrderFormView.as_view(), name='yandex_money_check'),
+    url(r'^wallet/pay/check/$', YandexCheckView.as_view(), name='yandex_money_check'),
-    url(r'^wallet/pay/result/$', NoticeFormView.as_view(), name='yandex_money_notice'),
+    url(r'^wallet/pay/result/$', YandexAvisoView.as_view(), name='yandex_money_notice'),
-    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
+    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    url(r'^yandex-money/check/$', DemoYandexCheckView.as_view()),
+    url(r'^yandex-money/aviso/$', DemoYandexAvisoView.as_view())
 ]

logs/celery.log

@@ -1,520 +0,0 @@
-[2017-10-20 13:12:58,041: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 13:12:58,049: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 13:12:59,065: INFO/MainProcess] mingle: all alone
-[2017-10-20 13:12:59,110: WARNING/MainProcess] /home/andrey/skillbox/lib/python3.6/site-packages/celery/fixups/django.py:202: UserWarning: Using settings.DEBUG leads to a memory leak, never use this setting in production environments!
-  warnings.warn('Using settings.DEBUG leads to a memory leak, never '
-[2017-10-20 13:12:59,113: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 13:13:02,946: INFO/MainProcess] Events of group {task} enabled by remote.
-[2017-10-20 13:17:23,104: INFO/MainProcess] Received task: lms.celery.debug_task[e7d9bdc2-a3a8-44b2-b3c6-935acfa092d7]  
-[2017-10-20 13:17:23,106: WARNING/ForkPoolWorker-2] Request: <Context: {'lang': 'py', 'task': 'lms.celery.debug_task', 'id': 'e7d9bdc2-a3a8-44b2-b3c6-935acfa092d7', 'eta': None, 'expires': None, 'group': None, 'retries': 0, 'timelimit': [None, None], 'root_id': 'e7d9bdc2-a3a8-44b2-b3c6-935acfa092d7', 'parent_id': None, 'argsrepr': '()', 'kwargsrepr': '{}', 'origin': 'gen13641@andrey-desktop', 'reply_to': 'b8c6ce7f-8ee0-35c7-ad70-026ad2f36d4a', 'correlation_id': 'e7d9bdc2-a3a8-44b2-b3c6-935acfa092d7', 'delivery_info': {'exchange': '', 'routing_key': 'celery', 'priority': 0, 'redelivered': False}, 'args': [], 'kwargs': {}, 'hostname': 'celery@andrey-desktop', 'is_eager': False, 'callbacks': None, 'errbacks': None, 'chain': None, 'chord': None, 'called_directly': False, '_protected': 1}>
-[2017-10-20 13:17:23,124: INFO/ForkPoolWorker-2] Task lms.celery.debug_task[e7d9bdc2-a3a8-44b2-b3c6-935acfa092d7] succeeded in 0.018874458000027516s: None
-[2017-10-20 13:17:29,057: INFO/MainProcess] Received task: lms.celery.debug_task[88f178fc-7222-4de0-b671-57e7472a9be1]  
-[2017-10-20 13:17:29,059: WARNING/ForkPoolWorker-1] Request: <Context: {'lang': 'py', 'task': 'lms.celery.debug_task', 'id': '88f178fc-7222-4de0-b671-57e7472a9be1', 'eta': None, 'expires': None, 'group': None, 'retries': 0, 'timelimit': [None, None], 'root_id': '88f178fc-7222-4de0-b671-57e7472a9be1', 'parent_id': None, 'argsrepr': '()', 'kwargsrepr': '{}', 'origin': 'gen13641@andrey-desktop', 'reply_to': 'b8c6ce7f-8ee0-35c7-ad70-026ad2f36d4a', 'correlation_id': '88f178fc-7222-4de0-b671-57e7472a9be1', 'delivery_info': {'exchange': '', 'routing_key': 'celery', 'priority': 0, 'redelivered': False}, 'args': [], 'kwargs': {}, 'hostname': 'celery@andrey-desktop', 'is_eager': False, 'callbacks': None, 'errbacks': None, 'chain': None, 'chord': None, 'called_directly': False, '_protected': 1}>
-[2017-10-20 13:17:29,081: INFO/ForkPoolWorker-1] Task lms.celery.debug_task[88f178fc-7222-4de0-b671-57e7472a9be1] succeeded in 0.022606980999626103s: None
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 13:12:57
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f47cb927be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 13:32:32,128: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 13:32:32,135: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 13:32:33,150: INFO/MainProcess] mingle: all alone
-[2017-10-20 13:32:33,201: WARNING/MainProcess] /home/andrey/skillbox/lib/python3.6/site-packages/celery/fixups/django.py:202: UserWarning: Using settings.DEBUG leads to a memory leak, never use this setting in production environments!
-  warnings.warn('Using settings.DEBUG leads to a memory leak, never '
-[2017-10-20 13:32:33,202: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 13:32:36,911: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 13:32:32
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f34afe2fbe0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 13:38:00,333: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 13:38:00,341: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 13:38:01,361: INFO/MainProcess] mingle: all alone
-[2017-10-20 13:38:01,408: WARNING/MainProcess] /home/andrey/skillbox/lib/python3.6/site-packages/celery/fixups/django.py:202: UserWarning: Using settings.DEBUG leads to a memory leak, never use this setting in production environments!
-  warnings.warn('Using settings.DEBUG leads to a memory leak, never '
-[2017-10-20 13:38:01,409: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 13:38:05,171: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 13:38:00
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7fd8781acbe0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 13:47:50,974: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 13:47:50,985: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 13:47:52,012: INFO/MainProcess] mingle: all alone
-[2017-10-20 13:47:52,069: WARNING/MainProcess] /home/andrey/skillbox/lib/python3.6/site-packages/celery/fixups/django.py:202: UserWarning: Using settings.DEBUG leads to a memory leak, never use this setting in production environments!
-  warnings.warn('Using settings.DEBUG leads to a memory leak, never '
-[2017-10-20 13:47:52,069: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 13:47:56,047: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 13:47:50
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7fc6511c1b70
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 14:42:47,658: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 14:42:47,664: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 14:42:48,682: INFO/MainProcess] mingle: all alone
-[2017-10-20 14:42:48,727: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 14:42:52,394: INFO/MainProcess] Events of group {task} enabled by remote.
-[2017-10-20 14:47:53,063: INFO/MainProcess] Tasks flagged as revoked: ff8246ff-1904-47da-ac57-1a844272c826
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 14:42:47
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f89a2228be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 14:56:43,024: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 14:56:43,031: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 14:56:44,048: INFO/MainProcess] mingle: all alone
-[2017-10-20 14:56:44,112: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 14:56:47,869: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 14:56:42
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f4f0c601be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 15:14:13,071: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 15:14:13,086: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 15:14:14,109: INFO/MainProcess] mingle: all alone
-[2017-10-20 15:14:14,123: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 15:14:18,076: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 15:14:12
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7fd94e575b70
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 15:18:26,330: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 15:18:26,337: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 15:18:27,355: INFO/MainProcess] mingle: all alone
-[2017-10-20 15:18:27,417: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 15:18:31,190: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 15:18:26
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f4b2ac05be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 15:31:17,246: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 15:31:17,253: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 15:31:18,269: INFO/MainProcess] mingle: all alone
-[2017-10-20 15:31:18,311: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 15:31:22,075: INFO/MainProcess] Events of group {task} enabled by remote.
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 15:31:17
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f2e6cc96be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send_multiple
-  . lms.celery.debug_task
-
-[2017-10-20 16:52:27,050: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-20 16:52:27,057: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-20 16:52:28,074: INFO/MainProcess] mingle: all alone
-[2017-10-20 16:52:28,128: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-20 16:52:31,818: INFO/MainProcess] Events of group {task} enabled by remote.
-[2017-10-20 17:00:17,556: INFO/MainProcess] Received task: djcelery_email_send[8735440e-9760-43c7-b84c-c6efdac4e64d]  
-[2017-10-20 17:00:19,202: INFO/ForkPoolWorker-2] Task djcelery_email_send[8735440e-9760-43c7-b84c-c6efdac4e64d] succeeded in 1.4465199199985364s: 1
-[2017-10-20 17:39:12,619: INFO/MainProcess] Received task: djcelery_email_send[243eb7a2-b4e0-4221-8ab2-c83c94d8f241]  
-[2017-10-20 17:39:14,523: INFO/ForkPoolWorker-1] Task djcelery_email_send[243eb7a2-b4e0-4221-8ab2-c83c94d8f241] succeeded in 1.4357735300000058s: 1
-[2017-10-20 17:40:33,125: INFO/MainProcess] Received task: djcelery_email_send[863adc65-6bf5-4a1d-a2b9-91ebb9737520]  
-[2017-10-20 17:40:34,548: INFO/ForkPoolWorker-2] Task djcelery_email_send[863adc65-6bf5-4a1d-a2b9-91ebb9737520] succeeded in 1.3558088320023671s: 1
-[2017-10-20 17:42:16,950: INFO/MainProcess] Received task: djcelery_email_send[a60b5727-8d77-49f8-8008-82ae064ed682]  
-[2017-10-20 17:42:18,493: INFO/ForkPoolWorker-1] Task djcelery_email_send[a60b5727-8d77-49f8-8008-82ae064ed682] succeeded in 1.1552653329999885s: 1
-[2017-10-20 17:57:36,541: INFO/MainProcess] Received task: djcelery_email_send[8184ca5f-b2e2-42ee-a096-b3c2ecf152e2]  
-[2017-10-20 17:57:37,905: INFO/ForkPoolWorker-2] Task djcelery_email_send[8184ca5f-b2e2-42ee-a096-b3c2ecf152e2] succeeded in 1.251813505001337s: 1
-[2017-10-20 19:20:51,999: WARNING/MainProcess] consumer: Connection to broker lost. Trying to re-establish the connection...
-Traceback (most recent call last):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 320, in start
-    blueprint.start(self)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/bootsteps.py", line 119, in start
-    step.start(parent)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 596, in start
-    c.loop(*c.loop_args())
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/loops.py", line 88, in asynloop
-    next(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/async/hub.py", line 354, in create_loop
-    cb(*cbargs)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 236, in on_readable
-    reader(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 218, in _read
-    drain_events(timeout=0)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 471, in drain_events
-    while not self.blocking_read(timeout):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 477, in blocking_read
-    return self.on_inbound_frame(frame)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 55, in on_frame
-    callback(channel, method_sig, buf, None)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 481, in on_inbound_method
-    method_sig, payload, content,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 128, in dispatch_method
-    listener(*args)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 603, in _on_close
-    (class_id, method_id), ConnectionError)
-amqp.exceptions.ConnectionForced: (0, 0): (320) CONNECTION_FORCED - broker forced connection closure with reason 'shutdown'
-[2017-10-20 19:20:52,012: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 2.00 seconds...
-
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-20 16:52:26
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7fe25f735be0
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send
-  . lms.celery.debug_task
-
-[2017-10-23 08:32:22,988: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-23 08:32:22,998: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-23 08:32:24,013: INFO/MainProcess] mingle: all alone
-[2017-10-23 08:32:24,021: INFO/MainProcess] celery@andrey-desktop ready.
-[2017-10-23 08:32:27,769: INFO/MainProcess] Events of group {task} enabled by remote.
-[2017-10-23 11:42:09,222: INFO/MainProcess] Received task: djcelery_email_send[54f16e2a-a437-4000-850f-0bf29ff758b8]  
-[2017-10-23 11:42:10,844: INFO/ForkPoolWorker-2] Task djcelery_email_send[54f16e2a-a437-4000-850f-0bf29ff758b8] succeeded in 1.4740454479997425s: 1
-[2017-10-23 11:44:36,901: INFO/MainProcess] Received task: djcelery_email_send[2ef60ead-2523-4bf8-b117-366bb120359d]  
-[2017-10-23 11:44:39,194: INFO/ForkPoolWorker-1] Task djcelery_email_send[2ef60ead-2523-4bf8-b117-366bb120359d] succeeded in 1.4229817790001107s: 1
-[2017-10-23 11:45:49,202: INFO/MainProcess] Received task: djcelery_email_send[3e60e35a-c846-4f37-bd88-1d92afc9dcac]  
-[2017-10-23 11:45:50,624: INFO/ForkPoolWorker-2] Task djcelery_email_send[3e60e35a-c846-4f37-bd88-1d92afc9dcac] succeeded in 1.1725643370009493s: 1
-[2017-10-23 11:47:18,371: INFO/MainProcess] Received task: djcelery_email_send[4530e853-0db4-499d-8a65-7128121ee5bc]  
-[2017-10-23 11:47:20,136: INFO/ForkPoolWorker-1] Task djcelery_email_send[4530e853-0db4-499d-8a65-7128121ee5bc] succeeded in 1.3828427380012727s: 1
-[2017-10-23 11:56:05,834: INFO/MainProcess] Received task: djcelery_email_send[9fc201ce-f3ec-40af-9dd1-bf998f34a57d]  
-[2017-10-23 11:56:08,831: INFO/ForkPoolWorker-2] Task djcelery_email_send[9fc201ce-f3ec-40af-9dd1-bf998f34a57d] succeeded in 1.293271452001136s: 1
-[2017-10-23 11:59:57,509: INFO/MainProcess] Received task: djcelery_email_send[7945e9d6-ef7c-4e19-9c59-422100ac9f73]  
-[2017-10-23 11:59:58,959: INFO/ForkPoolWorker-1] Task djcelery_email_send[7945e9d6-ef7c-4e19-9c59-422100ac9f73] succeeded in 1.1895115009992878s: 1
-[2017-10-23 12:08:24,457: INFO/MainProcess] Received task: djcelery_email_send[f0968ae1-8fbd-4d2c-905a-2ecf445aa10e]  
-[2017-10-23 12:08:25,890: INFO/ForkPoolWorker-2] Task djcelery_email_send[f0968ae1-8fbd-4d2c-905a-2ecf445aa10e] succeeded in 1.3443215190000046s: 1
-[2017-10-23 12:20:29,414: INFO/MainProcess] Received task: djcelery_email_send[4438a0d4-228c-40a9-b91d-612f82ea791b]  
-[2017-10-23 12:20:31,027: INFO/ForkPoolWorker-1] Task djcelery_email_send[4438a0d4-228c-40a9-b91d-612f82ea791b] succeeded in 1.452125650999733s: 1
-[2017-10-23 12:21:31,101: INFO/MainProcess] Received task: djcelery_email_send[c3793dcb-e5f9-42bd-83b2-dd94f166c741]  
-[2017-10-23 12:21:32,804: INFO/ForkPoolWorker-2] Task djcelery_email_send[c3793dcb-e5f9-42bd-83b2-dd94f166c741] succeeded in 1.1413313480006764s: 1
-[2017-10-23 12:38:27,027: INFO/MainProcess] Received task: djcelery_email_send[ea55b25a-8e6d-4e88-8b18-52d561bd7c95]  
-[2017-10-23 12:38:28,225: INFO/ForkPoolWorker-1] Task djcelery_email_send[ea55b25a-8e6d-4e88-8b18-52d561bd7c95] succeeded in 1.150906519000273s: 1
-[2017-10-23 13:47:05,338: INFO/MainProcess] Received task: djcelery_email_send[b05bd9eb-848d-49b6-9725-d190e256527e]  
-[2017-10-23 13:47:08,582: INFO/ForkPoolWorker-2] Task djcelery_email_send[b05bd9eb-848d-49b6-9725-d190e256527e] succeeded in 1.5058496720012045s: 1
-[2017-10-23 13:48:09,314: INFO/MainProcess] Received task: djcelery_email_send[fe0bd44a-f23e-476b-a447-c03d8b5bb266]  
-[2017-10-23 13:48:12,620: INFO/ForkPoolWorker-1] Task djcelery_email_send[fe0bd44a-f23e-476b-a447-c03d8b5bb266] succeeded in 1.340003754998179s: 1
-[2017-10-23 14:36:33,382: INFO/MainProcess] Received task: djcelery_email_send[33418ad8-1f87-4a6f-ba11-a2fc0f52374a]  
-[2017-10-23 14:36:35,323: INFO/ForkPoolWorker-2] Task djcelery_email_send[33418ad8-1f87-4a6f-ba11-a2fc0f52374a] succeeded in 1.3137642000001506s: 1
-[2017-10-23 14:36:49,212: INFO/MainProcess] Received task: djcelery_email_send[5f3beb45-7d03-447a-be90-41506efb897b]  
-[2017-10-23 14:36:51,271: INFO/ForkPoolWorker-1] Task djcelery_email_send[5f3beb45-7d03-447a-be90-41506efb897b] succeeded in 1.23961846200109s: 1
-[2017-10-23 14:46:42,199: INFO/MainProcess] Received task: djcelery_email_send[69d6f018-e571-4d65-93a4-151fa78361ae]  
-[2017-10-23 14:46:44,060: INFO/ForkPoolWorker-2] Task djcelery_email_send[69d6f018-e571-4d65-93a4-151fa78361ae] succeeded in 1.2866839900016203s: 1
-[2017-10-23 14:55:56,121: WARNING/MainProcess] consumer: Connection to broker lost. Trying to re-establish the connection...
-Traceback (most recent call last):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 320, in start
-    blueprint.start(self)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/bootsteps.py", line 119, in start
-    step.start(parent)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 596, in start
-    c.loop(*c.loop_args())
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/loops.py", line 88, in asynloop
-    next(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/async/hub.py", line 354, in create_loop
-    cb(*cbargs)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 236, in on_readable
-    reader(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 218, in _read
-    drain_events(timeout=0)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 471, in drain_events
-    while not self.blocking_read(timeout):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 477, in blocking_read
-    return self.on_inbound_frame(frame)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 55, in on_frame
-    callback(channel, method_sig, buf, None)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 481, in on_inbound_method
-    method_sig, payload, content,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 128, in dispatch_method
-    listener(*args)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 601, in _on_close
-    self._x_close_ok()
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 616, in _x_close_ok
-    self.send_method(spec.Connection.CloseOk, callback=self._on_close_ok)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 50, in send_method
-    conn.frame_writer(1, self.channel_id, sig, args, content)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 166, in write_frame
-    write(view[:offset])
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/transport.py", line 258, in write
-    self._write(s)
-ConnectionResetError: [Errno 104] Connection reset by peer
-[2017-10-23 14:55:56,137: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 2.00 seconds...
-
-[2017-10-23 14:55:58,150: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 4.00 seconds...
-
-[2017-10-23 14:56:02,176: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 6.00 seconds...
-
-[2017-10-23 14:56:08,193: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 8.00 seconds...
-
-[2017-10-23 14:56:16,210: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 10.00 seconds...
-
-[2017-10-23 14:56:26,228: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-23 14:56:26,237: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-23 14:56:26,241: WARNING/MainProcess] consumer: Connection to broker lost. Trying to re-establish the connection...
-Traceback (most recent call last):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 320, in start
-    blueprint.start(self)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/bootsteps.py", line 119, in start
-    step.start(parent)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/mingle.py", line 38, in start
-    self.sync(c)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/mingle.py", line 42, in sync
-    replies = self.send_hello(c)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/mingle.py", line 55, in send_hello
-    replies = inspect.hello(c.hostname, our_revoked._data) or {}
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/control.py", line 129, in hello
-    return self._request('hello', from_node=from_node, revoked=revoked)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/control.py", line 81, in _request
-    timeout=self.timeout, reply=True,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/control.py", line 436, in broadcast
-    limit, callback, channel=channel,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/pidbox.py", line 315, in _broadcast
-    serializer=serializer)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/pidbox.py", line 290, in _publish
-    serializer=serializer,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/messaging.py", line 181, in publish
-    exchange_name, declare,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/messaging.py", line 203, in _publish
-    mandatory=mandatory, immediate=immediate,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/channel.py", line 1734, in _basic_publish
-    (0, exchange, routing_key, mandatory, immediate), msg
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 50, in send_method
-    conn.frame_writer(1, self.channel_id, sig, args, content)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 166, in write_frame
-    write(view[:offset])
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/transport.py", line 258, in write
-    self._write(s)
-ConnectionResetError: [Errno 104] Connection reset by peer
-[2017-10-23 14:56:26,250: INFO/MainProcess] Connected to amqp://guest:**@127.0.0.1:5672//
-[2017-10-23 14:56:26,256: INFO/MainProcess] mingle: searching for neighbors
-[2017-10-23 14:56:27,273: INFO/MainProcess] mingle: all alone
-[2017-10-23 14:56:27,310: INFO/MainProcess] Received task: djcelery_email_send[455cf8cb-b29f-4159-a81b-b33e5dbee1f3]  
-[2017-10-23 14:56:28,959: INFO/ForkPoolWorker-2] Task djcelery_email_send[455cf8cb-b29f-4159-a81b-b33e5dbee1f3] succeeded in 1.1903551169998536s: 1
-[2017-10-23 18:52:13,477: INFO/MainProcess] Received task: djcelery_email_send[0fb5c171-4123-47fa-8089-823904fde5fd]  
-[2017-10-23 18:52:16,661: INFO/ForkPoolWorker-1] Task djcelery_email_send[0fb5c171-4123-47fa-8089-823904fde5fd] succeeded in 1.222238110996841s: 1
-[2017-10-23 19:05:28,619: WARNING/MainProcess] consumer: Connection to broker lost. Trying to re-establish the connection...
-Traceback (most recent call last):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 320, in start
-    blueprint.start(self)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/bootsteps.py", line 119, in start
-    step.start(parent)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/consumer/consumer.py", line 596, in start
-    c.loop(*c.loop_args())
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/worker/loops.py", line 88, in asynloop
-    next(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/async/hub.py", line 354, in create_loop
-    cb(*cbargs)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 236, in on_readable
-    reader(loop)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/kombu/transport/base.py", line 218, in _read
-    drain_events(timeout=0)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 471, in drain_events
-    while not self.blocking_read(timeout):
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 477, in blocking_read
-    return self.on_inbound_frame(frame)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 55, in on_frame
-    callback(channel, method_sig, buf, None)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 481, in on_inbound_method
-    method_sig, payload, content,
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 128, in dispatch_method
-    listener(*args)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 601, in _on_close
-    self._x_close_ok()
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/connection.py", line 616, in _x_close_ok
-    self.send_method(spec.Connection.CloseOk, callback=self._on_close_ok)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/abstract_channel.py", line 50, in send_method
-    conn.frame_writer(1, self.channel_id, sig, args, content)
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/method_framing.py", line 166, in write_frame
-    write(view[:offset])
-  File "/home/andrey/skillbox/lib/python3.6/site-packages/amqp/transport.py", line 258, in write
-    self._write(s)
-ConnectionResetError: [Errno 104] Connection reset by peer
-[2017-10-23 19:05:28,624: ERROR/MainProcess] consumer: Cannot connect to amqp://guest:**@127.0.0.1:5672//: [Errno 111] Connection refused.
-Trying again in 2.00 seconds...
-
-
-worker: Warm shutdown (MainProcess)
- 
- -------------- celery@andrey-desktop v4.1.0 (latentcall)
----- **** ----- 
---- * ***  * -- Linux-4.10.0-37-generic-x86_64-with-Ubuntu-16.04-xenial 2017-10-23 08:32:22
--- * - **** --- 
-- ** ---------- [config]
-- ** ---------- .> app:         lms:0x7f574ff21ba8
-- ** ---------- .> transport:   amqp://guest:**@localhost:5672//
-- ** ---------- .> results:     
-- *** --- * --- .> concurrency: 4 (prefork)
--- ******* ---- .> task events: OFF (enable -E to monitor tasks in this worker)
---- ***** ----- 
- -------------- [queues]
-                .> celery           exchange=celery(direct) key=celery
-                
-
-[tasks]
-  . djcelery_email_send
-  . lms.celery.debug_task
-

logs/flower.log

@@ -1,623 +0,0 @@
-[E 171020 13:12:57 signal:232] Signal handler <promise@0x7f84e8f79678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f84e711bbe0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 13:12:57 command:139] Visit me at http://localhost:5555
-[I 171020 13:12:57 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 13:12:57 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 13:12:57 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 13:13:00 control:44] 'stats' inspect method failed
-[W 171020 13:13:00 control:44] 'active_queues' inspect method failed
-[W 171020 13:13:00 control:44] 'registered' inspect method failed
-[W 171020 13:13:00 control:44] 'scheduled' inspect method failed
-[W 171020 13:13:00 control:44] 'active' inspect method failed
-[W 171020 13:13:00 control:44] 'reserved' inspect method failed
-[W 171020 13:13:00 control:44] 'revoked' inspect method failed
-[W 171020 13:13:00 control:44] 'conf' inspect method failed
-[I 171020 13:32:28 command:47] SIGTERM detected, shutting down
-[E 171020 13:32:31 signal:232] Signal handler <promise@0x7f72af4b2678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f72ad655b70>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 13:32:31 command:139] Visit me at http://localhost:5555
-[I 171020 13:32:31 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 13:32:31 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 13:32:31 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 13:32:34 control:44] 'stats' inspect method failed
-[W 171020 13:32:34 control:44] 'active_queues' inspect method failed
-[W 171020 13:32:34 control:44] 'registered' inspect method failed
-[W 171020 13:32:34 control:44] 'scheduled' inspect method failed
-[W 171020 13:32:34 control:44] 'active' inspect method failed
-[W 171020 13:32:34 control:44] 'reserved' inspect method failed
-[W 171020 13:32:34 control:44] 'revoked' inspect method failed
-[W 171020 13:32:34 control:44] 'conf' inspect method failed
-[I 171020 13:37:56 command:47] SIGTERM detected, shutting down
-[E 171020 13:38:00 signal:232] Signal handler <promise@0x7f00bb71c678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f00b98bebe0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 13:38:00 command:139] Visit me at http://localhost:5555
-[I 171020 13:38:00 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 13:38:00 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 13:38:00 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 13:38:02 control:44] 'stats' inspect method failed
-[W 171020 13:38:02 control:44] 'active_queues' inspect method failed
-[W 171020 13:38:02 control:44] 'registered' inspect method failed
-[W 171020 13:38:02 control:44] 'scheduled' inspect method failed
-[W 171020 13:38:02 control:44] 'active' inspect method failed
-[W 171020 13:38:02 control:44] 'reserved' inspect method failed
-[W 171020 13:38:02 control:44] 'revoked' inspect method failed
-[W 171020 13:38:02 control:44] 'conf' inspect method failed
-[I 171020 13:47:47 command:47] SIGTERM detected, shutting down
-[E 171020 13:47:51 signal:232] Signal handler <promise@0x7f7efbb18678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f7ef9cbabe0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 13:47:51 command:139] Visit me at http://localhost:5555
-[I 171020 13:47:51 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 13:47:51 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 13:47:51 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 13:47:53 control:44] 'stats' inspect method failed
-[W 171020 13:47:53 control:44] 'active_queues' inspect method failed
-[W 171020 13:47:53 control:44] 'registered' inspect method failed
-[W 171020 13:47:53 control:44] 'scheduled' inspect method failed
-[I 171020 14:42:44 command:47] SIGTERM detected, shutting down
-[E 171020 14:42:47 signal:232] Signal handler <promise@0x7f9b93353678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f9b914f5be0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 14:42:47 command:139] Visit me at http://localhost:5555
-[I 171020 14:42:47 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 14:42:47 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 14:42:47 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 14:42:49 control:44] 'stats' inspect method failed
-[W 171020 14:42:49 control:44] 'active_queues' inspect method failed
-[W 171020 14:42:49 control:44] 'registered' inspect method failed
-[W 171020 14:42:49 control:44] 'scheduled' inspect method failed
-[W 171020 14:42:49 control:44] 'active' inspect method failed
-[W 171020 14:42:49 control:44] 'reserved' inspect method failed
-[W 171020 14:42:49 control:44] 'revoked' inspect method failed
-[W 171020 14:42:49 control:44] 'conf' inspect method failed
-[I 171020 14:56:39 command:47] SIGTERM detected, shutting down
-[E 171020 14:56:42 signal:232] Signal handler <promise@0x7f15cad6f678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f15c8f11be0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 14:56:42 command:139] Visit me at http://localhost:5555
-[I 171020 14:56:42 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 14:56:42 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 14:56:42 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 14:56:45 control:44] 'stats' inspect method failed
-[W 171020 14:56:45 control:44] 'active_queues' inspect method failed
-[W 171020 14:56:45 control:44] 'registered' inspect method failed
-[W 171020 14:56:45 control:44] 'scheduled' inspect method failed
-[W 171020 14:56:45 control:44] 'active' inspect method failed
-[W 171020 14:56:45 control:44] 'reserved' inspect method failed
-[W 171020 14:56:45 control:44] 'revoked' inspect method failed
-[W 171020 14:56:45 control:44] 'conf' inspect method failed
-[I 171020 15:14:09 command:47] SIGTERM detected, shutting down
-[E 171020 15:14:13 signal:232] Signal handler <promise@0x7f60e14ab678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f60df64dbe0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 15:14:13 command:139] Visit me at http://localhost:5555
-[I 171020 15:14:13 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 15:14:13 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 15:14:13 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 15:14:15 control:44] 'stats' inspect method failed
-[W 171020 15:14:15 control:44] 'active_queues' inspect method failed
-[W 171020 15:14:15 control:44] 'registered' inspect method failed
-[W 171020 15:14:15 control:44] 'scheduled' inspect method failed
-[I 171020 15:18:22 command:47] SIGTERM detected, shutting down
-[E 171020 15:18:26 signal:232] Signal handler <promise@0x7ff7eb19f678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7ff7e9341b70>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 15:18:26 command:139] Visit me at http://localhost:5555
-[I 171020 15:18:26 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 15:18:26 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 15:18:26 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 15:18:28 control:44] 'stats' inspect method failed
-[W 171020 15:18:28 control:44] 'active_queues' inspect method failed
-[W 171020 15:18:28 control:44] 'registered' inspect method failed
-[W 171020 15:18:28 control:44] 'scheduled' inspect method failed
-[W 171020 15:18:28 control:44] 'active' inspect method failed
-[W 171020 15:18:28 control:44] 'reserved' inspect method failed
-[W 171020 15:18:28 control:44] 'revoked' inspect method failed
-[W 171020 15:18:28 control:44] 'conf' inspect method failed
-[I 171020 15:31:13 command:47] SIGTERM detected, shutting down
-[E 171020 15:31:17 signal:232] Signal handler <promise@0x7fcacf94e678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7fcacdaf0be0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 15:31:17 command:139] Visit me at http://localhost:5555
-[I 171020 15:31:17 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 15:31:17 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send_multiple',
-     'lms.celery.debug_task']
-[I 171020 15:31:17 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 15:31:19 control:44] 'stats' inspect method failed
-[W 171020 15:31:19 control:44] 'active_queues' inspect method failed
-[W 171020 15:31:19 control:44] 'registered' inspect method failed
-[W 171020 15:31:19 control:44] 'scheduled' inspect method failed
-[W 171020 15:31:19 control:44] 'active' inspect method failed
-[W 171020 15:31:19 control:44] 'reserved' inspect method failed
-[W 171020 15:31:19 control:44] 'revoked' inspect method failed
-[W 171020 15:31:19 control:44] 'conf' inspect method failed
-[I 171020 16:52:23 command:47] SIGTERM detected, shutting down
-[E 171020 16:52:26 signal:232] Signal handler <promise@0x7fb7bea9a678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7fb7bcc3cb70>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171020 16:52:26 command:139] Visit me at http://localhost:5555
-[I 171020 16:52:26 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171020 16:52:26 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send',
-     'lms.celery.debug_task']
-[I 171020 16:52:26 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171020 16:52:28 control:44] 'stats' inspect method failed
-[W 171020 16:52:28 control:44] 'active_queues' inspect method failed
-[W 171020 16:52:28 control:44] 'registered' inspect method failed
-[W 171020 16:52:28 control:44] 'scheduled' inspect method failed
-[W 171020 16:52:28 control:44] 'active' inspect method failed
-[W 171020 16:52:28 control:44] 'reserved' inspect method failed
-[W 171020 16:52:28 control:44] 'revoked' inspect method failed
-[W 171020 16:52:28 control:44] 'conf' inspect method failed
-[I 171020 19:20:51 command:47] SIGTERM detected, shutting down
-[E 171023 08:32:22 signal:232] Signal handler <promise@0x7f249b502678 --> <bound method Celery._autodiscover_tasks of <Celery lms at 0x7f24996a4be0>>> raised: ImportError("cannot import name 'TrafSource'",)
-    Traceback (most recent call last):
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/utils/dispatch/signal.py", line 227, in send
-        response = receiver(signal=self, sender=sender, **named)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 143, in __call__
-        return self.throw()
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/vine/promises.py", line 140, in __call__
-        retval = fun(*final_args, **final_kwargs)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 671, in _autodiscover_tasks
-        return self._autodiscover_tasks_from_fixups(related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 684, in _autodiscover_tasks_from_fixups
-        ], related_name=related_name)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/app/base.py", line 676, in _autodiscover_tasks_from_names
-        packages() if callable(packages) else packages, related_name,
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 223, in autodiscover_tasks
-        related_name) if mod)
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in autodiscover_tasks
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 248, in <listcomp>
-        return [find_related_module(pkg, related_name) for pkg in packages]
-      File "/home/andrey/skillbox/lib/python3.6/site-packages/celery/loaders/base.py", line 274, in find_related_module
-        return importlib.import_module('{0}.{1}'.format(package, related_name))
-      File "/usr/lib/python3.6/importlib/__init__.py", line 126, in import_module
-        return _bootstrap._gcd_import(name[level:], package, level)
-      File "<frozen importlib._bootstrap>", line 994, in _gcd_import
-      File "<frozen importlib._bootstrap>", line 971, in _find_and_load
-      File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
-      File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
-      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
-      File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
-      File "/home/andrey/skillbox/go.skillbox.ru/access/tasks.py", line 4, in <module>
-        from access.models import User, TrafSource, TrafTokenHistory
-    ImportError: cannot import name 'TrafSource'
-[I 171023 08:32:22 command:139] Visit me at http://localhost:5555
-[I 171023 08:32:22 command:144] Broker: amqp://guest:**@localhost:5672//
-[I 171023 08:32:22 command:147] Registered tasks: 
-    ['celery.accumulate',
-     'celery.backend_cleanup',
-     'celery.chain',
-     'celery.chord',
-     'celery.chord_unlock',
-     'celery.chunks',
-     'celery.group',
-     'celery.map',
-     'celery.starmap',
-     'djcelery_email_send',
-     'lms.celery.debug_task']
-[I 171023 08:32:22 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[W 171023 08:32:24 control:44] 'stats' inspect method failed
-[W 171023 08:32:24 control:44] 'active_queues' inspect method failed
-[W 171023 08:32:24 control:44] 'registered' inspect method failed
-[W 171023 08:32:24 control:44] 'scheduled' inspect method failed
-[W 171023 08:32:24 control:44] 'active' inspect method failed
-[W 171023 08:32:24 control:44] 'reserved' inspect method failed
-[W 171023 08:32:24 control:44] 'revoked' inspect method failed
-[W 171023 08:32:24 control:44] 'conf' inspect method failed
-[E 171023 14:55:56 events:123] Failed to capture events: '[Errno 104] Connection reset by peer', trying again in 1 seconds.
-[I 171023 14:56:17 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[E 171023 14:56:17 events:123] Failed to capture events: '[Errno 104] Connection reset by peer', trying again in 1 seconds.
-[I 171023 14:56:18 mixins:224] Connected to amqp://guest:**@127.0.0.1:5672//
-[I 171023 19:05:28 command:47] SIGTERM detected, shutting down

logs/schedule.log

@@ -1,121 +0,0 @@
-[2017-10-20 13:12:57,958: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 13:12:57
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 13:32:31,865: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 13:32:31
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 13:38:00,107: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 13:38:00
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 13:47:51,058: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 13:47:51
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 14:42:47,578: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 14:42:47
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 14:56:42,777: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 14:56:42
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 15:14:13,137: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 15:14:13
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 15:18:26,051: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 15:18:26
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 15:31:17,073: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 15:31:17
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-20 16:52:26,958: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-20 16:52:26
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)
-[2017-10-23 08:32:22,755: INFO/MainProcess] beat: Starting...
-celery beat v4.1.0 (latentcall) is starting.
-__    -    ... __   -        _
-LocalTime -> 2017-10-23 08:32:22
-Configuration ->
-    . broker -> amqp://guest:**@localhost:5672//
-    . loader -> celery.loaders.app.AppLoader
-    . scheduler -> celery.beat.PersistentScheduler
-    . db -> celerybeat-schedule
-    . logfile -> [stderr]@%INFO
-    . maxinterval -> 5.00 minutes (300s)

progress/migrations/0009_progress_is_freeze.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-27 13:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('progress', '0008_auto_20180227_1803'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='progress',
+            name='is_freeze',
+            field=models.BooleanField(default=False, verbose_name='Прохождение было преостановленно'),
+        ),
+    ]

progress/migrations/0010_progress_exp_date.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-04-16 18:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('progress', '0009_progress_is_freeze'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='progress',
+            name='exp_date',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Дата сгорания'),
+        ),
+    ]

progress/models.py

@@ -12,7 +12,9 @@ class Progress(models.Model):
     user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='Студент')
     course_token = models.UUIDField(verbose_name="Токен курса", editable=False)
     is_finish = models.BooleanField(verbose_name="Окончен ли курс", default=False)
+    is_freeze = models.BooleanField(verbose_name="Прохождение было преостановленно", default=False)
     only_watch = models.BooleanField(verbose_name="Только просмотр", default=False)
+    exp_date = models.DateTimeField(verbose_name='Дата сгорания', blank=True, null=True)
 
     def progress_status(self, sorted_token_list):
         """

progress/serializers.py

@@ -1,6 +1,8 @@
 from rest_framework import serializers
 
 from progress.models import Progress, ProgressLesson
+import jwt
+from django.conf import settings
 
 
 class ProgressSerializer(serializers.ModelSerializer):
@@ -15,6 +17,40 @@ class ProgressSerializer(serializers.ModelSerializer):
         return [ProgressLessonSerializer(i).data for i in self.progresslesson_set.all()]
 
 
+class SupportProgressSerializer(serializers.ModelSerializer):
+    teacher_email = serializers.SerializerMethodField()
+    mod = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Progress
+        fields = ('id', 'course_token', 'mod', 'teacher_email', "is_freeze")
+
+    @staticmethod
+    def get_teacher_email(self):
+        return self.teacher.email
+
+    @staticmethod
+    def get_mod(self):
+        return "Без дз" if self.only_watch else "Стандарт"
+
+
+class SecureProgressSerializer(serializers.ModelSerializer):
+    jwt_token = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Progress
+        fields = ('jwt_token', )
+
+    @staticmethod
+    def get_jwt_token(self):
+        payload = {
+            'lessons': [ProgressLessonSerializer(i).data for i in self.progresslesson_set.all()],
+            'course_token': str(self.course_token),
+            'only_watch': self.only_watch,
+        }
+        return jwt.encode(payload, settings.COURSE_PROGRESS_SECRET_KEY, algorithm='HS256')
+
+
 class ProgressAnalyticSerializer(serializers.ModelSerializer):
     name = serializers.SerializerMethodField()
     email = serializers.SerializerMethodField()
@@ -47,8 +83,8 @@ class ProgressLessonSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_student(self):
-        return {'name': self.progress.user.get_full_name(), "out_key": self.progress.user.out_key}
+        return {'name': self.progress.user.get_full_name(), "out_key": str(self.progress.user.out_key)}
 
     @staticmethod
     def get_course_token(self):
-        return self.progress.course_token
+        return str(self.progress.course_token)

progress/urls.py

@@ -3,9 +3,14 @@ from django.conf.urls import url
 from progress import views
 
 urlpatterns = [
+    url(r'progress_dynamic/$', views.CourseProgressDynamicView.as_view()),
     url(r'students/(?P<teacher_token>[0-9A-Fa-f-]+)/$', views.StudentWorkView.as_view()),
     url(r'student/$', views.StudentUpdateProgress.as_view()),
+    url(r'find/$', views.FindProgressView.as_view()),
+    url(r'freeze/$', views.FreezeProgressView.as_view()),
+    url(r'change_teacher/$', views.ChangeTeacherView.as_view()),
     url(r'teacher/$', views.TeacherUpdateProgress.as_view()),
     url(r'set-progress/$', views.SetProgress.as_view()),
     url(r'get_hw_pay/$', views.get_teachers_pay),
+    url(r'progress_token/$', views.ProgressToken.as_view()),
 ]

progress/views.py

@@ -1,18 +1,29 @@
 import csv
 import datetime
 
+from django.db import IntegrityError
+from django.shortcuts import redirect
+from dateutil.relativedelta import relativedelta
+from django.contrib import auth
+from django.utils import timezone
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
+from django.core.mail import EmailMessage
 from django.http import HttpResponse, HttpResponseForbidden
+from rest_framework import permissions
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from django.db.models import Q
+from django.db.models import Q, Count
+import jwt
+from django.conf import settings
 
-from courses.models import Course
+from access.serializers import UserProgressSearchSerializer
+from courses.models import Course, Lesson
 from progress.models import ProgressLesson, Progress
-from progress.serializers import ProgressAnalyticSerializer, ProgressLessonSerializer, ProgressSerializer
+from progress.serializers import ProgressAnalyticSerializer, ProgressLessonSerializer, ProgressSerializer, \
+    SecureProgressSerializer
 from courses.api import CourseProgressApi, CourseParamsApi
 from progress.tasks import add_next_lesson
 
@@ -53,19 +64,31 @@ class CourseProgressDynamicView(APIView):
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
-    def get(request, token):
+    def get(request):
+        course_token = request.GET.get('course_token', None)
+        from_date = int(request.GET.get('from', '7'))
+        to_date = int(request.GET.get('to', '0'))
+
         if request.user.is_authenticated() and request.user.is_staff:
-            try:
+            progresses = ProgressLesson.objects.filter(status='done')
-                progresses = Progress.objects.filter(course_token=token)
+            if not course_token is None:
-                res = {}
+                try:
-                for i in progresses:
+                    progresses = progresses.filter(progress__course_token=course_token)
-                    key = i.progresslesson_set.filter(status="done").count() + 1
+                except ProgressLesson.DoesNotExist:
-                    res[key] = 1 if not key in res.keys() else res[key] + 1
+                    return Response('incorrect course token', status=404)
-                return Response(res, status=200)
-            except ValidationError:
-                return Response("Bad request", status=400)
 
-        return Response(status=403)
+            progresses = progresses.filter(finish_date__gt=timezone.now() - relativedelta(days=from_date))
+            progresses = progresses.filter(finish_date__lt=timezone.now() - relativedelta(days=to_date))
+            progresses = progresses.order_by('finish_date')
+
+            res = {}
+            progresses = progresses.extra({'finish_date_day': "date(finish_date)"})\
+                                   .values('progress__course_token', 'finish_date_day')\
+                                   .annotate(total=Count('progress'))
+            #TODO Доделать
+
+            return Response(res, status=200)
+        return Response('Доступно только персоналу', status=403)
 
 
 class CourseProgressUserView(APIView):
@@ -89,6 +112,7 @@ class CourseProgressUserView(APIView):
 
 
 class TeacherUpdateProgress(APIView):
+    permission_classes = (permissions.IsAuthenticated, )
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
@@ -109,7 +133,6 @@ class TeacherUpdateProgress(APIView):
             student = get_user_model().objects.get(out_key=student_out_key)
             p = Progress.objects.get(
                 user=student,
-                teacher=request.user,
                 course_token=course_token,
             )
 
@@ -122,10 +145,24 @@ class TeacherUpdateProgress(APIView):
                 if pv.status == ProgressLesson.STATUSES.wait:
                     if action == "no":
                         pv.status = ProgressLesson.STATUSES.fail
+                        msg = EmailMessage(
+                            'Ваша работа отправлена на доработку',
+                            '''Преподаватель "%s" отклонил вашу работу''' % request.user.get_full_name(),
+                            'robo@skillbox.ru',
+                            [student.email],
+                        )
+                        msg.send()
 
                     elif action == "yes":
                         pv.status = ProgressLesson.STATUSES.done
                         pv.finish_date = datetime.datetime.now()
+                        msg = EmailMessage(
+                            'Ваша работа принята',
+                            '''Преподователь "%s" принял вашу работу''' % request.user.get_full_name(),
+                            'robo@skillbox.ru',
+                            [student.email],
+                        )
+                        msg.send()
 
                     else:
                         Response("Свойство action должно иметь значение либо done, либо fail", status=400)
@@ -153,52 +190,58 @@ class TeacherUpdateProgress(APIView):
 
 
 class StudentUpdateProgress(APIView):
+    permission_classes = (permissions.IsAuthenticated,)
     renderer_classes = (JSONRenderer,)
 
     @staticmethod
     def post(request):
         lesson_token = request.JSON.get('lesson_token', None)
-        course_token = request.JSON.get('course_token', None)
         comment = request.JSON.get('comment', None)
 
-        if lesson_token is None or course_token is None:
+        if lesson_token is None:
-            return Response('Не передан слаг курса или токен урока', status=400)
+            return Response('Не передан токен урока', status=400)
-        try:
-            student = request.user
 
-            p = Progress.objects.get(user=student, course_token=course_token)
+        student = request.user
 
-            try:
+        try:
-                pv = ProgressLesson.objects.get(
+            pv = ProgressLesson.objects.get(
-                    progress=p,
+                progress__user=student,
-                    lesson_token=lesson_token,
+                lesson_token=lesson_token,
-                )
+            )
 
-                if not pv.status == ProgressLesson.STATUSES.wait:
+            if pv.status == ProgressLesson.STATUSES.done:
-                    if pv.checker == p.teacher and not comment is None:
+                return Response(SecureProgressSerializer(pv.progress).data, status=200)
-                        pv.status = ProgressLesson.STATUSES.wait
-                        pv.comment_tokens.append(comment)
 
-                    elif pv.checker == p.user:
+            if not pv.status == ProgressLesson.STATUSES.wait:
-                        pv.status = ProgressLesson.STATUSES.done
+                if pv.checker == pv.progress.user:
-                        pv.finish_date = datetime.datetime.now()
+                    pv.status = ProgressLesson.STATUSES.done
+                    pv.finish_date = datetime.datetime.now()
 
-                    else:
+                elif not comment is None and\
-                        raise ValueError("Этого никогда не должно происходить, но я уверен, что произойдёт")
+                        not pv.progress.progresslesson_set.filter(status=ProgressLesson.STATUSES.wait).exists():
+                    pv.status = ProgressLesson.STATUSES.wait
+                    pv.comment_tokens.append(comment)
+                    msg = EmailMessage(
+                        'Студент оставил комментарий',
+                        '''Студент "%s" оставил вам комментарий.''' % request.user.get_full_name(),
+                        'robo@skillbox.ru',
+                        [pv.checker.email],
+                    )
+                    msg.send()
 
-                    pv.save()
+                elif comment is None:
+                    return Response("Не преложен комментарий", status=400)
 
                 else:
-                    return Response("Ошибка прав доступа", status=403)
+                    return Response("В настоящее время, мы уже  проверяем одно из ваших домашних заданий. <br> Как "
+                                    "только оно будет успешно сдано - вы сможете продолжить.", status=403)
 
-            except ProgressLesson.DoesNotExist:
+            elif not comment is None:
-                return Response('Урок не проходится этим пользователем', status=403)
+                pv.comment_tokens.append(comment)
 
-            if pv.status == ProgressLesson.STATUSES.done:
+            pv.save()
-                # TODO: Ассинхроннаязадача для celery
-                add_next_lesson(p)
 
-            return Response(ProgressSerializer(p).data, status=200)
+            return Response(SecureProgressSerializer(pv.progress).data, status=200)
 
         except Progress.DoesNotExist:
             return Response('Не найден прогресс по заданным параметрам', status=404)
@@ -232,36 +275,74 @@ class UploadCourseProgressUserView(APIView):
         return Response(status=403)
 
 
-class UserGuardView(APIView):
+class FindProgressView(APIView):
     renderer_classes = (JSONRenderer,)
     permission_classes = (IsAuthenticated,)
 
     @staticmethod
-    def get(request, pk, page):
+    def get(request):
+        if not request.user.is_staff:
+            return Response("Только сотрудники персонала могут запрашивать инфо по прогрессу", status=403)
+        key = request.GET.get('key', None)
+        count = int(request.GET.get('count', '10'))
+        if key:
+            res = get_user_model().objects.filter(
+                Q(id__contains=key) | Q(email__contains=key.lower()) | Q(first_name__contains=key) |
+                Q(last_name__contains=key) | Q(account__phone__contains=key)
+            )
+
+        else:
+            res = get_user_model().objects.all()
+
+        res = res[:(count if len(res) > count else len(res))]
+        return Response([UserProgressSearchSerializer(i).data for i in res], status=200)
+
+
+class FreezeProgressView(APIView):
+    renderer_classes = (JSONRenderer,)
+    permission_classes = (IsAuthenticated,)
+
+    @staticmethod
+    def post(request):
+        if not request.user.is_staff:
+            return Response("Только сотрудники персонала могут вносить изменение в прогресс", status=403)
+        key = request.JSON.get('id', None)
+        is_freeze = request.JSON.get('is_freeze', False)
+
         try:
-            user = get_user_model().objects.get(out_key=pk)
+            p = Progress.objects.get(id=key)
-        except get_user_model().DoesNotExist:
+            p.is_freeze = is_freeze
-            return Response("User doesn't exist", status=404)
+            p.save()
+        except Progress.DoesNotExist:
+            return Response("не найден прогресс по заданному id", status=404)
 
-        is_i = request.user == user
+        return Response(status=204)
-        res_403 = Response('Permission denied', status=403)
-        res_204 = Response(status=204)
 
-        if is_i and not request.user.groups.filter(name='teachers').exists() and page == 'homeworks':
-            return res_403
 
-        if is_i and not \
+class ChangeTeacherView(APIView):
-                request.user.groups.filter(name__in=['students', 'managers', 'lead_managers']).exists() \
+    renderer_classes = (JSONRenderer,)
-                and page == 'payment':
+    permission_classes = (IsAuthenticated,)
-            return res_403
 
-        if is_i:
+    @staticmethod
-            return res_204
+    def post(request):
+        if not request.user.is_staff:
+            return Response("Только сотрудники персонала могут вносить изменение в прогресс", status=403)
+        key = request.JSON.get('id', None)
+        teacher_email = request.JSON.get('teacher_email', False)
 
-        if page == 'profile' and (request.user.is_superuser or request.user.is_staff):
+        try:
-            return res_204
+            p = Progress.objects.get(id=key)
+            try:
+                teacher = get_user_model().objects.get(email=teacher_email.lower())
+            except get_user_model().DoesNotExist:
+                return Response("Нет пользователя c таким email", status=404)
+            p.teacher = teacher
+            p.progresslesson_set.filter(status=ProgressLesson.STATUSES.wait).update(checker=teacher)
+            p.save()
+        except Progress.DoesNotExist:
+            return Response("не найден прогресс по заданному id", status=404)
 
-        return res_403
+        return Response(status=204)
 
 
 class SetProgress(APIView):
@@ -275,6 +356,7 @@ class SetProgress(APIView):
             course_slug = request.JSON.get('course_slug', None)
             topic_sort = int(request.JSON.get('topic', 1))
             lesson_sort = int(request.JSON.get('lesson', 1))
+            only_watch = request.JSON.get('only_watch', False)
             force = request.JSON.get('force', False)
 
             if course_slug is None:
@@ -302,6 +384,9 @@ class SetProgress(APIView):
                 teacher = get_user_model().objects.get(out_key=course.get_teacher())
                 progress = Progress.objects.create(course_token=course.token, user=student, teacher=teacher)
 
+            progress.only_watch = only_watch
+            progress.save()
+
             token_list = []
             lesson_list = []
             for topic_idx, topic in enumerate(course.topic_set.all()):
@@ -382,16 +467,63 @@ def get_teachers_pay(request):
     response['Content-Disposition'] = 'attachment; filename="%s.csv"' % file_name
 
     writer = csv.writer(response)
-    writer.writerow(['Почта студента', 'Имя студента', 'Курс', 'Дата', 'Время',])
+    writer.writerow(['Почта студента', 'Имя студента', 'Тема', 'Курс', 'Дата', 'Время',])
 
     for i in progress_lessons.order_by('-finish_date'):
         course_api = CourseParamsApi(i.progress.course_token)
         writer.writerow([
             i.progress.user.email,
             i.progress.user.get_full_name(),
+            #TODO очередной костыль
+            Lesson.objects.get(token=i.lesson_token).topic.title,
             course_api.get_slug_and_title()['title'],
             i.finish_date.date(),
             i.finish_date.time(),
         ])
 
     return response
+
+
+class ProgressToken(APIView):
+    renderer_classes = (JSONRenderer,)
+
+    @staticmethod
+    def get(request):
+        token = request.GET.get('token', None)
+        if token is None:
+            return Response("bad request", 400)
+
+        payload = jwt.decode(token, settings.COURSE_PROGRESS_SECRET_KEY, algorithms=['HS256'])
+
+        try:
+            user = get_user_model().objects.get(email=payload['email'].lower())
+        except get_user_model().DoesNotExist:
+            user = get_user_model().objects.create_student(email=payload['email'].lower())
+
+        user.is_active = True
+        user.save()
+
+        try:
+            course = Course.objects.get(token=payload['course_token'])
+        except get_user_model().DoesNotExist:
+            return Response("Course doesn't exist", status=404)
+
+        teacher = get_user_model().objects.get(out_key=course.get_teacher())
+
+        try:
+            p = Progress.objects.create(
+                user=user,
+                course_token=payload['course_token'],
+                teacher=teacher,
+                exp_date=timezone.now() + relativedelta(days=int(payload['period'])),
+            )
+            ProgressLesson.objects.create(
+                progress=p,
+                lesson_token=course.get_first_lesson().token,
+                checker=p.user,
+            )
+        except IntegrityError:
+            pass
+
+        auth.login(request, user)
+        return redirect('/')

requirements.txt

@@ -16,6 +16,8 @@ raven==6.2.1
 requests==2.18.4
 Unidecode==0.4.21
 PyJWT==1.5.3
+dicttoxml==1.7.4
+gunicorn==19.7.1
 
 # testing
 flake8==3.5.0

static/admin/css/base.css

@@ -0,0 +1,967 @@
+/*
+    DJANGO Admin styles
+*/
+
+@import url(fonts.css);
+
+body {
+    margin: 0;
+    padding: 0;
+    font-size: 14px;
+    font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
+    color: #333;
+    background: #fff;
+}
+
+/* LINKS */
+
+a:link, a:visited {
+    color: #447e9b;
+    text-decoration: none;
+}
+
+a:focus, a:hover {
+    color: #036;
+}
+
+a:focus {
+    text-decoration: underline;
+}
+
+a img {
+    border: none;
+}
+
+a.section:link, a.section:visited {
+    color: #fff;
+    text-decoration: none;
+}
+
+a.section:focus, a.section:hover {
+    text-decoration: underline;
+}
+
+/* GLOBAL DEFAULTS */
+
+p, ol, ul, dl {
+    margin: .2em 0 .8em 0;
+}
+
+p {
+    padding: 0;
+    line-height: 140%;
+}
+
+h1,h2,h3,h4,h5 {
+    font-weight: bold;
+}
+
+h1 {
+    margin: 0 0 20px;
+    font-weight: 300;
+    font-size: 20px;
+    color: #666;
+}
+
+h2 {
+    font-size: 16px;
+    margin: 1em 0 .5em 0;
+}
+
+h2.subhead {
+    font-weight: normal;
+    margin-top: 0;
+}
+
+h3 {
+    font-size: 14px;
+    margin: .8em 0 .3em 0;
+    color: #666;
+    font-weight: bold;
+}
+
+h4 {
+    font-size: 12px;
+    margin: 1em 0 .8em 0;
+    padding-bottom: 3px;
+}
+
+h5 {
+    font-size: 10px;
+    margin: 1.5em 0 .5em 0;
+    color: #666;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+}
+
+ul li {
+    list-style-type: square;
+    padding: 1px 0;
+}
+
+li ul {
+    margin-bottom: 0;
+}
+
+li, dt, dd {
+    font-size: 13px;
+    line-height: 20px;
+}
+
+dt {
+    font-weight: bold;
+    margin-top: 4px;
+}
+
+dd {
+    margin-left: 0;
+}
+
+form {
+    margin: 0;
+    padding: 0;
+}
+
+fieldset {
+    margin: 0;
+    padding: 0;
+    border: none;
+    border-top: 1px solid #eee;
+}
+
+blockquote {
+    font-size: 11px;
+    color: #777;
+    margin-left: 2px;
+    padding-left: 10px;
+    border-left: 5px solid #ddd;
+}
+
+code, pre {
+    font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
+    color: #666;
+    font-size: 12px;
+}
+
+pre.literal-block {
+    margin: 10px;
+    background: #eee;
+    padding: 6px 8px;
+}
+
+code strong {
+    color: #930;
+}
+
+hr {
+    clear: both;
+    color: #eee;
+    background-color: #eee;
+    height: 1px;
+    border: none;
+    margin: 0;
+    padding: 0;
+    font-size: 1px;
+    line-height: 1px;
+}
+
+/* TEXT STYLES & MODIFIERS */
+
+.small {
+    font-size: 11px;
+}
+
+.tiny {
+    font-size: 10px;
+}
+
+p.tiny {
+    margin-top: -2px;
+}
+
+.mini {
+    font-size: 10px;
+}
+
+p.mini {
+    margin-top: -3px;
+}
+
+.help, p.help, form p.help {
+    font-size: 11px;
+    color: #999;
+}
+
+.help-tooltip {
+    cursor: help;
+}
+
+p img, h1 img, h2 img, h3 img, h4 img, td img {
+    vertical-align: middle;
+}
+
+.quiet, a.quiet:link, a.quiet:visited {
+    color: #999;
+    font-weight: normal;
+}
+
+.float-right {
+    float: right;
+}
+
+.float-left {
+    float: left;
+}
+
+.clear {
+    clear: both;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.align-right {
+    text-align: right;
+}
+
+.example {
+    margin: 10px 0;
+    padding: 5px 10px;
+    background: #efefef;
+}
+
+.nowrap {
+    white-space: nowrap;
+}
+
+/* TABLES */
+
+table {
+    border-collapse: collapse;
+    border-color: #ccc;
+}
+
+td, th {
+    font-size: 13px;
+    line-height: 16px;
+    border-bottom: 1px solid #eee;
+    vertical-align: top;
+    padding: 8px;
+    font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
+}
+
+th {
+    font-weight: 600;
+    text-align: left;
+}
+
+thead th,
+tfoot td {
+    color: #666;
+    padding: 5px 10px;
+    font-size: 11px;
+    background: #fff;
+    border: none;
+    border-top: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+}
+
+tfoot td {
+    border-bottom: none;
+    border-top: 1px solid #eee;
+}
+
+tr.alt {
+    background: #f6f6f6;
+}
+
+.row1 {
+    background: #fff;
+}
+
+.row2 {
+    background: #f9f9f9;
+}
+
+/* SORTABLE TABLES */
+
+thead th {
+    padding: 5px 10px;
+    line-height: normal;
+    text-transform: uppercase;
+    background: #f6f6f6;
+}
+
+thead th a:link, thead th a:visited {
+    color: #666;
+}
+
+thead th.sorted {
+    background: #eee;
+}
+
+thead th.sorted .text {
+    padding-right: 42px;
+}
+
+table thead th .text span {
+    padding: 8px 10px;
+    display: block;
+}
+
+table thead th .text a {
+    display: block;
+    cursor: pointer;
+    padding: 8px 10px;
+}
+
+table thead th .text a:focus, table thead th .text a:hover {
+    background: #eee;
+}
+
+thead th.sorted a.sortremove {
+    visibility: hidden;
+}
+
+table thead th.sorted:hover a.sortremove {
+    visibility: visible;
+}
+
+table thead th.sorted .sortoptions {
+    display: block;
+    padding: 9px 5px 0 5px;
+    float: right;
+    text-align: right;
+}
+
+table thead th.sorted .sortpriority {
+    font-size: .8em;
+    min-width: 12px;
+    text-align: center;
+    vertical-align: 3px;
+    margin-left: 2px;
+    margin-right: 2px;
+}
+
+table thead th.sorted .sortoptions a {
+    position: relative;
+    width: 14px;
+    height: 14px;
+    display: inline-block;
+    background: url(../img/sorting-icons.svg) 0 0 no-repeat;
+    background-size: 14px auto;
+}
+
+table thead th.sorted .sortoptions a.sortremove {
+    background-position: 0 0;
+}
+
+table thead th.sorted .sortoptions a.sortremove:after {
+    content: '\\';
+    position: absolute;
+    top: -6px;
+    left: 3px;
+    font-weight: 200;
+    font-size: 18px;
+    color: #999;
+}
+
+table thead th.sorted .sortoptions a.sortremove:focus:after,
+table thead th.sorted .sortoptions a.sortremove:hover:after {
+    color: #447e9b;
+}
+
+table thead th.sorted .sortoptions a.sortremove:focus,
+table thead th.sorted .sortoptions a.sortremove:hover {
+    background-position: 0 -14px;
+}
+
+table thead th.sorted .sortoptions a.ascending {
+    background-position: 0 -28px;
+}
+
+table thead th.sorted .sortoptions a.ascending:focus,
+table thead th.sorted .sortoptions a.ascending:hover {
+    background-position: 0 -42px;
+}
+
+table thead th.sorted .sortoptions a.descending {
+    top: 1px;
+    background-position: 0 -56px;
+}
+
+table thead th.sorted .sortoptions a.descending:focus,
+table thead th.sorted .sortoptions a.descending:hover {
+    background-position: 0 -70px;
+}
+
+/* FORM DEFAULTS */
+
+input, textarea, select, .form-row p, form .button {
+    margin: 2px 0;
+    padding: 2px 3px;
+    vertical-align: middle;
+    font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif;
+    font-weight: normal;
+    font-size: 13px;
+}
+
+textarea {
+    vertical-align: top;
+}
+
+input[type=text], input[type=password], input[type=email], input[type=url],
+input[type=number], textarea, select, .vTextField {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 5px 6px;
+    margin-top: 0;
+}
+
+input[type=text]:focus, input[type=password]:focus, input[type=email]:focus,
+input[type=url]:focus, input[type=number]:focus, textarea:focus, select:focus,
+.vTextField:focus {
+    border-color: #999;
+}
+
+select {
+    height: 30px;
+}
+
+select[multiple] {
+    min-height: 150px;
+}
+
+/* FORM BUTTONS */
+
+.button, input[type=submit], input[type=button], .submit-row input, a.button {
+    background: #79aec8;
+    padding: 10px 15px;
+    border: none;
+    border-radius: 4px;
+    color: #fff;
+    cursor: pointer;
+}
+
+a.button {
+    padding: 4px 5px;
+}
+
+.button:active, input[type=submit]:active, input[type=button]:active,
+.button:focus, input[type=submit]:focus, input[type=button]:focus,
+.button:hover, input[type=submit]:hover, input[type=button]:hover {
+    background: #609ab6;
+}
+
+.button[disabled], input[type=submit][disabled], input[type=button][disabled] {
+    opacity: 0.4;
+}
+
+.button.default, input[type=submit].default, .submit-row input.default {
+    float: right;
+    border: none;
+    font-weight: 400;
+    background: #417690;
+}
+
+.button.default:active, input[type=submit].default:active,
+.button.default:focus, input[type=submit].default:focus,
+.button.default:hover, input[type=submit].default:hover {
+    background: #205067;
+}
+
+.button[disabled].default,
+input[type=submit][disabled].default,
+input[type=button][disabled].default {
+    opacity: 0.4;
+}
+
+
+/* MODULES */
+
+.module {
+    border: none;
+    margin-bottom: 30px;
+    background: #fff;
+}
+
+.module p, .module ul, .module h3, .module h4, .module dl, .module pre {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.module blockquote {
+    margin-left: 12px;
+}
+
+.module ul, .module ol {
+    margin-left: 1.5em;
+}
+
+.module h3 {
+    margin-top: .6em;
+}
+
+.module h2, .module caption, .inline-group h2 {
+    margin: 0;
+    padding: 8px;
+    font-weight: 400;
+    font-size: 13px;
+    text-align: left;
+    background: #79aec8;
+    color: #fff;
+}
+
+.module caption,
+.inline-group h2 {
+    font-size: 12px;
+    letter-spacing: 0.5px;
+    text-transform: uppercase;
+}
+
+.module table {
+    border-collapse: collapse;
+}
+
+/* MESSAGES & ERRORS */
+
+ul.messagelist {
+    padding: 0;
+    margin: 0;
+}
+
+ul.messagelist li {
+    display: block;
+    font-weight: 400;
+    font-size: 13px;
+    padding: 10px 10px 10px 65px;
+    margin: 0 0 10px 0;
+    background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat;
+    background-size: 16px auto;
+    color: #333;
+}
+
+ul.messagelist li.warning {
+    background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat;
+    background-size: 14px auto;
+}
+
+ul.messagelist li.error {
+    background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat;
+    background-size: 16px auto;
+}
+
+.errornote {
+    font-size: 14px;
+    font-weight: 700;
+    display: block;
+    padding: 10px 12px;
+    margin: 0 0 10px 0;
+    color: #ba2121;
+    border: 1px solid #ba2121;
+    border-radius: 4px;
+    background-color: #fff;
+    background-position: 5px 12px;
+}
+
+ul.errorlist {
+    margin: 0 0 4px;
+    padding: 0;
+    color: #ba2121;
+    background: #fff;
+}
+
+ul.errorlist li {
+    font-size: 13px;
+    display: block;
+    margin-bottom: 4px;
+}
+
+ul.errorlist li:first-child {
+    margin-top: 0;
+}
+
+ul.errorlist li a {
+    color: inherit;
+    text-decoration: underline;
+}
+
+td ul.errorlist {
+    margin: 0;
+    padding: 0;
+}
+
+td ul.errorlist li {
+    margin: 0;
+}
+
+.form-row.errors {
+    margin: 0;
+    border: none;
+    border-bottom: 1px solid #eee;
+    background: none;
+}
+
+.form-row.errors ul.errorlist li {
+    padding-left: 0;
+}
+
+.errors input, .errors select, .errors textarea {
+    border: 1px solid #ba2121;
+}
+
+div.system-message {
+    background: #ffc;
+    margin: 10px;
+    padding: 6px 8px;
+    font-size: .8em;
+}
+
+div.system-message p.system-message-title {
+    padding: 4px 5px 4px 25px;
+    margin: 0;
+    color: #c11;
+    background: #ffefef url(../img/icon-no.svg) 5px 5px no-repeat;
+}
+
+.description {
+    font-size: 12px;
+    padding: 5px 0 0 12px;
+}
+
+/* BREADCRUMBS */
+
+div.breadcrumbs {
+    background: #79aec8;
+    padding: 10px 40px;
+    border: none;
+    font-size: 14px;
+    color: #c4dce8;
+    text-align: left;
+}
+
+div.breadcrumbs a {
+    color: #fff;
+}
+
+div.breadcrumbs a:focus, div.breadcrumbs a:hover {
+    color: #c4dce8;
+}
+
+/* ACTION ICONS */
+
+.addlink {
+    padding-left: 16px;
+    background: url(../img/icon-addlink.svg) 0 1px no-repeat;
+}
+
+.changelink, .inlinechangelink {
+    padding-left: 16px;
+    background: url(../img/icon-changelink.svg) 0 1px no-repeat;
+}
+
+.deletelink {
+    padding-left: 16px;
+    background: url(../img/icon-deletelink.svg) 0 1px no-repeat;
+}
+
+a.deletelink:link, a.deletelink:visited {
+    color: #CC3434;
+}
+
+a.deletelink:focus, a.deletelink:hover {
+    color: #993333;
+    text-decoration: none;
+}
+
+/* OBJECT TOOLS */
+
+.object-tools {
+    font-size: 10px;
+    font-weight: bold;
+    padding-left: 0;
+    float: right;
+    position: relative;
+    margin-top: -48px;
+}
+
+.form-row .object-tools {
+    margin-top: 5px;
+    margin-bottom: 5px;
+    float: none;
+    height: 2em;
+    padding-left: 3.5em;
+}
+
+.object-tools li {
+    display: block;
+    float: left;
+    margin-left: 5px;
+    height: 16px;
+}
+
+.object-tools a {
+    border-radius: 15px;
+}
+
+.object-tools a:link, .object-tools a:visited {
+    display: block;
+    float: left;
+    padding: 3px 12px;
+    background: #999;
+    font-weight: 400;
+    font-size: 11px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    color: #fff;
+}
+
+.object-tools a:focus, .object-tools a:hover {
+    background-color: #417690;
+}
+
+.object-tools a:focus{
+    text-decoration: none;
+}
+
+.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {
+    background-repeat: no-repeat;
+    background-position: 93% center;
+    padding-right: 26px;
+}
+
+.object-tools a.viewsitelink, .object-tools a.golink {
+    background-image: url(../img/tooltag-arrowright.svg);
+}
+
+.object-tools a.addlink {
+    background-image: url(../img/tooltag-add.svg);
+}
+
+/* OBJECT HISTORY */
+
+table#change-history {
+    width: 100%;
+}
+
+table#change-history tbody th {
+    width: 16em;
+}
+
+/* PAGE STRUCTURE */
+
+#container {
+    position: relative;
+    width: 100%;
+    min-width: 980px;
+    padding: 0;
+}
+
+#content {
+    padding: 20px 40px;
+}
+
+.dashboard #content {
+    width: 600px;
+}
+
+#content-main {
+    float: left;
+    width: 100%;
+}
+
+#content-related {
+    float: right;
+    width: 260px;
+    position: relative;
+    margin-right: -300px;
+}
+
+#footer {
+    clear: both;
+    padding: 10px;
+}
+
+/* COLUMN TYPES */
+
+.colMS {
+    margin-right: 300px;
+}
+
+.colSM {
+    margin-left: 300px;
+}
+
+.colSM #content-related {
+    float: left;
+    margin-right: 0;
+    margin-left: -300px;
+}
+
+.colSM #content-main {
+    float: right;
+}
+
+.popup .colM {
+    width: auto;
+}
+
+/* HEADER */
+
+#header {
+    width: auto;
+    height: 40px;
+    padding: 10px 40px;
+    background: #417690;
+    line-height: 40px;
+    color: #ffc;
+    overflow: hidden;
+}
+
+#header a:link, #header a:visited {
+    color: #fff;
+}
+
+#header a:focus , #header a:hover {
+    text-decoration: underline;
+}
+
+#branding {
+    float: left;
+}
+
+#branding h1 {
+    padding: 0;
+    margin: 0 20px 0 0;
+    font-weight: 300;
+    font-size: 24px;
+    color: #f5dd5d;
+}
+
+#branding h1, #branding h1 a:link, #branding h1 a:visited {
+    color: #f5dd5d;
+}
+
+#branding h2 {
+    padding: 0 10px;
+    font-size: 14px;
+    margin: -8px 0 8px 0;
+    font-weight: normal;
+    color: #ffc;
+}
+
+#branding a:hover {
+    text-decoration: none;
+}
+
+#user-tools {
+    float: right;
+    padding: 0;
+    margin: 0 0 0 20px;
+    font-weight: 300;
+    font-size: 11px;
+    letter-spacing: 0.5px;
+    text-transform: uppercase;
+    text-align: right;
+}
+
+#user-tools a {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
+#user-tools a:focus, #user-tools a:hover {
+    text-decoration: none;
+    border-bottom-color: #79aec8;
+    color: #79aec8;
+}
+
+/* SIDEBAR */
+
+#content-related {
+    background: #f8f8f8;
+}
+
+#content-related .module {
+    background: none;
+}
+
+#content-related h3 {
+    font-size: 14px;
+    color: #666;
+    padding: 0 16px;
+    margin: 0 0 16px;
+}
+
+#content-related h4 {
+    font-size: 13px;
+}
+
+#content-related p {
+    padding-left: 16px;
+    padding-right: 16px;
+}
+
+#content-related .actionlist {
+    padding: 0;
+    margin: 16px;
+}
+
+#content-related .actionlist li {
+    line-height: 1.2;
+    margin-bottom: 10px;
+    padding-left: 18px;
+}
+
+#content-related .module h2 {
+    background: none;
+    padding: 16px;
+    margin-bottom: 16px;
+    border-bottom: 1px solid #eaeaea;
+    font-size: 18px;
+    color: #333;
+}
+
+.delete-confirmation form input[type="submit"] {
+    background: #ba2121;
+    border-radius: 4px;
+    padding: 10px 15px;
+    color: #fff;
+}
+
+.delete-confirmation form input[type="submit"]:active,
+.delete-confirmation form input[type="submit"]:focus,
+.delete-confirmation form input[type="submit"]:hover {
+    background: #a41515;
+}
+
+.delete-confirmation form .cancel-link {
+    display: inline-block;
+    vertical-align: middle;
+    height: 15px;
+    line-height: 15px;
+    background: #ddd;
+    border-radius: 4px;
+    padding: 10px 15px;
+    color: #333;
+    margin: 0 0 0 10px;
+}
+
+.delete-confirmation form .cancel-link:active,
+.delete-confirmation form .cancel-link:focus,
+.delete-confirmation form .cancel-link:hover {
+    background: #ccc;
+}
+
+/* POPUP */
+.popup #content {
+    padding: 20px;
+}
+
+.popup #container {
+    min-width: 0;
+}
+
+.popup #header {
+    padding: 10px 20px;
+}

static/admin/css/changelists.css

@@ -0,0 +1,341 @@
+/* CHANGELISTS */
+
+#changelist {
+    position: relative;
+    width: 100%;
+}
+
+#changelist table {
+    width: 100%;
+}
+
+.change-list .hiddenfields { display:none; }
+
+.change-list .filtered table {
+    border-right: none;
+}
+
+.change-list .filtered {
+    min-height: 400px;
+}
+
+.change-list .filtered .results, .change-list .filtered .paginator,
+.filtered #toolbar, .filtered div.xfull {
+    margin-right: 280px;
+    width: auto;
+}
+
+.change-list .filtered table tbody th {
+    padding-right: 1em;
+}
+
+#changelist-form .results {
+  overflow-x: auto;
+}
+
+#changelist .toplinks {
+    border-bottom: 1px solid #ddd;
+}
+
+#changelist .paginator {
+    color: #666;
+    border-bottom: 1px solid #eee;
+    background: #fff;
+    overflow: hidden;
+}
+
+/* CHANGELIST TABLES */
+
+#changelist table thead th {
+    padding: 0;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+
+#changelist table thead th.action-checkbox-column {
+    width: 1.5em;
+    text-align: center;
+}
+
+#changelist table tbody td.action-checkbox {
+    text-align: center;
+}
+
+#changelist table tfoot {
+    color: #666;
+}
+
+/* TOOLBAR */
+
+#changelist #toolbar {
+    padding: 8px 10px;
+    margin-bottom: 15px;
+    border-top: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+    background: #f8f8f8;
+    color: #666;
+}
+
+#changelist #toolbar form input {
+    border-radius: 4px;
+    font-size: 14px;
+    padding: 5px;
+    color: #333;
+}
+
+#changelist #toolbar form #searchbar {
+    height: 19px;
+    border: 1px solid #ccc;
+    padding: 2px 5px;
+    margin: 0;
+    vertical-align: top;
+    font-size: 13px;
+}
+
+#changelist #toolbar form #searchbar:focus {
+    border-color: #999;
+}
+
+#changelist #toolbar form input[type="submit"] {
+    border: 1px solid #ccc;
+    padding: 2px 10px;
+    margin: 0;
+    vertical-align: middle;
+    background: #fff;
+    box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
+    cursor: pointer;
+    color: #333;
+}
+
+#changelist #toolbar form input[type="submit"]:focus,
+#changelist #toolbar form input[type="submit"]:hover {
+    border-color: #999;
+}
+
+#changelist #changelist-search img {
+    vertical-align: middle;
+    margin-right: 4px;
+}
+
+/* FILTER COLUMN */
+
+#changelist-filter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1000;
+    width: 240px;
+    background: #f8f8f8;
+    border-left: none;
+    margin: 0;
+}
+
+#changelist-filter h2 {
+    font-size: 14px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    padding: 5px 15px;
+    margin-bottom: 12px;
+    border-bottom: none;
+}
+
+#changelist-filter h3 {
+    font-weight: 400;
+    font-size: 14px;
+    padding: 0 15px;
+    margin-bottom: 10px;
+}
+
+#changelist-filter ul {
+    margin: 5px 0;
+    padding: 0 15px 15px;
+    border-bottom: 1px solid #eaeaea;
+}
+
+#changelist-filter ul:last-child {
+    border-bottom: none;
+    padding-bottom: none;
+}
+
+#changelist-filter li {
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+#changelist-filter a {
+    display: block;
+    color: #999;
+}
+
+#changelist-filter li.selected {
+    border-left: 5px solid #eaeaea;
+    padding-left: 10px;
+    margin-left: -15px;
+}
+
+#changelist-filter li.selected a {
+    color: #5b80b2;
+}
+
+#changelist-filter a:focus, #changelist-filter a:hover,
+#changelist-filter li.selected a:focus,
+#changelist-filter li.selected a:hover {
+    color: #036;
+}
+
+/* DATE DRILLDOWN */
+
+.change-list ul.toplinks {
+    display: block;
+    float: left;
+    padding: 0;
+    margin: 0;
+    width: 100%;
+}
+
+.change-list ul.toplinks li {
+    padding: 3px 6px;
+    font-weight: bold;
+    list-style-type: none;
+    display: inline-block;
+}
+
+.change-list ul.toplinks .date-back a {
+    color: #999;
+}
+
+.change-list ul.toplinks .date-back a:focus,
+.change-list ul.toplinks .date-back a:hover {
+    color: #036;
+}
+
+/* PAGINATOR */
+
+.paginator {
+    font-size: 13px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    line-height: 22px;
+    margin: 0;
+    border-top: 1px solid #ddd;
+}
+
+.paginator a:link, .paginator a:visited {
+    padding: 2px 6px;
+    background: #79aec8;
+    text-decoration: none;
+    color: #fff;
+}
+
+.paginator a.showall {
+    padding: 0;
+    border: none;
+    background: none;
+    color: #5b80b2;
+}
+
+.paginator a.showall:focus, .paginator a.showall:hover {
+    background: none;
+    color: #036;
+}
+
+.paginator .end {
+    margin-right: 6px;
+}
+
+.paginator .this-page {
+    padding: 2px 6px;
+    font-weight: bold;
+    font-size: 13px;
+    vertical-align: top;
+}
+
+.paginator a:focus, .paginator a:hover {
+    color: white;
+    background: #036;
+}
+
+/* ACTIONS */
+
+.filtered .actions {
+    margin-right: 280px;
+    border-right: none;
+}
+
+#changelist table input {
+    margin: 0;
+    vertical-align: baseline;
+}
+
+#changelist table tbody tr.selected {
+    background-color: #FFFFCC;
+}
+
+#changelist .actions {
+    padding: 10px;
+    background: #fff;
+    border-top: none;
+    border-bottom: none;
+    line-height: 24px;
+    color: #999;
+}
+
+#changelist .actions.selected {
+    background: #fffccf;
+    border-top: 1px solid #fffee8;
+    border-bottom: 1px solid #edecd6;
+}
+
+#changelist .actions span.all,
+#changelist .actions span.action-counter,
+#changelist .actions span.clear,
+#changelist .actions span.question {
+    font-size: 13px;
+    margin: 0 0.5em;
+    display: none;
+}
+
+#changelist .actions:last-child {
+    border-bottom: none;
+}
+
+#changelist .actions select {
+    vertical-align: top;
+    height: 24px;
+    background: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+    padding: 0 0 0 4px;
+    margin: 0;
+    margin-left: 10px;
+}
+
+#changelist .actions select:focus {
+    border-color: #999;
+}
+
+#changelist .actions label {
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 13px;
+}
+
+#changelist .actions .button {
+    font-size: 13px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    background: #fff;
+    box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset;
+    cursor: pointer;
+    height: 24px;
+    line-height: 1;
+    padding: 4px 8px;
+    margin: 0;
+    color: #333;
+}
+
+#changelist .actions .button:focus, #changelist .actions .button:hover {
+    border-color: #999;
+}

static/admin/css/dashboard.css

@@ -0,0 +1,30 @@
+/* DASHBOARD */
+
+.dashboard .module table th {
+    width: 100%;
+}
+
+.dashboard .module table td {
+    white-space: nowrap;
+}
+
+.dashboard .module table td a {
+    display: block;
+    padding-right: .6em;
+}
+
+/* RECENT ACTIONS MODULE */
+
+.module ul.actionlist {
+    margin-left: 0;
+}
+
+ul.actionlist li {
+    list-style-type: none;
+}
+
+ul.actionlist li {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}

static/admin/css/fonts.css

@@ -0,0 +1,20 @@
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Bold-webfont.woff');
+    font-weight: 700;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Regular-webfont.woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Roboto';
+    src: url('../fonts/Roboto-Light-webfont.woff');
+    font-weight: 300;
+    font-style: normal;
+}

static/admin/css/forms.css

@@ -0,0 +1,499 @@
+@import url('widgets.css');
+
+/* FORM ROWS */
+
+.form-row {
+    overflow: hidden;
+    padding: 10px;
+    font-size: 13px;
+    border-bottom: 1px solid #eee;
+}
+
+.form-row img, .form-row input {
+    vertical-align: middle;
+}
+
+.form-row label input[type="checkbox"] {
+    margin-top: 0;
+    vertical-align: 0;
+}
+
+form .form-row p {
+    padding-left: 0;
+}
+
+.hidden {
+    display: none;
+}
+
+/* FORM LABELS */
+
+label {
+    font-weight: normal;
+    color: #666;
+    font-size: 13px;
+}
+
+.required label, label.required {
+    font-weight: bold;
+    color: #333;
+}
+
+/* RADIO BUTTONS */
+
+form ul.radiolist li {
+    list-style-type: none;
+}
+
+form ul.radiolist label {
+    float: none;
+    display: inline;
+}
+
+form ul.radiolist input[type="radio"] {
+    margin: -2px 4px 0 0;
+    padding: 0;
+}
+
+form ul.inline {
+    margin-left: 0;
+    padding: 0;
+}
+
+form ul.inline li {
+    float: left;
+    padding-right: 7px;
+}
+
+/* ALIGNED FIELDSETS */
+
+.aligned label {
+    display: block;
+    padding: 4px 10px 0 0;
+    float: left;
+    width: 160px;
+    word-wrap: break-word;
+    line-height: 1;
+}
+
+.aligned label:not(.vCheckboxLabel):after {
+    content: '';
+    display: inline-block;
+    vertical-align: middle;
+    height: 26px;
+}
+
+.aligned label + p {
+    padding: 6px 0;
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 170px;
+}
+
+.aligned ul label {
+    display: inline;
+    float: none;
+    width: auto;
+}
+
+.aligned .form-row input {
+    margin-bottom: 0;
+}
+
+.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField {
+    width: 350px;
+}
+
+form .aligned ul {
+    margin-left: 160px;
+    padding-left: 10px;
+}
+
+form .aligned ul.radiolist {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+
+form .aligned p.help {
+    clear: left;
+    margin-top: 0;
+    margin-left: 160px;
+    padding-left: 10px;
+}
+
+form .aligned label + p.help {
+    margin-left: 0;
+    padding-left: 0;
+}
+
+form .aligned p.help:last-child {
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+
+form .aligned input + p.help,
+form .aligned textarea + p.help,
+form .aligned select + p.help {
+    margin-left: 160px;
+    padding-left: 10px;
+}
+
+form .aligned ul li {
+    list-style: none;
+}
+
+form .aligned table p {
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.aligned .vCheckboxLabel {
+    float: none;
+    width: auto;
+    display: inline-block;
+    vertical-align: -3px;
+    padding: 0 0 5px 5px;
+}
+
+.aligned .vCheckboxLabel + p.help {
+    margin-top: -4px;
+}
+
+.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField {
+    width: 610px;
+}
+
+.checkbox-row p.help {
+    margin-left: 0;
+    padding-left: 0;
+}
+
+fieldset .field-box {
+    float: left;
+    margin-right: 20px;
+}
+
+/* WIDE FIELDSETS */
+
+.wide label {
+    width: 200px;
+}
+
+form .wide p, form .wide input + p.help {
+    margin-left: 200px;
+}
+
+form .wide p.help {
+    padding-left: 38px;
+}
+
+.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField {
+    width: 450px;
+}
+
+/* COLLAPSED FIELDSETS */
+
+fieldset.collapsed * {
+    display: none;
+}
+
+fieldset.collapsed h2, fieldset.collapsed {
+    display: block;
+}
+
+fieldset.collapsed {
+    border: 1px solid #eee;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+fieldset.collapsed h2 {
+    background: #f8f8f8;
+    color: #666;
+}
+
+fieldset .collapse-toggle {
+    color: #fff;
+}
+
+fieldset.collapsed .collapse-toggle {
+    background: transparent;
+    display: inline;
+    color: #447e9b;
+}
+
+/* MONOSPACE TEXTAREAS */
+
+fieldset.monospace textarea {
+    font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace;
+}
+
+/* SUBMIT ROW */
+
+.submit-row {
+    padding: 12px 14px;
+    margin: 0 0 20px;
+    background: #f8f8f8;
+    border: 1px solid #eee;
+    border-radius: 4px;
+    text-align: right;
+    overflow: hidden;
+}
+
+body.popup .submit-row {
+    overflow: auto;
+}
+
+.submit-row input {
+    height: 35px;
+    line-height: 15px;
+    margin: 0 0 0 5px;
+}
+
+.submit-row input.default {
+    margin: 0 0 0 8px;
+    text-transform: uppercase;
+}
+
+.submit-row p {
+    margin: 0.3em;
+}
+
+.submit-row p.deletelink-box {
+    float: left;
+    margin: 0;
+}
+
+.submit-row a.deletelink {
+    display: block;
+    background: #ba2121;
+    border-radius: 4px;
+    padding: 10px 15px;
+    height: 15px;
+    line-height: 15px;
+    color: #fff;
+}
+
+.submit-row a.deletelink:focus,
+.submit-row a.deletelink:hover,
+.submit-row a.deletelink:active {
+    background: #a41515;
+}
+
+/* CUSTOM FORM FIELDS */
+
+.vSelectMultipleField {
+    vertical-align: top;
+}
+
+.vCheckboxField {
+    border: none;
+}
+
+.vDateField, .vTimeField {
+    margin-right: 2px;
+    margin-bottom: 4px;
+}
+
+.vDateField {
+    min-width: 6.85em;
+}
+
+.vTimeField {
+    min-width: 4.7em;
+}
+
+.vURLField {
+    width: 30em;
+}
+
+.vLargeTextField, .vXMLLargeTextField {
+    width: 48em;
+}
+
+.flatpages-flatpage #id_content {
+    height: 40.2em;
+}
+
+.module table .vPositiveSmallIntegerField {
+    width: 2.2em;
+}
+
+.vTextField {
+    width: 20em;
+}
+
+.vIntegerField {
+    width: 5em;
+}
+
+.vBigIntegerField {
+    width: 10em;
+}
+
+.vForeignKeyRawIdAdminField {
+    width: 5em;
+}
+
+/* INLINES */
+
+.inline-group {
+    padding: 0;
+    margin: 0 0 30px;
+}
+
+.inline-group thead th {
+    padding: 8px 10px;
+}
+
+.inline-group .aligned label {
+    width: 160px;
+}
+
+.inline-related {
+    position: relative;
+}
+
+.inline-related h3 {
+    margin: 0;
+    color: #666;
+    padding: 5px;
+    font-size: 13px;
+    background: #f8f8f8;
+    border-top: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+}
+
+.inline-related h3 span.delete {
+    float: right;
+}
+
+.inline-related h3 span.delete label {
+    margin-left: 2px;
+    font-size: 11px;
+}
+
+.inline-related fieldset {
+    margin: 0;
+    background: #fff;
+    border: none;
+    width: 100%;
+}
+
+.inline-related fieldset.module h3 {
+    margin: 0;
+    padding: 2px 5px 3px 5px;
+    font-size: 11px;
+    text-align: left;
+    font-weight: bold;
+    background: #bcd;
+    color: #fff;
+}
+
+.inline-group .tabular fieldset.module {
+    border: none;
+}
+
+.inline-related.tabular fieldset.module table {
+    width: 100%;
+}
+
+.last-related fieldset {
+    border: none;
+}
+
+.inline-group .tabular tr.has_original td {
+    padding-top: 2em;
+}
+
+.inline-group .tabular tr td.original {
+    padding: 2px 0 0 0;
+    width: 0;
+    _position: relative;
+}
+
+.inline-group .tabular th.original {
+    width: 0px;
+    padding: 0;
+}
+
+.inline-group .tabular td.original p {
+    position: absolute;
+    left: 0;
+    height: 1.1em;
+    padding: 2px 9px;
+    overflow: hidden;
+    font-size: 9px;
+    font-weight: bold;
+    color: #666;
+    _width: 700px;
+}
+
+.inline-group ul.tools {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+.inline-group ul.tools li {
+    display: inline;
+    padding: 0 5px;
+}
+
+.inline-group div.add-row,
+.inline-group .tabular tr.add-row td {
+    color: #666;
+    background: #f8f8f8;
+    padding: 8px 10px;
+    border-bottom: 1px solid #eee;
+}
+
+.inline-group .tabular tr.add-row td {
+    padding: 8px 10px;
+    border-bottom: 1px solid #eee;
+}
+
+.inline-group ul.tools a.add,
+.inline-group div.add-row a,
+.inline-group .tabular tr.add-row td a {
+    background: url(../img/icon-addlink.svg) 0 1px no-repeat;
+    padding-left: 16px;
+    font-size: 12px;
+}
+
+.empty-form {
+    display: none;
+}
+
+/* RELATED FIELD ADD ONE / LOOKUP */
+
+.add-another, .related-lookup {
+    margin-left: 5px;
+    display: inline-block;
+    vertical-align: middle;
+    background-repeat: no-repeat;
+    background-size: 14px;
+}
+
+.add-another {
+    width: 16px;
+    height: 16px;
+    background-image: url(../img/icon-addlink.svg);
+}
+
+.related-lookup {
+    width: 16px;
+    height: 16px;
+    background-image: url(../img/search.svg);
+}
+
+form .related-widget-wrapper ul {
+    display: inline-block;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.clearable-file-input input {
+    margin-top: 0;
+}

static/admin/css/login.css

@@ -0,0 +1,78 @@
+/* LOGIN FORM */
+
+body.login {
+    background: #f8f8f8;
+}
+
+.login #header {
+    height: auto;
+    padding: 5px 16px;
+}
+
+.login #header h1 {
+    font-size: 18px;
+}
+
+.login #header h1 a {
+    color: #fff;
+}
+
+.login #content {
+    padding: 20px 20px 0;
+}
+
+.login #container {
+    background: #fff;
+    border: 1px solid #eaeaea;
+    border-radius: 4px;
+    overflow: hidden;
+    width: 28em;
+    min-width: 300px;
+    margin: 100px auto;
+}
+
+.login #content-main {
+    width: 100%;
+}
+
+.login .form-row {
+    padding: 4px 0;
+    float: left;
+    width: 100%;
+    border-bottom: none;
+}
+
+.login .form-row label {
+    padding-right: 0.5em;
+    line-height: 2em;
+    font-size: 1em;
+    clear: both;
+    color: #333;
+}
+
+.login .form-row #id_username, .login .form-row #id_password {
+    clear: both;
+    padding: 8px;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+.login span.help {
+    font-size: 10px;
+    display: block;
+}
+
+.login .submit-row {
+    clear: both;
+    padding: 1em 0 0 9.4em;
+    margin: 0;
+    border: none;
+    background: none;
+    text-align: left;
+}
+
+.login .password-reset-link {
+    text-align: center;
+}

static/admin/css/rtl.css

@@ -0,0 +1,256 @@
+body {
+    direction: rtl;
+}
+
+/* LOGIN */
+
+.login .form-row {
+    float: right;
+}
+
+.login .form-row label {
+    float: right;
+    padding-left: 0.5em;
+    padding-right: 0;
+    text-align: left;
+}
+
+.login .submit-row {
+    clear: both;
+    padding: 1em 9.4em 0 0;
+}
+
+/* GLOBAL */
+
+th {
+    text-align: right;
+}
+
+.module h2, .module caption {
+    text-align: right;
+}
+
+.module ul, .module ol {
+    margin-left: 0;
+    margin-right: 1.5em;
+}
+
+.addlink, .changelink {
+    padding-left: 0;
+    padding-right: 16px;
+    background-position: 100% 1px;
+}
+
+.deletelink {
+    padding-left: 0;
+    padding-right: 16px;
+    background-position: 100% 1px;
+}
+
+.object-tools {
+    float: left;
+}
+
+thead th:first-child,
+tfoot td:first-child {
+    border-left: none;
+}
+
+/* LAYOUT */
+
+#user-tools {
+    right: auto;
+    left: 0;
+    text-align: left;
+}
+
+div.breadcrumbs {
+    text-align: right;
+}
+
+#content-main {
+    float: right;
+}
+
+#content-related {
+    float: left;
+    margin-left: -300px;
+    margin-right: auto;
+}
+
+.colMS {
+    margin-left: 300px;
+    margin-right: 0;
+}
+
+/* SORTABLE TABLES */
+
+table thead th.sorted .sortoptions {
+   float: left;
+}
+
+thead th.sorted .text {
+    padding-right: 0;
+    padding-left: 42px;
+}
+
+/* dashboard styles */
+
+.dashboard .module table td a {
+    padding-left: .6em;
+    padding-right: 16px;
+}
+
+/* changelists styles */
+
+.change-list .filtered table {
+    border-left: none;
+    border-right: 0px none;
+}
+
+#changelist-filter {
+    right: auto;
+    left: 0;
+    border-left: none;
+    border-right: none;
+}
+
+.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
+    margin-right: 0;
+    margin-left: 280px;
+}
+
+#changelist-filter li.selected {
+    border-left: none;
+    padding-left: 10px;
+    margin-left: 0;
+    border-right: 5px solid #eaeaea;
+    padding-right: 10px;
+    margin-right: -15px;
+}
+
+.filtered .actions {
+    margin-left: 280px;
+    margin-right: 0;
+}
+
+#changelist table tbody td:first-child, #changelist table tbody th:first-child {
+    border-right: none;
+    border-left: none;
+}
+
+/* FORMS */
+
+.aligned label {
+    padding: 0 0 3px 1em;
+    float: right;
+}
+
+.submit-row {
+    text-align: left
+}
+
+.submit-row p.deletelink-box {
+    float: right;
+}
+
+.submit-row input.default {
+    margin-left: 0;
+}
+
+.vDateField, .vTimeField {
+    margin-left: 2px;
+}
+
+.aligned .form-row input {
+    margin-left: 5px;
+}
+
+form ul.inline li {
+    float: right;
+    padding-right: 0;
+    padding-left: 7px;
+}
+
+input[type=submit].default, .submit-row input.default {
+    float: left;
+}
+
+fieldset .field-box {
+    float: right;
+    margin-left: 20px;
+    margin-right: 0;
+}
+
+.errorlist li {
+    background-position: 100% 12px;
+    padding: 0;
+}
+
+.errornote {
+    background-position: 100% 12px;
+    padding: 10px 12px;
+}
+
+/* WIDGETS */
+
+.calendarnav-previous {
+    top: 0;
+    left: auto;
+    right: 10px;
+}
+
+.calendarnav-next {
+    top: 0;
+    right: auto;
+    left: 10px;
+}
+
+.calendar caption, .calendarbox h2 {
+    text-align: center;
+}
+
+.selector {
+    float: right;
+}
+
+.selector .selector-filter {
+    text-align: right;
+}
+
+.inline-deletelink {
+    float: left;
+}
+
+form .form-row p.datetime {
+    overflow: hidden;
+}
+
+/* MISC */
+
+.inline-related h2, .inline-group h2 {
+    text-align: right
+}
+
+.inline-related h3 span.delete {
+    padding-right: 20px;
+    padding-left: inherit;
+    left: 10px;
+    right: inherit;
+    float:left;
+}
+
+.inline-related h3 span.delete label {
+    margin-left: inherit;
+    margin-right: 2px;
+}
+
+/* IE7 specific bug fixes */
+
+div.colM {
+    position: relative;
+}
+
+.submit-row input {
+    float: left;
+}

static/admin/css/widgets.css

@@ -0,0 +1,565 @@
+/* SELECTOR (FILTER INTERFACE) */
+
+.selector {
+    width: 800px;
+    float: left;
+}
+
+.selector select {
+    width: 380px;
+    height: 17.2em;
+}
+
+.selector-available, .selector-chosen {
+    float: left;
+    width: 380px;
+    text-align: center;
+    margin-bottom: 5px;
+}
+
+.selector-chosen select {
+    border-top: none;
+}
+
+.selector-available h2, .selector-chosen h2 {
+    border: 1px solid #ccc;
+    border-radius: 4px 4px 0 0;
+}
+
+.selector-chosen h2 {
+    background: #79aec8;
+    color: #fff;
+}
+
+.selector .selector-available h2 {
+    background: #f8f8f8;
+    color: #666;
+}
+
+.selector .selector-filter {
+    background: white;
+    border: 1px solid #ccc;
+    border-width: 0 1px;
+    padding: 8px;
+    color: #999;
+    font-size: 10px;
+    margin: 0;
+    text-align: left;
+}
+
+.selector .selector-filter label,
+.inline-group .aligned .selector .selector-filter label {
+    float: left;
+    margin: 7px 0 0;
+    width: 18px;
+    height: 18px;
+    padding: 0;
+    overflow: hidden;
+    line-height: 1;
+}
+
+.selector .selector-available input {
+    width: 320px;
+    margin-left: 8px;
+}
+
+.selector ul.selector-chooser {
+    float: left;
+    width: 22px;
+    background-color: #eee;
+    border-radius: 10px;
+    margin: 10em 5px 0 5px;
+    padding: 0;
+}
+
+.selector-chooser li {
+    margin: 0;
+    padding: 3px;
+    list-style-type: none;
+}
+
+.selector select {
+    padding: 0 10px;
+    margin: 0 0 10px;
+    border-radius: 0 0 4px 4px;
+}
+
+.selector-add, .selector-remove {
+    width: 16px;
+    height: 16px;
+    display: block;
+    text-indent: -3000px;
+    overflow: hidden;
+    cursor: default;
+    opacity: 0.3;
+}
+
+.active.selector-add, .active.selector-remove {
+    opacity: 1;
+}
+
+.active.selector-add:hover, .active.selector-remove:hover {
+    cursor: pointer;
+}
+
+.selector-add {
+    background: url(../img/selector-icons.svg) 0 -96px no-repeat;
+}
+
+.active.selector-add:focus, .active.selector-add:hover {
+    background-position: 0 -112px;
+}
+
+.selector-remove {
+    background: url(../img/selector-icons.svg) 0 -64px no-repeat;
+}
+
+.active.selector-remove:focus, .active.selector-remove:hover {
+    background-position: 0 -80px;
+}
+
+a.selector-chooseall, a.selector-clearall {
+    display: inline-block;
+    height: 16px;
+    text-align: left;
+    margin: 1px auto 3px;
+    overflow: hidden;
+    font-weight: bold;
+    line-height: 16px;
+    color: #666;
+    text-decoration: none;
+    opacity: 0.3;
+}
+
+a.active.selector-chooseall:focus, a.active.selector-clearall:focus,
+a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
+    color: #447e9b;
+}
+
+a.active.selector-chooseall, a.active.selector-clearall {
+    opacity: 1;
+}
+
+a.active.selector-chooseall:hover, a.active.selector-clearall:hover {
+    cursor: pointer;
+}
+
+a.selector-chooseall {
+    padding: 0 18px 0 0;
+    background: url(../img/selector-icons.svg) right -160px no-repeat;
+    cursor: default;
+}
+
+a.active.selector-chooseall:focus, a.active.selector-chooseall:hover {
+    background-position: 100% -176px;
+}
+
+a.selector-clearall {
+    padding: 0 0 0 18px;
+    background: url(../img/selector-icons.svg) 0 -128px no-repeat;
+    cursor: default;
+}
+
+a.active.selector-clearall:focus, a.active.selector-clearall:hover {
+    background-position: 0 -144px;
+}
+
+/* STACKED SELECTORS */
+
+.stacked {
+    float: left;
+    width: 490px;
+}
+
+.stacked select {
+    width: 480px;
+    height: 10.1em;
+}
+
+.stacked .selector-available, .stacked .selector-chosen {
+    width: 480px;
+}
+
+.stacked .selector-available {
+    margin-bottom: 0;
+}
+
+.stacked .selector-available input {
+    width: 422px;
+}
+
+.stacked ul.selector-chooser {
+    height: 22px;
+    width: 50px;
+    margin: 0 0 10px 40%;
+    background-color: #eee;
+    border-radius: 10px;
+}
+
+.stacked .selector-chooser li {
+    float: left;
+    padding: 3px 3px 3px 5px;
+}
+
+.stacked .selector-chooseall, .stacked .selector-clearall {
+    display: none;
+}
+
+.stacked .selector-add {
+    background: url(../img/selector-icons.svg) 0 -32px no-repeat;
+    cursor: default;
+}
+
+.stacked .active.selector-add {
+    background-position: 0 -48px;
+    cursor: pointer;
+}
+
+.stacked .selector-remove {
+    background: url(../img/selector-icons.svg) 0 0 no-repeat;
+    cursor: default;
+}
+
+.stacked .active.selector-remove {
+    background-position: 0 -16px;
+    cursor: pointer;
+}
+
+.selector .help-icon {
+    background: url(../img/icon-unknown.svg) 0 0 no-repeat;
+    display: inline-block;
+    vertical-align: middle;
+    margin: -2px 0 0 2px;
+    width: 13px;
+    height: 13px;
+}
+
+.selector .selector-chosen .help-icon {
+    background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat;
+}
+
+.selector .search-label-icon {
+    background: url(../img/search.svg) 0 0 no-repeat;
+    display: inline-block;
+    height: 18px;
+    width: 18px;
+}
+
+/* DATE AND TIME */
+
+p.datetime {
+    line-height: 20px;
+    margin: 0;
+    padding: 0;
+    color: #666;
+    font-weight: bold;
+}
+
+.datetime span {
+    white-space: nowrap;
+    font-weight: normal;
+    font-size: 11px;
+    color: #ccc;
+}
+
+.datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField {
+    min-width: 0;
+    margin-left: 5px;
+    margin-bottom: 4px;
+}
+
+table p.datetime {
+    font-size: 11px;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.datetimeshortcuts .clock-icon, .datetimeshortcuts .date-icon {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    height: 16px;
+    width: 16px;
+    overflow: hidden;
+}
+
+.datetimeshortcuts .clock-icon {
+    background: url(../img/icon-clock.svg) 0 0 no-repeat;
+}
+
+.datetimeshortcuts a:focus .clock-icon,
+.datetimeshortcuts a:hover .clock-icon {
+    background-position: 0 -16px;
+}
+
+.datetimeshortcuts .date-icon {
+    background: url(../img/icon-calendar.svg) 0 0 no-repeat;
+    top: -1px;
+}
+
+.datetimeshortcuts a:focus .date-icon,
+.datetimeshortcuts a:hover .date-icon {
+    background-position: 0 -16px;
+}
+
+.timezonewarning {
+    font-size: 11px;
+    color: #999;
+}
+
+/* URL */
+
+p.url {
+    line-height: 20px;
+    margin: 0;
+    padding: 0;
+    color: #666;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.url a {
+    font-weight: normal;
+}
+
+/* FILE UPLOADS */
+
+p.file-upload {
+    line-height: 20px;
+    margin: 0;
+    padding: 0;
+    color: #666;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.aligned p.file-upload {
+    margin-left: 170px;
+}
+
+.file-upload a {
+    font-weight: normal;
+}
+
+.file-upload .deletelink {
+    margin-left: 5px;
+}
+
+span.clearable-file-input label {
+    color: #333;
+    font-size: 11px;
+    display: inline;
+    float: none;
+}
+
+/* CALENDARS & CLOCKS */
+
+.calendarbox, .clockbox {
+    margin: 5px auto;
+    font-size: 12px;
+    width: 19em;
+    text-align: center;
+    background: white;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
+    overflow: hidden;
+    position: relative;
+}
+
+.clockbox {
+    width: auto;
+}
+
+.calendar {
+    margin: 0;
+    padding: 0;
+}
+
+.calendar table {
+    margin: 0;
+    padding: 0;
+    border-collapse: collapse;
+    background: white;
+    width: 100%;
+}
+
+.calendar caption, .calendarbox h2 {
+    margin: 0;
+    text-align: center;
+    border-top: none;
+    background: #f5dd5d;
+    font-weight: 700;
+    font-size: 12px;
+    color: #333;
+}
+
+.calendar th {
+    padding: 8px 5px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #ddd;
+    font-weight: 400;
+    font-size: 12px;
+    text-align: center;
+    color: #666;
+}
+
+.calendar td {
+    font-weight: 400;
+    font-size: 12px;
+    text-align: center;
+    padding: 0;
+    border-top: 1px solid #eee;
+    border-bottom: none;
+}
+
+.calendar td.selected a {
+    background: #79aec8;
+    color: #fff;
+}
+
+.calendar td.nonday {
+    background: #f8f8f8;
+}
+
+.calendar td.today a {
+    font-weight: 700;
+}
+
+.calendar td a, .timelist a {
+    display: block;
+    font-weight: 400;
+    padding: 6px;
+    text-decoration: none;
+    color: #444;
+}
+
+.calendar td a:focus, .timelist a:focus,
+.calendar td a:hover, .timelist a:hover {
+    background: #79aec8;
+    color: white;
+}
+
+.calendar td a:active, .timelist a:active {
+    background: #417690;
+    color: white;
+}
+
+.calendarnav {
+    font-size: 10px;
+    text-align: center;
+    color: #ccc;
+    margin: 0;
+    padding: 1px 3px;
+}
+
+.calendarnav a:link, #calendarnav a:visited,
+#calendarnav a:focus, #calendarnav a:hover {
+    color: #999;
+}
+
+.calendar-shortcuts {
+    background: white;
+    font-size: 11px;
+    line-height: 11px;
+    border-top: 1px solid #eee;
+    padding: 8px 0;
+    color: #ccc;
+}
+
+.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next {
+    display: block;
+    position: absolute;
+    top: 8px;
+    width: 15px;
+    height: 15px;
+    text-indent: -9999px;
+    padding: 0;
+}
+
+.calendarnav-previous {
+    left: 10px;
+    background: url(../img/calendar-icons.svg) 0 0 no-repeat;
+}
+
+.calendarbox .calendarnav-previous:focus,
+.calendarbox .calendarnav-previous:hover {
+    background-position: 0 -15px;
+}
+
+.calendarnav-next {
+    right: 10px;
+    background: url(../img/calendar-icons.svg) 0 -30px no-repeat;
+}
+
+.calendarbox .calendarnav-next:focus,
+.calendarbox .calendarnav-next:hover {
+    background-position: 0 -45px;
+}
+
+.calendar-cancel {
+    margin: 0;
+    padding: 4px 0;
+    font-size: 12px;
+    background: #eee;
+    border-top: 1px solid #ddd;
+    color: #333;
+}
+
+.calendar-cancel:focus, .calendar-cancel:hover {
+    background: #ddd;
+}
+
+.calendar-cancel a {
+    color: black;
+    display: block;
+}
+
+ul.timelist, .timelist li {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+.timelist a {
+    padding: 2px;
+}
+
+/* EDIT INLINE */
+
+.inline-deletelink {
+    float: right;
+    text-indent: -9999px;
+    background: url(../img/inline-delete.svg) 0 0 no-repeat;
+    width: 16px;
+    height: 16px;
+    border: 0px none;
+}
+
+.inline-deletelink:focus, .inline-deletelink:hover {
+    cursor: pointer;
+}
+
+/* RELATED WIDGET WRAPPER */
+.related-widget-wrapper {
+    float: left;       /* display properly in form rows with multiple fields */
+    overflow: hidden;  /* clear floated contents */
+}
+
+.related-widget-wrapper-link {
+    opacity: 0.3;
+}
+
+.related-widget-wrapper-link:link {
+    opacity: .8;
+}
+
+.related-widget-wrapper-link:link:focus,
+.related-widget-wrapper-link:link:hover {
+    opacity: 1;
+}
+
+select + .related-widget-wrapper-link,
+.related-widget-wrapper-link + .related-widget-wrapper-link {
+    margin-left: 7px;
+}

static/admin/fonts/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

static/admin/fonts/README.txt

@@ -0,0 +1,2 @@
+Roboto webfont source: https://www.google.com/fonts/specimen/Roboto
+Weights used in this project: Light (300), Regular (400), Bold (700)

static/admin/img/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Code Charm Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

static/admin/img/README.txt

@@ -0,0 +1,7 @@
+All icons are taken from Font Awesome (http://fontawesome.io/) project.
+The Font Awesome font is licensed under the SIL OFL 1.1:
+- http://scripts.sil.org/OFL
+
+SVG icons source: https://github.com/encharm/Font-Awesome-SVG-PNG
+Font-Awesome-SVG-PNG is licensed under the MIT license (see file license
+in current folder).

static/admin/img/calendar-icons.svg

@@ -0,0 +1,14 @@
+<svg width="15" height="60" viewBox="0 0 1792 7168" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <g id="previous">
+      <path d="M1037 1395l102-102q19-19 19-45t-19-45l-307-307 307-307q19-19 19-45t-19-45l-102-102q-19-19-45-19t-45 19l-454 454q-19 19-19 45t19 45l454 454q19 19 45 19t45-19zm627-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="next">
+      <path d="M845 1395l454-454q19-19 19-45t-19-45l-454-454q-19-19-45-19t-45 19l-102 102q-19 19-19 45t19 45l307 307-307 307q-19 19-19 45t19 45l102 102q19 19 45 19t45-19zm819-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+  </defs>
+  <use xlink:href="#previous" x="0" y="0" fill="#333333" />
+  <use xlink:href="#previous" x="0" y="1792" fill="#000000" />
+  <use xlink:href="#next" x="0" y="3584" fill="#333333" />
+  <use xlink:href="#next" x="0" y="5376" fill="#000000" />
+</svg>

static/admin/img/gis/move_vertex_off.svg

@@ -0,0 +1 @@
+<svg width="24" height="22" viewBox="0 0 847 779" xmlns="http://www.w3.org/2000/svg"><g><path fill="#EBECE6" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120z"/><path fill="#9E9E93" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120zm607 25h-607c-26 0-50 11-67 28-17 18-28 41-28 67v536c0 27 11 50 28 68 17 17 41 27 67 27h607c26 0 49-10 67-27 17-18 28-41 28-68v-536c0-26-11-49-28-67-18-17-41-28-67-28z"/><path stroke="#A9A8A4" stroke-width="20" d="M706 295l-68 281"/><path stroke="#E47474" stroke-width="20" d="M316 648l390-353M141 435l175 213"/><path stroke="#C9C9C9" stroke-width="20" d="M319 151l-178 284M706 295l-387-144"/><g fill="#040405"><path d="M319 111c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40zM141 395c22 0 40 18 40 40s-18 40-40 40c-23 0-41-18-41-40s18-40 41-40zM316 608c22 0 40 18 40 40 0 23-18 41-40 41s-40-18-40-41c0-22 18-40 40-40zM706 254c22 0 40 18 40 41 0 22-18 40-40 40s-40-18-40-40c0-23 18-41 40-41zM638 536c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40z"/></g></g></svg>

static/admin/img/gis/move_vertex_on.svg

@@ -0,0 +1 @@
+<svg width="24" height="22" viewBox="0 0 847 779" xmlns="http://www.w3.org/2000/svg"><g><path fill="#F1C02A" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120z"/><path fill="#9E9E93" d="M120 1h607c66 0 120 54 120 120v536c0 66-54 120-120 120h-607c-66 0-120-54-120-120v-536c0-66 54-120 120-120zm607 25h-607c-26 0-50 11-67 28-17 18-28 41-28 67v536c0 27 11 50 28 68 17 17 41 27 67 27h607c26 0 49-10 67-27 17-18 28-41 28-68v-536c0-26-11-49-28-67-18-17-41-28-67-28z"/><path stroke="#A9A8A4" stroke-width="20" d="M706 295l-68 281"/><path stroke="#E47474" stroke-width="20" d="M316 648l390-353M141 435l175 213"/><path stroke="#C9A741" stroke-width="20" d="M319 151l-178 284M706 295l-387-144"/><g fill="#040405"><path d="M319 111c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40zM141 395c22 0 40 18 40 40s-18 40-40 40c-23 0-41-18-41-40s18-40 41-40zM316 608c22 0 40 18 40 40 0 23-18 41-40 41s-40-18-40-41c0-22 18-40 40-40zM706 254c22 0 40 18 40 41 0 22-18 40-40 40s-40-18-40-40c0-23 18-41 40-41zM638 536c22 0 40 18 40 40s-18 40-40 40-40-18-40-40 18-40 40-40z"/></g></g></svg>

static/admin/img/icon-addlink.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#70bf2b" d="M1600 796v192q0 40-28 68t-68 28h-416v416q0 40-28 68t-68 28h-192q-40 0-68-28t-28-68v-416h-416q-40 0-68-28t-28-68v-192q0-40 28-68t68-28h416v-416q0-40 28-68t68-28h192q40 0 68 28t28 68v416h416q40 0 68 28t28 68z"/>
+</svg>

static/admin/img/icon-alert.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#efb80b" d="M1024 1375v-190q0-14-9.5-23.5t-22.5-9.5h-192q-13 0-22.5 9.5t-9.5 23.5v190q0 14 9.5 23.5t22.5 9.5h192q13 0 22.5-9.5t9.5-23.5zm-2-374l18-459q0-12-10-19-13-11-24-11h-220q-11 0-24 11-10 7-10 21l17 457q0 10 10 16.5t24 6.5h185q14 0 23.5-6.5t10.5-16.5zm-14-934l768 1408q35 63-2 126-17 29-46.5 46t-63.5 17h-1536q-34 0-63.5-17t-46.5-46q-37-63-2-126l768-1408q17-31 47-49t65-18 65 18 47 49z"/>
+</svg>

static/admin/img/icon-calendar.svg

@@ -0,0 +1,9 @@
+<svg width="16" height="32" viewBox="0 0 1792 3584" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <g id="icon">
+      <path d="M192 1664h288v-288h-288v288zm352 0h320v-288h-320v288zm-352-352h288v-320h-288v320zm352 0h320v-320h-320v320zm-352-384h288v-288h-288v288zm736 736h320v-288h-320v288zm-384-736h320v-288h-320v288zm768 736h288v-288h-288v288zm-384-352h320v-320h-320v320zm-352-864v-288q0-13-9.5-22.5t-22.5-9.5h-64q-13 0-22.5 9.5t-9.5 22.5v288q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5-9.5t9.5-22.5zm736 864h288v-320h-288v320zm-384-384h320v-288h-320v288zm384 0h288v-288h-288v288zm32-480v-288q0-13-9.5-22.5t-22.5-9.5h-64q-13 0-22.5 9.5t-9.5 22.5v288q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5-9.5t9.5-22.5zm384-64v1280q0 52-38 90t-90 38h-1408q-52 0-90-38t-38-90v-1280q0-52 38-90t90-38h128v-96q0-66 47-113t113-47h64q66 0 113 47t47 113v96h384v-96q0-66 47-113t113-47h64q66 0 113 47t47 113v96h128q52 0 90 38t38 90z"/>
+    </g>
+  </defs>
+  <use xlink:href="#icon" x="0" y="0" fill="#447e9b" />
+  <use xlink:href="#icon" x="0" y="1792" fill="#003366" />
+</svg>

static/admin/img/icon-changelink.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#efb80b" d="M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z"/>
+</svg>

static/admin/img/icon-clock.svg

@@ -0,0 +1,9 @@
+<svg width="16" height="32" viewBox="0 0 1792 3584" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <g id="icon">
+      <path d="M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+  </defs>
+  <use xlink:href="#icon" x="0" y="0" fill="#447e9b" />
+  <use xlink:href="#icon" x="0" y="1792" fill="#003366" />
+</svg>

static/admin/img/icon-deletelink.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#dd4646" d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z"/>
+</svg>

static/admin/img/icon-no.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#dd4646" d="M1277 1122q0-26-19-45l-181-181 181-181q19-19 19-45 0-27-19-46l-90-90q-19-19-46-19-26 0-45 19l-181 181-181-181q-19-19-45-19-27 0-46 19l-90 90q-19 19-19 46 0 26 19 45l181 181-181 181q-19 19-19 45 0 27 19 46l90 90q19 19 46 19 26 0 45-19l181-181 181 181q19 19 45 19 27 0 46-19l90-90q19-19 19-46zm387-226q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+</svg>

static/admin/img/icon-unknown-alt.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#ffffff" d="M1024 1376v-192q0-14-9-23t-23-9h-192q-14 0-23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23-9t9-23zm256-672q0-88-55.5-163t-138.5-116-170-41q-243 0-371 213-15 24 8 42l132 100q7 6 19 6 16 0 25-12 53-68 86-92 34-24 86-24 48 0 85.5 26t37.5 59q0 38-20 61t-68 45q-63 28-115.5 86.5t-52.5 125.5v36q0 14 9 23t23 9h192q14 0 23-9t9-23q0-19 21.5-49.5t54.5-49.5q32-18 49-28.5t46-35 44.5-48 28-60.5 12.5-81zm384 192q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+</svg>

static/admin/img/icon-unknown.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#666666" d="M1024 1376v-192q0-14-9-23t-23-9h-192q-14 0-23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23-9t9-23zm256-672q0-88-55.5-163t-138.5-116-170-41q-243 0-371 213-15 24 8 42l132 100q7 6 19 6 16 0 25-12 53-68 86-92 34-24 86-24 48 0 85.5 26t37.5 59q0 38-20 61t-68 45q-63 28-115.5 86.5t-52.5 125.5v36q0 14 9 23t23 9h192q14 0 23-9t9-23q0-19 21.5-49.5t54.5-49.5q32-18 49-28.5t46-35 44.5-48 28-60.5 12.5-81zm384 192q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+</svg>

static/admin/img/icon-yes.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#70bf2b" d="M1412 734q0-28-18-46l-91-90q-19-19-45-19t-45 19l-408 407-226-226q-19-19-45-19t-45 19l-91 90q-18 18-18 46 0 27 18 45l362 362q19 19 45 19 27 0 46-19l543-543q18-18 18-45zm252 162q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+</svg>

static/admin/img/inline-delete.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#999999" d="M1277 1122q0-26-19-45l-181-181 181-181q19-19 19-45 0-27-19-46l-90-90q-19-19-46-19-26 0-45 19l-181 181-181-181q-19-19-45-19-27 0-46 19l-90 90q-19 19-19 46 0 26 19 45l181 181-181 181q-19 19-19 45 0 27 19 46l90 90q19 19 46 19 26 0 45-19l181-181 181 181q19 19 45 19 27 0 46-19l90-90q19-19 19-46zm387-226q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+</svg>

static/admin/img/search.svg

@@ -0,0 +1,3 @@
+<svg width="15" height="15" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#555555" d="M1216 832q0-185-131.5-316.5t-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5 316.5-131.5 131.5-316.5zm512 832q0 52-38 90t-90 38q-54 0-90-38l-343-342q-179 124-399 124-143 0-273.5-55.5t-225-150-150-225-55.5-273.5 55.5-273.5 150-225 225-150 273.5-55.5 273.5 55.5 225 150 150 225 55.5 273.5q0 220-124 399l343 343q37 37 37 90z"/>
+</svg>

static/admin/img/selector-icons.svg

@@ -0,0 +1,34 @@
+<svg width="16" height="192" viewBox="0 0 1792 21504" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <g id="up">
+      <path d="M1412 895q0-27-18-45l-362-362-91-91q-18-18-45-18t-45 18l-91 91-362 362q-18 18-18 45t18 45l91 91q18 18 45 18t45-18l189-189v502q0 26 19 45t45 19h128q26 0 45-19t19-45v-502l189 189q19 19 45 19t45-19l91-91q18-18 18-45zm252 1q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="down">
+      <path d="M1412 897q0-27-18-45l-91-91q-18-18-45-18t-45 18l-189 189v-502q0-26-19-45t-45-19h-128q-26 0-45 19t-19 45v502l-189-189q-19-19-45-19t-45 19l-91 91q-18 18-18 45t18 45l362 362 91 91q18 18 45 18t45-18l91-91 362-362q18-18 18-45zm252-1q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="left">
+      <path d="M1408 960v-128q0-26-19-45t-45-19h-502l189-189q19-19 19-45t-19-45l-91-91q-18-18-45-18t-45 18l-362 362-91 91q-18 18-18 45t18 45l91 91 362 362q18 18 45 18t45-18l91-91q18-18 18-45t-18-45l-189-189h502q26 0 45-19t19-45zm256-64q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="right">
+      <path d="M1413 896q0-27-18-45l-91-91-362-362q-18-18-45-18t-45 18l-91 91q-18 18-18 45t18 45l189 189h-502q-26 0-45 19t-19 45v128q0 26 19 45t45 19h502l-189 189q-19 19-19 45t19 45l91 91q18 18 45 18t45-18l362-362 91-91q18-18 18-45zm251 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="clearall">
+      <path transform="translate(336, 336) scale(0.75)" d="M1037 1395l102-102q19-19 19-45t-19-45l-307-307 307-307q19-19 19-45t-19-45l-102-102q-19-19-45-19t-45 19l-454 454q-19 19-19 45t19 45l454 454q19 19 45 19t45-19zm627-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+    <g id="chooseall">
+      <path transform="translate(336, 336) scale(0.75)" d="M845 1395l454-454q19-19 19-45t-19-45l-454-454q-19-19-45-19t-45 19l-102 102q-19 19-19 45t19 45l307 307-307 307q-19 19-19 45t19 45l102 102q19 19 45 19t45-19zm819-499q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/>
+    </g>
+  </defs>
+  <use xlink:href="#up" x="0" y="0" fill="#666666" />
+  <use xlink:href="#up" x="0" y="1792" fill="#447e9b" />
+  <use xlink:href="#down" x="0" y="3584" fill="#666666" />
+  <use xlink:href="#down" x="0" y="5376" fill="#447e9b" />
+  <use xlink:href="#left" x="0" y="7168" fill="#666666" />
+  <use xlink:href="#left" x="0" y="8960" fill="#447e9b" />
+  <use xlink:href="#right" x="0" y="10752" fill="#666666" />
+  <use xlink:href="#right" x="0" y="12544" fill="#447e9b" />
+  <use xlink:href="#clearall" x="0" y="14336" fill="#666666" />
+  <use xlink:href="#clearall" x="0" y="16128" fill="#447e9b" />
+  <use xlink:href="#chooseall" x="0" y="17920" fill="#666666" />
+  <use xlink:href="#chooseall" x="0" y="19712" fill="#447e9b" />
+</svg>

static/admin/img/sorting-icons.svg

@@ -0,0 +1,19 @@
+<svg width="14" height="84" viewBox="0 0 1792 10752" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <g id="sort">
+      <path d="M1408 1088q0 26-19 45l-448 448q-19 19-45 19t-45-19l-448-448q-19-19-19-45t19-45 45-19h896q26 0 45 19t19 45zm0-384q0 26-19 45t-45 19h-896q-26 0-45-19t-19-45 19-45l448-448q19-19 45-19t45 19l448 448q19 19 19 45z"/>
+    </g>
+    <g id="ascending">
+      <path d="M1408 1216q0 26-19 45t-45 19h-896q-26 0-45-19t-19-45 19-45l448-448q19-19 45-19t45 19l448 448q19 19 19 45z"/>
+    </g>
+    <g id="descending">
+      <path d="M1408 704q0 26-19 45l-448 448q-19 19-45 19t-45-19l-448-448q-19-19-19-45t19-45 45-19h896q26 0 45 19t19 45z"/>
+    </g>
+  </defs>
+  <use xlink:href="#sort" x="0" y="0" fill="#999999" />
+  <use xlink:href="#sort" x="0" y="1792" fill="#447e9b" />
+  <use xlink:href="#ascending" x="0" y="3584" fill="#999999" />
+  <use xlink:href="#ascending" x="0" y="5376" fill="#447e9b" />
+  <use xlink:href="#descending" x="0" y="7168" fill="#999999" />
+  <use xlink:href="#descending" x="0" y="8960" fill="#447e9b" />
+</svg>

static/admin/img/tooltag-add.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#ffffff" d="M1600 736v192q0 40-28 68t-68 28h-416v416q0 40-28 68t-68 28h-192q-40 0-68-28t-28-68v-416h-416q-40 0-68-28t-28-68v-192q0-40 28-68t68-28h416v-416q0-40 28-68t68-28h192q40 0 68 28t28 68v416h416q40 0 68 28t28 68z"/>
+</svg>

static/admin/img/tooltag-arrowright.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="13" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#ffffff" d="M1363 877l-742 742q-19 19-45 19t-45-19l-166-166q-19-19-19-45t19-45l531-531-531-531q-19-19-19-45t19-45l166-166q19-19 45-19t45 19l742 742q19 19 19 45t-19 45z"/>
+</svg>

static/admin/js/SelectBox.js

@@ -0,0 +1,135 @@
+(function() {
+    'use strict';
+    var SelectBox = {
+        cache: {},
+        init: function(id) {
+            var box = document.getElementById(id);
+            var node;
+            SelectBox.cache[id] = [];
+            var cache = SelectBox.cache[id];
+            for (var i = 0, j = box.options.length; i < j; i++) {
+                node = box.options[i];
+                cache.push({value: node.value, text: node.text, displayed: 1});
+            }
+        },
+        redisplay: function(id) {
+            // Repopulate HTML select box from cache
+            var box = document.getElementById(id);
+            var node;
+            box.options.length = 0; // clear all options
+            var cache = SelectBox.cache[id];
+            for (var i = 0, j = cache.length; i < j; i++) {
+                node = cache[i];
+                if (node.displayed) {
+                    var new_option = new Option(node.text, node.value, false, false);
+                    // Shows a tooltip when hovering over the option
+                    new_option.setAttribute("title", node.text);
+                    box.options[box.options.length] = new_option;
+                }
+            }
+        },
+        filter: function(id, text) {
+            // Redisplay the HTML select box, displaying only the choices containing ALL
+            // the words in text. (It's an AND search.)
+            var tokens = text.toLowerCase().split(/\s+/);
+            var node, token;
+            var cache = SelectBox.cache[id];
+            for (var i = 0, j = cache.length; i < j; i++) {
+                node = cache[i];
+                node.displayed = 1;
+                var numTokens = tokens.length;
+                for (var k = 0; k < numTokens; k++) {
+                    token = tokens[k];
+                    if (node.text.toLowerCase().indexOf(token) === -1) {
+                        node.displayed = 0;
+                    }
+                }
+            }
+            SelectBox.redisplay(id);
+        },
+        delete_from_cache: function(id, value) {
+            var node, delete_index = null;
+            var cache = SelectBox.cache[id];
+            for (var i = 0, j = cache.length; i < j; i++) {
+                node = cache[i];
+                if (node.value === value) {
+                    delete_index = i;
+                    break;
+                }
+            }
+            var k = cache.length - 1;
+            for (i = delete_index; i < k; i++) {
+                cache[i] = cache[i + 1];
+            }
+            cache.length--;
+        },
+        add_to_cache: function(id, option) {
+            SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1});
+        },
+        cache_contains: function(id, value) {
+            // Check if an item is contained in the cache
+            var node;
+            var cache = SelectBox.cache[id];
+            for (var i = 0, j = cache.length; i < j; i++) {
+                node = cache[i];
+                if (node.value === value) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        move: function(from, to) {
+            var from_box = document.getElementById(from);
+            var option;
+            var boxOptions = from_box.options;
+            for (var i = 0, j = boxOptions.length; i < j; i++) {
+                option = boxOptions[i];
+                if (option.selected && SelectBox.cache_contains(from, option.value)) {
+                    SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
+                    SelectBox.delete_from_cache(from, option.value);
+                }
+            }
+            SelectBox.redisplay(from);
+            SelectBox.redisplay(to);
+        },
+        move_all: function(from, to) {
+            var from_box = document.getElementById(from);
+            var option;
+            var boxOptions = from_box.options;
+            for (var i = 0, j = boxOptions.length; i < j; i++) {
+                option = boxOptions[i];
+                if (SelectBox.cache_contains(from, option.value)) {
+                    SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1});
+                    SelectBox.delete_from_cache(from, option.value);
+                }
+            }
+            SelectBox.redisplay(from);
+            SelectBox.redisplay(to);
+        },
+        sort: function(id) {
+            SelectBox.cache[id].sort(function(a, b) {
+                a = a.text.toLowerCase();
+                b = b.text.toLowerCase();
+                try {
+                    if (a > b) {
+                        return 1;
+                    }
+                    if (a < b) {
+                        return -1;
+                    }
+                }
+                catch (e) {
+                    // silently fail on IE 'unknown' exception
+                }
+                return 0;
+            } );
+        },
+        select_all: function(id) {
+            var box = document.getElementById(id);
+            for (var i = 0; i < box.options.length; i++) {
+                box.options[i].selected = 'selected';
+            }
+        }
+    };
+    window.SelectBox = SelectBox;
+})();

static/admin/js/SelectFilter2.js

@@ -0,0 +1,198 @@
+/*global SelectBox, addEvent, gettext, interpolate, quickElement, SelectFilter*/
+/*
+SelectFilter2 - Turns a multiple-select box into a filter interface.
+
+Requires core.js, SelectBox.js and addevent.js.
+*/
+(function($) {
+    'use strict';
+    function findForm(node) {
+        // returns the node of the form containing the given node
+        if (node.tagName.toLowerCase() !== 'form') {
+            return findForm(node.parentNode);
+        }
+        return node;
+    }
+
+    window.SelectFilter = {
+        init: function(field_id, field_name, is_stacked) {
+            if (field_id.match(/__prefix__/)) {
+                // Don't initialize on empty forms.
+                return;
+            }
+            var from_box = document.getElementById(field_id);
+            from_box.id += '_from'; // change its ID
+            from_box.className = 'filtered';
+
+            var ps = from_box.parentNode.getElementsByTagName('p');
+            for (var i = 0; i < ps.length; i++) {
+                if (ps[i].className.indexOf("info") !== -1) {
+                    // Remove <p class="info">, because it just gets in the way.
+                    from_box.parentNode.removeChild(ps[i]);
+                } else if (ps[i].className.indexOf("help") !== -1) {
+                    // Move help text up to the top so it isn't below the select
+                    // boxes or wrapped off on the side to the right of the add
+                    // button:
+                    from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild);
+                }
+            }
+
+            // <div class="selector"> or <div class="selector stacked">
+            var selector_div = quickElement('div', from_box.parentNode);
+            selector_div.className = is_stacked ? 'selector stacked' : 'selector';
+
+            // <div class="selector-available">
+            var selector_available = quickElement('div', selector_div);
+            selector_available.className = 'selector-available';
+            var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
+            quickElement(
+                'span', title_available, '',
+                'class', 'help help-tooltip help-icon',
+                'title', interpolate(
+                    gettext(
+                        'This is the list of available %s. You may choose some by ' +
+                        'selecting them in the box below and then clicking the ' +
+                        '"Choose" arrow between the two boxes.'
+                    ),
+                    [field_name]
+                )
+            );
+
+            var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
+            filter_p.className = 'selector-filter';
+
+            var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input');
+
+            quickElement(
+                'span', search_filter_label, '',
+                'class', 'help-tooltip search-label-icon',
+                'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name])
+            );
+
+            filter_p.appendChild(document.createTextNode(' '));
+
+            var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter"));
+            filter_input.id = field_id + '_input';
+
+            selector_available.appendChild(from_box);
+            var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_add_all_link');
+            choose_all.className = 'selector-chooseall';
+
+            // <ul class="selector-chooser">
+            var selector_chooser = quickElement('ul', selector_div);
+            selector_chooser.className = 'selector-chooser';
+            var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', 'javascript:void(0);', 'id', field_id + '_add_link');
+            add_link.className = 'selector-add';
+            var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', 'javascript:void(0);', 'id', field_id + '_remove_link');
+            remove_link.className = 'selector-remove';
+
+            // <div class="selector-chosen">
+            var selector_chosen = quickElement('div', selector_div);
+            selector_chosen.className = 'selector-chosen';
+            var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
+            quickElement(
+                'span', title_chosen, '',
+                'class', 'help help-tooltip help-icon',
+                'title', interpolate(
+                    gettext(
+                        'This is the list of chosen %s. You may remove some by ' +
+                        'selecting them in the box below and then clicking the ' +
+                        '"Remove" arrow between the two boxes.'
+                    ),
+                    [field_name]
+                )
+            );
+
+            var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
+            to_box.className = 'filtered';
+            var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', 'javascript:void(0);', 'id', field_id + '_remove_all_link');
+            clear_all.className = 'selector-clearall';
+
+            from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
+
+            // Set up the JavaScript event handlers for the select box filter interface
+            addEvent(choose_all, 'click', function() { SelectBox.move_all(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+            addEvent(add_link, 'click', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+            addEvent(remove_link, 'click', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+            addEvent(clear_all, 'click', function() { SelectBox.move_all(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+            addEvent(filter_input, 'keypress', function(e) { SelectFilter.filter_key_press(e, field_id); });
+            addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); });
+            addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); });
+            addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); });
+            addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id); });
+            addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
+            addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+            addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); });
+            SelectBox.init(field_id + '_from');
+            SelectBox.init(field_id + '_to');
+            // Move selected from_box options to to_box
+            SelectBox.move(field_id + '_from', field_id + '_to');
+
+            if (!is_stacked) {
+                // In horizontal mode, give the same height to the two boxes.
+                var j_from_box = $(from_box);
+                var j_to_box = $(to_box);
+                var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); };
+                if (j_from_box.outerHeight() > 0) {
+                    resize_filters(); // This fieldset is already open. Resize now.
+                } else {
+                    // This fieldset is probably collapsed. Wait for its 'show' event.
+                    j_to_box.closest('fieldset').one('show.fieldset', resize_filters);
+                }
+            }
+
+            // Initial icon refresh
+            SelectFilter.refresh_icons(field_id);
+        },
+        refresh_icons: function(field_id) {
+            var from = $('#' + field_id + '_from');
+            var to = $('#' + field_id + '_to');
+            var is_from_selected = from.find('option:selected').length > 0;
+            var is_to_selected = to.find('option:selected').length > 0;
+            // Active if at least one item is selected
+            $('#' + field_id + '_add_link').toggleClass('active', is_from_selected);
+            $('#' + field_id + '_remove_link').toggleClass('active', is_to_selected);
+            // Active if the corresponding box isn't empty
+            $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
+            $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
+        },
+        filter_key_press: function(event, field_id) {
+            var from = document.getElementById(field_id + '_from');
+            // don't submit form if user pressed Enter
+            if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) {
+                from.selectedIndex = 0;
+                SelectBox.move(field_id + '_from', field_id + '_to');
+                from.selectedIndex = 0;
+                event.preventDefault();
+                return false;
+            }
+        },
+        filter_key_up: function(event, field_id) {
+            var from = document.getElementById(field_id + '_from');
+            var temp = from.selectedIndex;
+            SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);
+            from.selectedIndex = temp;
+            return true;
+        },
+        filter_key_down: function(event, field_id) {
+            var from = document.getElementById(field_id + '_from');
+            // right arrow -- move across
+            if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) {
+                var old_index = from.selectedIndex;
+                SelectBox.move(field_id + '_from', field_id + '_to');
+                from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index;
+                return false;
+            }
+            // down arrow -- wrap around
+            if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) {
+                from.selectedIndex = (from.length === from.selectedIndex + 1) ? 0 : from.selectedIndex + 1;
+            }
+            // up arrow -- wrap around
+            if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) {
+                from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1;
+            }
+            return true;
+        }
+    };
+
+})(django.jQuery);

static/admin/js/actions.js

@@ -0,0 +1,146 @@
+/*global _actions_icnt, gettext, interpolate, ngettext*/
+(function($) {
+    'use strict';
+    var lastChecked;
+
+    $.fn.actions = function(opts) {
+        var options = $.extend({}, $.fn.actions.defaults, opts);
+        var actionCheckboxes = $(this);
+        var list_editable_changed = false;
+        var showQuestion = function() {
+            $(options.acrossClears).hide();
+            $(options.acrossQuestions).show();
+            $(options.allContainer).hide();
+        },
+        showClear = function() {
+            $(options.acrossClears).show();
+            $(options.acrossQuestions).hide();
+            $(options.actionContainer).toggleClass(options.selectedClass);
+            $(options.allContainer).show();
+            $(options.counterContainer).hide();
+        },
+        reset = function() {
+            $(options.acrossClears).hide();
+            $(options.acrossQuestions).hide();
+            $(options.allContainer).hide();
+            $(options.counterContainer).show();
+        },
+        clearAcross = function() {
+            reset();
+            $(options.acrossInput).val(0);
+            $(options.actionContainer).removeClass(options.selectedClass);
+        },
+        checker = function(checked) {
+            if (checked) {
+                showQuestion();
+            } else {
+                reset();
+            }
+            $(actionCheckboxes).prop("checked", checked)
+                .parent().parent().toggleClass(options.selectedClass, checked);
+        },
+        updateCounter = function() {
+            var sel = $(actionCheckboxes).filter(":checked").length;
+            // _actions_icnt is defined in the generated HTML
+            // and contains the total amount of objects in the queryset
+            $(options.counterContainer).html(interpolate(
+            ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), {
+                sel: sel,
+                cnt: _actions_icnt
+            }, true));
+            $(options.allToggle).prop("checked", function() {
+                var value;
+                if (sel === actionCheckboxes.length) {
+                    value = true;
+                    showQuestion();
+                } else {
+                    value = false;
+                    clearAcross();
+                }
+                return value;
+            });
+        };
+        // Show counter by default
+        $(options.counterContainer).show();
+        // Check state of checkboxes and reinit state if needed
+        $(this).filter(":checked").each(function(i) {
+            $(this).parent().parent().toggleClass(options.selectedClass);
+            updateCounter();
+            if ($(options.acrossInput).val() === 1) {
+                showClear();
+            }
+        });
+        $(options.allToggle).show().click(function() {
+            checker($(this).prop("checked"));
+            updateCounter();
+        });
+        $("a", options.acrossQuestions).click(function(event) {
+            event.preventDefault();
+            $(options.acrossInput).val(1);
+            showClear();
+        });
+        $("a", options.acrossClears).click(function(event) {
+            event.preventDefault();
+            $(options.allToggle).prop("checked", false);
+            clearAcross();
+            checker(0);
+            updateCounter();
+        });
+        lastChecked = null;
+        $(actionCheckboxes).click(function(event) {
+            if (!event) { event = window.event; }
+            var target = event.target ? event.target : event.srcElement;
+            if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) {
+                var inrange = false;
+                $(lastChecked).prop("checked", target.checked)
+                    .parent().parent().toggleClass(options.selectedClass, target.checked);
+                $(actionCheckboxes).each(function() {
+                    if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) {
+                        inrange = (inrange) ? false : true;
+                    }
+                    if (inrange) {
+                        $(this).prop("checked", target.checked)
+                            .parent().parent().toggleClass(options.selectedClass, target.checked);
+                    }
+                });
+            }
+            $(target).parent().parent().toggleClass(options.selectedClass, target.checked);
+            lastChecked = target;
+            updateCounter();
+        });
+        $('form#changelist-form table#result_list tr').find('td:gt(0) :input').change(function() {
+            list_editable_changed = true;
+        });
+        $('form#changelist-form button[name="index"]').click(function(event) {
+            if (list_editable_changed) {
+                return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."));
+            }
+        });
+        $('form#changelist-form input[name="_save"]').click(function(event) {
+            var action_changed = false;
+            $('select option:selected', options.actionContainer).each(function() {
+                if ($(this).val()) {
+                    action_changed = true;
+                }
+            });
+            if (action_changed) {
+                if (list_editable_changed) {
+                    return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."));
+                } else {
+                    return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."));
+                }
+            }
+        });
+    };
+    /* Setup plugin defaults */
+    $.fn.actions.defaults = {
+        actionContainer: "div.actions",
+        counterContainer: "span.action-counter",
+        allContainer: "div.actions span.all",
+        acrossInput: "div.actions input.select-across",
+        acrossQuestions: "div.actions span.question",
+        acrossClears: "div.actions span.clear",
+        allToggle: "#action-toggle",
+        selectedClass: "selected"
+    };
+})(django.jQuery);

static/admin/js/actions.min.js

@@ -0,0 +1,6 @@
+(function(a){var f;a.fn.actions=function(q){var b=a.extend({},a.fn.actions.defaults,q),g=a(this),e=!1,k=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},l=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},m=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},n=function(){m();
+a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},p=function(c){c?k():m();a(g).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){var c=a(g).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).prop("checked",function(){var a;c===g.length?(a=!0,k()):(a=!1,n());return a})};a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);
+h();1===a(b.acrossInput).val()&&l()});a(b.allToggle).show().click(function(){p(a(this).prop("checked"));h()});a("a",b.acrossQuestions).click(function(c){c.preventDefault();a(b.acrossInput).val(1);l()});a("a",b.acrossClears).click(function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);n();p(0);h()});f=null;a(g).click(function(c){c||(c=window.event);var d=c.target?c.target:c.srcElement;if(f&&a.data(f)!==a.data(d)&&!0===c.shiftKey){var e=!1;a(f).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,
+d.checked);a(g).each(function(){if(a.data(this)===a.data(f)||a.data(this)===a.data(d))e=e?!1:!0;e&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);f=d;h()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(a){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});
+a('form#changelist-form input[name="_save"]').click(function(c){var d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};
+a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(django.jQuery);

static/admin/js/admin/DateTimeShortcuts.js

@@ -0,0 +1,364 @@
+/*global addEvent, Calendar, cancelEventPropagation, findPosX, findPosY, getStyle, get_format, gettext, interpolate, ngettext, quickElement, removeEvent*/
+// Inserts shortcut buttons after all of the following:
+//     <input type="text" class="vDateField">
+//     <input type="text" class="vTimeField">
+(function() {
+    'use strict';
+    var DateTimeShortcuts = {
+        calendars: [],
+        calendarInputs: [],
+        clockInputs: [],
+        dismissClockFunc: [],
+        dismissCalendarFunc: [],
+        calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
+        calendarDivName2: 'calendarin',  // name of <div> that contains calendar
+        calendarLinkName: 'calendarlink',// name of the link that is used to toggle
+        clockDivName: 'clockbox',        // name of clock <div> that gets toggled
+        clockLinkName: 'clocklink',      // name of the link that is used to toggle
+        shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts
+        timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch
+        timezoneOffset: 0,
+        init: function() {
+            var body = document.getElementsByTagName('body')[0];
+            var serverOffset = body.getAttribute('data-admin-utc-offset');
+            if (serverOffset) {
+                var localOffset = new Date().getTimezoneOffset() * -60;
+                DateTimeShortcuts.timezoneOffset = localOffset - serverOffset;
+            }
+
+            var inputs = document.getElementsByTagName('input');
+            for (var i = 0; i < inputs.length; i++) {
+                var inp = inputs[i];
+                if (inp.getAttribute('type') === 'text' && inp.className.match(/vTimeField/)) {
+                    DateTimeShortcuts.addClock(inp);
+                    DateTimeShortcuts.addTimezoneWarning(inp);
+                }
+                else if (inp.getAttribute('type') === 'text' && inp.className.match(/vDateField/)) {
+                    DateTimeShortcuts.addCalendar(inp);
+                    DateTimeShortcuts.addTimezoneWarning(inp);
+                }
+            }
+        },
+        // Return the current time while accounting for the server timezone.
+        now: function() {
+            var body = document.getElementsByTagName('body')[0];
+            var serverOffset = body.getAttribute('data-admin-utc-offset');
+            if (serverOffset) {
+                var localNow = new Date();
+                var localOffset = localNow.getTimezoneOffset() * -60;
+                localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset));
+                return localNow;
+            } else {
+                return new Date();
+            }
+        },
+        // Add a warning when the time zone in the browser and backend do not match.
+        addTimezoneWarning: function(inp) {
+            var $ = django.jQuery;
+            var warningClass = DateTimeShortcuts.timezoneWarningClass;
+            var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600;
+
+            // Only warn if there is a time zone mismatch.
+            if (!timezoneOffset) {
+                return;
+            }
+
+            // Check if warning is already there.
+            if ($(inp).siblings('.' + warningClass).length) {
+                return;
+            }
+
+            var message;
+            if (timezoneOffset > 0) {
+                message = ngettext(
+                    'Note: You are %s hour ahead of server time.',
+                    'Note: You are %s hours ahead of server time.',
+                    timezoneOffset
+                );
+            }
+            else {
+                timezoneOffset *= -1;
+                message = ngettext(
+                    'Note: You are %s hour behind server time.',
+                    'Note: You are %s hours behind server time.',
+                    timezoneOffset
+                );
+            }
+            message = interpolate(message, [timezoneOffset]);
+
+            var $warning = $('<span>');
+            $warning.attr('class', warningClass);
+            $warning.text(message);
+
+            $(inp).parent()
+                .append($('<br>'))
+                .append($warning);
+        },
+        // Add clock widget to a given field
+        addClock: function(inp) {
+            var num = DateTimeShortcuts.clockInputs.length;
+            DateTimeShortcuts.clockInputs[num] = inp;
+            DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };
+
+            // Shortcut links (clock icon and "Now" link)
+            var shortcuts_span = document.createElement('span');
+            shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
+            inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
+            var now_link = document.createElement('a');
+            now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
+            now_link.appendChild(document.createTextNode(gettext('Now')));
+            var clock_link = document.createElement('a');
+            clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');');
+            clock_link.id = DateTimeShortcuts.clockLinkName + num;
+            quickElement(
+                'span', clock_link, '',
+                'class', 'clock-icon',
+                'title', gettext('Choose a Time')
+            );
+            shortcuts_span.appendChild(document.createTextNode('\u00A0'));
+            shortcuts_span.appendChild(now_link);
+            shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0'));
+            shortcuts_span.appendChild(clock_link);
+
+            // Create clock link div
+            //
+            // Markup looks like:
+            // <div id="clockbox1" class="clockbox module">
+            //     <h2>Choose a time</h2>
+            //     <ul class="timelist">
+            //         <li><a href="#">Now</a></li>
+            //         <li><a href="#">Midnight</a></li>
+            //         <li><a href="#">6 a.m.</a></li>
+            //         <li><a href="#">Noon</a></li>
+            //         <li><a href="#">6 p.m.</a></li>
+            //     </ul>
+            //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
+            // </div>
+
+            var clock_box = document.createElement('div');
+            clock_box.style.display = 'none';
+            clock_box.style.position = 'absolute';
+            clock_box.className = 'clockbox module';
+            clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
+            document.body.appendChild(clock_box);
+            addEvent(clock_box, 'click', cancelEventPropagation);
+
+            quickElement('h2', clock_box, gettext('Choose a time'));
+            var time_list = quickElement('ul', clock_box);
+            time_list.className = 'timelist';
+            quickElement("a", quickElement("li", time_list), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", -1);");
+            quickElement("a", quickElement("li", time_list), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 0);");
+            quickElement("a", quickElement("li", time_list), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 6);");
+            quickElement("a", quickElement("li", time_list), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 12);");
+            quickElement("a", quickElement("li", time_list), gettext("6 p.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", 18);");
+
+            var cancel_p = quickElement('p', clock_box);
+            cancel_p.className = 'calendar-cancel';
+            quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');');
+            django.jQuery(document).bind('keyup', function(event) {
+                if (event.which === 27) {
+                    // ESC key closes popup
+                    DateTimeShortcuts.dismissClock(num);
+                    event.preventDefault();
+                }
+            });
+        },
+        openClock: function(num) {
+            var clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num);
+            var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num);
+
+            // Recalculate the clockbox position
+            // is it left-to-right or right-to-left layout ?
+            if (getStyle(document.body, 'direction') !== 'rtl') {
+                clock_box.style.left = findPosX(clock_link) + 17 + 'px';
+            }
+            else {
+                // since style's width is in em, it'd be tough to calculate
+                // px value of it. let's use an estimated px for now
+                // TODO: IE returns wrong value for findPosX when in rtl mode
+                //       (it returns as it was left aligned), needs to be fixed.
+                clock_box.style.left = findPosX(clock_link) - 110 + 'px';
+            }
+            clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px';
+
+            // Show the clock box
+            clock_box.style.display = 'block';
+            addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
+        },
+        dismissClock: function(num) {
+            document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
+            removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
+        },
+        handleClockQuicklink: function(num, val) {
+            var d;
+            if (val === -1) {
+                d = DateTimeShortcuts.now();
+            }
+            else {
+                d = new Date(1970, 1, 1, val, 0, 0, 0);
+            }
+            DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]);
+            DateTimeShortcuts.clockInputs[num].focus();
+            DateTimeShortcuts.dismissClock(num);
+        },
+        // Add calendar widget to a given field.
+        addCalendar: function(inp) {
+            var num = DateTimeShortcuts.calendars.length;
+
+            DateTimeShortcuts.calendarInputs[num] = inp;
+            DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; };
+
+            // Shortcut links (calendar icon and "Today" link)
+            var shortcuts_span = document.createElement('span');
+            shortcuts_span.className = DateTimeShortcuts.shortCutsClass;
+            inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
+            var today_link = document.createElement('a');
+            today_link.setAttribute('href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
+            today_link.appendChild(document.createTextNode(gettext('Today')));
+            var cal_link = document.createElement('a');
+            cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');');
+            cal_link.id = DateTimeShortcuts.calendarLinkName + num;
+            quickElement(
+                'span', cal_link, '',
+                'class', 'date-icon',
+                'title', gettext('Choose a Date')
+            );
+            shortcuts_span.appendChild(document.createTextNode('\u00A0'));
+            shortcuts_span.appendChild(today_link);
+            shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0'));
+            shortcuts_span.appendChild(cal_link);
+
+            // Create calendarbox div.
+            //
+            // Markup looks like:
+            //
+            // <div id="calendarbox3" class="calendarbox module">
+            //     <h2>
+            //           <a href="#" class="link-previous">&lsaquo;</a>
+            //           <a href="#" class="link-next">&rsaquo;</a> February 2003
+            //     </h2>
+            //     <div class="calendar" id="calendarin3">
+            //         <!-- (cal) -->
+            //     </div>
+            //     <div class="calendar-shortcuts">
+            //          <a href="#">Yesterday</a> | <a href="#">Today</a> | <a href="#">Tomorrow</a>
+            //     </div>
+            //     <p class="calendar-cancel"><a href="#">Cancel</a></p>
+            // </div>
+            var cal_box = document.createElement('div');
+            cal_box.style.display = 'none';
+            cal_box.style.position = 'absolute';
+            cal_box.className = 'calendarbox module';
+            cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
+            document.body.appendChild(cal_box);
+            addEvent(cal_box, 'click', cancelEventPropagation);
+
+            // next-prev links
+            var cal_nav = quickElement('div', cal_box);
+            var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev(' + num + ');');
+            cal_nav_prev.className = 'calendarnav-previous';
+            var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext(' + num + ');');
+            cal_nav_next.className = 'calendarnav-next';
+
+            // main box
+            var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num);
+            cal_main.className = 'calendar';
+            DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num));
+            DateTimeShortcuts.calendars[num].drawCurrent();
+
+            // calendar shortcuts
+            var shortcuts = quickElement('div', cal_box);
+            shortcuts.className = 'calendar-shortcuts';
+            quickElement('a', shortcuts, gettext('Yesterday'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);');
+            shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0'));
+            quickElement('a', shortcuts, gettext('Today'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);');
+            shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0'));
+            quickElement('a', shortcuts, gettext('Tomorrow'), 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);');
+
+            // cancel bar
+            var cancel_p = quickElement('p', cal_box);
+            cancel_p.className = 'calendar-cancel';
+            quickElement('a', cancel_p, gettext('Cancel'), 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');');
+            django.jQuery(document).bind('keyup', function(event) {
+                if (event.which === 27) {
+                    // ESC key closes popup
+                    DateTimeShortcuts.dismissCalendar(num);
+                    event.preventDefault();
+                }
+            });
+        },
+        openCalendar: function(num) {
+            var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num);
+            var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num);
+            var inp = DateTimeShortcuts.calendarInputs[num];
+
+            // Determine if the current value in the input has a valid date.
+            // If so, draw the calendar with that date's year and month.
+            if (inp.value) {
+                var format = get_format('DATE_INPUT_FORMATS')[0];
+                var selected = inp.value.strptime(format);
+                var year = selected.getUTCFullYear();
+                var month = selected.getUTCMonth() + 1;
+                var re = /\d{4}/;
+                if (re.test(year.toString()) && month >= 1 && month <= 12) {
+                    DateTimeShortcuts.calendars[num].drawDate(month, year, selected);
+                }
+            }
+
+            // Recalculate the clockbox position
+            // is it left-to-right or right-to-left layout ?
+            if (getStyle(document.body, 'direction') !== 'rtl') {
+                cal_box.style.left = findPosX(cal_link) + 17 + 'px';
+            }
+            else {
+                // since style's width is in em, it'd be tough to calculate
+                // px value of it. let's use an estimated px for now
+                // TODO: IE returns wrong value for findPosX when in rtl mode
+                //       (it returns as it was left aligned), needs to be fixed.
+                cal_box.style.left = findPosX(cal_link) - 180 + 'px';
+            }
+            cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
+
+            cal_box.style.display = 'block';
+            addEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
+        },
+        dismissCalendar: function(num) {
+            document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none';
+            removeEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
+        },
+        drawPrev: function(num) {
+            DateTimeShortcuts.calendars[num].drawPreviousMonth();
+        },
+        drawNext: function(num) {
+            DateTimeShortcuts.calendars[num].drawNextMonth();
+        },
+        handleCalendarCallback: function(num) {
+            var format = get_format('DATE_INPUT_FORMATS')[0];
+            // the format needs to be escaped a little
+            format = format.replace('\\', '\\\\');
+            format = format.replace('\r', '\\r');
+            format = format.replace('\n', '\\n');
+            format = format.replace('\t', '\\t');
+            format = format.replace("'", "\\'");
+            return ["function(y, m, d) { DateTimeShortcuts.calendarInputs[",
+                   num,
+                   "].value = new Date(y, m-1, d).strftime('",
+                   format,
+                   "');DateTimeShortcuts.calendarInputs[",
+                   num,
+                   "].focus();document.getElementById(DateTimeShortcuts.calendarDivName1+",
+                   num,
+                   ").style.display='none';}"].join('');
+        },
+        handleCalendarQuickLink: function(num, offset) {
+            var d = DateTimeShortcuts.now();
+            d.setDate(d.getDate() + offset);
+            DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
+            DateTimeShortcuts.calendarInputs[num].focus();
+            DateTimeShortcuts.dismissCalendar(num);
+        }
+    };
+
+    addEvent(window, 'load', DateTimeShortcuts.init);
+    window.DateTimeShortcuts = DateTimeShortcuts;
+})();

static/admin/js/admin/RelatedObjectLookups.js

@@ -0,0 +1,181 @@
+/*global SelectBox, interpolate*/
+// Handles related-objects functionality: lookup link for raw_id_fields
+// and Add Another links.
+
+(function($) {
+    'use strict';
+
+    function html_unescape(text) {
+        // Unescape a string that was escaped using django.utils.html.escape.
+        text = text.replace(/&lt;/g, '<');
+        text = text.replace(/&gt;/g, '>');
+        text = text.replace(/&quot;/g, '"');
+        text = text.replace(/&#39;/g, "'");
+        text = text.replace(/&amp;/g, '&');
+        return text;
+    }
+
+    // IE doesn't accept periods or dashes in the window name, but the element IDs
+    // we use to generate popup window names may contain them, therefore we map them
+    // to allowed characters in a reversible way so that we can locate the correct
+    // element when the popup window is dismissed.
+    function id_to_windowname(text) {
+        text = text.replace(/\./g, '__dot__');
+        text = text.replace(/\-/g, '__dash__');
+        return text;
+    }
+
+    function windowname_to_id(text) {
+        text = text.replace(/__dot__/g, '.');
+        text = text.replace(/__dash__/g, '-');
+        return text;
+    }
+
+    function showAdminPopup(triggeringLink, name_regexp, add_popup) {
+        var name = triggeringLink.id.replace(name_regexp, '');
+        name = id_to_windowname(name);
+        var href = triggeringLink.href;
+        if (add_popup) {
+            if (href.indexOf('?') === -1) {
+                href += '?_popup=1';
+            } else {
+                href += '&_popup=1';
+            }
+        }
+        var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+        win.focus();
+        return false;
+    }
+
+    function showRelatedObjectLookupPopup(triggeringLink) {
+        return showAdminPopup(triggeringLink, /^lookup_/, true);
+    }
+
+    function dismissRelatedLookupPopup(win, chosenId) {
+        var name = windowname_to_id(win.name);
+        var elem = document.getElementById(name);
+        if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+            elem.value += ',' + chosenId;
+        } else {
+            document.getElementById(name).value = chosenId;
+        }
+        win.close();
+    }
+
+    function showRelatedObjectPopup(triggeringLink) {
+        return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false);
+    }
+
+    function updateRelatedObjectLinks(triggeringLink) {
+        var $this = django.jQuery(triggeringLink);
+        var siblings = $this.nextAll('.change-related, .delete-related');
+        if (!siblings.length) {
+            return;
+        }
+        var value = $this.val();
+        if (value) {
+            siblings.each(function() {
+                var elm = django.jQuery(this);
+                elm.attr('href', elm.attr('data-href-template').replace('__fk__', value));
+            });
+        } else {
+            siblings.removeAttr('href');
+        }
+    }
+
+    function dismissAddRelatedObjectPopup(win, newId, newRepr) {
+        // newId and newRepr are expected to have previously been escaped by
+        // django.utils.html.escape.
+        newId = html_unescape(newId);
+        newRepr = html_unescape(newRepr);
+        var name = windowname_to_id(win.name);
+        var elem = document.getElementById(name);
+        if (elem) {
+            var elemName = elem.nodeName.toUpperCase();
+            if (elemName === 'SELECT') {
+                elem.options[elem.options.length] = new Option(newRepr, newId, true, true);
+            } else if (elemName === 'INPUT') {
+                if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) {
+                    elem.value += ',' + newId;
+                } else {
+                    elem.value = newId;
+                }
+            }
+            // Trigger a change event to update related links if required.
+            django.jQuery(elem).trigger('change');
+        } else {
+            var toId = name + "_to";
+            var o = new Option(newRepr, newId);
+            SelectBox.add_to_cache(toId, o);
+            SelectBox.redisplay(toId);
+        }
+        win.close();
+    }
+
+    function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
+        objId = html_unescape(objId);
+        newRepr = html_unescape(newRepr);
+        var id = windowname_to_id(win.name).replace(/^edit_/, '');
+        var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+        var selects = django.jQuery(selectsSelector);
+        selects.find('option').each(function() {
+            if (this.value === objId) {
+                this.innerHTML = newRepr;
+                this.value = newId;
+            }
+        });
+        win.close();
+    }
+
+    function dismissDeleteRelatedObjectPopup(win, objId) {
+        objId = html_unescape(objId);
+        var id = windowname_to_id(win.name).replace(/^delete_/, '');
+        var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
+        var selects = django.jQuery(selectsSelector);
+        selects.find('option').each(function() {
+            if (this.value === objId) {
+                django.jQuery(this).remove();
+            }
+        }).trigger('change');
+        win.close();
+    }
+
+    // Global for testing purposes
+    window.html_unescape = html_unescape;
+    window.id_to_windowname = id_to_windowname;
+    window.windowname_to_id = windowname_to_id;
+
+    window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup;
+    window.dismissRelatedLookupPopup = dismissRelatedLookupPopup;
+    window.showRelatedObjectPopup = showRelatedObjectPopup;
+    window.updateRelatedObjectLinks = updateRelatedObjectLinks;
+    window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup;
+    window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup;
+    window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup;
+
+    // Kept for backward compatibility
+    window.showAddAnotherPopup = showRelatedObjectPopup;
+    window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup;
+
+    $(document).ready(function() {
+        $('body').on('click', '.related-widget-wrapper-link', function(e) {
+            e.preventDefault();
+            if (this.href) {
+                var event = $.Event('django:show-related', {href: this.href});
+                $(this).trigger(event);
+                if (!event.isDefaultPrevented()) {
+                    showRelatedObjectPopup(this);
+                }
+            }
+        });
+        $('body').on('change', '.related-widget-wrapper select', function(e) {
+            var event = $.Event('django:update-related');
+            $(this).trigger(event);
+            if (!event.isDefaultPrevented()) {
+                updateRelatedObjectLinks(this);
+            }
+        });
+        $('.related-widget-wrapper select').trigger('change');
+    });
+
+})(django.jQuery);

static/admin/js/calendar.js

@@ -0,0 +1,178 @@
+/*global gettext, get_format, quickElement, removeChildren*/
+/*
+calendar.js - Calendar functions by Adrian Holovaty
+depends on core.js for utility functions like removeChildren or quickElement
+*/
+
+(function() {
+    'use strict';
+    // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
+    var CalendarNamespace = {
+        monthsOfYear: gettext('January February March April May June July August September October November December').split(' '),
+        daysOfWeek: gettext('S M T W T F S').split(' '),
+        firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')),
+        isLeapYear: function(year) {
+            return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0));
+        },
+        getDaysInMonth: function(month, year) {
+            var days;
+            if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) {
+                days = 31;
+            }
+            else if (month === 4 || month === 6 || month === 9 || month === 11) {
+                days = 30;
+            }
+            else if (month === 2 && CalendarNamespace.isLeapYear(year)) {
+                days = 29;
+            }
+            else {
+                days = 28;
+            }
+            return days;
+        },
+        draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999
+            var today = new Date();
+            var todayDay = today.getDate();
+            var todayMonth = today.getMonth() + 1;
+            var todayYear = today.getFullYear();
+            var todayClass = '';
+
+            // Use UTC functions here because the date field does not contain time
+            // and using the UTC function variants prevent the local time offset
+            // from altering the date, specifically the day field.  For example:
+            //
+            // ```
+            // var x = new Date('2013-10-02');
+            // var day = x.getDate();
+            // ```
+            //
+            // The day variable above will be 1 instead of 2 in, say, US Pacific time
+            // zone.
+            var isSelectedMonth = false;
+            if (typeof selected !== 'undefined') {
+                isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month);
+            }
+
+            month = parseInt(month);
+            year = parseInt(year);
+            var calDiv = document.getElementById(div_id);
+            removeChildren(calDiv);
+            var calTable = document.createElement('table');
+            quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year);
+            var tableBody = quickElement('tbody', calTable);
+
+            // Draw days-of-week header
+            var tableRow = quickElement('tr', tableBody);
+            for (var i = 0; i < 7; i++) {
+                quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]);
+            }
+
+            var startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay();
+            var days = CalendarNamespace.getDaysInMonth(month, year);
+
+            var nonDayCell;
+
+            // Draw blanks before first of month
+            tableRow = quickElement('tr', tableBody);
+            for (i = 0; i < startingPos; i++) {
+                nonDayCell = quickElement('td', tableRow, ' ');
+                nonDayCell.className = "nonday";
+            }
+
+            // Draw days of month
+            var currentDay = 1;
+            for (i = startingPos; currentDay <= days; i++) {
+                if (i % 7 === 0 && currentDay !== 1) {
+                    tableRow = quickElement('tr', tableBody);
+                }
+                if ((currentDay === todayDay) && (month === todayMonth) && (year === todayYear)) {
+                    todayClass = 'today';
+                } else {
+                    todayClass = '';
+                }
+
+                // use UTC function; see above for explanation.
+                if (isSelectedMonth && currentDay === selected.getUTCDate()) {
+                    if (todayClass !== '') {
+                        todayClass += " ";
+                    }
+                    todayClass += "selected";
+                }
+
+                var cell = quickElement('td', tableRow, '', 'class', todayClass);
+
+                quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '(' + year + ',' + month + ',' + currentDay + '));');
+                currentDay++;
+            }
+
+            // Draw blanks after end of month (optional, but makes for valid code)
+            while (tableRow.childNodes.length < 7) {
+                nonDayCell = quickElement('td', tableRow, ' ');
+                nonDayCell.className = "nonday";
+            }
+
+            calDiv.appendChild(calTable);
+        }
+    };
+
+    // Calendar -- A calendar instance
+    function Calendar(div_id, callback, selected) {
+        // div_id (string) is the ID of the element in which the calendar will
+        //     be displayed
+        // callback (string) is the name of a JavaScript function that will be
+        //     called with the parameters (year, month, day) when a day in the
+        //     calendar is clicked
+        this.div_id = div_id;
+        this.callback = callback;
+        this.today = new Date();
+        this.currentMonth = this.today.getMonth() + 1;
+        this.currentYear = this.today.getFullYear();
+        if (typeof selected !== 'undefined') {
+            this.selected = selected;
+        }
+    }
+    Calendar.prototype = {
+        drawCurrent: function() {
+            CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected);
+        },
+        drawDate: function(month, year, selected) {
+            this.currentMonth = month;
+            this.currentYear = year;
+
+            if(selected) {
+                this.selected = selected;
+            }
+
+            this.drawCurrent();
+        },
+        drawPreviousMonth: function() {
+            if (this.currentMonth === 1) {
+                this.currentMonth = 12;
+                this.currentYear--;
+            }
+            else {
+                this.currentMonth--;
+            }
+            this.drawCurrent();
+        },
+        drawNextMonth: function() {
+            if (this.currentMonth === 12) {
+                this.currentMonth = 1;
+                this.currentYear++;
+            }
+            else {
+                this.currentMonth++;
+            }
+            this.drawCurrent();
+        },
+        drawPreviousYear: function() {
+            this.currentYear--;
+            this.drawCurrent();
+        },
+        drawNextYear: function() {
+            this.currentYear++;
+            this.drawCurrent();
+        }
+    };
+    window.Calendar = Calendar;
+})();

static/admin/js/collapse.js

@@ -0,0 +1,26 @@
+/*global gettext*/
+(function($) {
+    'use strict';
+    $(document).ready(function() {
+        // Add anchor tag for Show/Hide link
+        $("fieldset.collapse").each(function(i, elem) {
+            // Don't hide if fields in this fieldset have errors
+            if ($(elem).find("div.errors").length === 0) {
+                $(elem).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser' +
+                    i + '" class="collapse-toggle" href="#">' + gettext("Show") +
+                    '</a>)');
+            }
+        });
+        // Add toggle to anchor tag
+        $("fieldset.collapse a.collapse-toggle").click(function(ev) {
+            if ($(this).closest("fieldset").hasClass("collapsed")) {
+                // Show
+                $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]);
+            } else {
+                // Hide
+                $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]);
+            }
+            return false;
+        });
+    });
+})(django.jQuery);

static/admin/js/collapse.min.js

@@ -0,0 +1,2 @@
+(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(b,c){0===a(c).find("div.errors").length&&a(c).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+b+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").click(function(b){a(this).closest("fieldset").hasClass("collapsed")?a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]):a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
+[a(this).attr("id")]);return!1})})})(django.jQuery);

static/admin/js/core.js

@@ -0,0 +1,266 @@
+// Core javascript helper functions
+
+// basic browser identification & version
+var isOpera = (navigator.userAgent.indexOf("Opera") >= 0) && parseFloat(navigator.appVersion);
+var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]);
+
+// Cross-browser event handlers.
+function addEvent(obj, evType, fn) {
+    'use strict';
+    if (obj.addEventListener) {
+        obj.addEventListener(evType, fn, false);
+        return true;
+    } else if (obj.attachEvent) {
+        var r = obj.attachEvent("on" + evType, fn);
+        return r;
+    } else {
+        return false;
+    }
+}
+
+function removeEvent(obj, evType, fn) {
+    'use strict';
+    if (obj.removeEventListener) {
+        obj.removeEventListener(evType, fn, false);
+        return true;
+    } else if (obj.detachEvent) {
+        obj.detachEvent("on" + evType, fn);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function cancelEventPropagation(e) {
+    'use strict';
+    if (!e) {
+        e = window.event;
+    }
+    e.cancelBubble = true;
+    if (e.stopPropagation) {
+        e.stopPropagation();
+    }
+}
+
+// quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]);
+function quickElement() {
+    'use strict';
+    var obj = document.createElement(arguments[0]);
+    if (arguments[2]) {
+        var textNode = document.createTextNode(arguments[2]);
+        obj.appendChild(textNode);
+    }
+    var len = arguments.length;
+    for (var i = 3; i < len; i += 2) {
+        obj.setAttribute(arguments[i], arguments[i + 1]);
+    }
+    arguments[1].appendChild(obj);
+    return obj;
+}
+
+// "a" is reference to an object
+function removeChildren(a) {
+    'use strict';
+    while (a.hasChildNodes()) {
+        a.removeChild(a.lastChild);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// Cross-browser xmlhttp object
+// from http://jibbering.com/2002/4/httprequest.html
+// ----------------------------------------------------------------------------
+var xmlhttp;
+/*@cc_on @*/
+/*@if (@_jscript_version >= 5)
+    try {
+        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+    } catch (e) {
+        try {
+            xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+        } catch (E) {
+            xmlhttp = false;
+        }
+    }
+@else
+    xmlhttp = false;
+@end @*/
+if (!xmlhttp && typeof XMLHttpRequest !== 'undefined') {
+    xmlhttp = new XMLHttpRequest();
+}
+
+// ----------------------------------------------------------------------------
+// Find-position functions by PPK
+// See http://www.quirksmode.org/js/findpos.html
+// ----------------------------------------------------------------------------
+function findPosX(obj) {
+    'use strict';
+    var curleft = 0;
+    if (obj.offsetParent) {
+        while (obj.offsetParent) {
+            curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft);
+            obj = obj.offsetParent;
+        }
+        // IE offsetParent does not include the top-level
+        if (isIE && obj.parentElement) {
+            curleft += obj.offsetLeft - obj.scrollLeft;
+        }
+    } else if (obj.x) {
+        curleft += obj.x;
+    }
+    return curleft;
+}
+
+function findPosY(obj) {
+    'use strict';
+    var curtop = 0;
+    if (obj.offsetParent) {
+        while (obj.offsetParent) {
+            curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop);
+            obj = obj.offsetParent;
+        }
+        // IE offsetParent does not include the top-level
+        if (isIE && obj.parentElement) {
+            curtop += obj.offsetTop - obj.scrollTop;
+        }
+    } else if (obj.y) {
+        curtop += obj.y;
+    }
+    return curtop;
+}
+
+//-----------------------------------------------------------------------------
+// Date object extensions
+// ----------------------------------------------------------------------------
+(function() {
+    'use strict';
+    Date.prototype.getTwelveHours = function() {
+        var hours = this.getHours();
+        if (hours === 0) {
+            return 12;
+        }
+        else {
+            return hours <= 12 ? hours : hours - 12;
+        }
+    };
+
+    Date.prototype.getTwoDigitMonth = function() {
+        return (this.getMonth() < 9) ? '0' + (this.getMonth() + 1) : (this.getMonth() + 1);
+    };
+
+    Date.prototype.getTwoDigitDate = function() {
+        return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate();
+    };
+
+    Date.prototype.getTwoDigitTwelveHour = function() {
+        return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours();
+    };
+
+    Date.prototype.getTwoDigitHour = function() {
+        return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours();
+    };
+
+    Date.prototype.getTwoDigitMinute = function() {
+        return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes();
+    };
+
+    Date.prototype.getTwoDigitSecond = function() {
+        return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
+    };
+
+    Date.prototype.getHourMinute = function() {
+        return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
+    };
+
+    Date.prototype.getHourMinuteSecond = function() {
+        return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
+    };
+
+    Date.prototype.strftime = function(format) {
+        var fields = {
+            c: this.toString(),
+            d: this.getTwoDigitDate(),
+            H: this.getTwoDigitHour(),
+            I: this.getTwoDigitTwelveHour(),
+            m: this.getTwoDigitMonth(),
+            M: this.getTwoDigitMinute(),
+            p: (this.getHours() >= 12) ? 'PM' : 'AM',
+            S: this.getTwoDigitSecond(),
+            w: '0' + this.getDay(),
+            x: this.toLocaleDateString(),
+            X: this.toLocaleTimeString(),
+            y: ('' + this.getFullYear()).substr(2, 4),
+            Y: '' + this.getFullYear(),
+            '%': '%'
+        };
+        var result = '', i = 0;
+        while (i < format.length) {
+            if (format.charAt(i) === '%') {
+                result = result + fields[format.charAt(i + 1)];
+                ++i;
+            }
+            else {
+                result = result + format.charAt(i);
+            }
+            ++i;
+        }
+        return result;
+    };
+
+// ----------------------------------------------------------------------------
+// String object extensions
+// ----------------------------------------------------------------------------
+    String.prototype.pad_left = function(pad_length, pad_string) {
+        var new_string = this;
+        for (var i = 0; new_string.length < pad_length; i++) {
+            new_string = pad_string + new_string;
+        }
+        return new_string;
+    };
+
+    String.prototype.strptime = function(format) {
+        var split_format = format.split(/[.\-/]/);
+        var date = this.split(/[.\-/]/);
+        var i = 0;
+        var day, month, year;
+        while (i < split_format.length) {
+            switch (split_format[i]) {
+                case "%d":
+                    day = date[i];
+                    break;
+                case "%m":
+                    month = date[i] - 1;
+                    break;
+                case "%Y":
+                    year = date[i];
+                    break;
+                case "%y":
+                    year = date[i];
+                    break;
+            }
+            ++i;
+        }
+        // Create Date object from UTC since the parsed value is supposed to be
+        // in UTC, not local time. Also, the calendar uses UTC functions for
+        // date extraction.
+        return new Date(Date.UTC(year, month, day));
+    };
+
+})();
+// ----------------------------------------------------------------------------
+// Get the computed style for and element
+// ----------------------------------------------------------------------------
+function getStyle(oElm, strCssRule) {
+    'use strict';
+    var strValue = "";
+    if(document.defaultView && document.defaultView.getComputedStyle) {
+        strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
+    }
+    else if(oElm.currentStyle) {
+        strCssRule = strCssRule.replace(/\-(\w)/g, function(strMatch, p1) {
+            return p1.toUpperCase();
+        });
+        strValue = oElm.currentStyle[strCssRule];
+    }
+    return strValue;
+}

static/admin/js/inlines.js

@@ -0,0 +1,275 @@
+/*global DateTimeShortcuts, SelectFilter*/
+/**
+ * Django admin inlines
+ *
+ * Based on jQuery Formset 1.1
+ * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com)
+ * @requires jQuery 1.2.6 or later
+ *
+ * Copyright (c) 2009, Stanislaus Madueke
+ * All rights reserved.
+ *
+ * Spiced up with Code from Zain Memon's GSoC project 2009
+ * and modified for Django by Jannis Leidel, Travis Swicegood and Julien Phalip.
+ *
+ * Licensed under the New BSD License
+ * See: http://www.opensource.org/licenses/bsd-license.php
+ */
+(function($) {
+    'use strict';
+    $.fn.formset = function(opts) {
+        var options = $.extend({}, $.fn.formset.defaults, opts);
+        var $this = $(this);
+        var $parent = $this.parent();
+        var updateElementIndex = function(el, prefix, ndx) {
+            var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
+            var replacement = prefix + "-" + ndx;
+            if ($(el).prop("for")) {
+                $(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
+            }
+            if (el.id) {
+                el.id = el.id.replace(id_regex, replacement);
+            }
+            if (el.name) {
+                el.name = el.name.replace(id_regex, replacement);
+            }
+        };
+        var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
+        var nextIndex = parseInt(totalForms.val(), 10);
+        var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
+        // only show the add button if we are allowed to add more items,
+        // note that max_num = None translates to a blank string.
+        var showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0;
+        $this.each(function(i) {
+            $(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
+        });
+        if ($this.length && showAddButton) {
+            var addButton;
+            if ($this.prop("tagName") === "TR") {
+                // If forms are laid out as table rows, insert the
+                // "add" button in a new table row:
+                var numCols = this.eq(-1).children().length;
+                $parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
+                addButton = $parent.find("tr:last a");
+            } else {
+                // Otherwise, insert it immediately after the last form:
+                $this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
+                addButton = $this.filter(":last").next().find("a");
+            }
+            addButton.click(function(e) {
+                e.preventDefault();
+                var template = $("#" + options.prefix + "-empty");
+                var row = template.clone(true);
+                row.removeClass(options.emptyCssClass)
+                .addClass(options.formCssClass)
+                .attr("id", options.prefix + "-" + nextIndex);
+                if (row.is("tr")) {
+                    // If the forms are laid out in table rows, insert
+                    // the remove button into the last table cell:
+                    row.children(":last").append('<div><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></div>");
+                } else if (row.is("ul") || row.is("ol")) {
+                    // If they're laid out as an ordered/unordered list,
+                    // insert an <li> after the last list item:
+                    row.append('<li><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></li>");
+                } else {
+                    // Otherwise, just insert the remove button as the
+                    // last child element of the form's container:
+                    row.children(":first").append('<span><a class="' + options.deleteCssClass + '" href="javascript:void(0)">' + options.deleteText + "</a></span>");
+                }
+                row.find("*").each(function() {
+                    updateElementIndex(this, options.prefix, totalForms.val());
+                });
+                // Insert the new form when it has been fully edited
+                row.insertBefore($(template));
+                // Update number of total forms
+                $(totalForms).val(parseInt(totalForms.val(), 10) + 1);
+                nextIndex += 1;
+                // Hide add button in case we've hit the max, except we want to add infinitely
+                if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) {
+                    addButton.parent().hide();
+                }
+                // The delete button of each row triggers a bunch of other things
+                row.find("a." + options.deleteCssClass).click(function(e1) {
+                    e1.preventDefault();
+                    // Remove the parent form containing this button:
+                    row.remove();
+                    nextIndex -= 1;
+                    // If a post-delete callback was provided, call it with the deleted form:
+                    if (options.removed) {
+                        options.removed(row);
+                    }
+                    $(document).trigger('formset:removed', [row, options.prefix]);
+                    // Update the TOTAL_FORMS form count.
+                    var forms = $("." + options.formCssClass);
+                    $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);
+                    // Show add button again once we drop below max
+                    if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) {
+                        addButton.parent().show();
+                    }
+                    // Also, update names and ids for all remaining form controls
+                    // so they remain in sequence:
+                    var i, formCount;
+                    var updateElementCallback = function() {
+                        updateElementIndex(this, options.prefix, i);
+                    };
+                    for (i = 0, formCount = forms.length; i < formCount; i++) {
+                        updateElementIndex($(forms).get(i), options.prefix, i);
+                        $(forms.get(i)).find("*").each(updateElementCallback);
+                    }
+                });
+                // If a post-add callback was supplied, call it with the added form:
+                if (options.added) {
+                    options.added(row);
+                }
+                $(document).trigger('formset:added', [row, options.prefix]);
+            });
+        }
+        return this;
+    };
+
+    /* Setup plugin defaults */
+    $.fn.formset.defaults = {
+        prefix: "form",          // The form prefix for your django formset
+        addText: "add another",      // Text for the add link
+        deleteText: "remove",      // Text for the delete link
+        addCssClass: "add-row",      // CSS class applied to the add link
+        deleteCssClass: "delete-row",  // CSS class applied to the delete link
+        emptyCssClass: "empty-row",    // CSS class applied to the empty row
+        formCssClass: "dynamic-form",  // CSS class applied to each form in a formset
+        added: null,          // Function called each time a new form is added
+        removed: null          // Function called each time a form is deleted
+    };
+
+
+    // Tabular inlines ---------------------------------------------------------
+    $.fn.tabularFormset = function(options) {
+        var $rows = $(this);
+        var alternatingRows = function(row) {
+            $($rows.selector).not(".add-row").removeClass("row1 row2")
+            .filter(":even").addClass("row1").end()
+            .filter(":odd").addClass("row2");
+        };
+
+        var reinitDateTimeShortCuts = function() {
+            // Reinitialize the calendar and clock widgets by force
+            if (typeof DateTimeShortcuts !== "undefined") {
+                $(".datetimeshortcuts").remove();
+                DateTimeShortcuts.init();
+            }
+        };
+
+        var updateSelectFilter = function() {
+            // If any SelectFilter widgets are a part of the new form,
+            // instantiate a new SelectFilter instance for it.
+            if (typeof SelectFilter !== 'undefined') {
+                $('.selectfilter').each(function(index, value) {
+                    var namearr = value.name.split('-');
+                    SelectFilter.init(value.id, namearr[namearr.length - 1], false);
+                });
+                $('.selectfilterstacked').each(function(index, value) {
+                    var namearr = value.name.split('-');
+                    SelectFilter.init(value.id, namearr[namearr.length - 1], true);
+                });
+            }
+        };
+
+        var initPrepopulatedFields = function(row) {
+            row.find('.prepopulated_field').each(function() {
+                var field = $(this),
+                    input = field.find('input, select, textarea'),
+                    dependency_list = input.data('dependency_list') || [],
+                    dependencies = [];
+                $.each(dependency_list, function(i, field_name) {
+                    dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
+                });
+                if (dependencies.length) {
+                    input.prepopulate(dependencies, input.attr('maxlength'));
+                }
+            });
+        };
+
+        $rows.formset({
+            prefix: options.prefix,
+            addText: options.addText,
+            formCssClass: "dynamic-" + options.prefix,
+            deleteCssClass: "inline-deletelink",
+            deleteText: options.deleteText,
+            emptyCssClass: "empty-form",
+            removed: alternatingRows,
+            added: function(row) {
+                initPrepopulatedFields(row);
+                reinitDateTimeShortCuts();
+                updateSelectFilter();
+                alternatingRows(row);
+            }
+        });
+
+        return $rows;
+    };
+
+    // Stacked inlines ---------------------------------------------------------
+    $.fn.stackedFormset = function(options) {
+        var $rows = $(this);
+        var updateInlineLabel = function(row) {
+            $($rows.selector).find(".inline_label").each(function(i) {
+                var count = i + 1;
+                $(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
+            });
+        };
+
+        var reinitDateTimeShortCuts = function() {
+            // Reinitialize the calendar and clock widgets by force, yuck.
+            if (typeof DateTimeShortcuts !== "undefined") {
+                $(".datetimeshortcuts").remove();
+                DateTimeShortcuts.init();
+            }
+        };
+
+        var updateSelectFilter = function() {
+            // If any SelectFilter widgets were added, instantiate a new instance.
+            if (typeof SelectFilter !== "undefined") {
+                $(".selectfilter").each(function(index, value) {
+                    var namearr = value.name.split('-');
+                    SelectFilter.init(value.id, namearr[namearr.length - 1], false);
+                });
+                $(".selectfilterstacked").each(function(index, value) {
+                    var namearr = value.name.split('-');
+                    SelectFilter.init(value.id, namearr[namearr.length - 1], true);
+                });
+            }
+        };
+
+        var initPrepopulatedFields = function(row) {
+            row.find('.prepopulated_field').each(function() {
+                var field = $(this),
+                    input = field.find('input, select, textarea'),
+                    dependency_list = input.data('dependency_list') || [],
+                    dependencies = [];
+                $.each(dependency_list, function(i, field_name) {
+                    dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
+                });
+                if (dependencies.length) {
+                    input.prepopulate(dependencies, input.attr('maxlength'));
+                }
+            });
+        };
+
+        $rows.formset({
+            prefix: options.prefix,
+            addText: options.addText,
+            formCssClass: "dynamic-" + options.prefix,
+            deleteCssClass: "inline-deletelink",
+            deleteText: options.deleteText,
+            emptyCssClass: "empty-form",
+            removed: updateInlineLabel,
+            added: function(row) {
+                initPrepopulatedFields(row);
+                reinitDateTimeShortCuts();
+                updateSelectFilter();
+                updateInlineLabel(row);
+            }
+        });
+
+        return $rows;
+    };
+})(django.jQuery);