Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-18 15:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
405 commits 3 branches 11 tags 3.7 MiB
Commit graph

86 commits

Author SHA1 Message Date
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
Peter Inglesby
8b6b56a1a8 Add messages to base.html 2013-05-22 11:32:01 +01:00
Peter Inglesby
88c0ce4e9f Remove stray closing tag. 2013-05-22 11:32:01 +01:00
Andrew Ingram
a1ce27d4c2 Improve the rendering of inline form sets 2013-05-22 01:06:25 +01:00
Andrew Ingram
05f69775b2 Merge remote-tracking branch 'origin/develop' into inline-formsets 
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_add_form.html
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
	djadmin2/views.py
 2013-05-22 00:58:53 +01:00
Audrey Roy
b79523c659 Refactor duplicate model add/edit forms. 2013-05-21 15:45:08 -07:00
Audrey Roy
16ceca0dfe Model edit form now reuses save logic 2013-05-21 23:50:50 +02:00
Daniel Greenfeld
ce835ffc79 Merge branch 'feature/save-options' of git://github.com/chrislawlor/django-admin2 into chrislawlor-feature/save-options 2013-05-21 23:18:53 +02:00
Andrew Ingram
c051b8807a Merge remote-tracking branch 'origin/develop' into inline-formsets 2013-05-21 00:11:28 +01:00
Andrew Ingram
262c759604 Merge remote-tracking branch 'origin/develop' into rename-templatetag-module 2013-05-21 00:05:25 +01:00
Andrew Ingram
3dcaeb4023 rename admin2_urls to admin2_tags 2013-05-20 23:45:22 +01:00
Audrey Roy
55168a0ea0 Fix delete text to match original admin. 2013-05-20 23:33:37 +02:00
Chris Lawlor
f9a1540e09 Add 'title' and 'page_title' template blocks. 
Makes template page title styling consistent across all templates.
 2013-05-20 16:17:44 -04:00
Chris Lawlor
32f5e4802f Adds page title to model create page 2013-05-20 09:07:19 -04:00
Chris Lawlor
c6c44bbdd0 Implements model save options, issue #110 2013-05-20 08:45:34 -04:00
Daniel Greenfeld
a2f73e0fb5 Merge pull request #108 from ludw/headerui 
Header UI style
 2013-05-19 15:46:32 -07:00
Daniel Greenfeld
83eb8da62a Merge pull request #107 from ludw/master 
Fixed small issue in modellistview
 2013-05-19 15:45:57 -07:00
Ludvig Wadenstein
7c08296772 Fixed bug with modellist if more than one item 2013-05-19 20:56:41 +02:00
Ludvig Wadenstein
36491b4894 Replaced change password and logout links with dropdown 2013-05-19 20:46:14 +02:00
Andrew Ingram
c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets 
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
 2013-05-19 19:17:51 +01:00
Audrey Roy
b19b477888 Edit form improvement - part of #72 2013-05-19 17:13:20 +02:00
Daniel Greenfeld
4f5eb65d5c Merge pull request #92 from ludw/modellistui 
Modellist UI cleaned up, #78
 2013-05-19 06:05:57 -07:00
Daniel Greenfeld
0c1238dff6 Merge pull request #90 from gregmuellegger/rest-api-integration 
Rest api integration
 2013-05-19 05:48:51 -07:00