diff --git a/import_xls/excel_settings.py b/import_xls/excel_settings.py index 43b583a5..43a30a4d 100644 --- a/import_xls/excel_settings.py +++ b/import_xls/excel_settings.py @@ -64,6 +64,7 @@ def get_quality(value, field): place_settings=[ {'name': 'id', 'verbose_name': u'id', 'type': get_int, 'width':1500}, + {'name': 'url', 'verbose_name': u'URL', 'type': unicode}, {'name': 'name', 'verbose_name': u'Название', 'type': unicode}, {'name': 'type', 'verbose_name': u'Тип', 'type': get_place_type},########## {'name': 'main_title', 'verbose_name': u'Краткое описание', 'type': unicode}, diff --git a/proj/admin.py b/proj/admin.py index 3258345e..39bccbc2 100644 --- a/proj/admin.py +++ b/proj/admin.py @@ -3,8 +3,7 @@ from django.shortcuts import render_to_response from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.contrib.contenttypes.models import ContentType from django.conf import settings -from django.contrib.auth.decorators import login_required -from django.contrib.admin.views.decorators import staff_member_required +from django.views.generic import TemplateView from file.models import TmpFile, FileModel from file.forms import FileModelForm, FileForm from city.models import City @@ -14,8 +13,9 @@ from django.db.models.loading import get_model -def admin_home(request): - return render_to_response('base.html') +class AdminIndex(TemplateView): + template_name = 'admin/base.html' + def ajax_city(request): """ diff --git a/proj/admin_urls.py b/proj/admin_urls.py index 2ceee92f..b9684a90 100644 --- a/proj/admin_urls.py +++ b/proj/admin_urls.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url +from proj.admin import AdminIndex from functions import required from django.contrib.admin.views.decorators import staff_member_required @@ -8,7 +9,7 @@ from django.contrib.admin.views.decorators import staff_member_required urlpatterns = required( staff_member_required, patterns('', - url(r'^$', 'proj.admin.admin_home'), + url(r'^$', AdminIndex.as_view()), url(r'^', include('import_xls.admin_urls')), url(r'^accounts/', include('accounts.admin_urls')), url(r'^article/', include('article.admin_urls')), diff --git a/templates/admin/includes/staff_nav.html b/templates/admin/includes/staff_nav.html index 82b42488..e37b5db2 100644 --- a/templates/admin/includes/staff_nav.html +++ b/templates/admin/includes/staff_nav.html @@ -9,6 +9,7 @@
  • Конференция
  • Семинар
  • Вебинар
  • +
  • Место проведения выставки
  • diff --git a/templates/client/404_test.html b/templates/client/404_test.html index 5a9be769..4f39bb6b 100644 --- a/templates/client/404_test.html +++ b/templates/client/404_test.html @@ -2,7 +2,7 @@ {% block content_list %}
    Страница не найдена
    - +