diff --git a/djadmin2/core.py b/djadmin2/core.py index 18c0fa3..5349a6f 100644 --- a/djadmin2/core.py +++ b/djadmin2/core.py @@ -23,6 +23,7 @@ class Admin2(object): It also provides an index view that serves as an entry point to the admin site. """ index_view = views.IndexView + app_index_view = views.AppIndexView api_index_view = apiviews.IndexAPIView def __init__(self, name='admin2'): @@ -98,6 +99,12 @@ class Admin2(object): 'apps': self.apps, } + def get_app_index_kwargs(self): + return { + 'registry': self.registry, + 'apps': self.apps, + } + def get_api_index_kwargs(self): return { 'registry': self.registry, @@ -106,9 +113,20 @@ class Admin2(object): def get_urls(self): urlpatterns = patterns('', - url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='dashboard'), - url(r'^api/v0/$', - self.api_index_view.as_view(**self.get_api_index_kwargs()), name='api-index'), + url(regex=r'^$', + view=self.index_view.as_view(**self.get_index_kwargs()), + name='dashboard' + ), + url( + regex=r'^(?P\w+)/$', + view=self.app_index_view.as_view(**self.get_app_index_kwargs()), + name='app_index' + ), + url( + regex=r'^api/v0/$', + view=self.api_index_view.as_view(**self.get_api_index_kwargs()), + name='api-index' + ), ) for model, model_admin in self.registry.iteritems(): model_options = utils.model_options(model) diff --git a/djadmin2/templates/admin2/bootstrap/app_index.html b/djadmin2/templates/admin2/bootstrap/app_index.html new file mode 100644 index 0000000..f6a7a36 --- /dev/null +++ b/djadmin2/templates/admin2/bootstrap/app_index.html @@ -0,0 +1,17 @@ +{% extends "admin2/bootstrap/base.html" %} +{% load admin2_tags i18n %} + +{% block breadcrumbs %} +
  • Home /
  • +
  • {{ app_label|title }}
  • +{% endblock %} + +{% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock %} + +{% block content %} +
    +
    + {% include 'admin2/bootstrap/includes/app_model_list.html' %} +
    +
    +{% endblock content %} diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index 40f3b38..bbe98b1 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -44,6 +44,12 @@ + + {% if messages %}