mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Переименована директория с админовскими шаблонами, дабы небыло конфликтов со стандартной джанговской админкой. Соответственно проведен рефакторинг по всему проекту.

Browse Source 
Включена стандартная джанговская админка.
remotes/origin/stage5
Alexander Burdeiny 10 years ago
parent f06566f636
commit 4b512eb812
211 changed files with 722 additions and 580 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      accounts/admin.py
  2. 10
      article/admin.py
  3. 2
      city/admin.py
  4. 4
      company/admin.py
  5. 4
      conference/admin.py
  6. 6
      core/views.py
  7. 4
      country/admin.py
  8. 2
      emencia/django/newsletter/admin/__init__.py
  9. 2
      emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html
  10. 2
      emencia/django/newsletter/templates/newsletter/contact_import.html
  11. 2
      emencia/django/newsletter/templates/newsletter/newsletter_historic.html
  12. 2
      emencia/django/newsletter/templates/newsletter/newsletter_statistics.html
  13. 6
      emencia/django/newsletter/utils/importation.py
  14. 28
      emencia/django/newsletter/views/admin_views.py
  15. 54
      expobanner/admin.py
  16. 4
      exposition/admin.py
  17. 10
      import_xls/admin.py
  18. 6
      meta/admin.py
  19. 8
      meta/views.py
  20. 6
      organiser/admin.py
  21. 10
      photologue/admin.py
  22. 6
      place_conference/admin.py
  23. 6
      place_exposition/admin.py
  24. 2
      proj/admin.py
  25. 4
      proj/admin_urls.py
  26. 2
      proj/urls.py
  27. 6
      redirects/admin.py
  28. 4
      seminar/admin.py
  29. 6
      service/admin.py
  30. 4
      service/views.py
  31. 2
      settings/admin.py
  32. 22
      specialist_catalog/views.py
  33. 6
      stats_collector/admin.py
  34. 46
      support/dev/settings.py
  35. 79
      support/prod/settings.py
  36. 2
      templates/admin/login.html
  37. 0
      templates/c_admin/accounts/create_admin.html
  38. 0
      templates/c_admin/accounts/registration.html
  39. 4
      templates/c_admin/accounts/user_all.html
  40. 0
      templates/c_admin/accounts/user_change.html
  41. 0
      templates/c_admin/accounts/user_confirm_delete.html
  42. 2
      templates/c_admin/accounts/user_list.html
  43. 2
      templates/c_admin/accounts/user_stat.html
  44. 0
      templates/c_admin/admin_list.html
  45. 4
      templates/c_admin/ajax_error_form.html
  46. 16
      templates/c_admin/article/article_add.html
  47. 0
      templates/c_admin/article/article_admin_list.html
  48. 0
      templates/c_admin/article/article_all.html
  49. 0
      templates/c_admin/article/article_confirm_delete.html
  50. 14
      templates/c_admin/article/blog_form.html
  51. 4
      templates/c_admin/base.html
  52. 0
      templates/c_admin/blog/blog_add.html
  53. 22
      templates/c_admin/city/city_add.html
  54. 4
      templates/c_admin/city/city_all.html
  55. 4
      templates/c_admin/city/city_list.html
  56. 14
      templates/c_admin/company/company.html
  57. 18
      templates/c_admin/company/company_add.html
  58. 2
      templates/c_admin/company/company_all.html
  59. 2
      templates/c_admin/company/company_list.html
  60. 28
      templates/c_admin/conference/conference.html
  61. 22
      templates/c_admin/conference/conference_add.html
  62. 4
      templates/c_admin/conference/conference_all.html
  63. 2
      templates/c_admin/conference/conference_list.html
  64. 24
      templates/c_admin/country/country_add.html
  65. 2
      templates/c_admin/country/country_all.html
  66. 2
      templates/c_admin/country/country_list.html
  67. 0
      templates/c_admin/delete.html
  68. 0
      templates/c_admin/directories/directories_add.html
  69. 0
      templates/c_admin/directories/directories_ajax.html
  70. 4
      templates/c_admin/expobanner/banner_list.html
  71. 0
      templates/c_admin/expobanner/banner_stat.html
  72. 0
      templates/c_admin/expobanner/banners_control.html
  73. 6
      templates/c_admin/expobanner/comment_create.html
  74. 2
      templates/c_admin/expobanner/comment_list.html
  75. 0
      templates/c_admin/expobanner/customer_confirm_delete.html
  76. 2
      templates/c_admin/expobanner/customer_list.html
  77. 0
      templates/c_admin/expobanner/default_form.html
  78. 4
      templates/c_admin/expobanner/default_list.html
  79. 2
      templates/c_admin/expobanner/link_list.html
  80. 6
      templates/c_admin/expobanner/main_list.html
  81. 6
      templates/c_admin/expobanner/main_page_block.html
  82. 4
      templates/c_admin/expobanner/main_stat.html
  83. 0
      templates/c_admin/expobanner/paid_create.html
  84. 2
      templates/c_admin/expobanner/paid_list.html
  85. 0
      templates/c_admin/expobanner/paid_stat.html
  86. 0
      templates/c_admin/expobanner/paid_update.html
  87. 2
      templates/c_admin/expobanner/pcomment_list.html
  88. 0
      templates/c_admin/expobanner/top_create.html
  89. 4
      templates/c_admin/expobanner/top_list.html
  90. 52
      templates/c_admin/exposition/exposition.html
  91. 30
      templates/c_admin/exposition/exposition_add.html
  92. 4
      templates/c_admin/exposition/exposition_all.html
  93. 2
      templates/c_admin/exposition/exposition_list.html
  94. 0
      templates/c_admin/file_list.html
  95. 0
      templates/c_admin/forms/multilang.html
  96. 0
      templates/c_admin/forms/test.html
  97. 0
      templates/c_admin/hvad/change_form.html
  98. 2
      templates/c_admin/hvad/deletion_not_allowed.html
  99. 4
      templates/c_admin/hvad/edit_inline/stacked.html
  100. 2
      templates/c_admin/hvad/edit_inline/tabular.html
  101. Some files were not shown because too many files have changed in this diff Show More

4
accounts/admin.py
Unescape View File

@ -37,7 +37,7 @@ class DeleteAccount(DeleteView):
class UserListView(AdminListView): class UserListView(AdminListView):
template_name = 'admin/accounts/user_list.html' template_name = 'c_admin/accounts/user_list.html'
form_class = UserFilterForm form_class = UserFilterForm
model = User model = User
@ -216,7 +216,7 @@ def change_password(request):
class AccountsStatistic(TemplateView, YearMixin, MonthMixin, DateMixin): class AccountsStatistic(TemplateView, YearMixin, MonthMixin, DateMixin):
queryset = None queryset = None
model = User model = User
template_name = 'admin/accounts/user_stat.html' template_name = 'c_admin/accounts/user_stat.html'
date_field = 'date_joined' date_field = 'date_joined'
def _get_prev_day(self, date=None): def _get_prev_day(self, date=None):

10
article/admin.py
Unescape View File

@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _
class ArticleDeleteView(DeleteView): class ArticleDeleteView(DeleteView):
model = Article model = Article
template_name = "admin/article/article_confirm_delete.html" template_name = "c_admin/article/article_confirm_delete.html"
def get_success_url(self): def get_success_url(self):
if self.object.type == 1: if self.object.type == 1:
@ -132,7 +132,7 @@ from forms import BlogForm
class BlogList(ListView): class BlogList(ListView):
model = Article model = Article
template_name = 'admin/article/article_admin_list.html' template_name = 'c_admin/article/article_admin_list.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self): def get_queryset(self):
@ -146,7 +146,7 @@ class BlogList(ListView):
class BlogView(FormView): class BlogView(FormView):
form_class = BlogForm form_class = BlogForm
template_name = 'admin/article/blog_form.html' template_name = 'c_admin/article/blog_form.html'
success_url = '/admin/article/blog/all/' success_url = '/admin/article/blog/all/'
obj = None obj = None
@ -230,7 +230,7 @@ class NewsList(ListView):
class NewsView(BlogView): class NewsView(BlogView):
form_class = NewsForm form_class = NewsForm
template_name = 'admin/article/blog_form.html' template_name = 'c_admin/article/blog_form.html'
success_url = '/admin/article/news/all/' success_url = '/admin/article/news/all/'
obj = None obj = None
@ -245,5 +245,5 @@ from forms import BlogForm
class BlogCreate(CreateView): class BlogCreate(CreateView):
model = Blog model = Blog
form_class = BlogForm form_class = BlogForm
template_name = 'admin/blog/blog_add.html' template_name = 'c_admin/blog/blog_add.html'
""" """

2
city/admin.py
Unescape View File

@ -109,6 +109,6 @@ def search_city(request):
return HttpResponse(json.dumps(result), content_type='application/json') return HttpResponse(json.dumps(result), content_type='application/json')
class CityListView(AdminListView): class CityListView(AdminListView):
template_name = 'admin/city/city_list.html' template_name = 'c_admin/city/city_list.html'
form_class = CityFilterForm form_class = CityFilterForm
model = City model = City

4
company/admin.py
Unescape View File

@ -116,7 +116,7 @@ def company_change(request, url):
class CompanyListView(AdminListView): class CompanyListView(AdminListView):
template_name = 'admin/company/company_list.html' template_name = 'c_admin/company/company_list.html'
form_class = CompanyFilterForm form_class = CompanyFilterForm
model = Company model = Company
@ -124,7 +124,7 @@ class CompanyListView(AdminListView):
class CompanyView(AdminView): class CompanyView(AdminView):
form_class = CompanyForm form_class = CompanyForm
model = Company model = Company
template_name = 'admin/company/company.html' template_name = 'c_admin/company/company.html'
success_url = '/admin/company/all/' success_url = '/admin/company/all/'
def get_form(self, form_class): def get_form(self, form_class):

4
conference/admin.py
Unescape View File

@ -235,7 +235,7 @@ class ConferenceView(AdminView):
form_class = ConferenceCreateForm form_class = ConferenceCreateForm
model = Conference model = Conference
success_url = '/admin/conference/all/' success_url = '/admin/conference/all/'
template_name = 'admin/conference/conference.html' template_name = 'c_admin/conference/conference.html'
def form_valid(self, form): def form_valid(self, form):
self.set_obj() self.set_obj()
@ -305,7 +305,7 @@ class ConferenceView(AdminView):
class ConferenceListView(AdminListView): class ConferenceListView(AdminListView):
paginate_func = staticmethod(stat_paginate_results) paginate_func = staticmethod(stat_paginate_results)
template_name = 'admin/conference/conference_list.html' template_name = 'c_admin/conference/conference_list.html'
form_class = ConferenceFilterForm form_class = ConferenceFilterForm
model = Conference model = Conference

6
core/views.py
Unescape View File

@ -160,7 +160,7 @@ import datetime
class EditPage(UpdateView): class EditPage(UpdateView):
model = Page model = Page
template_name = 'admin/page/new_page.html' template_name = 'c_admin/page/new_page.html'
form_class = PageForm form_class = PageForm
slug_url_kwarg = 'url' slug_url_kwarg = 'url'
slug_field = 'url' slug_field = 'url'
@ -175,7 +175,7 @@ class EditPage(UpdateView):
class DeletePage(DeleteView): class DeletePage(DeleteView):
template_name = 'admin/page/page_confirm_delete.html' template_name = 'c_admin/page/page_confirm_delete.html'
model = Page model = Page
success_url = reverse_lazy('page_list') success_url = reverse_lazy('page_list')
slug_field = 'url' slug_field = 'url'
@ -183,7 +183,7 @@ class DeletePage(DeleteView):
class PageDetailed(DetailView): class PageDetailed(DetailView):
model = Page model = Page
template_name = 'admin/page/page_template_view.html' template_name = 'c_admin/page/page_template_view.html'
slug_field = 'url' slug_field = 'url'
slug_url_kwarg = 'url' slug_url_kwarg = 'url'

4
country/admin.py
Unescape View File

@ -115,7 +115,7 @@ def country_change(request, url):
class CountryListView(AdminListView): class CountryListView(AdminListView):
template_name = 'admin/country/country_list.html' template_name = 'c_admin/country/country_list.html'
form_class = CountryFilterForm form_class = CountryFilterForm
model = Country model = Country
@ -124,4 +124,4 @@ class CountryListView(AdminListView):
qs = self.model.objects.all() qs = self.model.objects.all()
result = paginate_results(qs, page=self.request.GET.get('page')) result = paginate_results(qs, page=self.request.GET.get('page'))
context['object_list'] = result context['object_list'] = result
return context return context

2
emencia/django/newsletter/admin/__init__.py
Unescape View File

@ -18,7 +18,7 @@ from emencia.django.newsletter.admin.smtpserver import SMTPServerAdmin
from emencia.django.newsletter.admin.mailinglist import MailingListAdmin 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(SMTPServer, SMTPServerAdmin)
admin.site.register(Newsletter, NewsletterAdmin) admin.site.register(Newsletter, NewsletterAdmin)
admin.site.register(MailingList, MailingListAdmin) admin.site.register(MailingList, MailingListAdmin)

2
emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "admin/change_list.html" %} {% extends "c_admin/change_list.html" %}
{% load i18n %} {% load i18n %}
{% block extrahead %} {% block extrahead %}

2
emencia/django/newsletter/templates/newsletter/contact_import.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "admin/base_site.html" %} {% extends "c_admin/base_site.html" %}
{% load i18n adminmedia %} {% load i18n adminmedia %}
{% block breadcrumbs %} {% block breadcrumbs %}

2
emencia/django/newsletter/templates/newsletter/newsletter_historic.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "admin/change_list.html" %} {% extends "c_admin/change_list.html" %}
{% load i18n %} {% load i18n %}
{% block bodyclass %}change-list historic{% endblock %} {% block bodyclass %}change-list historic{% endblock %}

2
emencia/django/newsletter/templates/newsletter/newsletter_statistics.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "admin/base_site.html" %} {% extends "c_admin/base_site.html" %}
{% load i18n %} {% load i18n %}
{% block coltype %}colMS{% endblock %} {% block coltype %}colMS{% endblock %}

6
emencia/django/newsletter/utils/importation.py
Unescape View File

@ -9,7 +9,7 @@ from django.core.validators import validate_email
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _ 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 Contact
from emencia.django.newsletter.models import MailingList from emencia.django.newsletter.models import MailingList
@ -34,8 +34,8 @@ def create_contact(contact_dict, workgroups=[]):
if not created: if not created:
new_tags = contact_dict.get('tags') new_tags = contact_dict.get('tags')
if new_tags: # if new_tags:
Tag.objects.update_tags(contact, '%s, %s' % (contact.tags, new_tags)) # Tag.objects.update_tags(contact, '%s, %s' % (contact.tags, new_tags))
for workgroup in workgroups: for workgroup in workgroups:
workgroup.contacts.add(contact) workgroup.contacts.add(contact)

28
emencia/django/newsletter/views/admin_views.py
Unescape View File

@ -52,7 +52,7 @@ from ..utils.excel import ExcelResponse
class ContactList(FormView): class ContactList(FormView):
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
model = Contact model = Contact
template_name = 'admin/newsletters/contact_list.html' template_name = 'c_admin/newsletters/contact_list.html'
form_class = ContactFilterForm form_class = ContactFilterForm
queryset = Contact.objects.all() queryset = Contact.objects.all()
@ -106,13 +106,13 @@ class ContactQueryDelete(RedirectView):
class DeleteContact(DeleteView): class DeleteContact(DeleteView):
model = Contact model = Contact
success_url = reverse_lazy('newsletters_contact_list') 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): class UpdateContact(UpdateView):
model = ContactSettings model = ContactSettings
form_class = ContactSettingsForm form_class = ContactSettingsForm
template_name = 'admin/newsletters/contact.html' template_name = 'c_admin/newsletters/contact.html'
success_url = '/admin/newsletters/contact/all/' success_url = '/admin/newsletters/contact/all/'
def form_valid(self, form): def form_valid(self, form):
@ -151,7 +151,7 @@ class ExportContacts(FormView):
class ImportContacts(FormView): class ImportContacts(FormView):
form_class = ContactImportForm form_class = ContactImportForm
success_url = reverse_lazy("newsletters_contact_list") 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): def form_valid(self, form):
form.save() form.save()
@ -161,19 +161,19 @@ class ImportContacts(FormView):
class MailingListView(ListView): class MailingListView(ListView):
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
model = MailingList model = MailingList
template_name = 'admin/newsletters/mailing_list.html' template_name = 'c_admin/newsletters/mailing_list.html'
class DeleteMailingList(DeleteView): class DeleteMailingList(DeleteView):
model = MailingList model = MailingList
template_name = 'admin/newsletters/confirm_delete.html' template_name = 'c_admin/newsletters/confirm_delete.html'
success_url = reverse_lazy('newsletters_mailinglist') success_url = reverse_lazy('newsletters_mailinglist')
class MailingListMixin(object): class MailingListMixin(object):
model = MailingList model = MailingList
form_class = MailingListForm 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/' success_url = '/admin/newsletters/mailinglist/all/'
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
@ -216,7 +216,7 @@ class UpdateMailingList(MailingListMixin, UpdateView):
class NewsletterCreate(CreateView): class NewsletterCreate(CreateView):
model = Newsletter model = Newsletter
form_class = NewsletterForm form_class = NewsletterForm
template_name = 'admin/newsletters/newsletter_object.html' template_name = 'c_admin/newsletters/newsletter_object.html'
success_url = '/admin/newsletters/newsletters/all/' success_url = '/admin/newsletters/newsletters/all/'
def get_formset(self): def get_formset(self):
@ -249,7 +249,7 @@ class NewsletterCreate(CreateView):
class NewsletterUpdate(UpdateView): class NewsletterUpdate(UpdateView):
model = Newsletter model = Newsletter
form_class = NewsletterForm form_class = NewsletterForm
template_name = 'admin/newsletters/newsletter_object.html' template_name = 'c_admin/newsletters/newsletter_object.html'
success_url = '/admin/newsletters/newsletters/all/' success_url = '/admin/newsletters/newsletters/all/'
def get_formset(self): def get_formset(self):
@ -287,7 +287,7 @@ class NewsletterUpdate(UpdateView):
class NewsletterListView(ListView): class NewsletterListView(ListView):
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
model = Newsletter model = Newsletter
template_name = 'admin/newsletters/newsletter_list.html' template_name = 'c_admin/newsletters/newsletter_list.html'
success_url = '/admin/newsletters/newsletters/all/' success_url = '/admin/newsletters/newsletters/all/'
@ -308,7 +308,7 @@ def send_test_newsletter(request, pk):
class NewsletterStatistics(DetailView): class NewsletterStatistics(DetailView):
model = Newsletter model = Newsletter
template_name = 'admin/newsletters/newsletter_stat.html' template_name = 'c_admin/newsletters/newsletter_stat.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(NewsletterStatistics, self).get_context_data(**kwargs) context = super(NewsletterStatistics, self).get_context_data(**kwargs)
@ -372,7 +372,7 @@ class NewsletterCancelView(NewsletterCloneView):
class NewsletterHistory(ListView): class NewsletterHistory(ListView):
model = ContactMailingStatus model = ContactMailingStatus
template_name = 'admin/newsletters/newsletter_history.html' template_name = 'c_admin/newsletters/newsletter_history.html'
paginate_by = 50 paginate_by = 50
def get_queryset(self): def get_queryset(self):
@ -399,7 +399,7 @@ class NewsletterHistory(ListView):
class NewsletterDelete(DeleteView): class NewsletterDelete(DeleteView):
model = Newsletter model = Newsletter
template_name = 'admin/newsletters/confirm_delete.html' template_name = 'c_admin/newsletters/confirm_delete.html'
success_url = reverse_lazy('newsletters_newsletters_list') success_url = reverse_lazy('newsletters_newsletters_list')
@ -422,7 +422,7 @@ def count_popups(request):
class PopupStatisticsView(FormView): class PopupStatisticsView(FormView):
form_class = PopupCountFilter form_class = PopupCountFilter
template_name = 'admin/newsletters/popup_count.html' template_name = 'c_admin/newsletters/popup_count.html'
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
form_class = self.get_form_class() form_class = self.get_form_class()

54
expobanner/admin.py
Unescape View File

@ -47,11 +47,11 @@ from settings.models import Html, LandingComment, ParticipationComment
class BannersControl(TemplateView): class BannersControl(TemplateView):
template_name = 'admin/expobanner/banners_control.html' template_name = 'c_admin/expobanner/banners_control.html'
# CREATE VIEWS # CREATE VIEWS
class AbstractCreate(CreateView): class AbstractCreate(CreateView):
template_name = 'admin/expobanner/default_form.html' template_name = 'c_admin/expobanner/default_form.html'
success_url = '/admin/expobanners/banners/control/' success_url = '/admin/expobanners/banners/control/'
@ -83,7 +83,7 @@ class CreateCustomer(AbstractCreate):
# LISTS VIEWS # LISTS VIEWS
class AbstractList(ListView): class AbstractList(ListView):
paginate_by = settings.ADMIN_PAGINATION 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): def get_context_data(self, **kwargs):
context = super(AbstractList, self).get_context_data(**kwargs) context = super(AbstractList, self).get_context_data(**kwargs)
@ -103,7 +103,7 @@ class BannerGroupList(AbstractList):
class BannerList(AbstractList): class BannerList(AbstractList):
model = Banner model = Banner
verbose = _(u'Список банеров') verbose = _(u'Список банеров')
template_name = 'admin/expobanner/banner_list.html' template_name = 'c_admin/expobanner/banner_list.html'
def get_queryset(self): def get_queryset(self):
qs = self.model.objects.filter(group__isnull=False).order_by('-fr') qs = self.model.objects.filter(group__isnull=False).order_by('-fr')
@ -118,7 +118,7 @@ class BannerList(AbstractList):
class LinkList(AbstractList): class LinkList(AbstractList):
model = Banner model = Banner
verbose = _(u'Список ссылок') verbose = _(u'Список ссылок')
template_name = 'admin/expobanner/link_list.html' template_name = 'c_admin/expobanner/link_list.html'
def get_queryset(self): def get_queryset(self):
qs = super(LinkList, self).get_queryset() qs = super(LinkList, self).get_queryset()
@ -129,12 +129,12 @@ class LinkList(AbstractList):
class CustomerList(AbstractList): class CustomerList(AbstractList):
model = Customer model = Customer
verbose = _(u'Список заказчиков') verbose = _(u'Список заказчиков')
template_name = 'admin/expobanner/customer_list.html' template_name = 'c_admin/expobanner/customer_list.html'
# UPDATE VIEWS # UPDATE VIEWS
class AbstractUpdate(UpdateView): class AbstractUpdate(UpdateView):
template_name = 'admin/expobanner/default_form.html' template_name = 'c_admin/expobanner/default_form.html'
success_url = '/admin/expobanners/banners/control/' success_url = '/admin/expobanners/banners/control/'
@ -165,7 +165,7 @@ class UpdateCustomer(AbstractUpdate):
class BannerStat(DetailView): class BannerStat(DetailView):
model = Banner model = Banner
template_name = 'admin/expobanner/banner_stat.html' template_name = 'c_admin/expobanner/banner_stat.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(BannerStat, self).get_context_data(**kwargs) context = super(BannerStat, self).get_context_data(**kwargs)
@ -192,7 +192,7 @@ class BannerStat(DetailView):
# DELETE views # DELETE views
############################################################################### ###############################################################################
class DeleteCustomer(DeleteView): class DeleteCustomer(DeleteView):
template_name = 'admin/expobanner/customer_confirm_delete.html' template_name = 'c_admin/expobanner/customer_confirm_delete.html'
model = Customer model = Customer
success_url = reverse_lazy('expobanner-customer_list') success_url = reverse_lazy('expobanner-customer_list')
# slug_field = 'url' # slug_field = 'url'
@ -205,7 +205,7 @@ class DeleteCustomer(DeleteView):
class CommentMixin(object): class CommentMixin(object):
form_class = CommentForm form_class = CommentForm
model = LandingComment model = LandingComment
template_name = 'admin/expobanner/comment_create.html' template_name = 'c_admin/expobanner/comment_create.html'
success_url = reverse_lazy('expobaner-comment_list') success_url = reverse_lazy('expobaner-comment_list')
def get_context_data(self, *args, **kwargs): def get_context_data(self, *args, **kwargs):
@ -224,14 +224,14 @@ class ParticipationMixin(CommentMixin):
class CommentList(CommentMixin, ListView): class CommentList(CommentMixin, ListView):
template_name = 'admin/expobanner/comment_list.html' template_name = 'c_admin/expobanner/comment_list.html'
def get_queryset(self): def get_queryset(self):
return self.model.objects.language() return self.model.objects.language()
class ParticipationCommentList(ParticipationMixin, CommentList): class ParticipationCommentList(ParticipationMixin, CommentList):
template_name = 'admin/expobanner/pcomment_list.html' template_name = 'c_admin/expobanner/pcomment_list.html'
class CommentCreate(CommentMixin, CreateView): class CommentCreate(CommentMixin, CreateView):
@ -282,7 +282,7 @@ class PaidList(ListView):
} }
} }
model = None model = None
template_name = 'admin/expobanner/paid_list.html' template_name = 'c_admin/expobanner/paid_list.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get(self, *args, **kwargs): def get(self, *args, **kwargs):
@ -306,7 +306,7 @@ class PaidList(ListView):
class PaidCreate(CreateView): class PaidCreate(CreateView):
form_class = PaidCreateForm form_class = PaidCreateForm
template_name = 'admin/expobanner/paid_create.html' template_name = 'c_admin/expobanner/paid_create.html'
success_url = '/admin/expobanners/paid/list/' success_url = '/admin/expobanners/paid/list/'
@ -318,7 +318,7 @@ class PaidConfCreate(PaidCreate):
class PaidUpdate(UpdateView): class PaidUpdate(UpdateView):
model = Paid model = Paid
form_class = None form_class = None
template_name = 'admin/expobanner/paid_update.html' template_name = 'c_admin/expobanner/paid_update.html'
success_url = '/admin/expobanners/paid/list/' success_url = '/admin/expobanners/paid/list/'
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
@ -358,7 +358,7 @@ def paid_turn(request, pk, status):
class PaidStat(DetailView): class PaidStat(DetailView):
model = Paid model = Paid
template_name = 'admin/expobanner/paid_stat.html' template_name = 'c_admin/expobanner/paid_stat.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(PaidStat, self).get_context_data(**kwargs) context = super(PaidStat, self).get_context_data(**kwargs)
@ -385,7 +385,7 @@ class PaidStat(DetailView):
class MainList(ListView): class MainList(ListView):
model = Exposition model = Exposition
template_name = 'admin/expobanner/main_list.html' template_name = 'c_admin/expobanner/main_list.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self): def get_queryset(self):
@ -397,14 +397,14 @@ class MainList(ListView):
class MainCreate(CreateView): class MainCreate(CreateView):
form_class = MainCreateForm form_class = MainCreateForm
template_name = 'admin/expobanner/paid_create.html' template_name = 'c_admin/expobanner/paid_create.html'
success_url = '/admin/expobanners/main/list/' success_url = '/admin/expobanners/main/list/'
class MainUpdate(UpdateView): class MainUpdate(UpdateView):
model = MainPage model = MainPage
form_class = MainUpdateForm form_class = MainUpdateForm
template_name = 'admin/expobanner/default_form.html' template_name = 'c_admin/expobanner/default_form.html'
success_url = '/admin/expobanners/main/list/' success_url = '/admin/expobanners/main/list/'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -416,7 +416,7 @@ class MainUpdate(UpdateView):
class MainConfList(ListView): class MainConfList(ListView):
model = Conference model = Conference
template_name = 'admin/expobanner/main_list.html' template_name = 'c_admin/expobanner/main_list.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self): def get_queryset(self):
@ -433,7 +433,7 @@ class MainConfList(ListView):
class MainConfCreate(CreateView): class MainConfCreate(CreateView):
form_class = MainConfCreateForm 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') success_url = reverse_lazy('expobanner-conf-list_main')
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -445,7 +445,7 @@ class MainConfCreate(CreateView):
class MainConfUpdate(UpdateView): class MainConfUpdate(UpdateView):
model = MainPage model = MainPage
form_class = MainUpdateForm 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') success_url = reverse_lazy('expobanner-conf-list_main')
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -467,7 +467,7 @@ def main_turn(request, pk, status):
class MainStat(DetailView): class MainStat(DetailView):
model = MainPage model = MainPage
template_name = 'admin/expobanner/main_stat.html' template_name = 'c_admin/expobanner/main_stat.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(MainStat, self).get_context_data(**kwargs) context = super(MainStat, self).get_context_data(**kwargs)
@ -497,7 +497,7 @@ class TopStat(MainStat):
class TopList(ListView): class TopList(ListView):
model = Exposition model = Exposition
template_name = 'admin/expobanner/top_list.html' template_name = 'c_admin/expobanner/top_list.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self): def get_queryset(self):
@ -509,14 +509,14 @@ class TopList(ListView):
class TopCreate(CreateView): class TopCreate(CreateView):
form_class = TopCreateForm form_class = TopCreateForm
template_name = 'admin/expobanner/top_create.html' template_name = 'c_admin/expobanner/top_create.html'
success_url = '/admin/expobanners/top/list/' success_url = '/admin/expobanners/top/list/'
class TopUpdate(UpdateView): class TopUpdate(UpdateView):
model = Top model = Top
form_class = TopUpdateForm form_class = TopUpdateForm
template_name = 'admin/expobanner/top_create.html' template_name = 'c_admin/expobanner/top_create.html'
success_url = '/admin/expobanners/top/list/' success_url = '/admin/expobanners/top/list/'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -529,7 +529,7 @@ class TopUpdate(UpdateView):
class MainPageBlock(UpdateView): class MainPageBlock(UpdateView):
model = Html model = Html
form_class = HtmlForm 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): def get_context_data(self, **kwargs):
context = super(MainPageBlock, self).get_context_data(**kwargs) context = super(MainPageBlock, self).get_context_data(**kwargs)

4
exposition/admin.py
Unescape View File

@ -251,7 +251,7 @@ class ExpositionView(AdminView):
form_class = ExpositionCreateForm form_class = ExpositionCreateForm
model = Exposition model = Exposition
success_url = '/admin/exposition/all/' success_url = '/admin/exposition/all/'
template_name = 'admin/exposition/exposition.html' template_name = 'c_admin/exposition/exposition.html'
def form_valid(self, form): def form_valid(self, form):
self.set_obj() self.set_obj()
@ -342,7 +342,7 @@ class ExpositionView(AdminView):
class ExpositionListView(AdminListView): class ExpositionListView(AdminListView):
paginate_func = staticmethod(stat_paginate_results) paginate_func = staticmethod(stat_paginate_results)
template_name = 'admin/exposition/exposition_list.html' template_name = 'c_admin/exposition/exposition_list.html'
form_class = ExpositionFilterForm form_class = ExpositionFilterForm
model = Exposition model = Exposition

10
import_xls/admin.py
Unescape View File

@ -25,7 +25,7 @@ class ImportView(FormView):
""" """
abstract class abstract class
""" """
template_name = 'admin/import templates/import.html' template_name = 'c_admin/import templates/import.html'
def form_valid(self, form): def form_valid(self, form):
errors = form.save_file() errors = form.save_file()
@ -101,7 +101,7 @@ class ExportCity(ExportView):
class ImportEvent(FormView): class ImportEvent(FormView):
form_class = ImportEventForm form_class = ImportEventForm
success_url = '/admin/import-event/' 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): def form_valid(self, form):
@ -112,7 +112,7 @@ class ImportEvent(FormView):
class ImportPlaceExposition(FormView): class ImportPlaceExposition(FormView):
form_class = ImportPlaceExpositionForm form_class = ImportPlaceExpositionForm
success_url = '/admin/import-place_exposition/' 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): def form_valid(self, form):
errors = form.save_file_debug() errors = form.save_file_debug()
@ -149,13 +149,13 @@ class ExportEvent(ExportView):
class LogList(ListView): class LogList(ListView):
model = Log model = Log
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
template_name = 'admin/import templates/log.html' template_name = 'c_admin/import templates/log.html'
class LogDelete(DeleteView): class LogDelete(DeleteView):
model = Log model = Log
success_url = '/admin/import/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): def log_file(request, log_id):

6
meta/admin.py
Unescape View File

@ -9,7 +9,7 @@ from functions.admin_views import AdminListView, AdminView
class MetaListView(AdminListView): class MetaListView(AdminListView):
template_name = 'admin/meta/meta_list.html' template_name = 'c_admin/meta/meta_list.html'
form_class = MetaFilterForm form_class = MetaFilterForm
model = MetaSetting model = MetaSetting
@ -17,7 +17,7 @@ class MetaView(AdminView):
form_class = MetaForm form_class = MetaForm
model = MetaSetting model = MetaSetting
success_url = '/admin/meta/all/' 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): def form_valid(self, form):
self.set_obj() self.set_obj()
@ -48,4 +48,4 @@ class MetaView(AdminView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(MetaView, self).get_context_data(**kwargs) context = super(MetaView, self).get_context_data(**kwargs)
obj = self.set_obj() obj = self.set_obj()
return context return context

8
meta/views.py
Unescape View File

@ -192,25 +192,25 @@ class MetadataMixin(object):
class CreateSeoText(CreateView): class CreateSeoText(CreateView):
form_class = SeoTextForm form_class = SeoTextForm
model = SeoText 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/' success_url = '/admin/meta/seo/all/'
class SeoTextList(ListView): class SeoTextList(ListView):
model = SeoText model = SeoText
template_name = "admin/meta/seo_admin_list.html" template_name = "c_admin/meta/seo_admin_list.html"
class EditSeoText(UpdateView): class EditSeoText(UpdateView):
form_class = SeoTextForm form_class = SeoTextForm
model = SeoText model = SeoText
template_name = "admin/meta/create_seo_text.html" template_name = "c_admin/meta/create_seo_text.html"
class DeleteSeoText(DeleteView): class DeleteSeoText(DeleteView):
model = SeoText 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/' success_url = '/admin/meta/seo/all/'

6
organiser/admin.py
Unescape View File

@ -8,7 +8,7 @@ from functions.admin_views import AdminListView, AdminView
class OrganiserListView(AdminListView): class OrganiserListView(AdminListView):
template_name = 'admin/organiser/organiser_list.html' template_name = 'c_admin/organiser/organiser_list.html'
form_class = OrganiserFilterForm form_class = OrganiserFilterForm
model = Organiser model = Organiser
@ -16,7 +16,7 @@ class OrganiserView(AdminView):
form_class = OrganiserForm form_class = OrganiserForm
model = Organiser model = Organiser
success_url = '/admin/organiser/all/' success_url = '/admin/organiser/all/'
template_name = 'admin/organiser/organiser.html' template_name = 'c_admin/organiser/organiser.html'
def get_form(self, form_class): def get_form(self, form_class):
if self.request.POST: if self.request.POST:
@ -61,4 +61,4 @@ class OrganiserView(AdminView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(OrganiserView, self).get_context_data(**kwargs) context = super(OrganiserView, self).get_context_data(**kwargs)
context['photo_form'] = PhotoForm() context['photo_form'] = PhotoForm()
return context return context

10
photologue/admin.py
Unescape View File

@ -60,7 +60,7 @@ class AdminViewObject(FormView):
class PhotoView(AdminViewObject): class PhotoView(AdminViewObject):
model = Photo model = Photo
form_class = PhotoForm form_class = PhotoForm
template_name = 'admin/photogallery/admin_photo.html' template_name = 'c_admin/photogallery/admin_photo.html'
success_url = '/admin/photogallery/photo/all/' success_url = '/admin/photogallery/photo/all/'
def get_form(self, form_class): def get_form(self, form_class):
@ -88,7 +88,7 @@ class PhotoView(AdminViewObject):
class GalleryView(AdminViewObject): class GalleryView(AdminViewObject):
model = Gallery model = Gallery
form_class = GalleryForm form_class = GalleryForm
template_name = 'admin/photogallery/admin_gallery.html' template_name = 'c_admin/photogallery/admin_gallery.html'
success_url = '/admin/photogallery/gallery/all/' success_url = '/admin/photogallery/gallery/all/'
def get_form(self, form_class): def get_form(self, form_class):
@ -115,17 +115,17 @@ class GalleryView(AdminViewObject):
class PhotoListView(ListView): class PhotoListView(ListView):
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
model = Photo model = Photo
template_name = 'admin/photogallery/admin_photo_list.html' template_name = 'c_admin/photogallery/admin_photo_list.html'
class GalleryListView(ListView): class GalleryListView(ListView):
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
model = Gallery 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): def delete_photo(request, photo_id):
photo = get_object_or_404(Photo, pk=photo_id) photo = get_object_or_404(Photo, pk=photo_id)
photo.delete() photo.delete()
response = {'success': True} response = {'success': True}
return HttpResponse(json.dumps(response), content_type='application/json') return HttpResponse(json.dumps(response), content_type='application/json')

6
place_conference/admin.py
Unescape View File

@ -196,7 +196,7 @@ class PlaceConferenceView(AdminView):
form_class = ConferenceForm form_class = ConferenceForm
model = PlaceConference model = PlaceConference
success_url = '/admin/place_conference/all/' 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): def get_form(self, form_class):
if self.request.POST: if self.request.POST:
@ -247,6 +247,6 @@ class PlaceConferenceView(AdminView):
return context return context
class PlaceConferenceListView(AdminListView): 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 form_class = PlaceConferenceFilterForm
model = PlaceConference model = PlaceConference

6
place_exposition/admin.py
Unescape View File

@ -199,7 +199,7 @@ class PlaceExpositionView(AdminView):
form_class = ExpositionForm form_class = ExpositionForm
model = PlaceExposition model = PlaceExposition
success_url = '/admin/place_exposition/all/' 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): def get_form(self, form_class):
if self.request.POST: if self.request.POST:
@ -274,7 +274,7 @@ def delete_hall(request, hall_id):
class PlaceExpositionListView(AdminListView): 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 form_class = PlaceExpositionFilter
model = PlaceExposition model = PlaceExposition
@ -305,5 +305,5 @@ def edit_hall(request, place_url, hall_id):
context = {'form': form, 'languages': settings.LANGUAGES} context = {'form': form, 'languages': settings.LANGUAGES}
context.update(csrf(request)) 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)

2
proj/admin.py
Unescape View File

@ -20,7 +20,7 @@ from theme.models import Tag
class AdminIndex(TemplateView): class AdminIndex(TemplateView):
template_name = 'admin/base.html' template_name = 'c_admin/base.html'
def ajax_city(request): def ajax_city(request):

4
proj/admin_urls.py
Unescape View File

@ -5,6 +5,8 @@ from django.contrib.admin.views.decorators import staff_member_required
from functions import required from functions import required
from proj.admin import AdminIndex from proj.admin import AdminIndex
admin.autodiscover()
urlpatterns = required( urlpatterns = required(
staff_member_required, staff_member_required,
@ -61,6 +63,8 @@ urlpatterns = required(
url(r'^ckeditor/', include('ckeditor.urls')), url(r'^ckeditor/', include('ckeditor.urls')),
url(r'^tinymce/', include('tinymce.urls')), url(r'^tinymce/', include('tinymce.urls')),
url(r'^django/', include(admin.site.urls)),
# url(r'^stats/', include('statsy.urls')), # url(r'^stats/', include('statsy.urls')),
) )

2
proj/urls.py
Unescape View File

@ -10,6 +10,7 @@ from django.conf import settings
from django.conf.urls import include, patterns, url from django.conf.urls import include, patterns, url
from django.conf.urls.static import static from django.conf.urls.static import static
from django.contrib.sitemaps import views from django.contrib.sitemaps import views
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from sitemaps import ( from sitemaps import (
Additional, Additional,
@ -66,6 +67,7 @@ urlpatterns += solid_i18n_patterns('',
url(r'^rss/', include('core.urls')), url(r'^rss/', include('core.urls')),
url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}), url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}),
url(r'^admin/', include('proj.admin_urls')), url(r'^admin/', include('proj.admin_urls')),
url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}), url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}),
url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}), url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}),
url(r'^robots.txt$', Robot.as_view()), url(r'^robots.txt$', Robot.as_view()),

6
redirects/admin.py
Unescape View File

@ -15,7 +15,7 @@ from .forms import RedirectForm, NewUrlForObjectForm
class RedirectMixin(object): class RedirectMixin(object):
form_class = RedirectForm form_class = RedirectForm
model = Redirect 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') success_url = reverse_lazy('redirects-list')
def get_success_url(self): def get_success_url(self):
@ -23,7 +23,7 @@ class RedirectMixin(object):
class RedirectList(RedirectMixin, ListView): class RedirectList(RedirectMixin, ListView):
template_name = 'admin/redirects/list.html' template_name = 'c_admin/redirects/list.html'
class RedirectCreate(RedirectMixin, CreateView): class RedirectCreate(RedirectMixin, CreateView):
@ -40,7 +40,7 @@ class RedirectDelete(RedirectMixin, DeleteView):
class NewUrlForObject(AjaxableResponseMixin, UpdateView): class NewUrlForObject(AjaxableResponseMixin, UpdateView):
template_name = 'admin/redirects/newurlforobject.html' template_name = 'c_admin/redirects/newurlforobject.html'
context_object_name = 'object' context_object_name = 'object'
form_class = NewUrlForObjectForm form_class = NewUrlForObjectForm
slug_field = 'url' slug_field = 'url'

4
seminar/admin.py
Unescape View File

@ -211,6 +211,6 @@ def seminar_change(request, url):
class SeminarListView(AdminListView): class SeminarListView(AdminListView):
template_name = 'admin/seminar/seminar_list.html' template_name = 'c_admin/seminar/seminar_list.html'
form_class = SeminarFilterForm form_class = SeminarFilterForm
model = Seminar model = Seminar

6
service/admin.py
Unescape View File

@ -115,7 +115,7 @@ def get_city(request):
class LinkedServiceUpdateView(UpdateView): class LinkedServiceUpdateView(UpdateView):
form_class = LinkedServiceForm form_class = LinkedServiceForm
model = LinkedService model = LinkedService
template_name = "admin/service/linked_service.html" template_name = "c_admin/service/linked_service.html"
success_url = "/admin/service/control/all/" success_url = "/admin/service/control/all/"
def get_object(self, queryset=None): def get_object(self, queryset=None):
@ -160,12 +160,12 @@ class LinkedServiceUpdateView(UpdateView):
class LinkedServiceList(ListView): class LinkedServiceList(ListView):
model = LinkedService model = LinkedService
template_name = 'admin/service/linked_service_list.html' template_name = 'c_admin/service/linked_service_list.html'
class LinkedServiceDeleteView(DeleteView): class LinkedServiceDeleteView(DeleteView):
model = LinkedService 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' success_url = '/admin/service/test/all'
slug_url_kwarg = 'url' slug_url_kwarg = 'url'

4
service/views.py
Unescape View File

@ -99,7 +99,7 @@ def advertise(request, catalog=None, event_url=None):
from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets
class AbstractOrderListView(ListView): class AbstractOrderListView(ListView):
template_name = 'admin/service/order_list.html' template_name = 'c_admin/service/order_list.html'
paginate_by = 20 paginate_by = 20
class CallBackListView(AbstractOrderListView): class CallBackListView(AbstractOrderListView):
@ -127,4 +127,4 @@ class TicketsListView(AbstractOrderListView):
class Thanks(TemplateView): class Thanks(TemplateView):
template_name = 'client/service/thank_u_page.html' template_name = 'client/service/thank_u_page.html'

2
settings/admin.py
Unescape View File

@ -53,4 +53,4 @@ def main_page(request):
'confrence_themes': list(map(str, confrence_themes.values_list('pk', flat=True))), 'confrence_themes': list(map(str, confrence_themes.values_list('pk', flat=True))),
} }
args.update(csrf(request)) 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)

22
specialist_catalog/views.py
Unescape View File

@ -23,7 +23,7 @@ from .models import _city, _country
class SpecialistCreateView(CreateView): class SpecialistCreateView(CreateView):
form_class = SpecialistForm form_class = SpecialistForm
model = Specialist model = Specialist
template_name = 'admin/specialist/specialist_new.html' template_name = 'c_admin/specialist/specialist_new.html'
success_url = reverse_lazy("specialist_all") success_url = reverse_lazy("specialist_all")
@ -32,7 +32,7 @@ from hvad.utils import get_translation_aware_manager
class SpecialistListView(ListView): class SpecialistListView(ListView):
model = Specialist model = Specialist
template_name = 'admin/specialist/specialist_all.html' template_name = 'c_admin/specialist/specialist_all.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self): def get_queryset(self):
@ -49,7 +49,7 @@ class SpecialistListView(ListView):
class SpecialistUpdateView(UpdateView): class SpecialistUpdateView(UpdateView):
form_class = SpecialistForm form_class = SpecialistForm
model = Specialist model = Specialist
template_name = 'admin/specialist/specialist_new.html' template_name = 'c_admin/specialist/specialist_new.html'
success_url = reverse_lazy("specialist_all") success_url = reverse_lazy("specialist_all")
def get_form(self, form_class): def get_form(self, form_class):
@ -60,7 +60,7 @@ class SpecialistUpdateView(UpdateView):
class SpecialistDeleteView(DeleteView): class SpecialistDeleteView(DeleteView):
model = Specialist 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") success_url = reverse_lazy("specialist_all")
@ -70,14 +70,14 @@ class SpecialistDeleteView(DeleteView):
class CatalogCreateView(CreateView): class CatalogCreateView(CreateView):
form_class = SpecialistCatalogForm form_class = SpecialistCatalogForm
model = SpecialistCatalog model = SpecialistCatalog
template_name = 'admin/specialist/catalog_new.html' template_name = 'c_admin/specialist/catalog_new.html'
success_url = reverse_lazy("catalog_all") success_url = reverse_lazy("catalog_all")
class CatalogListView(ListView): class CatalogListView(ListView):
model = SpecialistCatalog model = SpecialistCatalog
template_name = 'admin/specialist/catalog_all.html' template_name = 'c_admin/specialist/catalog_all.html'
paginate_by = settings.ADMIN_PAGINATION paginate_by = settings.ADMIN_PAGINATION
paginator_class = settings.DEFAULT_PAGINATOR paginator_class = settings.DEFAULT_PAGINATOR
def get_queryset(self): def get_queryset(self):
@ -98,7 +98,7 @@ class CatalogListView(ListView):
class CatalogUpdateView(UpdateView): class CatalogUpdateView(UpdateView):
form_class = SpecialistCatalogForm form_class = SpecialistCatalogForm
model = SpecialistCatalog model = SpecialistCatalog
template_name = 'admin/specialist/catalog_new.html' template_name = 'c_admin/specialist/catalog_new.html'
success_url = reverse_lazy("catalog_all") success_url = reverse_lazy("catalog_all")
def get_form(self, form_class): def get_form(self, form_class):
@ -110,7 +110,7 @@ class CatalogUpdateView(UpdateView):
class CatalogDeleteView(DeleteView): class CatalogDeleteView(DeleteView):
model = SpecialistCatalog 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") success_url = reverse_lazy("catalog_all")
@ -120,7 +120,7 @@ class CatalogDeleteView(DeleteView):
class FeedbackCreateView(CreateView): class FeedbackCreateView(CreateView):
form_class = FeedbackForm form_class = FeedbackForm
model = Feedback model = Feedback
template_name = 'admin/specialist/feedback_new.html' template_name = 'c_admin/specialist/feedback_new.html'
success_url = reverse_lazy("catalog_all") success_url = reverse_lazy("catalog_all")
def get_initial(self): def get_initial(self):
@ -131,7 +131,7 @@ class FeedbackCreateView(CreateView):
class FeedbackUpdateView(UpdateView): class FeedbackUpdateView(UpdateView):
form_class = FeedbackForm form_class = FeedbackForm
model = Feedback model = Feedback
template_name = 'admin/specialist/feedback_new.html' template_name = 'c_admin/specialist/feedback_new.html'
success_url = reverse_lazy("catalog_all") success_url = reverse_lazy("catalog_all")
def get_initial(self): def get_initial(self):
@ -141,7 +141,7 @@ class FeedbackUpdateView(UpdateView):
class FeedbackDeleteView(DeleteView): class FeedbackDeleteView(DeleteView):
model = Feedback 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") success_url = reverse_lazy("catalog_all")

6
stats_collector/admin.py
Unescape View File

@ -96,8 +96,8 @@ class StatBaseView(FormView):
class StatSectionsView(StatBaseView): class StatSectionsView(StatBaseView):
template_name = 'admin/stats/section_stat.html' template_name = 'c_admin/stats/section_stat.html'
ajax_template_name = 'admin/stats/content_type_form.html' ajax_template_name = 'c_admin/stats/content_type_form.html'
form_class = DateFilter form_class = DateFilter
content_form_class = ByContentObjectsFilter content_form_class = ByContentObjectsFilter
@ -232,7 +232,7 @@ class EventStatView(StatBaseView):
form_class = EventsDateFilter form_class = EventsDateFilter
params_form_cls = EventsParamsFilter params_form_cls = EventsParamsFilter
pt_columns = ['content_type', 'object_id'] 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): def get_queryset(self):
return ObjectStats.objects\ return ObjectStats.objects\

46
support/dev/settings.py
Unescape View File

@ -167,29 +167,29 @@ TEMPLATE_DIRS = (
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
# os.path.join(SITE_ROOT, 'templates/debug_toolbar'), # os.path.join(SITE_ROOT, 'templates/debug_toolbar'),
os.path.join(SITE_ROOT, 'templates/admin'), os.path.join(SITE_ROOT, 'templates/c_admin'),
os.path.join(SITE_ROOT, 'templates/admin/accounts'), os.path.join(SITE_ROOT, 'templates/c_admin/accounts'),
os.path.join(SITE_ROOT, 'templates/admin/article'), os.path.join(SITE_ROOT, 'templates/c_admin/article'),
os.path.join(SITE_ROOT, 'templates/admin/country'), os.path.join(SITE_ROOT, 'templates/c_admin/country'),
os.path.join(SITE_ROOT, 'templates/admin/city'), os.path.join(SITE_ROOT, 'templates/c_admin/city'),
os.path.join(SITE_ROOT, 'templates/admin/company'), os.path.join(SITE_ROOT, 'templates/c_admin/company'),
os.path.join(SITE_ROOT, 'templates/admin/conference'), os.path.join(SITE_ROOT, 'templates/c_admin/conference'),
os.path.join(SITE_ROOT, 'templates/admin/directories'), os.path.join(SITE_ROOT, 'templates/c_admin/directories'),
os.path.join(SITE_ROOT, 'templates/admin/exposition'), os.path.join(SITE_ROOT, 'templates/c_admin/exposition'),
os.path.join(SITE_ROOT, 'templates/admin/forms'), os.path.join(SITE_ROOT, 'templates/c_admin/forms'),
os.path.join(SITE_ROOT, 'templates/admin/import templates'), os.path.join(SITE_ROOT, 'templates/c_admin/import templates'),
os.path.join(SITE_ROOT, 'templates/admin/news'), os.path.join(SITE_ROOT, 'templates/c_admin/news'),
os.path.join(SITE_ROOT, 'templates/admin/organiser'), os.path.join(SITE_ROOT, 'templates/c_admin/organiser'),
os.path.join(SITE_ROOT, 'templates/admin/place_conference'), os.path.join(SITE_ROOT, 'templates/c_admin/place_conference'),
os.path.join(SITE_ROOT, 'templates/admin/place_exposition'), os.path.join(SITE_ROOT, 'templates/c_admin/place_exposition'),
os.path.join(SITE_ROOT, 'templates/admin/page'), os.path.join(SITE_ROOT, 'templates/c_admin/page'),
os.path.join(SITE_ROOT, 'templates/admin/photoreport'), os.path.join(SITE_ROOT, 'templates/c_admin/photoreport'),
os.path.join(SITE_ROOT, 'templates/admin/settings'), os.path.join(SITE_ROOT, 'templates/c_admin/settings'),
os.path.join(SITE_ROOT, 'templates/admin/seminar'), os.path.join(SITE_ROOT, 'templates/c_admin/seminar'),
os.path.join(SITE_ROOT, 'templates/admin/service'), os.path.join(SITE_ROOT, 'templates/c_admin/service'),
os.path.join(SITE_ROOT, 'templates/admin/theme'), os.path.join(SITE_ROOT, 'templates/c_admin/theme'),
os.path.join(SITE_ROOT, 'templates/admin/translator'), os.path.join(SITE_ROOT, 'templates/c_admin/translator'),
os.path.join(SITE_ROOT, 'templates/admin/webinar'), os.path.join(SITE_ROOT, 'templates/c_admin/webinar'),
os.path.join(SITE_ROOT, 'templates/client'), os.path.join(SITE_ROOT, 'templates/client'),
os.path.join(SITE_ROOT, 'templates/client/exposition'), os.path.join(SITE_ROOT, 'templates/client/exposition'),

79
support/prod/settings.py
Unescape View File

@ -168,29 +168,29 @@ TEMPLATE_DIRS = (
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
# os.path.join(SITE_ROOT, 'templates/debug_toolbar'), # os.path.join(SITE_ROOT, 'templates/debug_toolbar'),
os.path.join(SITE_ROOT, 'templates/admin'), os.path.join(SITE_ROOT, 'templates/c_admin'),
os.path.join(SITE_ROOT, 'templates/admin/accounts'), os.path.join(SITE_ROOT, 'templates/c_admin/accounts'),
os.path.join(SITE_ROOT, 'templates/admin/article'), os.path.join(SITE_ROOT, 'templates/c_admin/article'),
os.path.join(SITE_ROOT, 'templates/admin/country'), os.path.join(SITE_ROOT, 'templates/c_admin/country'),
os.path.join(SITE_ROOT, 'templates/admin/city'), os.path.join(SITE_ROOT, 'templates/c_admin/city'),
os.path.join(SITE_ROOT, 'templates/admin/company'), os.path.join(SITE_ROOT, 'templates/c_admin/company'),
os.path.join(SITE_ROOT, 'templates/admin/conference'), os.path.join(SITE_ROOT, 'templates/c_admin/conference'),
os.path.join(SITE_ROOT, 'templates/admin/directories'), os.path.join(SITE_ROOT, 'templates/c_admin/directories'),
os.path.join(SITE_ROOT, 'templates/admin/exposition'), os.path.join(SITE_ROOT, 'templates/c_admin/exposition'),
os.path.join(SITE_ROOT, 'templates/admin/forms'), os.path.join(SITE_ROOT, 'templates/c_admin/forms'),
os.path.join(SITE_ROOT, 'templates/admin/import templates'), os.path.join(SITE_ROOT, 'templates/c_admin/import templates'),
os.path.join(SITE_ROOT, 'templates/admin/news'), os.path.join(SITE_ROOT, 'templates/c_admin/news'),
os.path.join(SITE_ROOT, 'templates/admin/organiser'), os.path.join(SITE_ROOT, 'templates/c_admin/organiser'),
os.path.join(SITE_ROOT, 'templates/admin/place_conference'), os.path.join(SITE_ROOT, 'templates/c_admin/place_conference'),
os.path.join(SITE_ROOT, 'templates/admin/place_exposition'), os.path.join(SITE_ROOT, 'templates/c_admin/place_exposition'),
os.path.join(SITE_ROOT, 'templates/admin/page'), os.path.join(SITE_ROOT, 'templates/c_admin/page'),
os.path.join(SITE_ROOT, 'templates/admin/photoreport'), os.path.join(SITE_ROOT, 'templates/c_admin/photoreport'),
os.path.join(SITE_ROOT, 'templates/admin/settings'), os.path.join(SITE_ROOT, 'templates/c_admin/settings'),
os.path.join(SITE_ROOT, 'templates/admin/seminar'), os.path.join(SITE_ROOT, 'templates/c_admin/seminar'),
os.path.join(SITE_ROOT, 'templates/admin/service'), os.path.join(SITE_ROOT, 'templates/c_admin/service'),
os.path.join(SITE_ROOT, 'templates/admin/theme'), os.path.join(SITE_ROOT, 'templates/c_admin/theme'),
os.path.join(SITE_ROOT, 'templates/admin/translator'), os.path.join(SITE_ROOT, 'templates/c_admin/translator'),
os.path.join(SITE_ROOT, 'templates/admin/webinar'), os.path.join(SITE_ROOT, 'templates/c_admin/webinar'),
os.path.join(SITE_ROOT, 'templates/client'), os.path.join(SITE_ROOT, 'templates/client'),
os.path.join(SITE_ROOT, 'templates/client/exposition'), 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',
},
}
}

2
templates/admin/login.html
Unescape View File

@ -100,4 +100,4 @@ But, you can <a href="/logout">logout</a>.<br/><br/>
</div> </div>
{% endif %} {% endif %}
</body> </body>

0
templates/admin/accounts/create_admin.html → templates/c_admin/accounts/create_admin.html
Unescape View File

0
templates/admin/accounts/registration.html → templates/c_admin/accounts/registration.html
Unescape View File

4
templates/admin/accounts/user_all.html → templates/c_admin/accounts/user_all.html
Unescape View File

@ -50,9 +50,9 @@
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>
{% endblock %} {% endblock %}

0
templates/admin/accounts/user_change.html → templates/c_admin/accounts/user_change.html
Unescape View File

0
templates/admin/accounts/user_confirm_delete.html → templates/c_admin/accounts/user_confirm_delete.html
Unescape View File

2
templates/admin/accounts/user_list.html → templates/c_admin/accounts/user_list.html
Unescape View File

@ -73,7 +73,7 @@
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>

2
templates/admin/accounts/user_stat.html → templates/c_admin/accounts/user_stat.html
Unescape View File

@ -1,4 +1,4 @@
{% extends 'admin/base.html' %} {% extends 'c_admin/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% block styles %} {% block styles %}

0
templates/admin/admin_list.html → templates/c_admin/admin_list.html
Unescape View File

4
templates/admin/ajax_error_form.html → templates/c_admin/ajax_error_form.html
Unescape View File

@ -19,11 +19,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>

16
templates/admin/article/article_add.html → templates/c_admin/article/article_add.html
Unescape View File

@ -34,7 +34,7 @@
{# main_title #} {# 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 #} {# theme #}
<div class="control-group {% if form.theme.errors %}error{% endif %}"> <div class="control-group {% if form.theme.errors %}error{% endif %}">
<label class="control-label"><b>{{ form.theme.label }}:</b></label> <label class="control-label"><b>{{ form.theme.label }}:</b></label>
@ -53,7 +53,7 @@
</div> </div>
{# preview #} {# 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 #} {# author #}
<div class="control-group {% if form.author.errors %}error{% endif %}"> <div class="control-group {% if form.author.errors %}error{% endif %}">
@ -64,18 +64,18 @@
</div> </div>
</div> </div>
{# description #} {# 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 #} {# 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 #} {# 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 #} {# 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 %}
</div> </div>
@ -164,11 +164,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>

0
templates/admin/article/article_admin_list.html → templates/c_admin/article/article_admin_list.html
Unescape View File

0
templates/admin/article/article_all.html → templates/c_admin/article/article_all.html
Unescape View File

0
templates/admin/article/article_confirm_delete.html → templates/c_admin/article/article_confirm_delete.html
Unescape View File

14
templates/admin/article/blog_form.html → templates/c_admin/article/blog_form.html
Unescape View File

@ -44,7 +44,7 @@
<div class="box-content"> <div class="box-content">
{# main_title #} {# 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 %}
<div class="control-group {% if form.publish_date.errors %}error{% endif %}"> <div class="control-group {% if form.publish_date.errors %}error{% endif %}">
<label class="control-label"><b>{{ form.publish_date.label }}:</b></label> <label class="control-label"><b>{{ form.publish_date.label }}:</b></label>
@ -111,15 +111,15 @@
</div> </div>
</div> </div>
{# preview #} {# 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 #} {# 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 #} {# 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 #} {# 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 #} {# 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 %}
</div> </div>
</div> </div>
@ -174,7 +174,7 @@
</fieldset> </fieldset>
</form> </form>
{% 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 %} {% endblock %}

4
templates/admin/base.html → templates/c_admin/base.html
Unescape View File

@ -77,9 +77,9 @@
{# Side navigation #} {# Side navigation #}
{% block sidebar %} {% block sidebar %}
{% if user.is_superuser %} {% if user.is_superuser %}
{% include 'admin/includes/admin_nav.html' %} {% include 'c_admin/includes/admin_nav.html' %}
{% else %} {% else %}
{% include 'admin/includes/staff_nav.html' %} {% include 'c_admin/includes/staff_nav.html' %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

0
templates/admin/blog/blog_add.html → templates/c_admin/blog/blog_add.html
Unescape View File

22
templates/admin/city/city_add.html → templates/c_admin/city/city_add.html
Unescape View File

@ -33,7 +33,7 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# population #} {# population #}
<div class="control-group"> <div class="control-group">
@ -56,15 +56,15 @@
</div> </div>
{# region #} {# region #}
{% with field='region' form=form languages=languages %} {% with field='region' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# famous places #} {# famous places #}
{% with field='famous_places' form=form languages=languages %} {% with field='famous_places' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# population #} {# population #}
<div class="control-group"> <div class="control-group">
@ -88,12 +88,12 @@
</div> </div>
{# transport #} {# transport #}
{% with field='transport' form=form languages=languages %} {% with field='transport' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# shoping #} {# shoping #}
{% with field='shoping' form=form languages=languages %} {% with field='shoping' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -150,15 +150,15 @@
</div> </div>
<div class="box-content"> <div class="box-content">
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -200,11 +200,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>

4
templates/admin/city/city_all.html → templates/c_admin/city/city_all.html
Unescape View File

@ -44,8 +44,8 @@ Displays lists of all cities in the table
<a class="btn btn-success" href="/admin/city/add"><i class="icon-plus-sign icon-white"></i> Добавить город</a> <a class="btn btn-success" href="/admin/city/add"><i class="icon-plus-sign icon-white"></i> Добавить город</a>
</div> </div>
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>
{% endblock %} {% endblock %}

4
templates/admin/city/city_list.html → templates/c_admin/city/city_list.html
Unescape View File

@ -49,8 +49,8 @@
<a class="btn btn-success" href="/admin/city/add"><i class="icon-plus-sign icon-white"></i> Добавить город</a> <a class="btn btn-success" href="/admin/city/add"><i class="icon-plus-sign icon-white"></i> Добавить город</a>
</div> </div>
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
{% endblock %} {% endblock %}

14
templates/admin/company/company.html → templates/c_admin/company/company.html
Unescape View File

@ -32,11 +32,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# specialization #} {# specialization #}
{% with field='specialization' form=form languages=languages %} {% with field='specialization' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# country #} {# country #}
<div class="control-group {% if form.country.errors %}error{% endif %}"> <div class="control-group {% if form.country.errors %}error{% endif %}">
@ -82,7 +82,7 @@
</div> </div>
{# address_inf #} {# address_inf #}
{% with field='address_inf' form=form languages=languages %} {% with field='address_inf' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# phone #} {# phone #}
<div class="control-group {% if form.phone.errors %}error{% endif %}"> <div class="control-group {% if form.phone.errors %}error{% endif %}">
@ -128,7 +128,7 @@
</div> </div>
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -185,15 +185,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>

18
templates/admin/company/company_add.html → templates/c_admin/company/company_add.html
Unescape View File

@ -46,11 +46,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# specialization #} {# specialization #}
{% with field='specialization' form=form languages=languages %} {% with field='specialization' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# country #} {# country #}
<div class="control-group {% if form.country.errors %}error{% endif %}"> <div class="control-group {% if form.country.errors %}error{% endif %}">
@ -96,7 +96,7 @@
</div> </div>
{# address_inf #} {# address_inf #}
{% with field='address_inf' form=form languages=languages %} {% with field='address_inf' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# phone #} {# phone #}
<div class="control-group {% if form.phone.errors %}error{% endif %}"> <div class="control-group {% if form.phone.errors %}error{% endif %}">
@ -142,7 +142,7 @@
</div> </div>
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -199,15 +199,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -251,11 +251,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>

2
templates/admin/company/company_all.html → templates/c_admin/company/company_all.html
Unescape View File

@ -44,7 +44,7 @@ Displays lists of all companies in the table
</table> </table>
<a class="btn btn-success" href="/admin/company/add"><i class="icon-plus-sign icon-white"></i> Добавить компанию</a> <a class="btn btn-success" href="/admin/company/add"><i class="icon-plus-sign icon-white"></i> Добавить компанию</a>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>

2
templates/admin/company/company_list.html → templates/c_admin/company/company_list.html
Unescape View File

@ -68,7 +68,7 @@
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>

28
templates/admin/conference/conference.html → templates/c_admin/conference/conference.html
Unescape View File

@ -92,11 +92,11 @@
{{ form.exposition_id }} {{ form.exposition_id }}
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# main_title #} {# main_title #}
{% with field='main_title' form=form languages=languages %} {% with field='main_title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# data_begin #} {# data_begin #}
<div class="control-group {% if form.data_begin.errors %}error{% endif %}"> <div class="control-group {% if form.data_begin.errors %}error{% endif %}">
@ -172,7 +172,7 @@
<div class="box-content"> <div class="box-content">
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# periodic #} {# periodic #}
<div class="control-group {% if form.periodic.errors %}error{% endif %}"> <div class="control-group {% if form.periodic.errors %}error{% endif %}">
@ -205,11 +205,11 @@
</div> </div>
{# main_themes #} {# main_themes #}
{% with field='main_themes' form=form languages=languages %} {% with field='main_themes' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# time #} {# time #}
{% with field='time' form=form languages=languages %} {% with field='time' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# foundation_year #} {# foundation_year #}
<div class="control-group {% if form.foundation_year.errors %}error{% endif %}"> <div class="control-group {% if form.foundation_year.errors %}error{% endif %}">
@ -291,7 +291,7 @@
</div> </div>
{# discount_description #} {# discount_description #}
{% with field='discount_description' form=form languages=languages %} {% with field='discount_description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -455,7 +455,7 @@
</div> </div>
</div> </div>
{% include 'admin/includes/photogallery.html' with object=object %} {% include 'c_admin/includes/photogallery.html' with object=object %}
<div class="box span8"> <div class="box span8">
<div class="box-header well"> <div class="box-header well">
@ -464,15 +464,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -487,7 +487,7 @@
</form> </form>
{% include 'admin/includes/photo_form.html' with form=photo_form object=object %} {% include 'c_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 'c_admin/includes/file_form.html' with file_form=file_form object=object %}
{% include 'admin/includes/stat_form.html' with form=stat_form object=object %} {% include 'c_admin/includes/stat_form.html' with form=stat_form object=object %}
{% endblock %} {% endblock %}

22
templates/admin/conference/conference_add.html → templates/c_admin/conference/conference_add.html
Unescape View File

@ -57,11 +57,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# main_title #} {# main_title #}
{% with field='main_title' form=form languages=languages %} {% with field='main_title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# data_begin #} {# data_begin #}
<div class="control-group {% if form.data_begin.errors %}error{% endif %}"> <div class="control-group {% if form.data_begin.errors %}error{% endif %}">
@ -131,7 +131,7 @@
<div class="box-content"> <div class="box-content">
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# web_page #} {# web_page #}
@ -150,11 +150,11 @@
</div> </div>
{# main_themes #} {# main_themes #}
{% with field='main_themes' form=form languages=languages %} {% with field='main_themes' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# time #} {# time #}
{% with field='time' form=form languages=languages %} {% with field='time' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# foundation_year #} {# foundation_year #}
<div class="control-group {% if form.foundation_year.errors %}error{% endif %}"> <div class="control-group {% if form.foundation_year.errors %}error{% endif %}">
@ -237,7 +237,7 @@
</div> </div>
{# discount_description #} {# discount_description #}
{% with field='discount_description' form=form languages=languages %} {% with field='discount_description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -405,15 +405,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -457,11 +457,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>

4
templates/admin/conference/conference_all.html → templates/c_admin/conference/conference_all.html
Unescape View File

@ -66,6 +66,6 @@
<a class="btn btn-success" href="/admin/conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конференцию</a> <a class="btn btn-success" href="/admin/conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конференцию</a>
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>
{% endblock %} {% endblock %}

2
templates/admin/conference/conference_list.html → templates/c_admin/conference/conference_list.html
Unescape View File

@ -99,7 +99,7 @@ td a{
<a class="btn btn-success" href="/admin/conference/"><i class="icon-plus-sign icon-white"></i> {% trans "Добавить конференцию" %}</a> <a class="btn btn-success" href="/admin/conference/"><i class="icon-plus-sign icon-white"></i> {% trans "Добавить конференцию" %}</a>
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
<script> <script>

24
templates/admin/country/country_add.html → templates/c_admin/country/country_add.html
Unescape View File

@ -35,11 +35,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
<div class="control-group {% if form.logo.errors %}error{% endif %}"> <div class="control-group {% if form.logo.errors %}error{% endif %}">
@ -113,7 +113,7 @@
</div> </div>
{# transport #} {# transport #}
{% with field='transport' form=form languages=languages %} {% with field='transport' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -170,7 +170,7 @@
<div class="box-content"> <div class="box-content">
{# rules #} {# rules #}
{% with field='rules' form=form languages=languages %} {% with field='rules' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# time delivery #} {# time delivery #}
<div class="control-group {% if form.time_delivery.errors %}error{% endif %}"> <div class="control-group {% if form.time_delivery.errors %}error{% endif %}">
@ -184,11 +184,11 @@
</div> </div>
{# documents #} {# documents #}
{% with field='documents' form=form languages=languages %} {% with field='documents' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# consulate #} {# consulate #}
{% with field='consulate' form=form languages=languages %} {% with field='consulate' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -200,15 +200,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -252,11 +252,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -272,4 +272,4 @@
</div> </div>
{% endblock %} {% endblock %}

2
templates/admin/country/country_all.html → templates/c_admin/country/country_all.html
Unescape View File

@ -47,7 +47,7 @@ Displays lists of all countries in the table
<a class="btn btn-success" href="/admin/country/add"><i class="icon-plus-sign icon-white"></i> Добавить страну</a> <a class="btn btn-success" href="/admin/country/add"><i class="icon-plus-sign icon-white"></i> Добавить страну</a>
</div> </div>
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>
{% endblock %} {% endblock %}

2
templates/admin/country/country_list.html → templates/c_admin/country/country_list.html
Unescape View File

@ -51,6 +51,6 @@
<a class="btn btn-success" href="/admin/country/add"><i class="icon-plus-sign icon-white"></i> Добавить страну</a> <a class="btn btn-success" href="/admin/country/add"><i class="icon-plus-sign icon-white"></i> Добавить страну</a>
</div> </div>
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
{% endblock %} {% endblock %}

0
templates/admin/delete.html → templates/c_admin/delete.html
Unescape View File

0
templates/admin/directories/directories_add.html → templates/c_admin/directories/directories_add.html
Unescape View File

0
templates/admin/directories/directories_ajax.html → templates/c_admin/directories/directories_ajax.html
Unescape View File

4
templates/admin/expobanner/banner_list.html → templates/c_admin/expobanner/banner_list.html
Unescape View File

@ -59,7 +59,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
</div> </div>
<a href="{% url 'expobanner-baneers_control' %}">Назад к управлению баннерами</a> <a href="{% url 'expobanner-baneers_control' %}">Назад к управлению баннерами</a>
<script> <script>
@ -71,4 +71,4 @@
form.submit() form.submit()
}); });
</script> </script>
{% endblock %} {% endblock %}

0
templates/admin/expobanner/banner_stat.html → templates/c_admin/expobanner/banner_stat.html
Unescape View File

0
templates/admin/expobanner/banners_control.html → templates/c_admin/expobanner/banners_control.html
Unescape View File

6
templates/admin/expobanner/comment_create.html → templates/c_admin/expobanner/comment_create.html
Unescape View File

@ -10,13 +10,13 @@
</div> </div>
<div class="box-content"> <div class="box-content">
{# name #} {# 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 #} {# 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 #} {# 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 #} {# logo #}
<div class="control-group {% if form.logo.errors %}error{% endif %}"> <div class="control-group {% if form.logo.errors %}error{% endif %}">

2
templates/admin/expobanner/comment_list.html → templates/c_admin/expobanner/comment_list.html
Unescape View File

@ -32,6 +32,6 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
{% endblock %} {% endblock %}

0
templates/admin/expobanner/customer_confirm_delete.html → templates/c_admin/expobanner/customer_confirm_delete.html
Unescape View File

2
templates/admin/expobanner/customer_list.html → templates/c_admin/expobanner/customer_list.html
Unescape View File

@ -31,7 +31,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
<a href="{% url 'expobanner-baneers_control' %}">{% trans "Назад к управлению баннерами" %}</a> <a href="{% url 'expobanner-baneers_control' %}">{% trans "Назад к управлению баннерами" %}</a>
{% endblock %} {% endblock %}

0
templates/admin/expobanner/default_form.html → templates/c_admin/expobanner/default_form.html
Unescape View File

4
templates/admin/expobanner/default_list.html → templates/c_admin/expobanner/default_list.html
Unescape View File

@ -28,8 +28,8 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
<a href="{% url 'expobanner-baneers_control' %}">Назад к управлению баннерами</a> <a href="{% url 'expobanner-baneers_control' %}">Назад к управлению баннерами</a>
{% endblock %} {% endblock %}

2
templates/admin/expobanner/link_list.html → templates/c_admin/expobanner/link_list.html
Unescape View File

@ -35,7 +35,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
<a href="{% url 'expobanner-baneers_control' %}">{% trans "Назад к управлению баннерами" %}</a> <a href="{% url 'expobanner-baneers_control' %}">{% trans "Назад к управлению баннерами" %}</a>
{% endblock %} {% endblock %}

6
templates/admin/expobanner/main_list.html → templates/c_admin/expobanner/main_list.html
Unescape View File

@ -1,4 +1,4 @@
{% extends 'admin/base.html' %} {% extends 'c_admin/base.html' %}
{% block body %} {% block body %}
@ -54,7 +54,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
</div> </div>
<script> <script>
var cbox = $("#public"); var cbox = $("#public");
@ -65,4 +65,4 @@
form.submit() form.submit()
}); });
</script> </script>
{% endblock %} {% endblock %}

6
templates/admin/expobanner/main_page_block.html → templates/c_admin/expobanner/main_page_block.html
Unescape View File

@ -1,4 +1,4 @@
{% extends 'admin/base.html' %} {% extends 'c_admin/base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
@ -12,7 +12,7 @@
<h2><i class="icon-pencil"></i> Блок на главной</h2> <h2><i class="icon-pencil"></i> Блок на главной</h2>
</div> </div>
<div class="box-content"> <div class="box-content">
{% 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 %}
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -23,4 +23,4 @@
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

4
templates/admin/expobanner/main_stat.html → templates/c_admin/expobanner/main_stat.html
Unescape View File

@ -1,4 +1,4 @@
{% extends 'admin/base.html' %} {% extends 'c_admin/base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% block scripts %} {% block scripts %}
@ -83,4 +83,4 @@
console.log("1"); console.log("1");
</script> </script>
{% endblock %} {% endblock %}

0
templates/admin/expobanner/paid_create.html → templates/c_admin/expobanner/paid_create.html
Unescape View File

2
templates/admin/expobanner/paid_list.html → templates/c_admin/expobanner/paid_list.html
Unescape View File

@ -54,7 +54,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
</div> </div>
<script> <script>
var cbox = $("#public"); var cbox = $("#public");

0
templates/admin/expobanner/paid_stat.html → templates/c_admin/expobanner/paid_stat.html
Unescape View File

0
templates/admin/expobanner/paid_update.html → templates/c_admin/expobanner/paid_update.html
Unescape View File

2
templates/admin/expobanner/pcomment_list.html → templates/c_admin/expobanner/pcomment_list.html
Unescape View File

@ -32,6 +32,6 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
{% endblock %} {% endblock %}

0
templates/admin/expobanner/top_create.html → templates/c_admin/expobanner/top_create.html
Unescape View File

4
templates/admin/expobanner/top_list.html → templates/c_admin/expobanner/top_list.html
Unescape View File

@ -35,7 +35,7 @@
{% endblock %} {% endblock %}
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
</div> </div>
<script> <script>
var cbox = $("#public"); var cbox = $("#public");
@ -46,4 +46,4 @@
form.submit() form.submit()
}); });
</script> </script>
{% endblock %} {% endblock %}

52
templates/admin/exposition/exposition.html → templates/c_admin/exposition/exposition.html
Unescape View File

@ -78,11 +78,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# main_title #} {# main_title #}
{% with field='main_title' form=form languages=languages %} {% with field='main_title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# data_begin #} {# data_begin #}
<div class="control-group {% if form.data_begin.errors %}error{% endif %}"> <div class="control-group {% if form.data_begin.errors %}error{% endif %}">
@ -194,7 +194,7 @@
<div class="box-content"> <div class="box-content">
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# periodic #} {# periodic #}
<div class="control-group {% if form.periodic.errors %}error{% endif %}"> <div class="control-group {% if form.periodic.errors %}error{% endif %}">
@ -226,11 +226,11 @@
</div> </div>
{# products #} {# products #}
{% with field='products' form=form languages=languages %} {% with field='products' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# time #} {# time #}
{% with field='time' form=form languages=languages %} {% with field='time' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -265,19 +265,19 @@
</div> </div>
{# price_day #} {# 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 #} {# 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 #} {# 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 #} {# 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 #} {# 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 #} {# 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 #} {# price_catalog #}
<div class="control-group {% if form.price_catalog.errors %}error{% endif %}"> <div class="control-group {% if form.price_catalog.errors %}error{% endif %}">
<label class="control-label">{{ form.price_catalog.label }}:</label> <label class="control-label">{{ form.price_catalog.label }}:</label>
@ -292,7 +292,7 @@
<span class="help-inline">{{ form.tax.errors }}</span> <span class="help-inline">{{ form.tax.errors }}</span>
</div> </div>
</div> </div>
{% 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 #} {# min_closed_area #}
<div class="control-group {% if form.min_closed_area.errors %}error{% endif %}"> <div class="control-group {% if form.min_closed_area.errors %}error{% endif %}">
<label class="control-label">{{ form.min_closed_area.label }}:</label> <label class="control-label">{{ form.min_closed_area.label }}:</label>
@ -356,7 +356,7 @@
<span class="help-inline">{{ form.registration_link.errors }}</span> <span class="help-inline">{{ form.registration_link.errors }}</span>
</div> </div>
</div> </div>
{% 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 #} {# discount #}
<div class="control-group {% if form.discount.errors %}error{% endif %}"> <div class="control-group {% if form.discount.errors %}error{% endif %}">
<label class="control-label">{{ form.discount.label }}:</label> <label class="control-label">{{ form.discount.label }}:</label>
@ -366,9 +366,9 @@
</div> </div>
{# discount_description #} {# discount_description #}
{% with field='discount_description' form=form languages=languages %} {% with field='discount_description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% 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 %}
</div> </div>
</div> </div>
@ -574,7 +574,7 @@
</div> </div>
</div> </div>
{% include 'admin/includes/photogallery.html' with object=object %} {% include 'c_admin/includes/photogallery.html' with object=object %}
<div class="box span8"> <div class="box span8">
@ -584,15 +584,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -624,18 +624,18 @@
</div> </div>
</div> </div>
{% with field='name' form=timetable_form languages=languages %} {% with field='name' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='programe' form=timetable_form languages=languages %} {% with field='programe' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
<div> <div>
{% with field='speaker' form=timetable_form languages=languages %} {% with field='speaker' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='place' form=timetable_form languages=languages %} {% with field='place' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
<!-- <!--
<div class="control-group"> <div class="control-group">
@ -661,7 +661,7 @@
</div> </div>
</div> </div>
{% include 'admin/includes/photo_form.html' with form=photo_form object=object %} {% include 'c_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 'c_admin/includes/file_form.html' with file_form=file_form object=object %}
{% include 'admin/includes/stat_form.html' with form=stat_form object=object %} {% include 'c_admin/includes/stat_form.html' with form=stat_form object=object %}
{% endblock %} {% endblock %}

30
templates/admin/exposition/exposition_add.html → templates/c_admin/exposition/exposition_add.html
Unescape View File

@ -83,11 +83,11 @@
{# name #} {# name #}
{% with field='name' form=form languages=languages %} {% with field='name' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# main_title #} {# main_title #}
{% with field='main_title' form=form languages=languages %} {% with field='main_title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# data_begin #} {# data_begin #}
<div class="control-group {% if form.data_begin.errors %}error{% endif %}"> <div class="control-group {% if form.data_begin.errors %}error{% endif %}">
@ -185,7 +185,7 @@
<div class="box-content"> <div class="box-content">
{# description #} {# description #}
{% with field='description' form=form languages=languages %} {% with field='description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# periodic #} {# periodic #}
<div class="control-group {% if form.periodic.errors %}error{% endif %}"> <div class="control-group {% if form.periodic.errors %}error{% endif %}">
@ -210,11 +210,11 @@
</div> </div>
{# products #} {# products #}
{% with field='products' form=form languages=languages %} {% with field='products' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# time #} {# time #}
{% with field='time' form=form languages=languages %} {% with field='time' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -355,7 +355,7 @@
</div> </div>
{# discount_description #} {# discount_description #}
{% with field='discount_description' form=form languages=languages %} {% with field='discount_description' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -564,15 +564,15 @@
<div class="box-content"> <div class="box-content">
{# keywords #} {# keywords #}
{% with field='keywords' form=form languages=languages %} {% with field='keywords' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# title #} {# title #}
{% with field='title' form=form languages=languages %} {% with field='title' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# descriptions #} {# descriptions #}
{% with field='descriptions' form=form languages=languages %} {% with field='descriptions' form=form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
@ -616,11 +616,11 @@
</div> </div>
{# file_name #} {# file_name #}
{% with field='file_name' form=file_form languages=languages %} {% with field='file_name' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{# file_description #} {# file_description #}
{% with field='description' form=file_form languages=languages %} {% with field='description' form=file_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
</div> </div>
@ -655,18 +655,18 @@
</div> </div>
</div> </div>
{% with field='name' form=timetable_form languages=languages %} {% with field='name' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='programe' form=timetable_form languages=languages %} {% with field='programe' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
<div> <div>
{% with field='speaker' form=timetable_form languages=languages %} {% with field='speaker' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
{% with field='place' form=timetable_form languages=languages %} {% with field='place' form=timetable_form languages=languages %}
{% include 'admin/forms/multilang.html' %} {% include 'c_admin/forms/multilang.html' %}
{% endwith %} {% endwith %}
<!-- <!--
<div class="control-group"> <div class="control-group">

4
templates/admin/exposition/exposition_all.html → templates/c_admin/exposition/exposition_all.html
Unescape View File

@ -70,6 +70,6 @@ td a{
<a class="btn btn-success" href="/admin/exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставку</a> <a class="btn btn-success" href="/admin/exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставку</a>
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=objects %}
</div> </div>
{% endblock %} {% endblock %}

2
templates/admin/exposition/exposition_list.html → templates/c_admin/exposition/exposition_list.html
Unescape View File

@ -99,7 +99,7 @@ td a{
<a class="btn btn-success" href="/admin/exposition/"><i class="icon-plus-sign icon-white"></i> {% trans "Добавить выставку" %}</a> <a class="btn btn-success" href="/admin/exposition/"><i class="icon-plus-sign icon-white"></i> {% trans "Добавить выставку" %}</a>
</div> </div>
{# pagination #} {# pagination #}
{% include 'admin/includes/admin_pagination.html' with page_obj=object_list %} {% include 'c_admin/includes/admin_pagination.html' with page_obj=object_list %}
</div> </div>
<script> <script>

0
templates/admin/file_list.html → templates/c_admin/file_list.html
Unescape View File

0
templates/admin/forms/multilang.html → templates/c_admin/forms/multilang.html
Unescape View File

0
templates/admin/forms/test.html → templates/c_admin/forms/test.html
Unescape View File

0
templates/admin/hvad/change_form.html → templates/c_admin/hvad/change_form.html
Unescape View File

2
templates/admin/hvad/deletion_not_allowed.html → templates/c_admin/hvad/deletion_not_allowed.html
Unescape View File

@ -1,4 +1,4 @@
{% extends "admin/base_site.html" %} {% extends "c_admin/base_site.html" %}
{% load i18n %} {% load i18n %}
{% block breadcrumbs %} {% block breadcrumbs %}

4
templates/admin/hvad/edit_inline/stacked.html → templates/c_admin/hvad/edit_inline/stacked.html
Unescape View File

@ -1,7 +1,7 @@
{% load i18n %} {% load i18n %}
<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group"> <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
<h2>{{ inline_admin_formset.opts.verbose_name_plural|title }}</h2> <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }}</h2>
{% include "admin/hvad/includes/translation_tabs.html" %} {% include "c_admin/hvad/includes/translation_tabs.html" %}
{{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.management_form }}
{{ inline_admin_formset.formset.non_form_errors }} {{ inline_admin_formset.formset.non_form_errors }}
@ -12,7 +12,7 @@
</h3> </h3>
{% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %} {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
{% for fieldset in inline_admin_form %} {% for fieldset in inline_admin_form %}
{% include "admin/includes/fieldset.html" %} {% include "c_admin/includes/fieldset.html" %}
{% endfor %} {% endfor %}
{% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
{{ inline_admin_form.fk_field.field }} {{ inline_admin_form.fk_field.field }}

2
templates/admin/hvad/edit_inline/tabular.html → templates/c_admin/hvad/edit_inline/tabular.html
Unescape View File

@ -6,7 +6,7 @@
<a name="{{ inline_admin_formset.opts.verbose_name|slugify }}"></a> <a name="{{ inline_admin_formset.opts.verbose_name|slugify }}"></a>
<h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2> <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
{{ inline_admin_formset.formset.non_form_errors }} {{ inline_admin_formset.formset.non_form_errors }}
{% include "admin/hvad/includes/translation_tabs.html" %} {% include "c_admin/hvad/includes/translation_tabs.html" %}
<table> <table>
<thead><tr> <thead><tr>
{% for field in inline_admin_formset.fields %} {% for field in inline_admin_formset.fields %}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save