From 29fc882c4b0fa5e771f823968dbc63b36f2561fb Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sun, 19 May 2013 09:53:37 +0200 Subject: [PATCH] merge from @rivo --- djadmin2/core.py | 2 +- djadmin2/templates/admin2/bootstrap/base.html | 42 ++++++++++++------- djadmin2/views.py | 2 +- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/djadmin2/core.py b/djadmin2/core.py index f0cea10..c3720b0 100644 --- a/djadmin2/core.py +++ b/djadmin2/core.py @@ -45,7 +45,7 @@ class Admin2(object): def get_urls(self): urlpatterns = patterns('', - url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='index'), + url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='dashboard'), ) for model, modeladmin in self.registry.iteritems(): app_label = model._meta.app_label diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index fe38092..231b9a8 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -1,21 +1,33 @@ - - django-admin2 - - - - - -
- {% block content %}{% endblock %} + + - Index -
+ django-admin2 + + + + + +
+
+
+ Django-Admin2 - - - {% block extrajs %}{% endblock %} + +
+
+
- +
+ {% block content %}{% endblock %} +
+ + + + {% block extrajs %}{% endblock %} + + \ No newline at end of file diff --git a/djadmin2/views.py b/djadmin2/views.py index 475f405..00e261a 100644 --- a/djadmin2/views.py +++ b/djadmin2/views.py @@ -129,5 +129,5 @@ class ModelAddFormView(AdminModel2Mixin, generic.CreateView): class ModelDeleteView(AdminModel2Mixin, generic.DeleteView): success_url = "../../" - default_template_name = "model_delete.html" + default_template_name = "model_delete_form.html" permission_type = 'delete'