From 876cc2c7232f1586ecf4b48dafca2304de9c74bd Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sun, 7 Jul 2013 10:58:35 +0200 Subject: [PATCH] for #268, this adds actions_on_bottom for the default view --- djadmin2/settings.py | 3 ++- .../djadmin2/bootstrap/includes/action_buttons.html | 6 ++++++ .../templates/djadmin2/bootstrap/model_update_form.html | 8 +++----- djadmin2/types.py | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 djadmin2/templates/djadmin2/bootstrap/includes/action_buttons.html diff --git a/djadmin2/settings.py b/djadmin2/settings.py index ec3d674..ec96437 100644 --- a/djadmin2/settings.py +++ b/djadmin2/settings.py @@ -4,6 +4,7 @@ MODEL_ADMIN_ATTRS = ( 'list_display', 'list_display_links', 'list_filter', 'admin', 'search_fields', 'index_view', 'detail_view', 'create_view', 'update_view', 'delete_view', - 'get_default_view_kwargs', 'get_list_actions') + 'get_default_view_kwargs', 'get_list_actions', + 'actions_on_bottom',) ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "djadmin2/bootstrap") diff --git a/djadmin2/templates/djadmin2/bootstrap/includes/action_buttons.html b/djadmin2/templates/djadmin2/bootstrap/includes/action_buttons.html new file mode 100644 index 0000000..2f5a25f --- /dev/null +++ b/djadmin2/templates/djadmin2/bootstrap/includes/action_buttons.html @@ -0,0 +1,6 @@ +{% load i18n %} +
+ + + +
\ No newline at end of file diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html index 815bc57..5ca017b 100644 --- a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html +++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html @@ -73,12 +73,10 @@ {% if object %} {% trans "Delete" %} {% endif %} + {% if view.model_admin.actions_on_bottom %} + {% include "djadmin2/bootstrap/includes/action_buttons.html" %} + {% endif %} -
- - - -
diff --git a/djadmin2/types.py b/djadmin2/types.py index 5047381..0254229 100644 --- a/djadmin2/types.py +++ b/djadmin2/types.py @@ -36,6 +36,7 @@ class ModelAdmin2(object): verbose_name = None verbose_name_plural = None model_admin_attributes = settings.MODEL_ADMIN_ATTRS + actions_on_bottom = True search_fields = []