diff --git a/.gitignore b/.gitignore index ef7b891..59da983 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ pip-log.txt ENV/ .idea/ -local_settings.py Thumbs.db distribute-*.tar.gz *.bak @@ -14,7 +13,5 @@ _public_html/ celerybeat-schedule yandex_money.log /tmp_emails/ -/tmp/ -/celerybeat-schedule.db /media/ /static/ diff --git a/src/static/fonts/261413575-a_AvanteLt-DemiBold.svg b/conf/env similarity index 100% rename from src/static/fonts/261413575-a_AvanteLt-DemiBold.svg rename to conf/env diff --git a/log/.gitignore b/log/.gitignore deleted file mode 100644 index f59ec20..0000000 --- a/log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index 3b91b07..0000000 --- a/src/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import absolute_import, unicode_literals - -# This will make sure the app is always imported when -# Django starts so that shared_task will use this app. -from .celery import app as celery_app - -__all__ = ['celery_app'] diff --git a/src/callback/views.py b/src/callback/views.py index aed6b9c..ef0073c 100644 --- a/src/callback/views.py +++ b/src/callback/views.py @@ -57,5 +57,5 @@ def req_avail(request, id=None): 'title': u'Сообщение', 'msg': u'Ваша Сообщение отправлено!
Скоро с Вами свяжется наш менеджер.', } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/src/commons/pdf_tools.py b/src/commons/pdf_tools.py index b269a67..2dda355 100644 --- a/src/commons/pdf_tools.py +++ b/src/commons/pdf_tools.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from io import StringIO - +from io import StringIO, BytesIO from xhtml2pdf import pisa from django.template.loader import render_to_string @@ -10,7 +9,7 @@ from django.http import HttpResponse def pdf_to_response(content, filename=None, filename_encode='windows-1251'): """Выводит content в django.http.HttpResponse, который и возвращает.""" - response = HttpResponse(content, mimetype='application/pdf') + response = HttpResponse(content, content_type='application/pdf') if filename: if filename_encode: filename = filename.encode(filename_encode) @@ -23,8 +22,9 @@ def render_pdf_to_string(request, template_name, dictionary=None): context_instance = RequestContext(request) html = render_to_string(template_name, dictionary, context_instance) #return HttpResponse(html) # для отладки - result = StringIO.StringIO() - pisa.pisaDocument(StringIO.StringIO(html.encode('utf-8')), result, encoding='utf-8') + result = BytesIO() + pdf = pisa.pisaDocument(BytesIO(html.encode('utf-8')), result) pdf_content = result.getvalue() - result.close() - return pdf_content + if not pdf.err: + return pdf_content + return None diff --git a/src/commons/templatetags/my_tags.py b/src/commons/templatetags/my_tags.py index 63ff306..f22fad0 100644 --- a/src/commons/templatetags/my_tags.py +++ b/src/commons/templatetags/my_tags.py @@ -32,7 +32,7 @@ def sum_by_attr(obj_list, attr_name, start=0, stop=None): result += attr() else: result += attr - except Exception, error: + except Exception as error: if DEBUG: result = 'Tag error: %s' % error else: @@ -57,7 +57,7 @@ def to_float(value): """Если возможно, приводит value к типу float.""" try: result = float(value) - except Exception, error: + except Exception as error: if DEBUG: result = 'Filter error, %s | %s' % (value, error,) else: diff --git a/src/customer/tasks.py b/src/customer/tasks.py index 36cd88c..3021210 100644 --- a/src/customer/tasks.py +++ b/src/customer/tasks.py @@ -5,7 +5,7 @@ from datetime import datetime, timedelta import traceback from django.core.mail import mail_admins -from celery import shared_task +from dokumentor.celery import shared_task from .models import License, UserProfile from .utils import check_one_profile diff --git a/src/customer/views/bank_accounts_ajax.py b/src/customer/views/bank_accounts_ajax.py index cb69413..713a4cd 100644 --- a/src/customer/views/bank_accounts_ajax.py +++ b/src/customer/views/bank_accounts_ajax.py @@ -31,7 +31,7 @@ def bank_accounts_list_ajax(request): a['delete_url'] = reverse('customer_bank_accounts_delete', kwargs={'id': a['pk'],}) data = json.dumps(list(accounts), default=dthandler) - return HttpResponse(data, mimetype='application/json') + return HttpResponse(data, content_type='application/json') @login_required @@ -53,7 +53,7 @@ def bank_accounts_get_ajax(request, id): account = get_object_or_404(models.BankAccount.objects.values(*fields_list), pk=id, company=request.user.profile) data = json.dumps(account, default=dthandler) - return HttpResponse(data, mimetype='application/json') + return HttpResponse(data, content_type='application/json') @login_required @@ -83,7 +83,7 @@ def bank_accounts_add_ajax(request): 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') @login_required @@ -113,7 +113,7 @@ def bank_accounts_edit_ajax(request, id): 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') @login_required @@ -134,4 +134,4 @@ def bank_accounts_delete_ajax(request, id): 'success': True, 'message': {'title': 'Инфо', 'msg': 'Расчётный счёт удалён.',}, } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/src/customer/views/clients_ajax.py b/src/customer/views/clients_ajax.py index 8985456..b58f55a 100644 --- a/src/customer/views/clients_ajax.py +++ b/src/customer/views/clients_ajax.py @@ -33,7 +33,7 @@ def clients_get_ajax(request, id): client = get_object_or_404(models.Client.objects.values(*fields_list), pk=id, company=request.user.profile) - return HttpResponse(json.dumps(client), mimetype='application/json') + return HttpResponse(json.dumps(client), content_type='application/json') @login_required @@ -78,7 +78,7 @@ def clients_add_ajax(request): 'action': 'client-add', 'row_html': html, } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') @login_required @@ -117,7 +117,7 @@ def clients_edit_ajax(request, id): 'action': 'client-edit', 'row_html': html, } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') @login_required @@ -157,4 +157,4 @@ def clients_delete_ajax(request, id): 'action': 'client-delete', 'id': del_id, } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/src/customer/views/license.py b/src/customer/views/license.py index 31211c0..cb691de 100644 --- a/src/customer/views/license.py +++ b/src/customer/views/license.py @@ -115,7 +115,7 @@ def delete_license(request, pk): dictionary = {'res': 'fail'} data = json.dumps(dictionary) - return HttpResponse(data, mimetype='application/json') + return HttpResponse(data, content_type='application/json') @csrf_exempt diff --git a/src/customer/views/profile.py b/src/customer/views/profile.py index 1b526ad..f8c466d 100644 --- a/src/customer/views/profile.py +++ b/src/customer/views/profile.py @@ -143,7 +143,7 @@ def tmp_upload(request): im_url = os.path.join(settings.MEDIA_URL, os.path.relpath(im.url, settings.MEDIA_ROOT)) data = {'res': 'ok', 'pic': im_url, 'full_pic': tmp_url_partial} data.update(request.REQUEST) - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') def del_tmp_photo(request, article_pk): diff --git a/src/customer/views/profile_ajax.py b/src/customer/views/profile_ajax.py index 7dce712..1c78ba0 100644 --- a/src/customer/views/profile_ajax.py +++ b/src/customer/views/profile_ajax.py @@ -44,7 +44,7 @@ def profile_filters_edit_ajax(request): 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') @login_required @@ -81,4 +81,4 @@ def profile_email_ajax(request): 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы } - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/src/docs/models/base_models.py b/src/docs/models/base_models.py index e7d7e31..55ca019 100644 --- a/src/docs/models/base_models.py +++ b/src/docs/models/base_models.py @@ -22,6 +22,7 @@ class VeryBaseModel(models.Model): # ----------------------------------------------------------------------------- + class BaseModel(VeryBaseModel): """Абстрактная модель бух.формы.""" user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+', verbose_name=u'Пользователь') @@ -41,6 +42,9 @@ class BaseModel(VeryBaseModel): def __unicode__(self): return u'%s № %s от %s' % (self._meta.verbose_name or '', self.doc_num, self.doc_date) + def __str__(self): + return u'%s № %s от %s' % (self._meta.verbose_name or '', self.doc_num, self.doc_date) + class BaseNdsModel(BaseModel): """Расширение абстрактной модели бух.формы - НДС. @@ -68,6 +72,7 @@ class BaseInvoiceModel(BaseNdsModel): # ----------------------------------------------------------------------------- + class BaseItemModel(VeryBaseModel): """Абстрактная модель табличной части бух.формы.""" name = models.CharField(u'Наименование', max_length=256) @@ -81,6 +86,9 @@ class BaseItemModel(VeryBaseModel): def __unicode__(self): return u'%s, %s %s' % (self.name[:30], self.qty, self.units) + def __str__(self): + return u'%s, %s %s' % (self.name[:30], self.qty, self.units) + class BaseItemInvoiceModel(BaseItemModel): """Расширение абстрактной модели табл. части бух.формы - по типу счета. @@ -96,6 +104,10 @@ class BaseItemInvoiceModel(BaseItemModel): curr = consts.CURRENCY_CHOICES_DICT.get(getattr(self, 'currency', consts.CURR_RUB)) return u'%s, %s %s * %s = %s %s' % (self.name[:30], self.qty, self.units, self.price, self.total_price, curr) + def __str__(self): + curr = consts.CURRENCY_CHOICES_DICT.get(getattr(self, 'currency', consts.CURR_RUB)) + return u'%s, %s %s * %s = %s %s' % (self.name[:30], self.qty, self.units, self.price, self.total_price, curr) + def save(self, *args, **kwargs): self.total_price = self.price * self.qty # пересчитать сумму super(BaseItemInvoiceModel, self).save(*args, **kwargs) diff --git a/src/docs/views/__init__.py b/src/docs/views/__init__.py index 1478ba7..86daa0e 100644 --- a/src/docs/views/__init__.py +++ b/src/docs/views/__init__.py @@ -14,11 +14,11 @@ from docs.views.faktura import FakturaViews from docs.views.ajax import get_invoices, get_tbl_items, get_client_by_invoice, toggle_doc_status -@login_required # важно!!! +@login_required # важно!!! def getview(request, *args, **kwargs): - views = kwargs['klass'](request) # класс с вьюхами - handler = getattr(views, kwargs['oper']) # конкретная вьюха - return handler(request, *args, **kwargs) # передать управление во вьюху и вернуть ее результат + views = kwargs['klass'](request) # класс с вьюхами + handler = getattr(views, kwargs['oper']) # конкретная вьюха + return handler(request, *args, **kwargs) # передать управление во вьюху и вернуть ее результат # ----------------------------------------------------------------------------- diff --git a/src/docs/views/ajax.py b/src/docs/views/ajax.py index da1b13a..8dc9328 100644 --- a/src/docs/views/ajax.py +++ b/src/docs/views/ajax.py @@ -24,7 +24,7 @@ def get_invoices(request, client_id=None): invoices = {invoice.id: '№ %s от %s' % (invoice.doc_num, invoice.doc_date) for invoice in invoices} - return HttpResponse(json.dumps(invoices), mimetype='application/json') + return HttpResponse(json.dumps(invoices), content_type='application/json') def get_tbl_items(request, invoice_id): @@ -36,7 +36,7 @@ def get_tbl_items(request, invoice_id): invoice = Invoice.objects.get(company=request.user.profile, pk=invoice_id) data = serializers.serialize('json', invoice.invoice_items.all()) - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') def get_client_by_invoice(request, invoice_id): @@ -47,7 +47,7 @@ def get_client_by_invoice(request, invoice_id): invoice = Invoice.objects.get(company=request.user.profile, pk=invoice_id) - return HttpResponse(json.dumps([invoice.client.id, invoice.client.name]), mimetype='application/json') + return HttpResponse(json.dumps([invoice.client.id, invoice.client.name]), content_type='application/json') def toggle_doc_status(request, doc_type, doc_id, doc_attr): @@ -74,4 +74,4 @@ def toggle_doc_status(request, doc_type, doc_id, doc_attr): next_text = dict(choices_)[next_val] - return HttpResponse(json.dumps([next_text, next_val]), mimetype='application/json') + return HttpResponse(json.dumps([next_text, next_val]), content_type='application/json') diff --git a/src/docs/views/base_views.py b/src/docs/views/base_views.py index 932f734..0a7ff8a 100644 --- a/src/docs/views/base_views.py +++ b/src/docs/views/base_views.py @@ -340,7 +340,7 @@ class BaseViews(object): 'success': success, 'del_id': del_id, } - return HttpResponse(json.dumps(result), mimetype='application/json') + return HttpResponse(json.dumps(result), content_type='application/json') #dictionary = { # 'padeji': self.PADEJI, @@ -570,7 +570,7 @@ class BaseViews(object): if form.is_valid() and result: data['message'] = {'title': 'Инфо', 'msg': 'Письмо отправлено.',} - return HttpResponse(json.dumps(data), mimetype='application/json') + return HttpResponse(json.dumps(data), content_type='application/json') def get_ajax(self, *args, **kwargs): """Получить документ - AJAX.""" @@ -578,7 +578,7 @@ class BaseViews(object): return HttpResponseBadRequest() obj = self.get_obj(kwargs['id'], only_form_fields=True) data = json.dumps(obj, default=dthandler) - return HttpResponse(data, mimetype='application/json') + return HttpResponse(data, content_type='application/json') # ----------------------------------------------------------------------------- diff --git a/src/celery.py b/src/dokumentor/__init__.py similarity index 65% rename from src/celery.py rename to src/dokumentor/__init__.py index 99728aa..ddbfadf 100644 --- a/src/celery.py +++ b/src/dokumentor/__init__.py @@ -1,13 +1,14 @@ +# coding: utf-8 from __future__ import absolute_import, unicode_literals import os from celery import Celery # set the default Django settings module for the 'celery' program. -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dokumentor.settings.local') -app = Celery('src') +app = Celery('dokumentor') -# Using a string here means the worker doesn't have to serialize +# Using a string here means the worker don't have to serialize # the configuration object to child processes. # - namespace='CELERY' means all celery-related configuration keys # should have a `CELERY_` prefix. @@ -15,9 +16,3 @@ app.config_from_object('django.conf:settings', namespace='CELERY') # Load task modules from all registered Django app configs. app.autodiscover_tasks() - - -@app.task(bind=True) -def debug_task(self): - print('Request: {0!r}'.format(self.request)) - diff --git a/src/dokumentor/celery.py b/src/dokumentor/celery.py new file mode 100644 index 0000000..9989278 --- /dev/null +++ b/src/dokumentor/celery.py @@ -0,0 +1,8 @@ +# coding: utf-8 + +from celery import Celery +from django.conf import settings + +app = Celery('dokumentor') +app.config_from_object('django.conf:settings', namespace='CELERY') +app.autodiscover_tasks() diff --git a/src/dokumentor/settings/__init__.py b/src/dokumentor/settings/__init__.py new file mode 100644 index 0000000..7c68785 --- /dev/null +++ b/src/dokumentor/settings/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- \ No newline at end of file diff --git a/src/settings.py b/src/dokumentor/settings/base.py similarity index 80% rename from src/settings.py rename to src/dokumentor/settings/base.py index 5c49448..1631b8a 100644 --- a/src/settings.py +++ b/src/dokumentor/settings/base.py @@ -4,18 +4,15 @@ import os import sys -from imp import find_module from datetime import timedelta -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -ROOT_DIR = os.path.dirname( - os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +PROJECT_DIR = os.path.normpath(os.path.join(os.path.dirname(__file__), '..')) +MANAGE_DIR = os.path.normpath(os.path.join(PROJECT_DIR, '..')) +ROOT_DIR = os.path.normpath(os.path.join(MANAGE_DIR, '..')) -path = lambda *xs: os.path.abspath(os.path.join(os.path.dirname(__file__), *xs)) - -sys.path.insert(1, path('..')) -sys.path.insert(1, path('.')) -sys.path.insert(1, path('src')) +sys.path.append(PROJECT_DIR) +sys.path.append(MANAGE_DIR) +sys.path.append(ROOT_DIR) DEBUG = False @@ -59,25 +56,23 @@ USE_TZ = True # Absolute filesystem path to the directory that will hold user-uploaded files. # Example: "/var/www/example.com/media/" -MEDIA_ROOT = path('../media') +MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media') + # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash. # Examples: "http://example.com/media/", "http://media.example.com/" -MEDIA_URL = '/m/' +MEDIA_URL = '/media/' -STATIC_ROOT = path('../static') +STATIC_ROOT = os.path.join(ROOT_DIR, 'static') # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/s/' +STATIC_URL = '/static/' # Additional locations of static files STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - path('static'), + os.path.join(PROJECT_DIR, 'static'), ) @@ -90,48 +85,27 @@ TEMPLATE_LOADERS = ( 'django.template.loaders.app_directories.Loader', ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE_CLASSES = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - # Uncomment the next line for simple clickjacking protection: 'django.middleware.clickjacking.XFrameOptionsMiddleware', - # 'django.middleware.doc.XViewMiddleware', 'cms.middleware.page.CurrentPageMiddleware', 'cms.middleware.user.CurrentUserMiddleware', 'cms.middleware.toolbar.ToolbarMiddleware', 'cms.middleware.language.LanguageCookieMiddleware', 'djangocms_ckeditor_filer.middleware.ThumbnailMiddleware', - - # my 'src.customer.middleware.ProfileMiddleware', -) - -# CHECK -# MIDDLEWARE_CLASSES = ( -# 'cms.middleware.utils.ApphookReloadMiddleware', -# 'django.contrib.sessions.middleware.SessionMiddleware', -# 'django.middleware.csrf.CsrfViewMiddleware', -# 'django.contrib.auth.middleware.AuthenticationMiddleware', -# 'django.contrib.messages.middleware.MessageMiddleware', -# 'django.middleware.locale.LocaleMiddleware', -# 'django.middleware.common.CommonMiddleware', -# 'cms.middleware.user.CurrentUserMiddleware', -# 'cms.middleware.page.CurrentPageMiddleware', -# 'cms.middleware.toolbar.ToolbarMiddleware', -# 'cms.middleware.language.LanguageCookieMiddleware', -# ) - +] TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [ - # os.path.join(BASE_DIR, 'templates'), - path('templates'), + os.path.join(PROJECT_DIR, 'templates'), ], 'APP_DIRS': True, @@ -154,20 +128,16 @@ TEMPLATES = [ ] TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - path('templates'), + os.path.join(PROJECT_DIR, 'templates'), ) - -ROOT_URLCONF = 'src.urls' +ROOT_URLCONF = 'dokumentor.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'src.wsgi.application' +WSGI_APPLICATION = 'wsgi.application' -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'myauth', 'djangocms_admin_style', @@ -203,7 +173,7 @@ INSTALLED_APPS = ( 'callback', # 'project.index_blocks', -) +] AUTH_USER_MODEL = 'myauth.DokUser' # A sample logging configuration. The only tangible logging @@ -228,7 +198,7 @@ LOGGING = { 'yandex_money': { 'level': 'DEBUG', 'class': 'logging.handlers.RotatingFileHandler', - 'filename': path('../log/yandex_money.log'), + 'filename': os.path.join(ROOT_DIR, 'var/log/yandex_money.log'), 'maxBytes': 1024 * 1024 * 5, 'backupCount': 5, }, @@ -256,14 +226,14 @@ LOGIN_URL = '/user/login/' SUPPORT_EMAIL = 'help@dokumentor.ru' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -PDF_FONTS_ROOT = path('pdf_fonts') +PDF_FONTS_ROOT = os.path.join(MANAGE_DIR, 'pdf_fonts') -XLS_ROOT = path('xls_templates') +XLS_ROOT = os.path.join(MANAGE_DIR, 'xls_templates') LANGUAGES = ( ('ru', 'Russian'), - #('en', gettext('English')), ) + CMS_TEMPLATES = ( ('pages/index.html', 'Index Page'), ('pages/inner_page.html', u'Внутренняя страница'), @@ -289,6 +259,8 @@ BROKER_USER = "dokumentor" BROKER_PASSWORD = "dokumentor" BROKER_VHOST = "dokumentor" +# CELERY_BROKER_URL = 'amqp://guest:guest@localhost:5672//' + CELERY_TIMEZONE = 'Europe/Moscow' @@ -305,7 +277,8 @@ CELERYBEAT_SCHEDULE = { }, } -CAPTCHA_OUTPUT_FORMAT = u"%(hidden_field)s %(image)s%(text_field)s" +CAPTCHA_OUTPUT_FORMAT = u"%(hidden_field)s %(image)s%(text_field)s" CAPTCHA_FONT_SIZE = 36 CKEDITOR_SETTINGS = { @@ -351,7 +324,7 @@ YANDEX_MONEY_PAYMENT_URL = 'https://money.yandex.ru/eshop.xml' YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True try: - from src.local_settings import * + from dokumentor.settings.local import * except ImportError: pass diff --git a/src/dokumentor/settings/local.py b/src/dokumentor/settings/local.py new file mode 100644 index 0000000..416ae4f --- /dev/null +++ b/src/dokumentor/settings/local.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from dokumentor.settings.base import * + +DEBUG = True + +ADMINS = () + +MANAGERS = ADMINS + +SERVER_EMAIL = 'dokumentor@localhost' + +ALLOWED_HOSTS = ['*'] + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(ROOT_DIR, 'db.sqlite3'), + } +} + +EMAIL_BACKEND = 'eml_email_backend.EmailBackend' +EMAIL_FILE_PATH = os.path.join(ROOT_DIR, 'tmp_emails') + +# debug toolbar +DEBUG_TOOLBAR_PATCH_SETTINGS = False + + +if DEBUG: + INSTALLED_APPS.append('debug_toolbar') + MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware') diff --git a/src/static/PD.pdf b/src/dokumentor/static/PD.pdf similarity index 100% rename from src/static/PD.pdf rename to src/dokumentor/static/PD.pdf diff --git a/src/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js b/src/dokumentor/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js similarity index 100% rename from src/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js rename to src/dokumentor/static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js diff --git a/src/static/ckeditor/plugins/filerimage/icons/filerimage.png b/src/dokumentor/static/ckeditor/plugins/filerimage/icons/filerimage.png similarity index 100% rename from src/static/ckeditor/plugins/filerimage/icons/filerimage.png rename to src/dokumentor/static/ckeditor/plugins/filerimage/icons/filerimage.png diff --git a/src/static/ckeditor/plugins/filerimage/plugin.js b/src/dokumentor/static/ckeditor/plugins/filerimage/plugin.js similarity index 100% rename from src/static/ckeditor/plugins/filerimage/plugin.js rename to src/dokumentor/static/ckeditor/plugins/filerimage/plugin.js diff --git a/src/static/css/custom_admin.css b/src/dokumentor/static/css/custom_admin.css similarity index 100% rename from src/static/css/custom_admin.css rename to src/dokumentor/static/css/custom_admin.css diff --git a/src/static/css/style.css b/src/dokumentor/static/css/style.css similarity index 100% rename from src/static/css/style.css rename to src/dokumentor/static/css/style.css diff --git a/src/static/css/suggestions.css b/src/dokumentor/static/css/suggestions.css similarity index 100% rename from src/static/css/suggestions.css rename to src/dokumentor/static/css/suggestions.css diff --git a/src/static/css/ui-lightness/images/animated-overlay.gif b/src/dokumentor/static/css/ui-lightness/images/animated-overlay.gif similarity index 100% rename from src/static/css/ui-lightness/images/animated-overlay.gif rename to src/dokumentor/static/css/ui-lightness/images/animated-overlay.gif diff --git a/src/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/src/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/src/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/src/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/src/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/src/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/src/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/src/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/src/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/dokumentor/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to src/dokumentor/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/src/static/css/ui-lightness/images/ui-icons_222222_256x240.png b/src/dokumentor/static/css/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-icons_222222_256x240.png rename to src/dokumentor/static/css/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/src/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/src/dokumentor/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png rename to src/dokumentor/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/src/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/src/dokumentor/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to src/dokumentor/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/src/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/src/dokumentor/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to src/dokumentor/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/src/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/src/dokumentor/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from src/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png rename to src/dokumentor/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/src/static/css/ui-lightness/jquery-ui-1.10.3.custom.css b/src/dokumentor/static/css/ui-lightness/jquery-ui-1.10.3.custom.css similarity index 100% rename from src/static/css/ui-lightness/jquery-ui-1.10.3.custom.css rename to src/dokumentor/static/css/ui-lightness/jquery-ui-1.10.3.custom.css diff --git a/src/static/css/ui-lightness/jquery-ui-1.10.3.custom.min.css b/src/dokumentor/static/css/ui-lightness/jquery-ui-1.10.3.custom.min.css similarity index 100% rename from src/static/css/ui-lightness/jquery-ui-1.10.3.custom.min.css rename to src/dokumentor/static/css/ui-lightness/jquery-ui-1.10.3.custom.min.css diff --git a/src/static/dogovor.pdf b/src/dokumentor/static/dogovor.pdf similarity index 100% rename from src/static/dogovor.pdf rename to src/dokumentor/static/dogovor.pdf diff --git a/src/static/favicon.ico b/src/dokumentor/static/favicon.ico similarity index 100% rename from src/static/favicon.ico rename to src/dokumentor/static/favicon.ico diff --git a/src/static/fonts/261413575-a_AvanteLt-DemiBold.eot b/src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.eot similarity index 100% rename from src/static/fonts/261413575-a_AvanteLt-DemiBold.eot rename to src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.eot diff --git a/src/static/fonts/261413575-a_AvanteLt-DemiBold.html b/src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.html similarity index 100% rename from src/static/fonts/261413575-a_AvanteLt-DemiBold.html rename to src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.html diff --git a/src/static/fonts/332733155-a_AvanteLt-Light.svg b/src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.svg similarity index 100% rename from src/static/fonts/332733155-a_AvanteLt-Light.svg rename to src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.svg diff --git a/src/static/fonts/261413575-a_AvanteLt-DemiBold.ttf b/src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.ttf similarity index 100% rename from src/static/fonts/261413575-a_AvanteLt-DemiBold.ttf rename to src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.ttf diff --git a/src/static/fonts/261413575-a_AvanteLt-DemiBold.woff b/src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.woff similarity index 100% rename from src/static/fonts/261413575-a_AvanteLt-DemiBold.woff rename to src/dokumentor/static/fonts/261413575-a_AvanteLt-DemiBold.woff diff --git a/src/static/fonts/332733155-a_AvanteLt-Light.eot b/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.eot similarity index 100% rename from src/static/fonts/332733155-a_AvanteLt-Light.eot rename to src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.eot diff --git a/src/static/fonts/332733155-a_AvanteLt-Light.html b/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.html similarity index 100% rename from src/static/fonts/332733155-a_AvanteLt-Light.html rename to src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.html diff --git a/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.svg b/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.svg new file mode 100644 index 0000000..e69de29 diff --git a/src/static/fonts/332733155-a_AvanteLt-Light.ttf b/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.ttf similarity index 100% rename from src/static/fonts/332733155-a_AvanteLt-Light.ttf rename to src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.ttf diff --git a/src/static/fonts/332733155-a_AvanteLt-Light.woff b/src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.woff similarity index 100% rename from src/static/fonts/332733155-a_AvanteLt-Light.woff rename to src/dokumentor/static/fonts/332733155-a_AvanteLt-Light.woff diff --git a/src/static/fonts/MyriadPro-Light.eot b/src/dokumentor/static/fonts/MyriadPro-Light.eot similarity index 100% rename from src/static/fonts/MyriadPro-Light.eot rename to src/dokumentor/static/fonts/MyriadPro-Light.eot diff --git a/src/static/fonts/MyriadPro-Light.otf b/src/dokumentor/static/fonts/MyriadPro-Light.otf similarity index 100% rename from src/static/fonts/MyriadPro-Light.otf rename to src/dokumentor/static/fonts/MyriadPro-Light.otf diff --git a/src/static/fonts/MyriadPro-Light.svg b/src/dokumentor/static/fonts/MyriadPro-Light.svg similarity index 100% rename from src/static/fonts/MyriadPro-Light.svg rename to src/dokumentor/static/fonts/MyriadPro-Light.svg diff --git a/src/static/fonts/MyriadPro-Light.ttf b/src/dokumentor/static/fonts/MyriadPro-Light.ttf similarity index 100% rename from src/static/fonts/MyriadPro-Light.ttf rename to src/dokumentor/static/fonts/MyriadPro-Light.ttf diff --git a/src/static/fonts/MyriadPro-Light.woff b/src/dokumentor/static/fonts/MyriadPro-Light.woff similarity index 100% rename from src/static/fonts/MyriadPro-Light.woff rename to src/dokumentor/static/fonts/MyriadPro-Light.woff diff --git a/src/static/fonts/myriadpro-cond.eot b/src/dokumentor/static/fonts/myriadpro-cond.eot similarity index 100% rename from src/static/fonts/myriadpro-cond.eot rename to src/dokumentor/static/fonts/myriadpro-cond.eot diff --git a/src/static/fonts/myriadpro-cond.svg b/src/dokumentor/static/fonts/myriadpro-cond.svg similarity index 100% rename from src/static/fonts/myriadpro-cond.svg rename to src/dokumentor/static/fonts/myriadpro-cond.svg diff --git a/src/static/fonts/myriadpro-cond.ttf b/src/dokumentor/static/fonts/myriadpro-cond.ttf similarity index 100% rename from src/static/fonts/myriadpro-cond.ttf rename to src/dokumentor/static/fonts/myriadpro-cond.ttf diff --git a/src/static/fonts/myriadpro-cond.woff b/src/dokumentor/static/fonts/myriadpro-cond.woff similarity index 100% rename from src/static/fonts/myriadpro-cond.woff rename to src/dokumentor/static/fonts/myriadpro-cond.woff diff --git a/src/static/fonts/myriadpro-regular.css b/src/dokumentor/static/fonts/myriadpro-regular.css similarity index 100% rename from src/static/fonts/myriadpro-regular.css rename to src/dokumentor/static/fonts/myriadpro-regular.css diff --git a/src/static/fonts/myriadpro-regular.eot b/src/dokumentor/static/fonts/myriadpro-regular.eot similarity index 100% rename from src/static/fonts/myriadpro-regular.eot rename to src/dokumentor/static/fonts/myriadpro-regular.eot diff --git a/src/static/fonts/myriadpro-regular.svg b/src/dokumentor/static/fonts/myriadpro-regular.svg similarity index 100% rename from src/static/fonts/myriadpro-regular.svg rename to src/dokumentor/static/fonts/myriadpro-regular.svg diff --git a/src/static/fonts/myriadpro-regular.ttf b/src/dokumentor/static/fonts/myriadpro-regular.ttf similarity index 100% rename from src/static/fonts/myriadpro-regular.ttf rename to src/dokumentor/static/fonts/myriadpro-regular.ttf diff --git a/src/static/fonts/myriadpro-regular.woff b/src/dokumentor/static/fonts/myriadpro-regular.woff similarity index 100% rename from src/static/fonts/myriadpro-regular.woff rename to src/dokumentor/static/fonts/myriadpro-regular.woff diff --git a/src/static/img/add-new.png b/src/dokumentor/static/img/add-new.png similarity index 100% rename from src/static/img/add-new.png rename to src/dokumentor/static/img/add-new.png diff --git a/src/static/img/ajax-loader.gif b/src/dokumentor/static/img/ajax-loader.gif similarity index 100% rename from src/static/img/ajax-loader.gif rename to src/dokumentor/static/img/ajax-loader.gif diff --git a/src/static/img/alfa.svg b/src/dokumentor/static/img/alfa.svg similarity index 100% rename from src/static/img/alfa.svg rename to src/dokumentor/static/img/alfa.svg diff --git a/src/static/img/asc.png b/src/dokumentor/static/img/asc.png similarity index 100% rename from src/static/img/asc.png rename to src/dokumentor/static/img/asc.png diff --git a/src/static/img/beel.svg b/src/dokumentor/static/img/beel.svg similarity index 100% rename from src/static/img/beel.svg rename to src/dokumentor/static/img/beel.svg diff --git a/src/static/img/bg.png b/src/dokumentor/static/img/bg.png similarity index 100% rename from src/static/img/bg.png rename to src/dokumentor/static/img/bg.png diff --git a/src/static/img/black_arrow.png b/src/dokumentor/static/img/black_arrow.png similarity index 100% rename from src/static/img/black_arrow.png rename to src/dokumentor/static/img/black_arrow.png diff --git a/src/static/img/close.png b/src/dokumentor/static/img/close.png similarity index 100% rename from src/static/img/close.png rename to src/dokumentor/static/img/close.png diff --git a/src/static/img/comepay.svg b/src/dokumentor/static/img/comepay.svg similarity index 100% rename from src/static/img/comepay.svg rename to src/dokumentor/static/img/comepay.svg diff --git a/src/static/img/darker-bg.png b/src/dokumentor/static/img/darker-bg.png similarity index 100% rename from src/static/img/darker-bg.png rename to src/dokumentor/static/img/darker-bg.png diff --git a/src/static/img/desc.png b/src/dokumentor/static/img/desc.png similarity index 100% rename from src/static/img/desc.png rename to src/dokumentor/static/img/desc.png diff --git a/src/static/img/envelope.png b/src/dokumentor/static/img/envelope.png similarity index 100% rename from src/static/img/envelope.png rename to src/dokumentor/static/img/envelope.png diff --git a/src/static/img/euroset.svg b/src/dokumentor/static/img/euroset.svg similarity index 100% rename from src/static/img/euroset.svg rename to src/dokumentor/static/img/euroset.svg diff --git a/src/static/img/footer-bg.jpg b/src/dokumentor/static/img/footer-bg.jpg similarity index 100% rename from src/static/img/footer-bg.jpg rename to src/dokumentor/static/img/footer-bg.jpg diff --git a/src/static/img/glavbuh_sign.png b/src/dokumentor/static/img/glavbuh_sign.png similarity index 100% rename from src/static/img/glavbuh_sign.png rename to src/dokumentor/static/img/glavbuh_sign.png diff --git a/src/static/img/gotopay-hover.png b/src/dokumentor/static/img/gotopay-hover.png similarity index 100% rename from src/static/img/gotopay-hover.png rename to src/dokumentor/static/img/gotopay-hover.png diff --git a/src/static/img/gotopay.png b/src/dokumentor/static/img/gotopay.png similarity index 100% rename from src/static/img/gotopay.png rename to src/dokumentor/static/img/gotopay.png diff --git a/src/static/img/icon-add.gif b/src/dokumentor/static/img/icon-add.gif similarity index 100% rename from src/static/img/icon-add.gif rename to src/dokumentor/static/img/icon-add.gif diff --git a/src/static/img/icon-add.png b/src/dokumentor/static/img/icon-add.png similarity index 100% rename from src/static/img/icon-add.png rename to src/dokumentor/static/img/icon-add.png diff --git a/src/static/img/icon-alert.gif b/src/dokumentor/static/img/icon-alert.gif similarity index 100% rename from src/static/img/icon-alert.gif rename to src/dokumentor/static/img/icon-alert.gif diff --git a/src/static/img/icon-calendar.gif b/src/dokumentor/static/img/icon-calendar.gif similarity index 100% rename from src/static/img/icon-calendar.gif rename to src/dokumentor/static/img/icon-calendar.gif diff --git a/src/static/img/icon-calendar.png b/src/dokumentor/static/img/icon-calendar.png similarity index 100% rename from src/static/img/icon-calendar.png rename to src/dokumentor/static/img/icon-calendar.png diff --git a/src/static/img/icon-delete.gif b/src/dokumentor/static/img/icon-delete.gif similarity index 100% rename from src/static/img/icon-delete.gif rename to src/dokumentor/static/img/icon-delete.gif diff --git a/src/static/img/icon-delete.png b/src/dokumentor/static/img/icon-delete.png similarity index 100% rename from src/static/img/icon-delete.png rename to src/dokumentor/static/img/icon-delete.png diff --git a/src/static/img/icon-directory.png b/src/dokumentor/static/img/icon-directory.png similarity index 100% rename from src/static/img/icon-directory.png rename to src/dokumentor/static/img/icon-directory.png diff --git a/src/static/img/icon-edit.gif b/src/dokumentor/static/img/icon-edit.gif similarity index 100% rename from src/static/img/icon-edit.gif rename to src/dokumentor/static/img/icon-edit.gif diff --git a/src/static/img/icon-edit.png b/src/dokumentor/static/img/icon-edit.png similarity index 100% rename from src/static/img/icon-edit.png rename to src/dokumentor/static/img/icon-edit.png diff --git a/src/static/img/icon-email.gif b/src/dokumentor/static/img/icon-email.gif similarity index 100% rename from src/static/img/icon-email.gif rename to src/dokumentor/static/img/icon-email.gif diff --git a/src/static/img/icon-error.gif b/src/dokumentor/static/img/icon-error.gif similarity index 100% rename from src/static/img/icon-error.gif rename to src/dokumentor/static/img/icon-error.gif diff --git a/src/static/img/icon-excel.gif b/src/dokumentor/static/img/icon-excel.gif similarity index 100% rename from src/static/img/icon-excel.gif rename to src/dokumentor/static/img/icon-excel.gif diff --git a/src/static/img/icon-pdf.gif b/src/dokumentor/static/img/icon-pdf.gif similarity index 100% rename from src/static/img/icon-pdf.gif rename to src/dokumentor/static/img/icon-pdf.gif diff --git a/src/static/img/icon-success.gif b/src/dokumentor/static/img/icon-success.gif similarity index 100% rename from src/static/img/icon-success.gif rename to src/dokumentor/static/img/icon-success.gif diff --git a/src/static/img/index-banner.png b/src/dokumentor/static/img/index-banner.png similarity index 100% rename from src/static/img/index-banner.png rename to src/dokumentor/static/img/index-banner.png diff --git a/src/static/img/index-promo-1.png b/src/dokumentor/static/img/index-promo-1.png similarity index 100% rename from src/static/img/index-promo-1.png rename to src/dokumentor/static/img/index-promo-1.png diff --git a/src/static/img/index-promo-2.png b/src/dokumentor/static/img/index-promo-2.png similarity index 100% rename from src/static/img/index-promo-2.png rename to src/dokumentor/static/img/index-promo-2.png diff --git a/src/static/img/index-promo-3.png b/src/dokumentor/static/img/index-promo-3.png similarity index 100% rename from src/static/img/index-promo-3.png rename to src/dokumentor/static/img/index-promo-3.png diff --git a/src/static/img/index-promo-bg.jpg b/src/dokumentor/static/img/index-promo-bg.jpg similarity index 100% rename from src/static/img/index-promo-bg.jpg rename to src/dokumentor/static/img/index-promo-bg.jpg diff --git a/src/static/img/index-yellow-bg.jpg b/src/dokumentor/static/img/index-yellow-bg.jpg similarity index 100% rename from src/static/img/index-yellow-bg.jpg rename to src/dokumentor/static/img/index-yellow-bg.jpg diff --git a/src/static/img/lamp-off.png b/src/dokumentor/static/img/lamp-off.png similarity index 100% rename from src/static/img/lamp-off.png rename to src/dokumentor/static/img/lamp-off.png diff --git a/src/static/img/lamp.png b/src/dokumentor/static/img/lamp.png similarity index 100% rename from src/static/img/lamp.png rename to src/dokumentor/static/img/lamp.png diff --git a/src/static/img/left-arrow.gif b/src/dokumentor/static/img/left-arrow.gif similarity index 100% rename from src/static/img/left-arrow.gif rename to src/dokumentor/static/img/left-arrow.gif diff --git a/src/static/img/left-arrow.png b/src/dokumentor/static/img/left-arrow.png similarity index 100% rename from src/static/img/left-arrow.png rename to src/dokumentor/static/img/left-arrow.png diff --git a/src/static/img/login-black.png b/src/dokumentor/static/img/login-black.png similarity index 100% rename from src/static/img/login-black.png rename to src/dokumentor/static/img/login-black.png diff --git a/src/static/img/login-yellow.png b/src/dokumentor/static/img/login-yellow.png similarity index 100% rename from src/static/img/login-yellow.png rename to src/dokumentor/static/img/login-yellow.png diff --git a/src/static/img/login.png b/src/dokumentor/static/img/login.png similarity index 100% rename from src/static/img/login.png rename to src/dokumentor/static/img/login.png diff --git a/src/static/img/logo.png b/src/dokumentor/static/img/logo.png similarity index 100% rename from src/static/img/logo.png rename to src/dokumentor/static/img/logo.png diff --git a/src/static/img/maestro.svg b/src/dokumentor/static/img/maestro.svg similarity index 100% rename from src/static/img/maestro.svg rename to src/dokumentor/static/img/maestro.svg diff --git a/src/static/img/man.png b/src/dokumentor/static/img/man.png similarity index 100% rename from src/static/img/man.png rename to src/dokumentor/static/img/man.png diff --git a/src/static/img/mastercard.svg b/src/dokumentor/static/img/mastercard.svg similarity index 100% rename from src/static/img/mastercard.svg rename to src/dokumentor/static/img/mastercard.svg diff --git a/src/static/img/masterpass.svg b/src/dokumentor/static/img/masterpass.svg similarity index 100% rename from src/static/img/masterpass.svg rename to src/dokumentor/static/img/masterpass.svg diff --git a/src/static/img/megafon.svg b/src/dokumentor/static/img/megafon.svg similarity index 100% rename from src/static/img/megafon.svg rename to src/dokumentor/static/img/megafon.svg diff --git a/src/static/img/menu-selected.png b/src/dokumentor/static/img/menu-selected.png similarity index 100% rename from src/static/img/menu-selected.png rename to src/dokumentor/static/img/menu-selected.png diff --git a/src/static/img/menu-selected2.png b/src/dokumentor/static/img/menu-selected2.png similarity index 100% rename from src/static/img/menu-selected2.png rename to src/dokumentor/static/img/menu-selected2.png diff --git a/src/static/img/mir.svg b/src/dokumentor/static/img/mir.svg similarity index 100% rename from src/static/img/mir.svg rename to src/dokumentor/static/img/mir.svg diff --git a/src/static/img/mts.svg b/src/dokumentor/static/img/mts.svg similarity index 100% rename from src/static/img/mts.svg rename to src/dokumentor/static/img/mts.svg diff --git a/src/static/img/nosort.png b/src/dokumentor/static/img/nosort.png similarity index 100% rename from src/static/img/nosort.png rename to src/dokumentor/static/img/nosort.png diff --git a/src/static/img/pencil.png b/src/dokumentor/static/img/pencil.png similarity index 100% rename from src/static/img/pencil.png rename to src/dokumentor/static/img/pencil.png diff --git a/src/static/img/popup-cabinet.png b/src/dokumentor/static/img/popup-cabinet.png similarity index 100% rename from src/static/img/popup-cabinet.png rename to src/dokumentor/static/img/popup-cabinet.png diff --git a/src/static/img/popup-cart.png b/src/dokumentor/static/img/popup-cart.png similarity index 100% rename from src/static/img/popup-cart.png rename to src/dokumentor/static/img/popup-cart.png diff --git a/src/static/img/popup-clock.png b/src/dokumentor/static/img/popup-clock.png similarity index 100% rename from src/static/img/popup-clock.png rename to src/dokumentor/static/img/popup-clock.png diff --git a/src/static/img/popup-link.png b/src/dokumentor/static/img/popup-link.png similarity index 100% rename from src/static/img/popup-link.png rename to src/dokumentor/static/img/popup-link.png diff --git a/src/static/img/popup-list.png b/src/dokumentor/static/img/popup-list.png similarity index 100% rename from src/static/img/popup-list.png rename to src/dokumentor/static/img/popup-list.png diff --git a/src/static/img/popup-settings.png b/src/dokumentor/static/img/popup-settings.png similarity index 100% rename from src/static/img/popup-settings.png rename to src/dokumentor/static/img/popup-settings.png diff --git a/src/static/img/popup-trash.png b/src/dokumentor/static/img/popup-trash.png similarity index 100% rename from src/static/img/popup-trash.png rename to src/dokumentor/static/img/popup-trash.png diff --git a/src/static/img/printer.png b/src/dokumentor/static/img/printer.png similarity index 100% rename from src/static/img/printer.png rename to src/dokumentor/static/img/printer.png diff --git a/src/static/img/psb.svg b/src/dokumentor/static/img/psb.svg similarity index 100% rename from src/static/img/psb.svg rename to src/dokumentor/static/img/psb.svg diff --git a/src/static/img/qiwi.svg b/src/dokumentor/static/img/qiwi.svg similarity index 100% rename from src/static/img/qiwi.svg rename to src/dokumentor/static/img/qiwi.svg diff --git a/src/static/img/refresh.png b/src/dokumentor/static/img/refresh.png similarity index 100% rename from src/static/img/refresh.png rename to src/dokumentor/static/img/refresh.png diff --git a/src/static/img/register-black.png b/src/dokumentor/static/img/register-black.png similarity index 100% rename from src/static/img/register-black.png rename to src/dokumentor/static/img/register-black.png diff --git a/src/static/img/register-yellow.png b/src/dokumentor/static/img/register-yellow.png similarity index 100% rename from src/static/img/register-yellow.png rename to src/dokumentor/static/img/register-yellow.png diff --git a/src/static/img/register.png b/src/dokumentor/static/img/register.png similarity index 100% rename from src/static/img/register.png rename to src/dokumentor/static/img/register.png diff --git a/src/static/img/save.png b/src/dokumentor/static/img/save.png similarity index 100% rename from src/static/img/save.png rename to src/dokumentor/static/img/save.png diff --git a/src/static/img/sber.svg b/src/dokumentor/static/img/sber.svg similarity index 100% rename from src/static/img/sber.svg rename to src/dokumentor/static/img/sber.svg diff --git a/src/static/img/sign-add.png b/src/dokumentor/static/img/sign-add.png similarity index 100% rename from src/static/img/sign-add.png rename to src/dokumentor/static/img/sign-add.png diff --git a/src/static/img/sign-copy.png b/src/dokumentor/static/img/sign-copy.png similarity index 100% rename from src/static/img/sign-copy.png rename to src/dokumentor/static/img/sign-copy.png diff --git a/src/static/img/sign-edit.png b/src/dokumentor/static/img/sign-edit.png similarity index 100% rename from src/static/img/sign-edit.png rename to src/dokumentor/static/img/sign-edit.png diff --git a/src/static/img/sign-email.png b/src/dokumentor/static/img/sign-email.png similarity index 100% rename from src/static/img/sign-email.png rename to src/dokumentor/static/img/sign-email.png diff --git a/src/static/img/sign-look.png b/src/dokumentor/static/img/sign-look.png similarity index 100% rename from src/static/img/sign-look.png rename to src/dokumentor/static/img/sign-look.png diff --git a/src/static/img/sign-pdf.png b/src/dokumentor/static/img/sign-pdf.png similarity index 100% rename from src/static/img/sign-pdf.png rename to src/dokumentor/static/img/sign-pdf.png diff --git a/src/static/img/sign-xls.png b/src/dokumentor/static/img/sign-xls.png similarity index 100% rename from src/static/img/sign-xls.png rename to src/dokumentor/static/img/sign-xls.png diff --git a/src/static/img/spinner.gif b/src/dokumentor/static/img/spinner.gif similarity index 100% rename from src/static/img/spinner.gif rename to src/dokumentor/static/img/spinner.gif diff --git a/src/static/img/svyaznoy.svg b/src/dokumentor/static/img/svyaznoy.svg similarity index 100% rename from src/static/img/svyaznoy.svg rename to src/dokumentor/static/img/svyaznoy.svg diff --git a/src/static/img/triangle-grey-bottom.png b/src/dokumentor/static/img/triangle-grey-bottom.png similarity index 100% rename from src/static/img/triangle-grey-bottom.png rename to src/dokumentor/static/img/triangle-grey-bottom.png diff --git a/src/static/img/triangle-orange-bottom.png b/src/dokumentor/static/img/triangle-orange-bottom.png similarity index 100% rename from src/static/img/triangle-orange-bottom.png rename to src/dokumentor/static/img/triangle-orange-bottom.png diff --git a/src/static/img/triangle-popup.png b/src/dokumentor/static/img/triangle-popup.png similarity index 100% rename from src/static/img/triangle-popup.png rename to src/dokumentor/static/img/triangle-popup.png diff --git a/src/static/img/triangle.png b/src/dokumentor/static/img/triangle.png similarity index 100% rename from src/static/img/triangle.png rename to src/dokumentor/static/img/triangle.png diff --git a/src/static/img/triangle2.png b/src/dokumentor/static/img/triangle2.png similarity index 100% rename from src/static/img/triangle2.png rename to src/dokumentor/static/img/triangle2.png diff --git a/src/static/img/upload-boss_sign.png b/src/dokumentor/static/img/upload-boss_sign.png similarity index 100% rename from src/static/img/upload-boss_sign.png rename to src/dokumentor/static/img/upload-boss_sign.png diff --git a/src/static/img/upload-glavbuh_sign.png b/src/dokumentor/static/img/upload-glavbuh_sign.png similarity index 100% rename from src/static/img/upload-glavbuh_sign.png rename to src/dokumentor/static/img/upload-glavbuh_sign.png diff --git a/src/static/img/upload-logo.png b/src/dokumentor/static/img/upload-logo.png similarity index 100% rename from src/static/img/upload-logo.png rename to src/dokumentor/static/img/upload-logo.png diff --git a/src/static/img/upload-stamp.png b/src/dokumentor/static/img/upload-stamp.png similarity index 100% rename from src/static/img/upload-stamp.png rename to src/dokumentor/static/img/upload-stamp.png diff --git a/src/static/img/visa.svg b/src/dokumentor/static/img/visa.svg similarity index 100% rename from src/static/img/visa.svg rename to src/dokumentor/static/img/visa.svg diff --git a/src/static/img/webmoney.svg b/src/dokumentor/static/img/webmoney.svg similarity index 100% rename from src/static/img/webmoney.svg rename to src/dokumentor/static/img/webmoney.svg diff --git a/src/static/img/yamoney.svg b/src/dokumentor/static/img/yamoney.svg similarity index 100% rename from src/static/img/yamoney.svg rename to src/dokumentor/static/img/yamoney.svg diff --git a/src/static/js/callback.js b/src/dokumentor/static/js/callback.js similarity index 100% rename from src/static/js/callback.js rename to src/dokumentor/static/js/callback.js diff --git a/src/static/js/client.commons.js b/src/dokumentor/static/js/client.commons.js similarity index 100% rename from src/static/js/client.commons.js rename to src/dokumentor/static/js/client.commons.js diff --git a/src/static/js/client.list.js b/src/dokumentor/static/js/client.list.js similarity index 100% rename from src/static/js/client.list.js rename to src/dokumentor/static/js/client.list.js diff --git a/src/static/js/client/search-external-api.js b/src/dokumentor/static/js/client/search-external-api.js similarity index 100% rename from src/static/js/client/search-external-api.js rename to src/dokumentor/static/js/client/search-external-api.js diff --git a/src/static/js/commons.js b/src/dokumentor/static/js/commons.js similarity index 100% rename from src/static/js/commons.js rename to src/dokumentor/static/js/commons.js diff --git a/src/static/js/csrf.js b/src/dokumentor/static/js/csrf.js similarity index 100% rename from src/static/js/csrf.js rename to src/dokumentor/static/js/csrf.js diff --git a/src/static/js/customer/profile.edit.js b/src/dokumentor/static/js/customer/profile.edit.js similarity index 100% rename from src/static/js/customer/profile.edit.js rename to src/dokumentor/static/js/customer/profile.edit.js diff --git a/src/static/js/customer/profile.view.js b/src/dokumentor/static/js/customer/profile.view.js similarity index 100% rename from src/static/js/customer/profile.view.js rename to src/dokumentor/static/js/customer/profile.view.js diff --git a/src/static/js/dialogs.js b/src/dokumentor/static/js/dialogs.js similarity index 100% rename from src/static/js/dialogs.js rename to src/dokumentor/static/js/dialogs.js diff --git a/src/static/js/docs/client.form.js b/src/dokumentor/static/js/docs/client.form.js similarity index 100% rename from src/static/js/docs/client.form.js rename to src/dokumentor/static/js/docs/client.form.js diff --git a/src/static/js/docs/common/calc_nds.js b/src/dokumentor/static/js/docs/common/calc_nds.js similarity index 100% rename from src/static/js/docs/common/calc_nds.js rename to src/dokumentor/static/js/docs/common/calc_nds.js diff --git a/src/static/js/docs/del_doc.js b/src/dokumentor/static/js/docs/del_doc.js similarity index 100% rename from src/static/js/docs/del_doc.js rename to src/dokumentor/static/js/docs/del_doc.js diff --git a/src/static/js/docs/list.email.js b/src/dokumentor/static/js/docs/list.email.js similarity index 100% rename from src/static/js/docs/list.email.js rename to src/dokumentor/static/js/docs/list.email.js diff --git a/src/static/js/docs/list.filters.js b/src/dokumentor/static/js/docs/list.filters.js similarity index 100% rename from src/static/js/docs/list.filters.js rename to src/dokumentor/static/js/docs/list.filters.js diff --git a/src/static/js/docs/list.panels.js b/src/dokumentor/static/js/docs/list.panels.js similarity index 100% rename from src/static/js/docs/list.panels.js rename to src/dokumentor/static/js/docs/list.panels.js diff --git a/src/static/js/docs/platejka.form.js b/src/dokumentor/static/js/docs/platejka.form.js similarity index 100% rename from src/static/js/docs/platejka.form.js rename to src/dokumentor/static/js/docs/platejka.form.js diff --git a/src/static/js/formset-events.js b/src/dokumentor/static/js/formset-events.js similarity index 100% rename from src/static/js/formset-events.js rename to src/dokumentor/static/js/formset-events.js diff --git a/src/static/js/lib/entertotab.js b/src/dokumentor/static/js/lib/entertotab.js similarity index 100% rename from src/static/js/lib/entertotab.js rename to src/dokumentor/static/js/lib/entertotab.js diff --git a/src/static/js/lib/handlebars-v4.0.5.js b/src/dokumentor/static/js/lib/handlebars-v4.0.5.js similarity index 100% rename from src/static/js/lib/handlebars-v4.0.5.js rename to src/dokumentor/static/js/lib/handlebars-v4.0.5.js diff --git a/src/static/js/lib/jquery-1.10.2.min.js b/src/dokumentor/static/js/lib/jquery-1.10.2.min.js similarity index 100% rename from src/static/js/lib/jquery-1.10.2.min.js rename to src/dokumentor/static/js/lib/jquery-1.10.2.min.js diff --git a/src/static/js/lib/jquery-ui-1.10.3.custom.min.js b/src/dokumentor/static/js/lib/jquery-ui-1.10.3.custom.min.js similarity index 100% rename from src/static/js/lib/jquery-ui-1.10.3.custom.min.js rename to src/dokumentor/static/js/lib/jquery-ui-1.10.3.custom.min.js diff --git a/src/static/js/lib/jquery.blockUI.js b/src/dokumentor/static/js/lib/jquery.blockUI.js similarity index 100% rename from src/static/js/lib/jquery.blockUI.js rename to src/dokumentor/static/js/lib/jquery.blockUI.js diff --git a/src/static/js/lib/jquery.cookie.js b/src/dokumentor/static/js/lib/jquery.cookie.js similarity index 100% rename from src/static/js/lib/jquery.cookie.js rename to src/dokumentor/static/js/lib/jquery.cookie.js diff --git a/src/static/js/lib/jquery.form.js b/src/dokumentor/static/js/lib/jquery.form.js similarity index 100% rename from src/static/js/lib/jquery.form.js rename to src/dokumentor/static/js/lib/jquery.form.js diff --git a/src/static/js/lib/jquery.formset.js b/src/dokumentor/static/js/lib/jquery.formset.js similarity index 100% rename from src/static/js/lib/jquery.formset.js rename to src/dokumentor/static/js/lib/jquery.formset.js diff --git a/src/static/js/lib/jquery.suggestions.min.js b/src/dokumentor/static/js/lib/jquery.suggestions.min.js similarity index 100% rename from src/static/js/lib/jquery.suggestions.min.js rename to src/dokumentor/static/js/lib/jquery.suggestions.min.js diff --git a/src/static/js/lib/jquery.ui.datepicker-ru.js b/src/dokumentor/static/js/lib/jquery.ui.datepicker-ru.js similarity index 100% rename from src/static/js/lib/jquery.ui.datepicker-ru.js rename to src/dokumentor/static/js/lib/jquery.ui.datepicker-ru.js diff --git a/src/static/js/license.js b/src/dokumentor/static/js/license.js similarity index 100% rename from src/static/js/license.js rename to src/dokumentor/static/js/license.js diff --git a/src/static/js/paginator.js b/src/dokumentor/static/js/paginator.js similarity index 100% rename from src/static/js/paginator.js rename to src/dokumentor/static/js/paginator.js diff --git a/src/static/js/profile/search-bank-external-api.js b/src/dokumentor/static/js/profile/search-bank-external-api.js similarity index 100% rename from src/static/js/profile/search-bank-external-api.js rename to src/dokumentor/static/js/profile/search-bank-external-api.js diff --git a/src/static/js/profile/search-main-external-api.js b/src/dokumentor/static/js/profile/search-main-external-api.js similarity index 100% rename from src/static/js/profile/search-main-external-api.js rename to src/dokumentor/static/js/profile/search-main-external-api.js diff --git a/src/templates/admin/callback/callback_change.html b/src/dokumentor/templates/admin/callback/callback_change.html similarity index 100% rename from src/templates/admin/callback/callback_change.html rename to src/dokumentor/templates/admin/callback/callback_change.html diff --git a/src/templates/autocomplete_light/docs_country_choice.html b/src/dokumentor/templates/autocomplete_light/docs_country_choice.html similarity index 100% rename from src/templates/autocomplete_light/docs_country_choice.html rename to src/dokumentor/templates/autocomplete_light/docs_country_choice.html diff --git a/src/templates/autocomplete_light/docs_measure_choice.html b/src/dokumentor/templates/autocomplete_light/docs_measure_choice.html similarity index 100% rename from src/templates/autocomplete_light/docs_measure_choice.html rename to src/dokumentor/templates/autocomplete_light/docs_measure_choice.html diff --git a/src/templates/base.html b/src/dokumentor/templates/base.html similarity index 100% rename from src/templates/base.html rename to src/dokumentor/templates/base.html diff --git a/src/templates/callback/callback_btn.html b/src/dokumentor/templates/callback/callback_btn.html similarity index 100% rename from src/templates/callback/callback_btn.html rename to src/dokumentor/templates/callback/callback_btn.html diff --git a/src/templates/callback/callback_form.html b/src/dokumentor/templates/callback/callback_form.html similarity index 100% rename from src/templates/callback/callback_form.html rename to src/dokumentor/templates/callback/callback_form.html diff --git a/src/templates/callback/req_avail_done.txt b/src/dokumentor/templates/callback/req_avail_done.txt similarity index 100% rename from src/templates/callback/req_avail_done.txt rename to src/dokumentor/templates/callback/req_avail_done.txt diff --git a/src/templates/callback/req_avail_new.txt b/src/dokumentor/templates/callback/req_avail_new.txt similarity index 100% rename from src/templates/callback/req_avail_new.txt rename to src/dokumentor/templates/callback/req_avail_new.txt diff --git a/src/templates/cms/menu.html b/src/dokumentor/templates/cms/menu.html similarity index 100% rename from src/templates/cms/menu.html rename to src/dokumentor/templates/cms/menu.html diff --git a/src/templates/cms/menu/main.html b/src/dokumentor/templates/cms/menu/main.html similarity index 100% rename from src/templates/cms/menu/main.html rename to src/dokumentor/templates/cms/menu/main.html diff --git a/src/templates/cms/menu/menu.html b/src/dokumentor/templates/cms/menu/menu.html similarity index 100% rename from src/templates/cms/menu/menu.html rename to src/dokumentor/templates/cms/menu/menu.html diff --git a/src/templates/customer/bank_accounts/add.html b/src/dokumentor/templates/customer/bank_accounts/add.html similarity index 100% rename from src/templates/customer/bank_accounts/add.html rename to src/dokumentor/templates/customer/bank_accounts/add.html diff --git a/src/templates/customer/bank_accounts/delete.html b/src/dokumentor/templates/customer/bank_accounts/delete.html similarity index 100% rename from src/templates/customer/bank_accounts/delete.html rename to src/dokumentor/templates/customer/bank_accounts/delete.html diff --git a/src/templates/customer/bank_accounts/edit.html b/src/dokumentor/templates/customer/bank_accounts/edit.html similarity index 100% rename from src/templates/customer/bank_accounts/edit.html rename to src/dokumentor/templates/customer/bank_accounts/edit.html diff --git a/src/templates/customer/bank_accounts/form.html b/src/dokumentor/templates/customer/bank_accounts/form.html similarity index 100% rename from src/templates/customer/bank_accounts/form.html rename to src/dokumentor/templates/customer/bank_accounts/form.html diff --git a/src/templates/customer/bank_accounts/list.html b/src/dokumentor/templates/customer/bank_accounts/list.html similarity index 100% rename from src/templates/customer/bank_accounts/list.html rename to src/dokumentor/templates/customer/bank_accounts/list.html diff --git a/src/templates/customer/clients/!!form.html b/src/dokumentor/templates/customer/clients/!!form.html similarity index 100% rename from src/templates/customer/clients/!!form.html rename to src/dokumentor/templates/customer/clients/!!form.html diff --git a/src/templates/customer/clients/add.html b/src/dokumentor/templates/customer/clients/add.html similarity index 100% rename from src/templates/customer/clients/add.html rename to src/dokumentor/templates/customer/clients/add.html diff --git a/src/templates/customer/clients/delete.html b/src/dokumentor/templates/customer/clients/delete.html similarity index 100% rename from src/templates/customer/clients/delete.html rename to src/dokumentor/templates/customer/clients/delete.html diff --git a/src/templates/customer/clients/edit.html b/src/dokumentor/templates/customer/clients/edit.html similarity index 100% rename from src/templates/customer/clients/edit.html rename to src/dokumentor/templates/customer/clients/edit.html diff --git a/src/templates/customer/clients/form.html b/src/dokumentor/templates/customer/clients/form.html similarity index 100% rename from src/templates/customer/clients/form.html rename to src/dokumentor/templates/customer/clients/form.html diff --git a/src/templates/customer/clients/list.html b/src/dokumentor/templates/customer/clients/list.html similarity index 100% rename from src/templates/customer/clients/list.html rename to src/dokumentor/templates/customer/clients/list.html diff --git a/src/templates/customer/clients/list_item.html b/src/dokumentor/templates/customer/clients/list_item.html similarity index 100% rename from src/templates/customer/clients/list_item.html rename to src/dokumentor/templates/customer/clients/list_item.html diff --git a/src/templates/customer/img_load.html b/src/dokumentor/templates/customer/img_load.html similarity index 100% rename from src/templates/customer/img_load.html rename to src/dokumentor/templates/customer/img_load.html diff --git a/src/templates/customer/img_load.png b/src/dokumentor/templates/customer/img_load.png similarity index 100% rename from src/templates/customer/img_load.png rename to src/dokumentor/templates/customer/img_load.png diff --git a/src/templates/customer/index.html b/src/dokumentor/templates/customer/index.html similarity index 100% rename from src/templates/customer/index.html rename to src/dokumentor/templates/customer/index.html diff --git a/src/templates/customer/profile/as_pdf.html b/src/dokumentor/templates/customer/profile/as_pdf.html similarity index 100% rename from src/templates/customer/profile/as_pdf.html rename to src/dokumentor/templates/customer/profile/as_pdf.html diff --git a/src/templates/customer/profile/edit.html b/src/dokumentor/templates/customer/profile/edit.html similarity index 100% rename from src/templates/customer/profile/edit.html rename to src/dokumentor/templates/customer/profile/edit.html diff --git a/src/templates/customer/profile/email.html b/src/dokumentor/templates/customer/profile/email.html similarity index 100% rename from src/templates/customer/profile/email.html rename to src/dokumentor/templates/customer/profile/email.html diff --git a/src/templates/customer/profile/end_order.html b/src/dokumentor/templates/customer/profile/end_order.html similarity index 100% rename from src/templates/customer/profile/end_order.html rename to src/dokumentor/templates/customer/profile/end_order.html diff --git a/src/templates/customer/profile/license.html b/src/dokumentor/templates/customer/profile/license.html similarity index 98% rename from src/templates/customer/profile/license.html rename to src/dokumentor/templates/customer/profile/license.html index 24dee1e..fb544ce 100644 --- a/src/templates/customer/profile/license.html +++ b/src/dokumentor/templates/customer/profile/license.html @@ -11,7 +11,7 @@
-
+ {% csrf_token %} {% for hidden in form.hidden_fields %} diff --git a/src/templates/customer/profile/license_list.html b/src/dokumentor/templates/customer/profile/license_list.html similarity index 100% rename from src/templates/customer/profile/license_list.html rename to src/dokumentor/templates/customer/profile/license_list.html diff --git a/src/templates/customer/profile/paid_list.html b/src/dokumentor/templates/customer/profile/paid_list.html similarity index 100% rename from src/templates/customer/profile/paid_list.html rename to src/dokumentor/templates/customer/profile/paid_list.html diff --git a/src/templates/customer/profile/profile_email.txt b/src/dokumentor/templates/customer/profile/profile_email.txt similarity index 100% rename from src/templates/customer/profile/profile_email.txt rename to src/dokumentor/templates/customer/profile/profile_email.txt diff --git a/src/templates/customer/profile/view.html b/src/dokumentor/templates/customer/profile/view.html similarity index 100% rename from src/templates/customer/profile/view.html rename to src/dokumentor/templates/customer/profile/view.html diff --git a/src/templates/customer/profile/yandex.html b/src/dokumentor/templates/customer/profile/yandex.html similarity index 100% rename from src/templates/customer/profile/yandex.html rename to src/dokumentor/templates/customer/profile/yandex.html diff --git a/src/templates/docs/!!stub_js.html b/src/dokumentor/templates/docs/!!stub_js.html similarity index 100% rename from src/templates/docs/!!stub_js.html rename to src/dokumentor/templates/docs/!!stub_js.html diff --git a/src/templates/docs/_base/base_add.html b/src/dokumentor/templates/docs/_base/base_add.html similarity index 100% rename from src/templates/docs/_base/base_add.html rename to src/dokumentor/templates/docs/_base/base_add.html diff --git a/src/templates/docs/_base/base_delete.html b/src/dokumentor/templates/docs/_base/base_delete.html similarity index 100% rename from src/templates/docs/_base/base_delete.html rename to src/dokumentor/templates/docs/_base/base_delete.html diff --git a/src/templates/docs/_base/base_edit.html b/src/dokumentor/templates/docs/_base/base_edit.html similarity index 100% rename from src/templates/docs/_base/base_edit.html rename to src/dokumentor/templates/docs/_base/base_edit.html diff --git a/src/templates/docs/_base/base_form.html b/src/dokumentor/templates/docs/_base/base_form.html similarity index 100% rename from src/templates/docs/_base/base_form.html rename to src/dokumentor/templates/docs/_base/base_form.html diff --git a/src/templates/docs/_base/base_list.html b/src/dokumentor/templates/docs/_base/base_list.html similarity index 100% rename from src/templates/docs/_base/base_list.html rename to src/dokumentor/templates/docs/_base/base_list.html diff --git a/src/templates/docs/_base/preview.html b/src/dokumentor/templates/docs/_base/preview.html similarity index 100% rename from src/templates/docs/_base/preview.html rename to src/dokumentor/templates/docs/_base/preview.html diff --git a/src/templates/docs/aktrabot/as_pdf.html b/src/dokumentor/templates/docs/aktrabot/as_pdf.html similarity index 100% rename from src/templates/docs/aktrabot/as_pdf.html rename to src/dokumentor/templates/docs/aktrabot/as_pdf.html diff --git a/src/templates/docs/aktrabot/form.html b/src/dokumentor/templates/docs/aktrabot/form.html similarity index 100% rename from src/templates/docs/aktrabot/form.html rename to src/dokumentor/templates/docs/aktrabot/form.html diff --git a/src/templates/docs/aktrabot/list.html b/src/dokumentor/templates/docs/aktrabot/list.html similarity index 100% rename from src/templates/docs/aktrabot/list.html rename to src/dokumentor/templates/docs/aktrabot/list.html diff --git a/src/templates/docs/aktsverki/as_pdf.html b/src/dokumentor/templates/docs/aktsverki/as_pdf.html similarity index 100% rename from src/templates/docs/aktsverki/as_pdf.html rename to src/dokumentor/templates/docs/aktsverki/as_pdf.html diff --git a/src/templates/docs/aktsverki/form.html b/src/dokumentor/templates/docs/aktsverki/form.html similarity index 100% rename from src/templates/docs/aktsverki/form.html rename to src/dokumentor/templates/docs/aktsverki/form.html diff --git a/src/templates/docs/aktsverki/form_tbl_items.html b/src/dokumentor/templates/docs/aktsverki/form_tbl_items.html similarity index 100% rename from src/templates/docs/aktsverki/form_tbl_items.html rename to src/dokumentor/templates/docs/aktsverki/form_tbl_items.html diff --git a/src/templates/docs/aktsverki/list.html b/src/dokumentor/templates/docs/aktsverki/list.html similarity index 100% rename from src/templates/docs/aktsverki/list.html rename to src/dokumentor/templates/docs/aktsverki/list.html diff --git a/src/templates/docs/docs.html b/src/dokumentor/templates/docs/docs.html similarity index 100% rename from src/templates/docs/docs.html rename to src/dokumentor/templates/docs/docs.html diff --git a/src/templates/docs/dover/as_pdf.html b/src/dokumentor/templates/docs/dover/as_pdf.html similarity index 100% rename from src/templates/docs/dover/as_pdf.html rename to src/dokumentor/templates/docs/dover/as_pdf.html diff --git a/src/templates/docs/dover/form.html b/src/dokumentor/templates/docs/dover/form.html similarity index 100% rename from src/templates/docs/dover/form.html rename to src/dokumentor/templates/docs/dover/form.html diff --git a/src/templates/docs/dover/form_tbl_items.html b/src/dokumentor/templates/docs/dover/form_tbl_items.html similarity index 100% rename from src/templates/docs/dover/form_tbl_items.html rename to src/dokumentor/templates/docs/dover/form_tbl_items.html diff --git a/src/templates/docs/dover/list.html b/src/dokumentor/templates/docs/dover/list.html similarity index 100% rename from src/templates/docs/dover/list.html rename to src/dokumentor/templates/docs/dover/list.html diff --git a/src/templates/docs/email/base_email.html b/src/dokumentor/templates/docs/email/base_email.html similarity index 100% rename from src/templates/docs/email/base_email.html rename to src/dokumentor/templates/docs/email/base_email.html diff --git a/src/templates/docs/email/base_email_form.html b/src/dokumentor/templates/docs/email/base_email_form.html similarity index 100% rename from src/templates/docs/email/base_email_form.html rename to src/dokumentor/templates/docs/email/base_email_form.html diff --git a/src/templates/docs/email/email.txt b/src/dokumentor/templates/docs/email/email.txt similarity index 100% rename from src/templates/docs/email/email.txt rename to src/dokumentor/templates/docs/email/email.txt diff --git a/src/templates/docs/faktura/as_pdf.html b/src/dokumentor/templates/docs/faktura/as_pdf.html similarity index 100% rename from src/templates/docs/faktura/as_pdf.html rename to src/dokumentor/templates/docs/faktura/as_pdf.html diff --git a/src/templates/docs/faktura/as_pdf_items_tbl_header.html b/src/dokumentor/templates/docs/faktura/as_pdf_items_tbl_header.html similarity index 100% rename from src/templates/docs/faktura/as_pdf_items_tbl_header.html rename to src/dokumentor/templates/docs/faktura/as_pdf_items_tbl_header.html diff --git a/src/templates/docs/faktura/form.html b/src/dokumentor/templates/docs/faktura/form.html similarity index 100% rename from src/templates/docs/faktura/form.html rename to src/dokumentor/templates/docs/faktura/form.html diff --git a/src/templates/docs/faktura/form_tbl_items.html b/src/dokumentor/templates/docs/faktura/form_tbl_items.html similarity index 100% rename from src/templates/docs/faktura/form_tbl_items.html rename to src/dokumentor/templates/docs/faktura/form_tbl_items.html diff --git a/src/templates/docs/faktura/list.html b/src/dokumentor/templates/docs/faktura/list.html similarity index 100% rename from src/templates/docs/faktura/list.html rename to src/dokumentor/templates/docs/faktura/list.html diff --git a/src/templates/docs/faktura/stub_js.html b/src/dokumentor/templates/docs/faktura/stub_js.html similarity index 100% rename from src/templates/docs/faktura/stub_js.html rename to src/dokumentor/templates/docs/faktura/stub_js.html diff --git a/src/templates/docs/index.html b/src/dokumentor/templates/docs/index.html similarity index 100% rename from src/templates/docs/index.html rename to src/dokumentor/templates/docs/index.html diff --git a/src/templates/docs/invoice/as_pdf.html b/src/dokumentor/templates/docs/invoice/as_pdf.html similarity index 100% rename from src/templates/docs/invoice/as_pdf.html rename to src/dokumentor/templates/docs/invoice/as_pdf.html diff --git a/src/templates/docs/invoice/form.html b/src/dokumentor/templates/docs/invoice/form.html similarity index 100% rename from src/templates/docs/invoice/form.html rename to src/dokumentor/templates/docs/invoice/form.html diff --git a/src/templates/docs/invoice/list.html b/src/dokumentor/templates/docs/invoice/list.html similarity index 100% rename from src/templates/docs/invoice/list.html rename to src/dokumentor/templates/docs/invoice/list.html diff --git a/src/templates/docs/nakladn/as_pdf.html b/src/dokumentor/templates/docs/nakladn/as_pdf.html similarity index 100% rename from src/templates/docs/nakladn/as_pdf.html rename to src/dokumentor/templates/docs/nakladn/as_pdf.html diff --git a/src/templates/docs/nakladn/as_pdf_items_tbl_header.html b/src/dokumentor/templates/docs/nakladn/as_pdf_items_tbl_header.html similarity index 100% rename from src/templates/docs/nakladn/as_pdf_items_tbl_header.html rename to src/dokumentor/templates/docs/nakladn/as_pdf_items_tbl_header.html diff --git a/src/templates/docs/nakladn/form.html b/src/dokumentor/templates/docs/nakladn/form.html similarity index 100% rename from src/templates/docs/nakladn/form.html rename to src/dokumentor/templates/docs/nakladn/form.html diff --git a/src/templates/docs/nakladn/form_tbl_items.html b/src/dokumentor/templates/docs/nakladn/form_tbl_items.html similarity index 100% rename from src/templates/docs/nakladn/form_tbl_items.html rename to src/dokumentor/templates/docs/nakladn/form_tbl_items.html diff --git a/src/templates/docs/nakladn/list.html b/src/dokumentor/templates/docs/nakladn/list.html similarity index 100% rename from src/templates/docs/nakladn/list.html rename to src/dokumentor/templates/docs/nakladn/list.html diff --git a/src/templates/docs/platejka/as_pdf.html b/src/dokumentor/templates/docs/platejka/as_pdf.html similarity index 100% rename from src/templates/docs/platejka/as_pdf.html rename to src/dokumentor/templates/docs/platejka/as_pdf.html diff --git a/src/templates/docs/platejka/form.html b/src/dokumentor/templates/docs/platejka/form.html similarity index 100% rename from src/templates/docs/platejka/form.html rename to src/dokumentor/templates/docs/platejka/form.html diff --git a/src/templates/docs/platejka/js.html b/src/dokumentor/templates/docs/platejka/js.html similarity index 100% rename from src/templates/docs/platejka/js.html rename to src/dokumentor/templates/docs/platejka/js.html diff --git a/src/templates/docs/platejka/list.html b/src/dokumentor/templates/docs/platejka/list.html similarity index 100% rename from src/templates/docs/platejka/list.html rename to src/dokumentor/templates/docs/platejka/list.html diff --git a/src/templates/docs/stub_js.html b/src/dokumentor/templates/docs/stub_js.html similarity index 100% rename from src/templates/docs/stub_js.html rename to src/dokumentor/templates/docs/stub_js.html diff --git a/src/templates/hbs/bank-tpl.html b/src/dokumentor/templates/hbs/bank-tpl.html similarity index 100% rename from src/templates/hbs/bank-tpl.html rename to src/dokumentor/templates/hbs/bank-tpl.html diff --git a/src/templates/menu/menu.html b/src/dokumentor/templates/menu/menu.html similarity index 100% rename from src/templates/menu/menu.html rename to src/dokumentor/templates/menu/menu.html diff --git a/src/templates/myauth/change_email.html b/src/dokumentor/templates/myauth/change_email.html similarity index 100% rename from src/templates/myauth/change_email.html rename to src/dokumentor/templates/myauth/change_email.html diff --git a/src/templates/myauth/change_email_form.html b/src/dokumentor/templates/myauth/change_email_form.html similarity index 100% rename from src/templates/myauth/change_email_form.html rename to src/dokumentor/templates/myauth/change_email_form.html diff --git a/src/templates/myauth/change_password.html b/src/dokumentor/templates/myauth/change_password.html similarity index 100% rename from src/templates/myauth/change_password.html rename to src/dokumentor/templates/myauth/change_password.html diff --git a/src/templates/myauth/change_password_form.html b/src/dokumentor/templates/myauth/change_password_form.html similarity index 100% rename from src/templates/myauth/change_password_form.html rename to src/dokumentor/templates/myauth/change_password_form.html diff --git a/src/templates/myauth/delete_profile.html b/src/dokumentor/templates/myauth/delete_profile.html similarity index 98% rename from src/templates/myauth/delete_profile.html rename to src/dokumentor/templates/myauth/delete_profile.html index cf99d6d..4b11d86 100644 --- a/src/templates/myauth/delete_profile.html +++ b/src/dokumentor/templates/myauth/delete_profile.html @@ -16,7 +16,7 @@

Отменить удаление будет невозможно!

Пожалуйста, убедитесь в том, что вы точно желаете удалить все свои данные с сайта.

- + {% csrf_token %} diff --git a/src/templates/myauth/license_activated.txt b/src/dokumentor/templates/myauth/license_activated.txt similarity index 100% rename from src/templates/myauth/license_activated.txt rename to src/dokumentor/templates/myauth/license_activated.txt diff --git a/src/templates/myauth/license_ended.txt b/src/dokumentor/templates/myauth/license_ended.txt similarity index 100% rename from src/templates/myauth/license_ended.txt rename to src/dokumentor/templates/myauth/license_ended.txt diff --git a/src/templates/myauth/license_ends.txt b/src/dokumentor/templates/myauth/license_ends.txt similarity index 100% rename from src/templates/myauth/license_ends.txt rename to src/dokumentor/templates/myauth/license_ends.txt diff --git a/src/templates/myauth/license_to_pay.txt b/src/dokumentor/templates/myauth/license_to_pay.txt similarity index 100% rename from src/templates/myauth/license_to_pay.txt rename to src/dokumentor/templates/myauth/license_to_pay.txt diff --git a/src/templates/myauth/login.html b/src/dokumentor/templates/myauth/login.html similarity index 100% rename from src/templates/myauth/login.html rename to src/dokumentor/templates/myauth/login.html diff --git a/src/templates/myauth/login_form.html b/src/dokumentor/templates/myauth/login_form.html similarity index 100% rename from src/templates/myauth/login_form.html rename to src/dokumentor/templates/myauth/login_form.html diff --git a/src/templates/myauth/register.html b/src/dokumentor/templates/myauth/register.html similarity index 100% rename from src/templates/myauth/register.html rename to src/dokumentor/templates/myauth/register.html diff --git a/src/templates/myauth/register_form.html b/src/dokumentor/templates/myauth/register_form.html similarity index 100% rename from src/templates/myauth/register_form.html rename to src/dokumentor/templates/myauth/register_form.html diff --git a/src/templates/myauth/registration_closed.html b/src/dokumentor/templates/myauth/registration_closed.html similarity index 100% rename from src/templates/myauth/registration_closed.html rename to src/dokumentor/templates/myauth/registration_closed.html diff --git a/src/templates/myauth/registration_email.txt b/src/dokumentor/templates/myauth/registration_email.txt similarity index 100% rename from src/templates/myauth/registration_email.txt rename to src/dokumentor/templates/myauth/registration_email.txt diff --git a/src/templates/myauth/reset.html b/src/dokumentor/templates/myauth/reset.html similarity index 100% rename from src/templates/myauth/reset.html rename to src/dokumentor/templates/myauth/reset.html diff --git a/src/templates/myauth/reset_form.html b/src/dokumentor/templates/myauth/reset_form.html similarity index 100% rename from src/templates/myauth/reset_form.html rename to src/dokumentor/templates/myauth/reset_form.html diff --git a/src/templates/myauth/reset_key_email.txt b/src/dokumentor/templates/myauth/reset_key_email.txt similarity index 100% rename from src/templates/myauth/reset_key_email.txt rename to src/dokumentor/templates/myauth/reset_key_email.txt diff --git a/src/templates/myauth/reset_key_ready.html b/src/dokumentor/templates/myauth/reset_key_ready.html similarity index 100% rename from src/templates/myauth/reset_key_ready.html rename to src/dokumentor/templates/myauth/reset_key_ready.html diff --git a/src/templates/myauth/reset_new_password_email.txt b/src/dokumentor/templates/myauth/reset_new_password_email.txt similarity index 100% rename from src/templates/myauth/reset_new_password_email.txt rename to src/dokumentor/templates/myauth/reset_new_password_email.txt diff --git a/src/templates/pages/index.html b/src/dokumentor/templates/pages/index.html similarity index 100% rename from src/templates/pages/index.html rename to src/dokumentor/templates/pages/index.html diff --git a/src/templates/pages/inner_page.html b/src/dokumentor/templates/pages/inner_page.html similarity index 100% rename from src/templates/pages/inner_page.html rename to src/dokumentor/templates/pages/inner_page.html diff --git a/src/templates/pages/placeholders.html b/src/dokumentor/templates/pages/placeholders.html similarity index 100% rename from src/templates/pages/placeholders.html rename to src/dokumentor/templates/pages/placeholders.html diff --git a/src/templates/paginator.html b/src/dokumentor/templates/paginator.html similarity index 100% rename from src/templates/paginator.html rename to src/dokumentor/templates/paginator.html diff --git a/src/templates/xls/4pd.xls b/src/dokumentor/templates/xls/4pd.xls similarity index 100% rename from src/templates/xls/4pd.xls rename to src/dokumentor/templates/xls/4pd.xls diff --git a/src/templates/xls/act.xls b/src/dokumentor/templates/xls/act.xls similarity index 100% rename from src/templates/xls/act.xls rename to src/dokumentor/templates/xls/act.xls diff --git a/src/templates/xls/bill.xls b/src/dokumentor/templates/xls/bill.xls similarity index 100% rename from src/templates/xls/bill.xls rename to src/dokumentor/templates/xls/bill.xls diff --git a/src/templates/xls/stamp.bmp b/src/dokumentor/templates/xls/stamp.bmp similarity index 100% rename from src/templates/xls/stamp.bmp rename to src/dokumentor/templates/xls/stamp.bmp diff --git a/src/templates/xls/stamp1.bmp b/src/dokumentor/templates/xls/stamp1.bmp similarity index 100% rename from src/templates/xls/stamp1.bmp rename to src/dokumentor/templates/xls/stamp1.bmp diff --git a/src/urls.py b/src/dokumentor/urls.py similarity index 100% rename from src/urls.py rename to src/dokumentor/urls.py diff --git a/src/dokumentor/wsgi.py b/src/dokumentor/wsgi.py new file mode 100644 index 0000000..f3e5c22 --- /dev/null +++ b/src/dokumentor/wsgi.py @@ -0,0 +1,14 @@ +""" +WSGI config for garpun project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dokumentor.settings") + +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() diff --git a/src/local_settings.py.dev-example b/src/local_settings.py.dev-example deleted file mode 100644 index cd89bd2..0000000 --- a/src/local_settings.py.dev-example +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -from settings import * - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = () - -MANAGERS = ADMINS - -SERVER_EMAIL = 'dokumentor@localhost' - -ALLOWED_HOSTS = ['*'] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'dokumentor', # Or path to database file if using sqlite3. - 'USER': 'dokumentor', # Not used with sqlite3. - 'PASSWORD': 'dokumentor', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -EMAIL_BACKEND = 'eml_email_backend.EmailBackend' -EMAIL_FILE_PATH = path('../../tmp_emails') - -DEVSERVER_DEFAULT_PORT = '8080' -DEVSERVER_MODULES = () -INSTALLED_APPS += ('devserver',) - -if False and 'debug_toolbar' not in INSTALLED_APPS: - MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) - INSTALLED_APPS += ('debug_toolbar',) - - DEBUG_TOOLBAR_PANELS = ( - #'debug_toolbar.panels.version.VersionDebugPanel', - 'debug_toolbar.panels.timer.TimerDebugPanel', - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', - 'debug_toolbar.panels.headers.HeaderDebugPanel', - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', - 'debug_toolbar.panels.template.TemplateDebugPanel', - 'debug_toolbar.panels.sql.SQLDebugPanel', - 'debug_toolbar.panels.cache.CacheDebugPanel', - 'debug_toolbar.panels.logger.LoggingPanel', - ) - - INTERNAL_IPS = ('127.0.0.1',) - - DEBUG_TOOLBAR_CONFIG = { - 'EXCLUDE_URLS': ('/admin',), - 'INTERCEPT_REDIRECTS': False, - } diff --git a/src/local_settings.py.prod-example b/src/local_settings.py.prod-example deleted file mode 100644 index b62de57..0000000 --- a/src/local_settings.py.prod-example +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from settings import * - -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - ('andrey.goo', 'andrey.goo@gmail.com'), -) - -MANAGERS = ADMINS - -SERVER_EMAIL = 'dokumentor@localhost' - -ALLOWED_HOSTS = ['dokumentor.ru'] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'dokumentor', # Or path to database file if using sqlite3. - 'USER': 'dokumentor', # Not used with sqlite3. - 'PASSWORD': 'dokumentor', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -# переопределить secret_key, на случай если посторонние имели доступ к исходникам проекта -#SECRET_KEY = '30rdy#9a!y-=^kdh6+v*e$cxdf$uu7djbnlm#=c(g^30@250rb' diff --git a/src/local_settings.py.skeleton b/src/local_settings.py.skeleton deleted file mode 100644 index 3ad336e..0000000 --- a/src/local_settings.py.skeleton +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -from settings import * - -DEBUG = True - -ADMINS = () - -MANAGERS = ADMINS - -SERVER_EMAIL = 'dokumentor@localhost' - -ALLOWED_HOSTS = ['*'] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - -EMAIL_BACKEND = 'eml_email_backend.EmailBackend' -EMAIL_FILE_PATH = path('../tmp_emails') - -if False and 'debug_toolbar' not in INSTALLED_APPS: - MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) - INSTALLED_APPS += ('debug_toolbar',) - - INTERNAL_IPS = ('127.0.0.1',) - - DEBUG_TOOLBAR_CONFIG = { - 'EXCLUDE_URLS': ('/admin',), - 'INTERCEPT_REDIRECTS': False, - } diff --git a/manage.py b/src/manage.py similarity index 68% rename from manage.py rename to src/manage.py index 8c8d0b2..cb4c2f2 100755 --- a/manage.py +++ b/src/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dokumentor.settings.local") from django.core.management import execute_from_command_line diff --git a/src/myauth/emails.py b/src/myauth/emails.py index b15c2cd..9ab3ad5 100644 --- a/src/myauth/emails.py +++ b/src/myauth/emails.py @@ -2,7 +2,7 @@ from django.template.loader import render_to_string from django.core.mail import EmailMessage from django.conf import settings -from celery.task import task +from celery import task SUPPORT_EMAIL = getattr(settings, 'SUPPORT_EMAIL', '') diff --git a/src/wsgi.py b/src/wsgi.py deleted file mode 100644 index 4b12233..0000000 --- a/src/wsgi.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -WSGI config for project project. - -This module contains the WSGI application used by Django's development server -and any production WSGI deployments. It should expose a module-level variable -named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover -this application via the ``WSGI_APPLICATION`` setting. - -Usually you will have the standard Django WSGI application here, but it also -might make sense to replace the whole Django WSGI application with a custom one -that later delegates to the Django one. For example, you could introduce WSGI -middleware here, or combine a Django application with an application of another -framework. - -""" -import os - -# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks -# if running multiple sites in the same mod_wsgi process. To fix this, use -# mod_wsgi daemon mode with each site in its own daemon process, or use -# os.environ["DJANGO_SETTINGS_MODULE"] = "project.settings" -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.settings") - -# This application object is used by any WSGI server configured to use this -# file. This includes Django's development server, if the WSGI_APPLICATION -# setting points here. -from django.core.wsgi import get_wsgi_application -application = get_wsgi_application() - -# Apply WSGI middleware here. -# from helloworld.wsgi import HelloWorldApplication -# application = HelloWorldApplication(application)