diff --git a/accounts/admin.py b/accounts/admin.py index ac23916f..7353249b 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -37,7 +37,7 @@ class DeleteAccount(DeleteView): class UserListView(AdminListView): - template_name = 'admin/accounts/user_list.html' + template_name = 'c_admin/accounts/user_list.html' form_class = UserFilterForm model = User @@ -216,7 +216,7 @@ def change_password(request): class AccountsStatistic(TemplateView, YearMixin, MonthMixin, DateMixin): queryset = None model = User - template_name = 'admin/accounts/user_stat.html' + template_name = 'c_admin/accounts/user_stat.html' date_field = 'date_joined' def _get_prev_day(self, date=None): diff --git a/article/admin.py b/article/admin.py index e846ba69..402aa5fb 100644 --- a/article/admin.py +++ b/article/admin.py @@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _ class ArticleDeleteView(DeleteView): model = Article - template_name = "admin/article/article_confirm_delete.html" + template_name = "c_admin/article/article_confirm_delete.html" def get_success_url(self): if self.object.type == 1: @@ -132,7 +132,7 @@ from forms import BlogForm class BlogList(ListView): model = Article - template_name = 'admin/article/article_admin_list.html' + template_name = 'c_admin/article/article_admin_list.html' paginate_by = settings.ADMIN_PAGINATION def get_queryset(self): @@ -146,7 +146,7 @@ class BlogList(ListView): class BlogView(FormView): form_class = BlogForm - template_name = 'admin/article/blog_form.html' + template_name = 'c_admin/article/blog_form.html' success_url = '/admin/article/blog/all/' obj = None @@ -230,7 +230,7 @@ class NewsList(ListView): class NewsView(BlogView): form_class = NewsForm - template_name = 'admin/article/blog_form.html' + template_name = 'c_admin/article/blog_form.html' success_url = '/admin/article/news/all/' obj = None @@ -245,5 +245,5 @@ from forms import BlogForm class BlogCreate(CreateView): model = Blog form_class = BlogForm - template_name = 'admin/blog/blog_add.html' + template_name = 'c_admin/blog/blog_add.html' """ diff --git a/city/admin.py b/city/admin.py index 753c81b3..8b95d5a7 100644 --- a/city/admin.py +++ b/city/admin.py @@ -109,6 +109,6 @@ def search_city(request): return HttpResponse(json.dumps(result), content_type='application/json') class CityListView(AdminListView): - template_name = 'admin/city/city_list.html' + template_name = 'c_admin/city/city_list.html' form_class = CityFilterForm model = City diff --git a/company/admin.py b/company/admin.py index c6c866d0..a2a0f843 100644 --- a/company/admin.py +++ b/company/admin.py @@ -116,7 +116,7 @@ def company_change(request, url): class CompanyListView(AdminListView): - template_name = 'admin/company/company_list.html' + template_name = 'c_admin/company/company_list.html' form_class = CompanyFilterForm model = Company @@ -124,7 +124,7 @@ class CompanyListView(AdminListView): class CompanyView(AdminView): form_class = CompanyForm model = Company - template_name = 'admin/company/company.html' + template_name = 'c_admin/company/company.html' success_url = '/admin/company/all/' def get_form(self, form_class): diff --git a/conference/admin.py b/conference/admin.py index e46af6b1..f0bb365a 100644 --- a/conference/admin.py +++ b/conference/admin.py @@ -235,7 +235,7 @@ class ConferenceView(AdminView): form_class = ConferenceCreateForm model = Conference success_url = '/admin/conference/all/' - template_name = 'admin/conference/conference.html' + template_name = 'c_admin/conference/conference.html' def form_valid(self, form): self.set_obj() @@ -305,7 +305,7 @@ class ConferenceView(AdminView): class ConferenceListView(AdminListView): paginate_func = staticmethod(stat_paginate_results) - template_name = 'admin/conference/conference_list.html' + template_name = 'c_admin/conference/conference_list.html' form_class = ConferenceFilterForm model = Conference diff --git a/core/views.py b/core/views.py index f50d9256..277067c9 100644 --- a/core/views.py +++ b/core/views.py @@ -160,7 +160,7 @@ import datetime class EditPage(UpdateView): model = Page - template_name = 'admin/page/new_page.html' + template_name = 'c_admin/page/new_page.html' form_class = PageForm slug_url_kwarg = 'url' slug_field = 'url' @@ -175,7 +175,7 @@ class EditPage(UpdateView): class DeletePage(DeleteView): - template_name = 'admin/page/page_confirm_delete.html' + template_name = 'c_admin/page/page_confirm_delete.html' model = Page success_url = reverse_lazy('page_list') slug_field = 'url' @@ -183,7 +183,7 @@ class DeletePage(DeleteView): class PageDetailed(DetailView): model = Page - template_name = 'admin/page/page_template_view.html' + template_name = 'c_admin/page/page_template_view.html' slug_field = 'url' slug_url_kwarg = 'url' diff --git a/country/admin.py b/country/admin.py index 1ad06c86..612d2aa1 100644 --- a/country/admin.py +++ b/country/admin.py @@ -115,7 +115,7 @@ def country_change(request, url): class CountryListView(AdminListView): - template_name = 'admin/country/country_list.html' + template_name = 'c_admin/country/country_list.html' form_class = CountryFilterForm model = Country @@ -124,4 +124,4 @@ class CountryListView(AdminListView): qs = self.model.objects.all() result = paginate_results(qs, page=self.request.GET.get('page')) context['object_list'] = result - return context \ No newline at end of file + return context diff --git a/emencia/django/newsletter/admin/__init__.py b/emencia/django/newsletter/admin/__init__.py index 9105faf4..faff6f7e 100644 --- a/emencia/django/newsletter/admin/__init__.py +++ b/emencia/django/newsletter/admin/__init__.py @@ -18,7 +18,7 @@ from emencia.django.newsletter.admin.smtpserver import SMTPServerAdmin from emencia.django.newsletter.admin.mailinglist import MailingListAdmin -admin.site.register(Contact, ContactAdmin) +# admin.site.register(Contact, ContactAdmin) admin.site.register(SMTPServer, SMTPServerAdmin) admin.site.register(Newsletter, NewsletterAdmin) admin.site.register(MailingList, MailingListAdmin) diff --git a/emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html b/emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html index e19ce963..81a29713 100644 --- a/emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html +++ b/emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html @@ -1,4 +1,4 @@ -{% extends "admin/change_list.html" %} +{% extends "c_admin/change_list.html" %} {% load i18n %} {% block extrahead %} diff --git a/emencia/django/newsletter/templates/newsletter/contact_import.html b/emencia/django/newsletter/templates/newsletter/contact_import.html index 61fb304f..102e4b12 100644 --- a/emencia/django/newsletter/templates/newsletter/contact_import.html +++ b/emencia/django/newsletter/templates/newsletter/contact_import.html @@ -1,4 +1,4 @@ -{% extends "admin/base_site.html" %} +{% extends "c_admin/base_site.html" %} {% load i18n adminmedia %} {% block breadcrumbs %} diff --git a/emencia/django/newsletter/templates/newsletter/newsletter_historic.html b/emencia/django/newsletter/templates/newsletter/newsletter_historic.html index 5f4698ed..5d62b987 100644 --- a/emencia/django/newsletter/templates/newsletter/newsletter_historic.html +++ b/emencia/django/newsletter/templates/newsletter/newsletter_historic.html @@ -1,4 +1,4 @@ -{% extends "admin/change_list.html" %} +{% extends "c_admin/change_list.html" %} {% load i18n %} {% block bodyclass %}change-list historic{% endblock %} diff --git a/emencia/django/newsletter/templates/newsletter/newsletter_statistics.html b/emencia/django/newsletter/templates/newsletter/newsletter_statistics.html index 334b640c..a86c7965 100644 --- a/emencia/django/newsletter/templates/newsletter/newsletter_statistics.html +++ b/emencia/django/newsletter/templates/newsletter/newsletter_statistics.html @@ -1,4 +1,4 @@ -{% extends "admin/base_site.html" %} +{% extends "c_admin/base_site.html" %} {% load i18n %} {% block coltype %}colMS{% endblock %} diff --git a/emencia/django/newsletter/utils/importation.py b/emencia/django/newsletter/utils/importation.py index 8873cba4..60ca07f2 100644 --- a/emencia/django/newsletter/utils/importation.py +++ b/emencia/django/newsletter/utils/importation.py @@ -9,7 +9,7 @@ from django.core.validators import validate_email from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ -from tagging.models import Tag +# from tagging.models import Tag from emencia.django.newsletter.models import Contact from emencia.django.newsletter.models import MailingList @@ -34,8 +34,8 @@ def create_contact(contact_dict, workgroups=[]): if not created: new_tags = contact_dict.get('tags') - if new_tags: - Tag.objects.update_tags(contact, '%s, %s' % (contact.tags, new_tags)) + # if new_tags: + # Tag.objects.update_tags(contact, '%s, %s' % (contact.tags, new_tags)) for workgroup in workgroups: workgroup.contacts.add(contact) diff --git a/emencia/django/newsletter/views/admin_views.py b/emencia/django/newsletter/views/admin_views.py index 47e0cda8..1d1c5579 100644 --- a/emencia/django/newsletter/views/admin_views.py +++ b/emencia/django/newsletter/views/admin_views.py @@ -52,7 +52,7 @@ from ..utils.excel import ExcelResponse class ContactList(FormView): paginate_by = settings.ADMIN_PAGINATION model = Contact - template_name = 'admin/newsletters/contact_list.html' + template_name = 'c_admin/newsletters/contact_list.html' form_class = ContactFilterForm queryset = Contact.objects.all() @@ -106,13 +106,13 @@ class ContactQueryDelete(RedirectView): class DeleteContact(DeleteView): model = Contact success_url = reverse_lazy('newsletters_contact_list') - template_name = 'admin/newsletters/confirm_delete.html' + template_name = 'c_admin/newsletters/confirm_delete.html' class UpdateContact(UpdateView): model = ContactSettings form_class = ContactSettingsForm - template_name = 'admin/newsletters/contact.html' + template_name = 'c_admin/newsletters/contact.html' success_url = '/admin/newsletters/contact/all/' def form_valid(self, form): @@ -151,7 +151,7 @@ class ExportContacts(FormView): class ImportContacts(FormView): form_class = ContactImportForm success_url = reverse_lazy("newsletters_contact_list") - template_name = 'admin/import templates/import_contacts.html' + template_name = 'c_admin/import templates/import_contacts.html' def form_valid(self, form): form.save() @@ -161,19 +161,19 @@ class ImportContacts(FormView): class MailingListView(ListView): paginate_by = settings.ADMIN_PAGINATION model = MailingList - template_name = 'admin/newsletters/mailing_list.html' + template_name = 'c_admin/newsletters/mailing_list.html' class DeleteMailingList(DeleteView): model = MailingList - template_name = 'admin/newsletters/confirm_delete.html' + template_name = 'c_admin/newsletters/confirm_delete.html' success_url = reverse_lazy('newsletters_mailinglist') class MailingListMixin(object): model = MailingList form_class = MailingListForm - template_name = 'admin/newsletters/mailing_list_object.html' + template_name = 'c_admin/newsletters/mailing_list_object.html' success_url = '/admin/newsletters/mailinglist/all/' def dispatch(self, request, *args, **kwargs): @@ -216,7 +216,7 @@ class UpdateMailingList(MailingListMixin, UpdateView): class NewsletterCreate(CreateView): model = Newsletter form_class = NewsletterForm - template_name = 'admin/newsletters/newsletter_object.html' + template_name = 'c_admin/newsletters/newsletter_object.html' success_url = '/admin/newsletters/newsletters/all/' def get_formset(self): @@ -249,7 +249,7 @@ class NewsletterCreate(CreateView): class NewsletterUpdate(UpdateView): model = Newsletter form_class = NewsletterForm - template_name = 'admin/newsletters/newsletter_object.html' + template_name = 'c_admin/newsletters/newsletter_object.html' success_url = '/admin/newsletters/newsletters/all/' def get_formset(self): @@ -287,7 +287,7 @@ class NewsletterUpdate(UpdateView): class NewsletterListView(ListView): paginate_by = settings.ADMIN_PAGINATION model = Newsletter - template_name = 'admin/newsletters/newsletter_list.html' + template_name = 'c_admin/newsletters/newsletter_list.html' success_url = '/admin/newsletters/newsletters/all/' @@ -308,7 +308,7 @@ def send_test_newsletter(request, pk): class NewsletterStatistics(DetailView): model = Newsletter - template_name = 'admin/newsletters/newsletter_stat.html' + template_name = 'c_admin/newsletters/newsletter_stat.html' def get_context_data(self, **kwargs): context = super(NewsletterStatistics, self).get_context_data(**kwargs) @@ -372,7 +372,7 @@ class NewsletterCancelView(NewsletterCloneView): class NewsletterHistory(ListView): model = ContactMailingStatus - template_name = 'admin/newsletters/newsletter_history.html' + template_name = 'c_admin/newsletters/newsletter_history.html' paginate_by = 50 def get_queryset(self): @@ -399,7 +399,7 @@ class NewsletterHistory(ListView): class NewsletterDelete(DeleteView): model = Newsletter - template_name = 'admin/newsletters/confirm_delete.html' + template_name = 'c_admin/newsletters/confirm_delete.html' success_url = reverse_lazy('newsletters_newsletters_list') @@ -422,7 +422,7 @@ def count_popups(request): class PopupStatisticsView(FormView): form_class = PopupCountFilter - template_name = 'admin/newsletters/popup_count.html' + template_name = 'c_admin/newsletters/popup_count.html' def get(self, request, *args, **kwargs): form_class = self.get_form_class() diff --git a/expobanner/admin.py b/expobanner/admin.py index 9042fae6..85dc70d4 100644 --- a/expobanner/admin.py +++ b/expobanner/admin.py @@ -47,11 +47,11 @@ from settings.models import Html, LandingComment, ParticipationComment class BannersControl(TemplateView): - template_name = 'admin/expobanner/banners_control.html' + template_name = 'c_admin/expobanner/banners_control.html' # CREATE VIEWS class AbstractCreate(CreateView): - template_name = 'admin/expobanner/default_form.html' + template_name = 'c_admin/expobanner/default_form.html' success_url = '/admin/expobanners/banners/control/' @@ -83,7 +83,7 @@ class CreateCustomer(AbstractCreate): # LISTS VIEWS class AbstractList(ListView): paginate_by = settings.ADMIN_PAGINATION - template_name = 'admin/expobanner/default_list.html' + template_name = 'c_admin/expobanner/default_list.html' def get_context_data(self, **kwargs): context = super(AbstractList, self).get_context_data(**kwargs) @@ -103,7 +103,7 @@ class BannerGroupList(AbstractList): class BannerList(AbstractList): model = Banner verbose = _(u'Список банеров') - template_name = 'admin/expobanner/banner_list.html' + template_name = 'c_admin/expobanner/banner_list.html' def get_queryset(self): qs = self.model.objects.filter(group__isnull=False).order_by('-fr') @@ -118,7 +118,7 @@ class BannerList(AbstractList): class LinkList(AbstractList): model = Banner verbose = _(u'Список ссылок') - template_name = 'admin/expobanner/link_list.html' + template_name = 'c_admin/expobanner/link_list.html' def get_queryset(self): qs = super(LinkList, self).get_queryset() @@ -129,12 +129,12 @@ class LinkList(AbstractList): class CustomerList(AbstractList): model = Customer verbose = _(u'Список заказчиков') - template_name = 'admin/expobanner/customer_list.html' + template_name = 'c_admin/expobanner/customer_list.html' # UPDATE VIEWS class AbstractUpdate(UpdateView): - template_name = 'admin/expobanner/default_form.html' + template_name = 'c_admin/expobanner/default_form.html' success_url = '/admin/expobanners/banners/control/' @@ -165,7 +165,7 @@ class UpdateCustomer(AbstractUpdate): class BannerStat(DetailView): model = Banner - template_name = 'admin/expobanner/banner_stat.html' + template_name = 'c_admin/expobanner/banner_stat.html' def get_context_data(self, **kwargs): context = super(BannerStat, self).get_context_data(**kwargs) @@ -192,7 +192,7 @@ class BannerStat(DetailView): # DELETE views ############################################################################### class DeleteCustomer(DeleteView): - template_name = 'admin/expobanner/customer_confirm_delete.html' + template_name = 'c_admin/expobanner/customer_confirm_delete.html' model = Customer success_url = reverse_lazy('expobanner-customer_list') # slug_field = 'url' @@ -205,7 +205,7 @@ class DeleteCustomer(DeleteView): class CommentMixin(object): form_class = CommentForm model = LandingComment - template_name = 'admin/expobanner/comment_create.html' + template_name = 'c_admin/expobanner/comment_create.html' success_url = reverse_lazy('expobaner-comment_list') def get_context_data(self, *args, **kwargs): @@ -224,14 +224,14 @@ class ParticipationMixin(CommentMixin): class CommentList(CommentMixin, ListView): - template_name = 'admin/expobanner/comment_list.html' + template_name = 'c_admin/expobanner/comment_list.html' def get_queryset(self): return self.model.objects.language() class ParticipationCommentList(ParticipationMixin, CommentList): - template_name = 'admin/expobanner/pcomment_list.html' + template_name = 'c_admin/expobanner/pcomment_list.html' class CommentCreate(CommentMixin, CreateView): @@ -282,7 +282,7 @@ class PaidList(ListView): } } model = None - template_name = 'admin/expobanner/paid_list.html' + template_name = 'c_admin/expobanner/paid_list.html' paginate_by = settings.ADMIN_PAGINATION def get(self, *args, **kwargs): @@ -306,7 +306,7 @@ class PaidList(ListView): class PaidCreate(CreateView): form_class = PaidCreateForm - template_name = 'admin/expobanner/paid_create.html' + template_name = 'c_admin/expobanner/paid_create.html' success_url = '/admin/expobanners/paid/list/' @@ -318,7 +318,7 @@ class PaidConfCreate(PaidCreate): class PaidUpdate(UpdateView): model = Paid form_class = None - template_name = 'admin/expobanner/paid_update.html' + template_name = 'c_admin/expobanner/paid_update.html' success_url = '/admin/expobanners/paid/list/' def dispatch(self, request, *args, **kwargs): @@ -358,7 +358,7 @@ def paid_turn(request, pk, status): class PaidStat(DetailView): model = Paid - template_name = 'admin/expobanner/paid_stat.html' + template_name = 'c_admin/expobanner/paid_stat.html' def get_context_data(self, **kwargs): context = super(PaidStat, self).get_context_data(**kwargs) @@ -385,7 +385,7 @@ class PaidStat(DetailView): class MainList(ListView): model = Exposition - template_name = 'admin/expobanner/main_list.html' + template_name = 'c_admin/expobanner/main_list.html' paginate_by = settings.ADMIN_PAGINATION def get_queryset(self): @@ -397,14 +397,14 @@ class MainList(ListView): class MainCreate(CreateView): form_class = MainCreateForm - template_name = 'admin/expobanner/paid_create.html' + template_name = 'c_admin/expobanner/paid_create.html' success_url = '/admin/expobanners/main/list/' class MainUpdate(UpdateView): model = MainPage form_class = MainUpdateForm - template_name = 'admin/expobanner/default_form.html' + template_name = 'c_admin/expobanner/default_form.html' success_url = '/admin/expobanners/main/list/' def get_context_data(self, **kwargs): @@ -416,7 +416,7 @@ class MainUpdate(UpdateView): class MainConfList(ListView): model = Conference - template_name = 'admin/expobanner/main_list.html' + template_name = 'c_admin/expobanner/main_list.html' paginate_by = settings.ADMIN_PAGINATION def get_queryset(self): @@ -433,7 +433,7 @@ class MainConfList(ListView): class MainConfCreate(CreateView): form_class = MainConfCreateForm - template_name = 'admin/expobanner/paid_create.html' + template_name = 'c_admin/expobanner/paid_create.html' success_url = reverse_lazy('expobanner-conf-list_main') def get_context_data(self, **kwargs): @@ -445,7 +445,7 @@ class MainConfCreate(CreateView): class MainConfUpdate(UpdateView): model = MainPage form_class = MainUpdateForm - template_name = 'admin/expobanner/default_form.html' + template_name = 'c_admin/expobanner/default_form.html' success_url = reverse_lazy('expobanner-conf-list_main') def get_context_data(self, **kwargs): @@ -467,7 +467,7 @@ def main_turn(request, pk, status): class MainStat(DetailView): model = MainPage - template_name = 'admin/expobanner/main_stat.html' + template_name = 'c_admin/expobanner/main_stat.html' def get_context_data(self, **kwargs): context = super(MainStat, self).get_context_data(**kwargs) @@ -497,7 +497,7 @@ class TopStat(MainStat): class TopList(ListView): model = Exposition - template_name = 'admin/expobanner/top_list.html' + template_name = 'c_admin/expobanner/top_list.html' paginate_by = settings.ADMIN_PAGINATION def get_queryset(self): @@ -509,14 +509,14 @@ class TopList(ListView): class TopCreate(CreateView): form_class = TopCreateForm - template_name = 'admin/expobanner/top_create.html' + template_name = 'c_admin/expobanner/top_create.html' success_url = '/admin/expobanners/top/list/' class TopUpdate(UpdateView): model = Top form_class = TopUpdateForm - template_name = 'admin/expobanner/top_create.html' + template_name = 'c_admin/expobanner/top_create.html' success_url = '/admin/expobanners/top/list/' def get_context_data(self, **kwargs): @@ -529,7 +529,7 @@ class TopUpdate(UpdateView): class MainPageBlock(UpdateView): model = Html form_class = HtmlForm - template_name = 'admin/expobanner/main_page_block.html' + template_name = 'c_admin/expobanner/main_page_block.html' def get_context_data(self, **kwargs): context = super(MainPageBlock, self).get_context_data(**kwargs) diff --git a/exposition/admin.py b/exposition/admin.py index f12f1479..18b52db2 100644 --- a/exposition/admin.py +++ b/exposition/admin.py @@ -251,7 +251,7 @@ class ExpositionView(AdminView): form_class = ExpositionCreateForm model = Exposition success_url = '/admin/exposition/all/' - template_name = 'admin/exposition/exposition.html' + template_name = 'c_admin/exposition/exposition.html' def form_valid(self, form): self.set_obj() @@ -342,7 +342,7 @@ class ExpositionView(AdminView): class ExpositionListView(AdminListView): paginate_func = staticmethod(stat_paginate_results) - template_name = 'admin/exposition/exposition_list.html' + template_name = 'c_admin/exposition/exposition_list.html' form_class = ExpositionFilterForm model = Exposition diff --git a/import_xls/admin.py b/import_xls/admin.py index e40504d5..e43f4b44 100644 --- a/import_xls/admin.py +++ b/import_xls/admin.py @@ -25,7 +25,7 @@ class ImportView(FormView): """ abstract class """ - template_name = 'admin/import templates/import.html' + template_name = 'c_admin/import templates/import.html' def form_valid(self, form): errors = form.save_file() @@ -101,7 +101,7 @@ class ExportCity(ExportView): class ImportEvent(FormView): form_class = ImportEventForm success_url = '/admin/import-event/' - template_name = 'admin/import templates/import_event.html' + template_name = 'c_admin/import templates/import_event.html' def form_valid(self, form): @@ -112,7 +112,7 @@ class ImportEvent(FormView): class ImportPlaceExposition(FormView): form_class = ImportPlaceExpositionForm success_url = '/admin/import-place_exposition/' - template_name = 'admin/import templates/import.html' + template_name = 'c_admin/import templates/import.html' def form_valid(self, form): errors = form.save_file_debug() @@ -149,13 +149,13 @@ class ExportEvent(ExportView): class LogList(ListView): model = Log paginate_by = settings.ADMIN_PAGINATION - template_name = 'admin/import templates/log.html' + template_name = 'c_admin/import templates/log.html' class LogDelete(DeleteView): model = Log success_url = '/admin/import/log/' - template_name = 'admin/import templates/log_delete.html' + template_name = 'c_admin/import templates/log_delete.html' def log_file(request, log_id): diff --git a/meta/admin.py b/meta/admin.py index 7f21eb6b..20c0f236 100644 --- a/meta/admin.py +++ b/meta/admin.py @@ -9,7 +9,7 @@ from functions.admin_views import AdminListView, AdminView class MetaListView(AdminListView): - template_name = 'admin/meta/meta_list.html' + template_name = 'c_admin/meta/meta_list.html' form_class = MetaFilterForm model = MetaSetting @@ -17,7 +17,7 @@ class MetaView(AdminView): form_class = MetaForm model = MetaSetting success_url = '/admin/meta/all/' - template_name = 'admin/meta/meta_setting.html' + template_name = 'c_admin/meta/meta_setting.html' def form_valid(self, form): self.set_obj() @@ -48,4 +48,4 @@ class MetaView(AdminView): def get_context_data(self, **kwargs): context = super(MetaView, self).get_context_data(**kwargs) obj = self.set_obj() - return context \ No newline at end of file + return context diff --git a/meta/views.py b/meta/views.py index a4097c80..4c8d0df3 100644 --- a/meta/views.py +++ b/meta/views.py @@ -192,25 +192,25 @@ class MetadataMixin(object): class CreateSeoText(CreateView): form_class = SeoTextForm model = SeoText - template_name = "admin/meta/create_seo_text.html" + template_name = "c_admin/meta/create_seo_text.html" success_url = '/admin/meta/seo/all/' class SeoTextList(ListView): model = SeoText - template_name = "admin/meta/seo_admin_list.html" + template_name = "c_admin/meta/seo_admin_list.html" class EditSeoText(UpdateView): form_class = SeoTextForm model = SeoText - template_name = "admin/meta/create_seo_text.html" + template_name = "c_admin/meta/create_seo_text.html" class DeleteSeoText(DeleteView): model = SeoText - template_name = "admin/meta/seo_confirm_delete.html" + template_name = "c_admin/meta/seo_confirm_delete.html" success_url = '/admin/meta/seo/all/' diff --git a/organiser/admin.py b/organiser/admin.py index 723342f2..dde1a9ce 100644 --- a/organiser/admin.py +++ b/organiser/admin.py @@ -8,7 +8,7 @@ from functions.admin_views import AdminListView, AdminView class OrganiserListView(AdminListView): - template_name = 'admin/organiser/organiser_list.html' + template_name = 'c_admin/organiser/organiser_list.html' form_class = OrganiserFilterForm model = Organiser @@ -16,7 +16,7 @@ class OrganiserView(AdminView): form_class = OrganiserForm model = Organiser success_url = '/admin/organiser/all/' - template_name = 'admin/organiser/organiser.html' + template_name = 'c_admin/organiser/organiser.html' def get_form(self, form_class): if self.request.POST: @@ -61,4 +61,4 @@ class OrganiserView(AdminView): def get_context_data(self, **kwargs): context = super(OrganiserView, self).get_context_data(**kwargs) context['photo_form'] = PhotoForm() - return context \ No newline at end of file + return context diff --git a/photologue/admin.py b/photologue/admin.py index 53481d2b..3ab13aac 100644 --- a/photologue/admin.py +++ b/photologue/admin.py @@ -60,7 +60,7 @@ class AdminViewObject(FormView): class PhotoView(AdminViewObject): model = Photo form_class = PhotoForm - template_name = 'admin/photogallery/admin_photo.html' + template_name = 'c_admin/photogallery/admin_photo.html' success_url = '/admin/photogallery/photo/all/' def get_form(self, form_class): @@ -88,7 +88,7 @@ class PhotoView(AdminViewObject): class GalleryView(AdminViewObject): model = Gallery form_class = GalleryForm - template_name = 'admin/photogallery/admin_gallery.html' + template_name = 'c_admin/photogallery/admin_gallery.html' success_url = '/admin/photogallery/gallery/all/' def get_form(self, form_class): @@ -115,17 +115,17 @@ class GalleryView(AdminViewObject): class PhotoListView(ListView): paginate_by = settings.ADMIN_PAGINATION model = Photo - template_name = 'admin/photogallery/admin_photo_list.html' + template_name = 'c_admin/photogallery/admin_photo_list.html' class GalleryListView(ListView): paginate_by = settings.ADMIN_PAGINATION model = Gallery - template_name = 'admin/photogallery/admin_gallery_list.html' + template_name = 'c_admin/photogallery/admin_gallery_list.html' def delete_photo(request, photo_id): photo = get_object_or_404(Photo, pk=photo_id) photo.delete() response = {'success': True} - return HttpResponse(json.dumps(response), content_type='application/json') \ No newline at end of file + return HttpResponse(json.dumps(response), content_type='application/json') diff --git a/place_conference/admin.py b/place_conference/admin.py index 1202bd5f..fc609033 100644 --- a/place_conference/admin.py +++ b/place_conference/admin.py @@ -196,7 +196,7 @@ class PlaceConferenceView(AdminView): form_class = ConferenceForm model = PlaceConference success_url = '/admin/place_conference/all/' - template_name = 'admin/place_conference/place_conference.html' + template_name = 'c_admin/place_conference/place_conference.html' def get_form(self, form_class): if self.request.POST: @@ -247,6 +247,6 @@ class PlaceConferenceView(AdminView): return context class PlaceConferenceListView(AdminListView): - template_name = 'admin/place_conference/place_conference_list.html' + template_name = 'c_admin/place_conference/place_conference_list.html' form_class = PlaceConferenceFilterForm - model = PlaceConference \ No newline at end of file + model = PlaceConference diff --git a/place_exposition/admin.py b/place_exposition/admin.py index 52e97bec..300e44a0 100644 --- a/place_exposition/admin.py +++ b/place_exposition/admin.py @@ -199,7 +199,7 @@ class PlaceExpositionView(AdminView): form_class = ExpositionForm model = PlaceExposition success_url = '/admin/place_exposition/all/' - template_name = 'admin/place_exposition/place_exposition.html' + template_name = 'c_admin/place_exposition/place_exposition.html' def get_form(self, form_class): if self.request.POST: @@ -274,7 +274,7 @@ def delete_hall(request, hall_id): class PlaceExpositionListView(AdminListView): - template_name = 'admin/place_exposition/place_exposition_list.html' + template_name = 'c_admin/place_exposition/place_exposition_list.html' form_class = PlaceExpositionFilter model = PlaceExposition @@ -305,5 +305,5 @@ def edit_hall(request, place_url, hall_id): context = {'form': form, 'languages': settings.LANGUAGES} context.update(csrf(request)) - return render_to_response('admin/place_exposition/hall.html', context) + return render_to_response('c_admin/place_exposition/hall.html', context) diff --git a/proj/admin.py b/proj/admin.py index b6ebdf86..9af9fe76 100644 --- a/proj/admin.py +++ b/proj/admin.py @@ -20,7 +20,7 @@ from theme.models import Tag class AdminIndex(TemplateView): - template_name = 'admin/base.html' + template_name = 'c_admin/base.html' def ajax_city(request): diff --git a/proj/admin_urls.py b/proj/admin_urls.py index 72049c19..c25b39ea 100644 --- a/proj/admin_urls.py +++ b/proj/admin_urls.py @@ -5,6 +5,8 @@ from django.contrib.admin.views.decorators import staff_member_required from functions import required from proj.admin import AdminIndex +admin.autodiscover() + urlpatterns = required( staff_member_required, @@ -61,6 +63,8 @@ urlpatterns = required( url(r'^ckeditor/', include('ckeditor.urls')), url(r'^tinymce/', include('tinymce.urls')), + url(r'^django/', include(admin.site.urls)), + # url(r'^stats/', include('statsy.urls')), ) diff --git a/proj/urls.py b/proj/urls.py index e4bd3dd7..90549e94 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -10,6 +10,7 @@ from django.conf import settings from django.conf.urls import include, patterns, url from django.conf.urls.static import static from django.contrib.sitemaps import views + from django.views.generic.base import TemplateView from sitemaps import ( Additional, @@ -66,6 +67,7 @@ urlpatterns += solid_i18n_patterns('', url(r'^rss/', include('core.urls')), url(r'^sitemap-(?P
.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}), url(r'^admin/', include('proj.admin_urls')), + url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}), url(r'^sitemap-(?P
.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}), url(r'^robots.txt$', Robot.as_view()), diff --git a/redirects/admin.py b/redirects/admin.py index 0fa4c0ac..4bcd0a2e 100644 --- a/redirects/admin.py +++ b/redirects/admin.py @@ -15,7 +15,7 @@ from .forms import RedirectForm, NewUrlForObjectForm class RedirectMixin(object): form_class = RedirectForm model = Redirect - template_name = 'admin/redirects/create_or_edit.html' + template_name = 'c_admin/redirects/create_or_edit.html' success_url = reverse_lazy('redirects-list') def get_success_url(self): @@ -23,7 +23,7 @@ class RedirectMixin(object): class RedirectList(RedirectMixin, ListView): - template_name = 'admin/redirects/list.html' + template_name = 'c_admin/redirects/list.html' class RedirectCreate(RedirectMixin, CreateView): @@ -40,7 +40,7 @@ class RedirectDelete(RedirectMixin, DeleteView): class NewUrlForObject(AjaxableResponseMixin, UpdateView): - template_name = 'admin/redirects/newurlforobject.html' + template_name = 'c_admin/redirects/newurlforobject.html' context_object_name = 'object' form_class = NewUrlForObjectForm slug_field = 'url' diff --git a/seminar/admin.py b/seminar/admin.py index bc5ecd79..7dbde95b 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -211,6 +211,6 @@ def seminar_change(request, url): class SeminarListView(AdminListView): - template_name = 'admin/seminar/seminar_list.html' + template_name = 'c_admin/seminar/seminar_list.html' form_class = SeminarFilterForm - model = Seminar \ No newline at end of file + model = Seminar diff --git a/service/admin.py b/service/admin.py index ec5cfd8a..70afede5 100644 --- a/service/admin.py +++ b/service/admin.py @@ -115,7 +115,7 @@ def get_city(request): class LinkedServiceUpdateView(UpdateView): form_class = LinkedServiceForm model = LinkedService - template_name = "admin/service/linked_service.html" + template_name = "c_admin/service/linked_service.html" success_url = "/admin/service/control/all/" def get_object(self, queryset=None): @@ -160,12 +160,12 @@ class LinkedServiceUpdateView(UpdateView): class LinkedServiceList(ListView): model = LinkedService - template_name = 'admin/service/linked_service_list.html' + template_name = 'c_admin/service/linked_service_list.html' class LinkedServiceDeleteView(DeleteView): model = LinkedService - template_name = 'admin/service/linked_service_confirm_delete.html' + template_name = 'c_admin/service/linked_service_confirm_delete.html' success_url = '/admin/service/test/all' slug_url_kwarg = 'url' diff --git a/service/views.py b/service/views.py index a88e3766..c11fe832 100644 --- a/service/views.py +++ b/service/views.py @@ -99,7 +99,7 @@ def advertise(request, catalog=None, event_url=None): from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets class AbstractOrderListView(ListView): - template_name = 'admin/service/order_list.html' + template_name = 'c_admin/service/order_list.html' paginate_by = 20 class CallBackListView(AbstractOrderListView): @@ -127,4 +127,4 @@ class TicketsListView(AbstractOrderListView): class Thanks(TemplateView): - template_name = 'client/service/thank_u_page.html' \ No newline at end of file + template_name = 'client/service/thank_u_page.html' diff --git a/settings/admin.py b/settings/admin.py index 8e975c51..39d428a3 100644 --- a/settings/admin.py +++ b/settings/admin.py @@ -53,4 +53,4 @@ def main_page(request): 'confrence_themes': list(map(str, confrence_themes.values_list('pk', flat=True))), } args.update(csrf(request)) - return render_to_response('admin/settings/main_page.html', args) + return render_to_response('c_admin/settings/main_page.html', args) diff --git a/specialist_catalog/views.py b/specialist_catalog/views.py index 69c020ec..bc575a6a 100644 --- a/specialist_catalog/views.py +++ b/specialist_catalog/views.py @@ -23,7 +23,7 @@ from .models import _city, _country class SpecialistCreateView(CreateView): form_class = SpecialistForm model = Specialist - template_name = 'admin/specialist/specialist_new.html' + template_name = 'c_admin/specialist/specialist_new.html' success_url = reverse_lazy("specialist_all") @@ -32,7 +32,7 @@ from hvad.utils import get_translation_aware_manager class SpecialistListView(ListView): model = Specialist - template_name = 'admin/specialist/specialist_all.html' + template_name = 'c_admin/specialist/specialist_all.html' paginate_by = settings.ADMIN_PAGINATION def get_queryset(self): @@ -49,7 +49,7 @@ class SpecialistListView(ListView): class SpecialistUpdateView(UpdateView): form_class = SpecialistForm model = Specialist - template_name = 'admin/specialist/specialist_new.html' + template_name = 'c_admin/specialist/specialist_new.html' success_url = reverse_lazy("specialist_all") def get_form(self, form_class): @@ -60,7 +60,7 @@ class SpecialistUpdateView(UpdateView): class SpecialistDeleteView(DeleteView): model = Specialist - template_name = 'admin/specialist/specialist_confirm_delete.html' + template_name = 'c_admin/specialist/specialist_confirm_delete.html' success_url = reverse_lazy("specialist_all") @@ -70,14 +70,14 @@ class SpecialistDeleteView(DeleteView): class CatalogCreateView(CreateView): form_class = SpecialistCatalogForm model = SpecialistCatalog - template_name = 'admin/specialist/catalog_new.html' + template_name = 'c_admin/specialist/catalog_new.html' success_url = reverse_lazy("catalog_all") class CatalogListView(ListView): model = SpecialistCatalog - template_name = 'admin/specialist/catalog_all.html' + template_name = 'c_admin/specialist/catalog_all.html' paginate_by = settings.ADMIN_PAGINATION paginator_class = settings.DEFAULT_PAGINATOR def get_queryset(self): @@ -98,7 +98,7 @@ class CatalogListView(ListView): class CatalogUpdateView(UpdateView): form_class = SpecialistCatalogForm model = SpecialistCatalog - template_name = 'admin/specialist/catalog_new.html' + template_name = 'c_admin/specialist/catalog_new.html' success_url = reverse_lazy("catalog_all") def get_form(self, form_class): @@ -110,7 +110,7 @@ class CatalogUpdateView(UpdateView): class CatalogDeleteView(DeleteView): model = SpecialistCatalog - template_name = 'admin/specialist/catalog_confirm_delete.html' + template_name = 'c_admin/specialist/catalog_confirm_delete.html' success_url = reverse_lazy("catalog_all") @@ -120,7 +120,7 @@ class CatalogDeleteView(DeleteView): class FeedbackCreateView(CreateView): form_class = FeedbackForm model = Feedback - template_name = 'admin/specialist/feedback_new.html' + template_name = 'c_admin/specialist/feedback_new.html' success_url = reverse_lazy("catalog_all") def get_initial(self): @@ -131,7 +131,7 @@ class FeedbackCreateView(CreateView): class FeedbackUpdateView(UpdateView): form_class = FeedbackForm model = Feedback - template_name = 'admin/specialist/feedback_new.html' + template_name = 'c_admin/specialist/feedback_new.html' success_url = reverse_lazy("catalog_all") def get_initial(self): @@ -141,7 +141,7 @@ class FeedbackUpdateView(UpdateView): class FeedbackDeleteView(DeleteView): model = Feedback - template_name = 'admin/specialist/feedback_confirm_delete.html' + template_name = 'c_admin/specialist/feedback_confirm_delete.html' success_url = reverse_lazy("catalog_all") diff --git a/stats_collector/admin.py b/stats_collector/admin.py index 7cb263f6..70275974 100644 --- a/stats_collector/admin.py +++ b/stats_collector/admin.py @@ -96,8 +96,8 @@ class StatBaseView(FormView): class StatSectionsView(StatBaseView): - template_name = 'admin/stats/section_stat.html' - ajax_template_name = 'admin/stats/content_type_form.html' + template_name = 'c_admin/stats/section_stat.html' + ajax_template_name = 'c_admin/stats/content_type_form.html' form_class = DateFilter content_form_class = ByContentObjectsFilter @@ -232,7 +232,7 @@ class EventStatView(StatBaseView): form_class = EventsDateFilter params_form_cls = EventsParamsFilter pt_columns = ['content_type', 'object_id'] - template_name = 'admin/stats/event_stat.html' + template_name = 'c_admin/stats/event_stat.html' def get_queryset(self): return ObjectStats.objects\ diff --git a/support/dev/settings.py b/support/dev/settings.py index fd515035..de5c84e5 100644 --- a/support/dev/settings.py +++ b/support/dev/settings.py @@ -167,29 +167,29 @@ TEMPLATE_DIRS = ( # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. # os.path.join(SITE_ROOT, 'templates/debug_toolbar'), - os.path.join(SITE_ROOT, 'templates/admin'), - os.path.join(SITE_ROOT, 'templates/admin/accounts'), - os.path.join(SITE_ROOT, 'templates/admin/article'), - os.path.join(SITE_ROOT, 'templates/admin/country'), - os.path.join(SITE_ROOT, 'templates/admin/city'), - os.path.join(SITE_ROOT, 'templates/admin/company'), - os.path.join(SITE_ROOT, 'templates/admin/conference'), - os.path.join(SITE_ROOT, 'templates/admin/directories'), - os.path.join(SITE_ROOT, 'templates/admin/exposition'), - os.path.join(SITE_ROOT, 'templates/admin/forms'), - os.path.join(SITE_ROOT, 'templates/admin/import templates'), - os.path.join(SITE_ROOT, 'templates/admin/news'), - os.path.join(SITE_ROOT, 'templates/admin/organiser'), - os.path.join(SITE_ROOT, 'templates/admin/place_conference'), - os.path.join(SITE_ROOT, 'templates/admin/place_exposition'), - os.path.join(SITE_ROOT, 'templates/admin/page'), - os.path.join(SITE_ROOT, 'templates/admin/photoreport'), - os.path.join(SITE_ROOT, 'templates/admin/settings'), - os.path.join(SITE_ROOT, 'templates/admin/seminar'), - os.path.join(SITE_ROOT, 'templates/admin/service'), - os.path.join(SITE_ROOT, 'templates/admin/theme'), - os.path.join(SITE_ROOT, 'templates/admin/translator'), - os.path.join(SITE_ROOT, 'templates/admin/webinar'), + os.path.join(SITE_ROOT, 'templates/c_admin'), + os.path.join(SITE_ROOT, 'templates/c_admin/accounts'), + os.path.join(SITE_ROOT, 'templates/c_admin/article'), + os.path.join(SITE_ROOT, 'templates/c_admin/country'), + os.path.join(SITE_ROOT, 'templates/c_admin/city'), + os.path.join(SITE_ROOT, 'templates/c_admin/company'), + os.path.join(SITE_ROOT, 'templates/c_admin/conference'), + os.path.join(SITE_ROOT, 'templates/c_admin/directories'), + os.path.join(SITE_ROOT, 'templates/c_admin/exposition'), + os.path.join(SITE_ROOT, 'templates/c_admin/forms'), + os.path.join(SITE_ROOT, 'templates/c_admin/import templates'), + os.path.join(SITE_ROOT, 'templates/c_admin/news'), + os.path.join(SITE_ROOT, 'templates/c_admin/organiser'), + os.path.join(SITE_ROOT, 'templates/c_admin/place_conference'), + os.path.join(SITE_ROOT, 'templates/c_admin/place_exposition'), + os.path.join(SITE_ROOT, 'templates/c_admin/page'), + os.path.join(SITE_ROOT, 'templates/c_admin/photoreport'), + os.path.join(SITE_ROOT, 'templates/c_admin/settings'), + os.path.join(SITE_ROOT, 'templates/c_admin/seminar'), + os.path.join(SITE_ROOT, 'templates/c_admin/service'), + os.path.join(SITE_ROOT, 'templates/c_admin/theme'), + os.path.join(SITE_ROOT, 'templates/c_admin/translator'), + os.path.join(SITE_ROOT, 'templates/c_admin/webinar'), os.path.join(SITE_ROOT, 'templates/client'), os.path.join(SITE_ROOT, 'templates/client/exposition'), diff --git a/support/prod/settings.py b/support/prod/settings.py index f4954e94..3f269636 100644 --- a/support/prod/settings.py +++ b/support/prod/settings.py @@ -168,29 +168,29 @@ TEMPLATE_DIRS = ( # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. # os.path.join(SITE_ROOT, 'templates/debug_toolbar'), - os.path.join(SITE_ROOT, 'templates/admin'), - os.path.join(SITE_ROOT, 'templates/admin/accounts'), - os.path.join(SITE_ROOT, 'templates/admin/article'), - os.path.join(SITE_ROOT, 'templates/admin/country'), - os.path.join(SITE_ROOT, 'templates/admin/city'), - os.path.join(SITE_ROOT, 'templates/admin/company'), - os.path.join(SITE_ROOT, 'templates/admin/conference'), - os.path.join(SITE_ROOT, 'templates/admin/directories'), - os.path.join(SITE_ROOT, 'templates/admin/exposition'), - os.path.join(SITE_ROOT, 'templates/admin/forms'), - os.path.join(SITE_ROOT, 'templates/admin/import templates'), - os.path.join(SITE_ROOT, 'templates/admin/news'), - os.path.join(SITE_ROOT, 'templates/admin/organiser'), - os.path.join(SITE_ROOT, 'templates/admin/place_conference'), - os.path.join(SITE_ROOT, 'templates/admin/place_exposition'), - os.path.join(SITE_ROOT, 'templates/admin/page'), - os.path.join(SITE_ROOT, 'templates/admin/photoreport'), - os.path.join(SITE_ROOT, 'templates/admin/settings'), - os.path.join(SITE_ROOT, 'templates/admin/seminar'), - os.path.join(SITE_ROOT, 'templates/admin/service'), - os.path.join(SITE_ROOT, 'templates/admin/theme'), - os.path.join(SITE_ROOT, 'templates/admin/translator'), - os.path.join(SITE_ROOT, 'templates/admin/webinar'), + os.path.join(SITE_ROOT, 'templates/c_admin'), + os.path.join(SITE_ROOT, 'templates/c_admin/accounts'), + os.path.join(SITE_ROOT, 'templates/c_admin/article'), + os.path.join(SITE_ROOT, 'templates/c_admin/country'), + os.path.join(SITE_ROOT, 'templates/c_admin/city'), + os.path.join(SITE_ROOT, 'templates/c_admin/company'), + os.path.join(SITE_ROOT, 'templates/c_admin/conference'), + os.path.join(SITE_ROOT, 'templates/c_admin/directories'), + os.path.join(SITE_ROOT, 'templates/c_admin/exposition'), + os.path.join(SITE_ROOT, 'templates/c_admin/forms'), + os.path.join(SITE_ROOT, 'templates/c_admin/import templates'), + os.path.join(SITE_ROOT, 'templates/c_admin/news'), + os.path.join(SITE_ROOT, 'templates/c_admin/organiser'), + os.path.join(SITE_ROOT, 'templates/c_admin/place_conference'), + os.path.join(SITE_ROOT, 'templates/c_admin/place_exposition'), + os.path.join(SITE_ROOT, 'templates/c_admin/page'), + os.path.join(SITE_ROOT, 'templates/c_admin/photoreport'), + os.path.join(SITE_ROOT, 'templates/c_admin/settings'), + os.path.join(SITE_ROOT, 'templates/c_admin/seminar'), + os.path.join(SITE_ROOT, 'templates/c_admin/service'), + os.path.join(SITE_ROOT, 'templates/c_admin/theme'), + os.path.join(SITE_ROOT, 'templates/c_admin/translator'), + os.path.join(SITE_ROOT, 'templates/c_admin/webinar'), os.path.join(SITE_ROOT, 'templates/client'), os.path.join(SITE_ROOT, 'templates/client/exposition'), @@ -549,5 +549,38 @@ if DEBUG: ] +# logging +U_LOGFILE_SIZE = 1 * 1024 * 1024 +U_LOGFILE_COUNT = 2 +DEFAULT_LOGGER_NAME = 'mail' +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s \n' + }, + 'simple': { + 'format': '%(levelname)s %(message)s' + }, + }, + 'handlers': { + 'file': { + 'level': 'INFO', + 'filename': os.path.join(SITE_ROOT, 'logs/django.log'), + 'formatter': 'verbose', + 'class':'logging.handlers.RotatingFileHandler', + 'maxBytes': U_LOGFILE_SIZE, + 'backupCount': U_LOGFILE_COUNT, + }, + }, + 'loggers': { + 'mail': { + 'handlers': ['file'], + 'propagate': True, + 'level': 'DEBUG', + }, + } +} diff --git a/templates/admin/login.html b/templates/admin/login.html index 06c5cdf2..7ce42764 100644 --- a/templates/admin/login.html +++ b/templates/admin/login.html @@ -100,4 +100,4 @@ But, you can logout.

{% endif %} - \ No newline at end of file + diff --git a/templates/admin/accounts/create_admin.html b/templates/c_admin/accounts/create_admin.html similarity index 100% rename from templates/admin/accounts/create_admin.html rename to templates/c_admin/accounts/create_admin.html diff --git a/templates/admin/accounts/registration.html b/templates/c_admin/accounts/registration.html similarity index 100% rename from templates/admin/accounts/registration.html rename to templates/c_admin/accounts/registration.html diff --git a/templates/admin/accounts/user_all.html b/templates/c_admin/accounts/user_all.html similarity index 93% rename from templates/admin/accounts/user_all.html rename to templates/c_admin/accounts/user_all.html index cccdd7d7..948c8a9d 100644 --- a/templates/admin/accounts/user_all.html +++ b/templates/c_admin/accounts/user_all.html @@ -50,9 +50,9 @@ {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/accounts/user_change.html b/templates/c_admin/accounts/user_change.html similarity index 100% rename from templates/admin/accounts/user_change.html rename to templates/c_admin/accounts/user_change.html diff --git a/templates/admin/accounts/user_confirm_delete.html b/templates/c_admin/accounts/user_confirm_delete.html similarity index 100% rename from templates/admin/accounts/user_confirm_delete.html rename to templates/c_admin/accounts/user_confirm_delete.html diff --git a/templates/admin/accounts/user_list.html b/templates/c_admin/accounts/user_list.html similarity index 96% rename from templates/admin/accounts/user_list.html rename to templates/c_admin/accounts/user_list.html index 3fb8be3a..b8bb8184 100644 --- a/templates/admin/accounts/user_list.html +++ b/templates/c_admin/accounts/user_list.html @@ -73,7 +73,7 @@ {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} diff --git a/templates/admin/accounts/user_stat.html b/templates/c_admin/accounts/user_stat.html similarity index 95% rename from templates/admin/accounts/user_stat.html rename to templates/c_admin/accounts/user_stat.html index 28efea34..6bbea3b7 100644 --- a/templates/admin/accounts/user_stat.html +++ b/templates/c_admin/accounts/user_stat.html @@ -1,4 +1,4 @@ -{% extends 'admin/base.html' %} +{% extends 'c_admin/base.html' %} {% load staticfiles %} {% block styles %} diff --git a/templates/admin/admin_list.html b/templates/c_admin/admin_list.html similarity index 100% rename from templates/admin/admin_list.html rename to templates/c_admin/admin_list.html diff --git a/templates/admin/ajax_error_form.html b/templates/c_admin/ajax_error_form.html similarity index 93% rename from templates/admin/ajax_error_form.html rename to templates/c_admin/ajax_error_form.html index bdfc0172..9a9d35f5 100644 --- a/templates/admin/ajax_error_form.html +++ b/templates/c_admin/ajax_error_form.html @@ -19,11 +19,11 @@ {# file_name #} {% with field='file_name' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# file_description #} {% with field='description' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} diff --git a/templates/admin/article/article_add.html b/templates/c_admin/article/article_add.html similarity index 89% rename from templates/admin/article/article_add.html rename to templates/c_admin/article/article_add.html index 2adcb5a2..488593cc 100644 --- a/templates/admin/article/article_add.html +++ b/templates/c_admin/article/article_add.html @@ -34,7 +34,7 @@ {# main_title #} - {% include 'admin/forms/multilang.html' with field='main_title' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='main_title' form=form languages=languages %} {# theme #}
@@ -53,7 +53,7 @@
{# preview #} - {% include 'admin/forms/multilang.html' with field='preview' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='preview' form=form languages=languages %} {# author #}
@@ -64,18 +64,18 @@
{# description #} - {% include 'admin/forms/multilang.html' with field='description' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='description' form=form languages=languages %} {# keywords #} - {% include 'admin/forms/multilang.html' with field='keywords' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='keywords' form=form languages=languages %} {# title #} - {% include 'admin/forms/multilang.html' with field='title' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='title' form=form languages=languages %} {# descriptions #} - {% include 'admin/forms/multilang.html' with field='descriptions' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='descriptions' form=form languages=languages %} @@ -164,11 +164,11 @@ {# file_name #} {% with field='file_name' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# file_description #} {% with field='description' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} diff --git a/templates/admin/article/article_admin_list.html b/templates/c_admin/article/article_admin_list.html similarity index 100% rename from templates/admin/article/article_admin_list.html rename to templates/c_admin/article/article_admin_list.html diff --git a/templates/admin/article/article_all.html b/templates/c_admin/article/article_all.html similarity index 100% rename from templates/admin/article/article_all.html rename to templates/c_admin/article/article_all.html diff --git a/templates/admin/article/article_confirm_delete.html b/templates/c_admin/article/article_confirm_delete.html similarity index 100% rename from templates/admin/article/article_confirm_delete.html rename to templates/c_admin/article/article_confirm_delete.html diff --git a/templates/admin/article/blog_form.html b/templates/c_admin/article/blog_form.html similarity index 92% rename from templates/admin/article/blog_form.html rename to templates/c_admin/article/blog_form.html index f6670569..27faf6c9 100644 --- a/templates/admin/article/blog_form.html +++ b/templates/c_admin/article/blog_form.html @@ -44,7 +44,7 @@
{# main_title #} - {% include 'admin/forms/multilang.html' with field='main_title' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='main_title' form=form languages=languages %}
@@ -111,15 +111,15 @@
{# preview #} - {% include 'admin/forms/multilang.html' with field='preview' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='preview' form=form languages=languages %} {# description #} - {% include 'admin/forms/multilang.html' with field='description' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='description' form=form languages=languages %} {# keywords #} - {% include 'admin/forms/multilang.html' with field='keywords' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='keywords' form=form languages=languages %} {# title #} - {% include 'admin/forms/multilang.html' with field='title' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='title' form=form languages=languages %} {# descriptions #} - {% include 'admin/forms/multilang.html' with field='descriptions' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='descriptions' form=form languages=languages %} @@ -174,7 +174,7 @@ -{% include 'admin/includes/file_form.html' with file_form=file_form object=article %} +{% include 'c_admin/includes/file_form.html' with file_form=file_form object=article %} {% endblock %} diff --git a/templates/admin/base.html b/templates/c_admin/base.html similarity index 96% rename from templates/admin/base.html rename to templates/c_admin/base.html index 64eac45b..1135b55d 100644 --- a/templates/admin/base.html +++ b/templates/c_admin/base.html @@ -77,9 +77,9 @@ {# Side navigation #} {% block sidebar %} {% if user.is_superuser %} - {% include 'admin/includes/admin_nav.html' %} + {% include 'c_admin/includes/admin_nav.html' %} {% else %} - {% include 'admin/includes/staff_nav.html' %} + {% include 'c_admin/includes/staff_nav.html' %} {% endif %} {% endblock %} diff --git a/templates/admin/blog/blog_add.html b/templates/c_admin/blog/blog_add.html similarity index 100% rename from templates/admin/blog/blog_add.html rename to templates/c_admin/blog/blog_add.html diff --git a/templates/admin/city/city_add.html b/templates/c_admin/city/city_add.html similarity index 92% rename from templates/admin/city/city_add.html rename to templates/c_admin/city/city_add.html index da12c2cc..3af7fda1 100644 --- a/templates/admin/city/city_add.html +++ b/templates/c_admin/city/city_add.html @@ -33,7 +33,7 @@ {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# population #}
@@ -56,15 +56,15 @@
{# region #} {% with field='region' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# famous places #} {% with field='famous_places' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# population #}
@@ -88,12 +88,12 @@
{# transport #} {% with field='transport' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# shoping #} {% with field='shoping' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} @@ -150,15 +150,15 @@
{% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -200,11 +200,11 @@ {# file_name #} {% with field='file_name' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# file_description #} {% with field='description' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} diff --git a/templates/admin/city/city_all.html b/templates/c_admin/city/city_all.html similarity index 94% rename from templates/admin/city/city_all.html rename to templates/c_admin/city/city_all.html index c0d015f2..03d575e4 100644 --- a/templates/admin/city/city_all.html +++ b/templates/c_admin/city/city_all.html @@ -44,8 +44,8 @@ Displays lists of all cities in the table Добавить город - {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/city/city_list.html b/templates/c_admin/city/city_list.html similarity index 93% rename from templates/admin/city/city_list.html rename to templates/c_admin/city/city_list.html index 5bc2e619..32f1e8c6 100644 --- a/templates/admin/city/city_list.html +++ b/templates/c_admin/city/city_list.html @@ -49,8 +49,8 @@ Добавить город - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/company/company.html b/templates/c_admin/company/company.html similarity index 95% rename from templates/admin/company/company.html rename to templates/c_admin/company/company.html index cc917ddf..fd7ae37d 100644 --- a/templates/admin/company/company.html +++ b/templates/c_admin/company/company.html @@ -32,11 +32,11 @@ {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# specialization #} {% with field='specialization' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# country #}
@@ -82,7 +82,7 @@
{# address_inf #} {% with field='address_inf' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# phone #}
@@ -128,7 +128,7 @@
{# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} @@ -185,15 +185,15 @@
{# keywords #} {% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# title #} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# descriptions #} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
diff --git a/templates/admin/company/company_add.html b/templates/c_admin/company/company_add.html similarity index 95% rename from templates/admin/company/company_add.html rename to templates/c_admin/company/company_add.html index d991c963..0ad489a5 100644 --- a/templates/admin/company/company_add.html +++ b/templates/c_admin/company/company_add.html @@ -46,11 +46,11 @@ {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# specialization #} {% with field='specialization' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# country #}
@@ -96,7 +96,7 @@
{# address_inf #} {% with field='address_inf' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# phone #}
@@ -142,7 +142,7 @@
{# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} @@ -199,15 +199,15 @@
{# keywords #} {% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# title #} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# descriptions #} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -251,11 +251,11 @@ {# file_name #} {% with field='file_name' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# file_description #} {% with field='description' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} diff --git a/templates/admin/company/company_all.html b/templates/c_admin/company/company_all.html similarity index 94% rename from templates/admin/company/company_all.html rename to templates/c_admin/company/company_all.html index 8ee26a81..e96f4613 100644 --- a/templates/admin/company/company_all.html +++ b/templates/c_admin/company/company_all.html @@ -44,7 +44,7 @@ Displays lists of all companies in the table Добавить компанию {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/company/company_list.html b/templates/c_admin/company/company_list.html similarity index 96% rename from templates/admin/company/company_list.html rename to templates/c_admin/company/company_list.html index 9a3ea1b8..a144b7de 100644 --- a/templates/admin/company/company_list.html +++ b/templates/c_admin/company/company_list.html @@ -68,7 +68,7 @@ {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} diff --git a/templates/admin/conference/conference.html b/templates/c_admin/conference/conference.html similarity index 96% rename from templates/admin/conference/conference.html rename to templates/c_admin/conference/conference.html index 8d6a7f6b..679e3b14 100644 --- a/templates/admin/conference/conference.html +++ b/templates/c_admin/conference/conference.html @@ -92,11 +92,11 @@ {{ form.exposition_id }} {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# main_title #} {% with field='main_title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# data_begin #}
@@ -172,7 +172,7 @@
{# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# periodic #}
@@ -205,11 +205,11 @@
{# main_themes #} {% with field='main_themes' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# time #} {% with field='time' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# foundation_year #}
@@ -291,7 +291,7 @@
{# discount_description #} {% with field='discount_description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -455,7 +455,7 @@
- {% include 'admin/includes/photogallery.html' with object=object %} + {% include 'c_admin/includes/photogallery.html' with object=object %}
@@ -464,15 +464,15 @@
{# keywords #} {% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# title #} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# descriptions #} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -487,7 +487,7 @@ -{% include 'admin/includes/photo_form.html' with form=photo_form object=object %} -{% include 'admin/includes/file_form.html' with file_form=file_form object=object %} -{% include 'admin/includes/stat_form.html' with form=stat_form object=object %} -{% endblock %} \ No newline at end of file +{% include 'c_admin/includes/photo_form.html' with form=photo_form object=object %} +{% include 'c_admin/includes/file_form.html' with file_form=file_form object=object %} +{% include 'c_admin/includes/stat_form.html' with form=stat_form object=object %} +{% endblock %} diff --git a/templates/admin/conference/conference_add.html b/templates/c_admin/conference/conference_add.html similarity index 96% rename from templates/admin/conference/conference_add.html rename to templates/c_admin/conference/conference_add.html index 39fb4a90..0f3118bc 100644 --- a/templates/admin/conference/conference_add.html +++ b/templates/c_admin/conference/conference_add.html @@ -57,11 +57,11 @@ {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# main_title #} {% with field='main_title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# data_begin #}
@@ -131,7 +131,7 @@
{# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# web_page #} @@ -150,11 +150,11 @@
{# main_themes #} {% with field='main_themes' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# time #} {% with field='time' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# foundation_year #}
@@ -237,7 +237,7 @@
{# discount_description #} {% with field='discount_description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -405,15 +405,15 @@
{# keywords #} {% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# title #} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# descriptions #} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -457,11 +457,11 @@ {# file_name #} {% with field='file_name' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# file_description #} {% with field='description' form=file_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} diff --git a/templates/admin/conference/conference_all.html b/templates/c_admin/conference/conference_all.html similarity index 95% rename from templates/admin/conference/conference_all.html rename to templates/c_admin/conference/conference_all.html index 8d0a6bbb..207c1ac6 100644 --- a/templates/admin/conference/conference_all.html +++ b/templates/c_admin/conference/conference_all.html @@ -66,6 +66,6 @@ Добавить конференцию {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/conference/conference_list.html b/templates/c_admin/conference/conference_list.html similarity index 98% rename from templates/admin/conference/conference_list.html rename to templates/c_admin/conference/conference_list.html index 2e7a7e07..35590f63 100644 --- a/templates/admin/conference/conference_list.html +++ b/templates/c_admin/conference/conference_list.html @@ -99,7 +99,7 @@ td a{ {% trans "Добавить конференцию" %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/expobanner/banner_stat.html b/templates/c_admin/expobanner/banner_stat.html similarity index 100% rename from templates/admin/expobanner/banner_stat.html rename to templates/c_admin/expobanner/banner_stat.html diff --git a/templates/admin/expobanner/banners_control.html b/templates/c_admin/expobanner/banners_control.html similarity index 100% rename from templates/admin/expobanner/banners_control.html rename to templates/c_admin/expobanner/banners_control.html diff --git a/templates/admin/expobanner/comment_create.html b/templates/c_admin/expobanner/comment_create.html similarity index 78% rename from templates/admin/expobanner/comment_create.html rename to templates/c_admin/expobanner/comment_create.html index 762dba22..53abd40b 100644 --- a/templates/admin/expobanner/comment_create.html +++ b/templates/c_admin/expobanner/comment_create.html @@ -10,13 +10,13 @@
{# name #} - {% include 'admin/forms/multilang.html' with field='name' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='name' form=form languages=languages %} {# position #} - {% include 'admin/forms/multilang.html' with field='position' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='position' form=form languages=languages %} {# text #} - {% include 'admin/forms/multilang.html' with field='text' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='text' form=form languages=languages %} {# logo #}
diff --git a/templates/admin/expobanner/comment_list.html b/templates/c_admin/expobanner/comment_list.html similarity index 94% rename from templates/admin/expobanner/comment_list.html rename to templates/c_admin/expobanner/comment_list.html index 4e3fa6e0..e243b2fd 100644 --- a/templates/admin/expobanner/comment_list.html +++ b/templates/c_admin/expobanner/comment_list.html @@ -32,6 +32,6 @@ {% endblock %}
{# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
{% endblock %} diff --git a/templates/admin/expobanner/customer_confirm_delete.html b/templates/c_admin/expobanner/customer_confirm_delete.html similarity index 100% rename from templates/admin/expobanner/customer_confirm_delete.html rename to templates/c_admin/expobanner/customer_confirm_delete.html diff --git a/templates/admin/expobanner/customer_list.html b/templates/c_admin/expobanner/customer_list.html similarity index 93% rename from templates/admin/expobanner/customer_list.html rename to templates/c_admin/expobanner/customer_list.html index 7a3c48a2..4f38b7c9 100644 --- a/templates/admin/expobanner/customer_list.html +++ b/templates/c_admin/expobanner/customer_list.html @@ -31,7 +31,7 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} {% trans "Назад к управлению баннерами" %} {% endblock %} diff --git a/templates/admin/expobanner/default_form.html b/templates/c_admin/expobanner/default_form.html similarity index 100% rename from templates/admin/expobanner/default_form.html rename to templates/c_admin/expobanner/default_form.html diff --git a/templates/admin/expobanner/default_list.html b/templates/c_admin/expobanner/default_list.html similarity index 89% rename from templates/admin/expobanner/default_list.html rename to templates/c_admin/expobanner/default_list.html index c1ef5119..a08decce 100644 --- a/templates/admin/expobanner/default_list.html +++ b/templates/c_admin/expobanner/default_list.html @@ -28,8 +28,8 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} Назад к управлению баннерами -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/expobanner/link_list.html b/templates/c_admin/expobanner/link_list.html similarity index 94% rename from templates/admin/expobanner/link_list.html rename to templates/c_admin/expobanner/link_list.html index ab57268e..e7306934 100644 --- a/templates/admin/expobanner/link_list.html +++ b/templates/c_admin/expobanner/link_list.html @@ -35,7 +35,7 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %} {% trans "Назад к управлению баннерами" %} {% endblock %} diff --git a/templates/admin/expobanner/main_list.html b/templates/c_admin/expobanner/main_list.html similarity index 95% rename from templates/admin/expobanner/main_list.html rename to templates/c_admin/expobanner/main_list.html index 86d4a767..c7c9d7f8 100644 --- a/templates/admin/expobanner/main_list.html +++ b/templates/c_admin/expobanner/main_list.html @@ -1,4 +1,4 @@ -{% extends 'admin/base.html' %} +{% extends 'c_admin/base.html' %} {% block body %} @@ -54,7 +54,7 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/expobanner/main_page_block.html b/templates/c_admin/expobanner/main_page_block.html similarity index 80% rename from templates/admin/expobanner/main_page_block.html rename to templates/c_admin/expobanner/main_page_block.html index 050e0656..ab646abc 100644 --- a/templates/admin/expobanner/main_page_block.html +++ b/templates/c_admin/expobanner/main_page_block.html @@ -1,4 +1,4 @@ -{% extends 'admin/base.html' %} +{% extends 'c_admin/base.html' %} {% load static %} {% load i18n %} @@ -12,7 +12,7 @@

Блок на главной

- {% include 'admin/forms/multilang.html' with field='text' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='text' form=form languages=languages %}
@@ -23,4 +23,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/expobanner/main_stat.html b/templates/c_admin/expobanner/main_stat.html similarity index 98% rename from templates/admin/expobanner/main_stat.html rename to templates/c_admin/expobanner/main_stat.html index f4f64f9c..d5569354 100644 --- a/templates/admin/expobanner/main_stat.html +++ b/templates/c_admin/expobanner/main_stat.html @@ -1,4 +1,4 @@ -{% extends 'admin/base.html' %} +{% extends 'c_admin/base.html' %} {% load static %} {% load i18n %} {% block scripts %} @@ -83,4 +83,4 @@ console.log("1"); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/expobanner/paid_create.html b/templates/c_admin/expobanner/paid_create.html similarity index 100% rename from templates/admin/expobanner/paid_create.html rename to templates/c_admin/expobanner/paid_create.html diff --git a/templates/admin/expobanner/paid_list.html b/templates/c_admin/expobanner/paid_list.html similarity index 97% rename from templates/admin/expobanner/paid_list.html rename to templates/c_admin/expobanner/paid_list.html index 683f599d..1946811b 100644 --- a/templates/admin/expobanner/paid_list.html +++ b/templates/c_admin/expobanner/paid_list.html @@ -54,7 +54,7 @@ {% endblock %} {# pagination #} - {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} + {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/exposition/exposition.html b/templates/c_admin/exposition/exposition.html similarity index 93% rename from templates/admin/exposition/exposition.html rename to templates/c_admin/exposition/exposition.html index 4a1d08e9..ab547093 100644 --- a/templates/admin/exposition/exposition.html +++ b/templates/c_admin/exposition/exposition.html @@ -78,11 +78,11 @@ {# name #} {% with field='name' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# main_title #} {% with field='main_title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# data_begin #}
@@ -194,7 +194,7 @@
{# description #} {% with field='description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# periodic #}
@@ -226,11 +226,11 @@
{# products #} {% with field='products' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# time #} {% with field='time' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -265,19 +265,19 @@
{# price_day #} - {% include 'admin/forms/multilang.html' with field='price_day' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='price_day' form=form languages=languages %} {# price_all #} - {% include 'admin/forms/multilang.html' with field='price_all' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='price_all' form=form languages=languages %} {# pre_condition #} - {% include 'admin/forms/multilang.html' with field='pre_condition' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='pre_condition' form=form languages=languages %} {# price_day_bar #} - {% include 'admin/forms/multilang.html' with field='price_day_bar' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='price_day_bar' form=form languages=languages %} {# price_all_bar #} - {% include 'admin/forms/multilang.html' with field='price_all_bar' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='price_all_bar' form=form languages=languages %} {# stand_condition #} - {% include 'admin/forms/multilang.html' with field='stand_condition' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='stand_condition' form=form languages=languages %} {# price_catalog #}
@@ -292,7 +292,7 @@ {{ form.tax.errors }}
- {% include 'admin/forms/multilang.html' with field='visit_note' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='visit_note' form=form languages=languages %} {# min_closed_area #}
@@ -356,7 +356,7 @@ {{ form.registration_link.errors }}
- {% include 'admin/forms/multilang.html' with field='participation_note' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='participation_note' form=form languages=languages %} {# discount #}
@@ -366,9 +366,9 @@
{# discount_description #} {% with field='discount_description' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} - {% include 'admin/forms/multilang.html' with field='stat_countries' form=form languages=languages %} + {% include 'c_admin/forms/multilang.html' with field='stat_countries' form=form languages=languages %} @@ -574,7 +574,7 @@ - {% include 'admin/includes/photogallery.html' with object=object %} + {% include 'c_admin/includes/photogallery.html' with object=object %}
@@ -584,15 +584,15 @@
{# keywords #} {% with field='keywords' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# title #} {% with field='title' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {# descriptions #} {% with field='descriptions' form=form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
@@ -624,18 +624,18 @@ {% with field='name' form=timetable_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {% with field='programe' form=timetable_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}
{% with field='speaker' form=timetable_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %} {% with field='place' form=timetable_form languages=languages %} - {% include 'admin/forms/multilang.html' %} + {% include 'c_admin/forms/multilang.html' %} {% endwith %}