Commit graph

108 commits

Author SHA1 Message Date
NotSqrt
c132a7cdd0 more details on i18n 2013-07-07 11:00:49 +02:00
NotSqrt
8935395534 work on i18n : add comments for translators, french translation to check the result 2013-07-07 11:00:49 +02:00
Daniel Greenfeld
876cc2c723 for #268, this adds actions_on_bottom for the default view 2013-07-07 10:58:35 +02:00
Daniel Greenfeld
115c7f9a09 Merge branch 'list_filter' of git://github.com/beezz/django-admin2 into beezz-list_filter 2013-07-06 17:59:21 +02:00
Michal Kuffa
0862210d4d Added id to list_filters container 2013-07-06 16:47:11 +02:00
Daniel Greenfeld
847d0ee78f Add an action_name context variable to model form views 2013-07-06 16:39:42 +02:00
Michal Kuffa
d433013fcc Merge remote-tracking branch 'upstream/develop' into list_filter
Conflicts:
	djadmin2/views.py
2013-07-06 16:22:14 +02:00
Michal Kuffa
4522e65ce6 Added list_filter block 2013-07-06 16:07:43 +02:00
Daniel Greenfeld
819f8cd677 merge 2013-07-06 15:42:25 +02:00
bootandy
9f449a6b66 moving templates to djadmin 2013-07-06 15:23:08 +02:00
bootandy
1ef08cc20f first itteration 2013-07-06 15:18:01 +02:00
Danilo Bargen
3c44a8b930 Changed inconsistent use of "login/logout" 2013-07-06 15:02:33 +02:00
NotSqrt
5889c5d849 i18n : fixes for tests -> use string interpolation, not positional interpolation 2013-07-06 13:33:52 +02:00
NotSqrt
5ab4f33b6a check i18n completeness 2013-07-06 13:33:52 +02:00
Danilo Bargen
ce5566be82 Show verbose column name in list view (fixes #236) 2013-07-06 11:53:46 +02:00
Douglas Miranda
1aa9a02957 add a basic style for login form 2013-06-24 23:49:55 -04:00
Ethan Soergel
b0ff9abf5f converted indentation to two spaces in templates 2013-06-24 11:25:42 -04:00
Douglas Miranda
d008b3e842 fix: issue #199 static jQuery version and add jQuery fallback 2013-06-18 21:30:16 -04:00
d1ffuz0r
256efa679e #154 changed fbc action views behavior to cbv. added breadcrumbs to actions with multiple items 2013-06-17 11:56:37 +07:00
Douglas Miranda
2ccb399c11 fix navbar and breadcrumb on the login page - issue #196 2013-06-10 02:02:10 -04:00
Wade Austin
9ea725600f Add search form to model list template. Form is only displayed if search_fields is not None 2013-06-06 12:49:34 -05:00
Daniel Greenfeld
806e032032 fixes #165 we now can control what gets displayed 2013-06-04 21:22:28 +02:00
Daniel Greenfeld
5be8972dac Merge branch 'modellist-170' of git://github.com/ludw/django-admin2 into ludw-modellist-170 2013-06-03 23:26:42 +02:00
Audrey Roy
03d5ed03f5 Fix merge conflict. Remove extrajs block. 2013-06-03 22:51:15 +02:00
paurosello
b0a8594990 Trying to fix issue #173.
Every block is finished with it's own name.
2013-06-03 22:28:41 +02:00
Daniel Greenfeld
d140086dd1 fixes #172 2013-06-03 20:46:17 +02:00
Ludvig Wadenstein
a802dfe8ae Replaced actions select with button dropdown. 2013-06-02 20:58:27 +02:00
Ludvig Wadenstein
574037acfe Chackbox column has apropriate width 2013-06-02 20:18:47 +02:00
Ludvig Wadenstein
c45a544a1d List row links to update or read page based on permissions 2013-06-02 20:17:04 +02:00
Audrey Roy
d72d7e4deb Fix error on create from this form. 2013-06-01 12:54:15 +02:00
Audrey Roy
b389af9bb9 Add delete button to edit form as per issue #72. 2013-05-31 22:21:04 +02:00
Daniel Greenfeld
0da6f453b7 For #161, this removes the FBV and implements an easily extendible BaseListAction class 2013-05-31 16:47:25 +02:00
Daniel Greenfeld
fd6c0a57b3 Added Roman Gladkov as a contributor, PEP8 and djadmin2 standards fixes 2013-05-31 08:36:09 +02:00
d1ffuz0r
db939ef753 fixed names 2013-05-31 08:25:45 +07:00
d1ffuz0r
b8413f96e3 change password form dependent from user 2013-05-31 07:24:22 +07:00
d1ffuz0r
2b172fdcc2 merge from develop 2013-05-31 06:55:34 +07:00
d1ffuz0r
6c0978189a login view 2013-05-31 06:20:39 +07:00
d1ffuz0r
8ae0644fb9 #101 #103 added change password, logout views 2013-05-31 06:19:33 +07:00
Ben Tappin
11f193ffc9 UI improvements when deleting objects.
Shows nested child objects that will be deleted when deleting a single object or multiple objects.

Includes some hacky tests for NestedObjects in the example app.
2013-05-29 12:38:32 +01:00
Gregor Müllegger
2771d160a7 Using new permission handling in templates. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
ab778191c6 Adding the ability to check for permissions in templates. 2013-05-29 10:44:22 +02:00
Andrew Ingram
23b0389c1a Rename app-index view to app_index 2013-05-28 13:24:18 +01:00
Andrew Ingram
9f41c3f56e Initial stab at breadcrumbs
There's currently a lot of copy-pasting of breadcrumbs, this can be revisited once we have a better understanding of how we're going to handle navigation.

I've also tried to make template context variables more logical and consistent throughout.
2013-05-26 01:55:43 +01:00
Andrew Ingram
a4d77a9309 Template internationalization 2013-05-25 18:44:48 +01:00
Ben Tappin
30cacb7569 Use PK instead of ID in the model list view and template. 2013-05-24 12:06:35 +01:00
Daniel Greenfeld
0236a5cc07 small correction on model naming 2013-05-23 22:34:15 +02:00
Daniel Greenfeld
0092325262 Used filters to present results of views better for #128 2013-05-23 20:11:04 +02:00
Daniel Greenfeld
a62d3aceff merge conflict resolutions 2013-05-23 13:01:27 +02:00
Peter Inglesby
ade92956d0 Handle actions by POSTing to ModelListView 2013-05-22 11:32:01 +01:00
Peter Inglesby
79e6dfad83 Add delete_selected action 2013-05-22 11:32:01 +01:00