Commit Graph

285 Commits

Author SHA1 Message Date
Jannis Leidel afa4c5ac60 Fixed #10615 - Added selection counter to admin change list. Thanks to Martin Mahner for the idea and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-05 18:24:27 +00:00
Brian Rosner bcd9482a20 Fixed #342 -- added readonly_fields to ModelAdmin. Thanks Alex Gaynor for bootstrapping the patch.
ModelAdmin has been given a readonly_fields that allow field and calculated
values to be displayed alongside editable fields. This works on model
add/change pages and inlines.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 18:29:00 +00:00
Jannis Leidel 9233d04265 Fixed #7980 - Improved i18n framework to support locale aware formatting (dates and numbers) and form processing.
Thanks to Marc Garcia for working on this during his Google Summer of Code 2009!

Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:58:49 +00:00
Luke Plant 8e70cef9b6 Fixed #9977 - CsrfMiddleware gets template tag added, session dependency removed, and turned on by default.
This is a large change to CSRF protection for Django.  It includes:

 * removing the dependency on the session framework.
 * deprecating CsrfResponseMiddleware, and replacing with a core template tag.
 * turning on CSRF protection by default by adding CsrfViewMiddleware to
   the default value of MIDDLEWARE_CLASSES.
 * protecting all contrib apps (whatever is in settings.py)
   using a decorator.

For existing users of the CSRF functionality, it should be a seamless update,
but please note that it includes DEPRECATION of features in Django 1.1,
and there are upgrade steps which are detailed in the docs.

Many thanks to 'Glenn' and 'bthomas', who did a lot of the thinking and work
on the patch, and to lots of other people including Simon Willison and
Russell Keith-Magee who refined the ideas.

Details of the rationale for these changes is found here:

http://code.djangoproject.com/wiki/CsrfProtection

As of this commit, the CSRF code is mainly in 'contrib'.  The code will be
moved to core in a separate commit, to make the changeset as readable as
possible.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 23:23:07 +00:00
Luke Plant 18a67e1069 Fixed #11591: invalid HTML in tabular.html.
Thanks rlaager(at)wiktel.com



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 16:12:08 +00:00
Karen Tracey eaf1f7d6e3 Fixed #11534: Improved wording for admin delete confirmation. Thanks hanksims and others who reported this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 17:16:29 +00:00
Russell Keith-Magee 8d48eaa064 Fixed #10061 -- Added namespacing for named URLs - most importantly, for the admin site, where the absence of this facility was causing problems. Thanks to the many people who contributed to and helped review this patch.
This change is backwards incompatible for anyone that is using the named URLs
introduced in [9739]. Any usage of the old admin_XXX names need to be modified
to use the new namespaced format; in many cases this will be as simple as a
search & replace for "admin_" -> "admin:". See the docs for more details on
the new URL names, and the namespace resolution strategy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 16:16:13 +00:00
Russell Keith-Magee 708bc80ba6 Fixed #11271 -- Added a translation marker for the list_editable save button. Thanks to dc for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06 13:43:44 +00:00
Jacob Kaplan-Moss f7d01c49e9 Fixed #10651: fixed a javascript error on the admin user add form. Thanks, seanl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-08 12:57:57 +00:00
Russell Keith-Magee e2d66e7d03 Fixed #10959 -- Changed the admin search button text to make it clearer in the UI, and to disambiguate during translation. Thanks to Ramiro Morales for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-05 22:26:01 +00:00
Russell Keith-Magee 9d28568cb4 Fixed #10275 -- Corrected the edge case of rendering a LogEntry with a contenttype of None. Thanks to Jarek Zgoda for the report, and Peter Bengtsson for the patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-05 11:52:03 +00:00
Russell Keith-Magee 80a54dd23b Fixed #9362 -- Prevented inline forms from overwriting the content_type_id attribute on objets being inlined. Thanks to carljm for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-03 13:38:36 +00:00
Russell Keith-Magee 2c24bba934 Fixed #8903 -- Corrected rendering of admin inline formsets (tabular and stacked) when the inline model has a custom non-autofield primary key. Thanks to dgouldin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-03 13:37:20 +00:00
Malcolm Tredinnick 86b6db591c Fixed #9420 -- Fixed admin templates CSS.
Removed some unconditional, invalid, IE-specific notations that were
protecting IE 5 users. IE 5 is sufficiently old, we don't really need to
do that and helping that small userbase at the expense of everybody else
was a slight priority inversion.

Patch from G2P and reviwed by Wilson Miner (who made the original
changes).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-19 03:06:29 +00:00
Jacob Kaplan-Moss bb15cee58a Made a bunch of improvements to admin actions. Be warned: this includes one minor but BACKWARDS-INCOMPATIBLE change.
These changes are:

    * BACKWARDS-INCOMPATIBLE CHANGE: action functions and action methods now share the same signature: `(modeladmin, request, queryset)`. Actions defined as methods stay the same, but if you've defined an action as a standalone function you'll now need to add that first `modeladmin` argument.
    * The delete selected action is now a standalone function registered site-wide; this makes disabling it easy.
    * Fixed #10596: there are now official, documented `AdminSite` APIs for dealing with actions, including a method to disable global actions. You can still re-enable globally-disabled actions on a case-by-case basis.
    * Fixed #10595: you can now disable actions for a particular `ModelAdmin` by setting `actions` to `None`.
    * Fixed #10734: actions are now sorted (by name).
    * Fixed #10618: the action is now taken from the form whose "submit" button you clicked, not arbitrarily the last form on the page.
    * All of the above is documented and tested.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-06 20:23:33 +00:00
Jacob Kaplan-Moss 4e035a03b6 Fixed #8749: add better breadcrumbs in the change password template. Thanks, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 23:00:55 +00:00
Jacob Kaplan-Moss 44f3080226 Fixed #10505: added support for bulk admin actions, including a globally-available "delete selected" action. See the documentation for details.
This work started life as Brian Beck's "django-batchadmin." It was rewritten for inclusion in Django by Alex Gaynor, Jannis Leidel (jezdez), and Martin Mahner (bartTC). Thanks, guys!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 20:22:56 +00:00
Jacob Kaplan-Moss 7bc0878922 Fixed #8939: added a `list_editable` option to `ModelAdmin`; fields declared `list_editable` may be edited, in bulk, on the changelist page. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-17 20:51:47 +00:00
Russell Keith-Magee 8569157664 Fixed #9276 -- Corrected the way the CSS class is rolled out in a stacked edit-inline template. Thanks to creecode@gmail.com for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 08:05:40 +00:00
Luke Plant a754165a91 Fixed #9637: Use 'block.super' in admin 'extrastyle' blocks to preserve changes in base_site.html
The current admin templates do not need this.  However, a common way to customize admin
appearance is to provide your own 'base_site.html' template, and add stylesheets using
the extrastyle block.  Without this patch, these customizations are lost.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@9690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-27 00:01:11 +00:00
Gary Wilson Jr fa7aa7255c Fixed #9732 -- Added missing close paragraph tag to password reset confirmation template, thanks casseen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 05:41:28 +00:00
Wilson Miner 21e86f2af2 Updated stylesheet link on the change password form.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-16 00:09:39 +00:00
Wilson Miner 902df97f36 Removed the hidden import rules in the contrib.admin stylesheets. Each individual stylesheet is now linked to explicitly from the template where it's used (in the extrastyle block), with the exception of widgets.css, which is imported by forms.css, but still available separately for reuse. Also moved the override stylesheets (IE and RTL) below the extrastyle block and all styles within the conditional comment which blocks CSS from IE5 and lower.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-16 00:08:48 +00:00
Karen Tracey c367e2869e Fixed #9514 -- Made admin change_form template correctly recognize/report when a form has only a single error.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-09 18:51:28 +00:00
Wilson Miner 6b82c386f6 Applied contrib.admin IE CSS patches to IE6 and 7, and added simple hacks to filter some rules to both and some only to IE6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 23:44:24 +00:00
Wilson Miner 50535505a9 Added IE conditional comments to contrib.admin base template to block CSS from IE5 and lower and serve a patch to IE6 with IE conditional comments. Removed dependency on CSS hacks and empty null.css file.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 23:01:38 +00:00
Brian Rosner 0ea15f5650 Fixed #8882 -- When a foreign key is among the unique_together fields in an inline formset properly handle it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-31 22:07:05 +00:00
Karen Tracey 03070a9955 Fixed #7179 -- Changed breadcrumbs on the add page so that a link to the change view is not included when the user doesn't have permission for that view. Also added tests to ensure the link is not there when it shouldn't be, and there when it should be. Thanks for the report & patch alen__ribic.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 19:14:24 +00:00
Brian Rosner 5e5af8a8aa Display non_field_errors of inline forms in the admin. This was a presentation bug.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-21 20:25:45 +00:00
Karen Tracey 0ededc611f Fixed 8984: Only include a "Documentation" link on change password and change password done pages if admin docs have been configured.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-21 16:15:09 +00:00
Adrian Holovaty 6bdb7b9529 Fixed #8172 -- Improved a whole bunch of contrib templates (admin, databrowse, admindocs, etc.) to remove unnecessary 'escape' filters, given autoescaping. Also removed unnecessary {% if %} tags and shortened some {% if %}/{% else %} tags to use {% firstof %}. Thanks for the patch, benspaulding
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-08 05:19:28 +00:00
Malcolm Tredinnick 42393ff604 Fixed #8812 -- Fixed up the positioning of the "delete" link in the admin
interface for right-to-left languages (Hebrew, Arabic, etc). Patch from Jannis
Leidel.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-03 04:22:39 +00:00
Jacob Kaplan-Moss 0e5faf225c Security fix. Announcement forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 21:10:00 +00:00
Jacob Kaplan-Moss 7a9b55ddc4 Fixed #2612: fixed display of admin `help_text` with multiple fields on the same line. Thanks to Nathan Borror for the original patch, and jezdez for a little cleanup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 19:25:27 +00:00
Brian Rosner eefec151d1 Fixed #2612 -- Fixed admin formatting when help_text is used with multiple fields on the same line.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 22:59:43 +00:00
Brian Rosner 30c7ce90c5 Fixed #8631 -- Corrected a display issue with the popup submit_row where the Save button would overflow. Thanks btaylordesign for report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 17:13:29 +00:00
Jacob Kaplan-Moss 0871ff2c9c Fixed #7810: added named URLs for admin docs, and use them in the admin base template. Thanks, MattBowen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-29 19:28:53 +00:00
Brian Rosner 5dd68fa74a Marked a couple of unmarked strings in edit_inline templates and corrected a marked string.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 18:15:19 +00:00
Brian Rosner 5a72589d7a Fixed #7984 -- 'View on site' links now work in inlines. Thanks philwo for the report and initial patch by julianb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 18:07:36 +00:00
Brian Rosner 853f4d29b8 Fixed #8547 -- Corrected the breadcrumb display in the object_history.html template. Thanks sorl for catching this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 19:56:14 +00:00
Russell Keith-Magee 78c2c95ed3 Fixed #8129: Modified the password reset email template to use a URL lookup, so that the email doesn't require customization based on the way that the reset view is deployed. Thanks to davenaff for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-24 08:51:33 +00:00
Malcolm Tredinnick b3688e8194 Fixed #7903 -- Allow admin's prepopulated_from to work with TextFields. Patch
from mk and Alex Gaynor.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 22:10:45 +00:00
Malcolm Tredinnick c83a96d298 Tweaked the Admin add/change page so that "save" is still the highlighted
too look like the default button and it actually operates as the defaut
(previously "save and add another" was the default action, which confused
people if you hit the save button and it looked like your work was eaten by a
grue).

Fixed #7272. Patch from Jannis Leidel.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 19:07:49 +00:00
Malcolm Tredinnick cc95b44547 Updated password change template (in admin templates) to use current form
variables (rather than oldforms stuff). Patch from Mike Richardson. Refs #8402.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 18:20:19 +00:00
Russell Keith-Magee 358ba07166 Fixed #7946: Modified object history template to use a common date format. Thanks to Marc Garcia for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 14:23:50 +00:00
Brian Rosner 77c78201b8 Fixed #1390 -- Added an app index in the admin interface. Thanks juliae and ext for their work on patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 04:00:15 +00:00
Brian Rosner d7467a0bfc Fixed #957 -- prepopulated_fields now works correctly on inlines.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:38:39 +00:00
Gary Wilson Jr dd842ad34d Refs #7742 -- Changed the `django.contrib.admin.views.template.template_validator` view to use newforms instead of oldforms.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-11 04:31:55 +00:00
Jacob Kaplan-Moss 88baf06c3d Fixed #7811: moved admindocs templates into admindocs/templates. This is slightly backwards-incompatible in that if you're using the admindocs you'll need to add 'django.contrib.admindocs' to INSTALLED_APPS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-09 15:53:50 +00:00
Brian Rosner 5d199ba901 Fixed #8163 -- Restore oldforms admin styling on input fields. Also cleaned up some styles for both tabular and stacked inlines. Thanks Nathan Borror for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-08 19:54:34 +00:00
Luke Plant 7b4b1309d9 Added a 'name' attribute to the 'Save' button on admin change form
This makes it much easier/possible for testing tools e.g. twill to find
the 'Save' submit button.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@8226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-07 21:18:43 +00:00
Luke Plant 079e5bf1ec Added a login link to the password reset completion screen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 16:13:12 +00:00
Luke Plant fcd837cd0f Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 20:47:53 +00:00
Russell Keith-Magee bf777442fa Fixed #7695 -- Modified template to trust help_text on a model field. Thanks to Ben Spaulding for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-29 13:32:47 +00:00
Luke Plant 3992683ea3 Fixed #6109 again.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-25 14:44:56 +00:00
Brian Rosner a19ed8aea3 Merged the newforms-admin branch into trunk.
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:54:34 +00:00
Malcolm Tredinnick 9b52f35f35 Added "svn:eol-style native" to every text file in the tree (*.txt, *.html,
*.py, *.xml and AUTHORS, etc). Added "svn:ignore *.pyc" to some directories in
tests/regressiontests/ that were previously missing it.

Fixed #6545, #6801.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-18 14:54:39 +00:00
Malcolm Tredinnick 25c4ab99e3 Fixed #6109 -- Marked fieldset descriptions as safe from auto-escaping. Good
catch, SomeGuy.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-03 07:39:10 +00:00
Malcolm Tredinnick f27365e5bd Fixed #6061 -- Don't escape help_text in the admin interface (so that it
behaves as documented). Thanks, baumer.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-30 19:59:13 +00:00
Malcolm Tredinnick 0171f00761 Fixed #5706 -- Fixed a couple of XHTML incompatibilities. Based on a patch from
tvrg.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-29 16:32:29 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 12:58:53 +00:00
Gary Wilson Jr 04a110836d Fixed #3491 -- Fixed links in `user-tools` section of admin's `base.html` template to use the `url` template tag. This also removes the need for child templates to override the block just to adjust the relative path. Thanks, saintsjd@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-20 06:59:13 +00:00
Russell Keith-Magee 09145d2e5f Fixed #208 -- Modernized the syntax of the cycle tag to allow for spaces and variables in cycle values. Thanks to SmileyChris and Chris McAvoy for their work on this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 02:49:21 +00:00
Malcolm Tredinnick a901af5f58 Fixed #5155 -- Translated the model name (when available) in the Recent Actions log.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-19 05:40:47 +00:00
Adrian Holovaty 9ee6326cb6 Fixed #5019 -- Fixed broken links in navigation of 'change password' admin page. Thanks, hpxchan@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-12 03:26:35 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:11:04 +00:00
Adrian Holovaty 2144a2c23f Fixed #3269 -- Fixed typo in admin change_password.html template. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-10 22:34:37 +00:00
Adrian Holovaty 7180207328 Fixed #3166 -- Added admin 'Change user password' view. Thanks for the patch, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-12-30 07:16:25 +00:00
Jacob Kaplan-Moss 069a8858ba Fixed #3128: Added explicit object-tools block so custom admin templates can override it where needed. Thanks, Gary Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-12-20 05:00:36 +00:00
Adrian Holovaty c7345f4e0f Fixed bug in admin with raw_id_admin -- change list in popup didn't append 'pop' link to the 'total' link. Thanks for reporting, patrickk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-12-06 06:23:59 +00:00
Adrian Holovaty 60b46d72ac Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the patch, mccutchen@gmail.com and Hawkeye
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 21:30:38 +00:00
Malcolm Tredinnick 876a3ed602 Fixed #2587 -- Removed some escaping from the summary fields.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 11:58:56 +00:00
Adrian Holovaty 513ae3a3f4 Fixed #2587 -- Removed unnecessary escaping from admin_doc/model_detail.html template. Thanks for reporting, Gary Wilson
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-22 04:53:43 +00:00
Adrian Holovaty eefe35c7fa Changed admin/base.html template to add a NONE,NOARCHIVE meta tag for robots. Thanks for the idea, Ian Holsman
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-17 23:05:42 +00:00
Adrian Holovaty 3e51dac933 Fixed #2533 -- Fixed XHTML error in admin edit_inline_tabular.html template. Thanks, erikg@codepoet.no
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-12 17:42:02 +00:00
Adrian Holovaty 9354cfb6ce Fixed #2410 -- Added HTML ID attribute to <form> on admin change-list pages, for easy targetting with JavaScript and CSS
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-12 05:42:48 +00:00
Adrian Holovaty fd5d923c6b Fixed #61 -- No more editing hashes when creating users via the admin. Created a special-case 'Add user' admin view. The change form still displays the hash, for the moment.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-04 04:18:12 +00:00
Jacob Kaplan-Moss 1687b025dc Part 3 of pedant day: replaced all tabs in Django with spaces. Python the way Guido intended it, baby!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-21 20:48:17 +00:00
Malcolm Tredinnick 51705f60b1 Fixed #2332 -- Introduced is_authenticated() method on User and AnonymousUser classes. Recommended its use over is_anonymous in the docs. Changed internal Django use to match this recommendation. Thanks to SmileyChris and Gary Wilson for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-19 02:09:26 +00:00
Malcolm Tredinnick 6d104115d1 More pre-emptive escaping of strings that should not be interpreted as HTML.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-15 01:07:13 +00:00
Malcolm Tredinnick ebc6f90d44 Escaped variables that should not be interpreted as HTML and which might
contain dangerous characters.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 11:48:25 +00:00
Malcolm Tredinnick 1725db5a35 Escaped all strings that should not contain active HTML tags.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 11:04:33 +00:00
Malcolm Tredinnick 04e83a0517 Fixed another title string that needed escaping (these strings do need
escaping, because they can be created from object strings, in part).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:17:17 +00:00
Malcolm Tredinnick 24fa22883a Fixed #2346 -- Escaped string output in titles in admin interface. Thanks Gary
Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:03:01 +00:00
Malcolm Tredinnick 49bb884d0b Fixed #2345 -- escaped object titles in breadcrumb display in admin. Thanks
Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:00:09 +00:00
Malcolm Tredinnick 2175c99825 Fixed #2344 -- Filtered some object string representations through the escape
filter.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 00:49:18 +00:00
Adrian Holovaty 16c5cec9c1 Fixed #2290 -- Escaped HTML in admin messages. Thanks, Sean
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 03:56:15 +00:00
Adrian Holovaty a25fe3b65e Changed admin/templates/admin/index.html to make <caption> translatable
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:57:07 +00:00
Adrian Holovaty 2673aa366a Fixed #2275 -- Added footer hook to admin base.html template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30 19:21:02 +00:00
Adrian Holovaty c8f1d0a84e Fixed #2186 -- Fixed i18n variable substitution in admin/templates/registration/password_reset_email.html. Thanks, md@hudora.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18 17:32:15 +00:00
Adrian Holovaty 8938d5eeb3 Fixed #2152 -- Now HTML-escaping user.first_name in admin/base.html template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-14 14:56:19 +00:00
Georg Bauer 4fcb72d306 fixed #2128: updated BiDi support
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 14:52:51 +00:00
Adrian Holovaty 3db34ce73e Fixed #2100 -- Made some remaining parts of the admin changelist translatable. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 03:17:58 +00:00
Georg Bauer 7e88ec5271 fixed #2089: added language bidirectional support and updated the admin to use it. thanks meir@mksoft!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-06 15:22:53 +00:00
Adrian Holovaty 066dac168d Fixed #2084 -- Removed admin-site 'documentation / change password / log out' links on login page for users who are logged in but don't have staff status. Thanks, rudolphfroger
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-05 00:21:12 +00:00
Adrian Holovaty 350c360776 Negligible spacing change to admin/templates/admin/field_line.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-01 03:37:59 +00:00
Adrian Holovaty f10af2de24 Fixed #2056 -- Escaped history messages in admin. Thanks, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-01 02:10:44 +00:00
Adrian Holovaty 2543d0ae93 Fixed bug in admin where it would redirect infinitely if invalid lookup parameters were given in the URL. Refs #2024
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 15:25:23 +00:00
Adrian Holovaty ea59344d72 Fixed #2006 -- Admin now quotes strings in breadcrumbs and filters. Thanks, mhf@hex.no
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 15:10:01 +00:00
Jacob Kaplan-Moss 20416b2972 Made a few small tweaks to admin doc pages.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-18 15:17:42 +00:00
Adrian Holovaty f2ef28fd5c Fixed #1728 -- Fixed broken nav links in password_change_done admin page. Thanks for reporting, mdt@emdete.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-05 03:02:11 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 01:31:56 +00:00
Jacob Kaplan-Moss b830fa7e78 Exposed model __doc__ in admin docs views which fixes #1408. Thanks, poelzi
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-27 21:05:50 +00:00
Jacob Kaplan-Moss 0df9fb8f9a Fixed #620 -- raw_id_admin and limit_choices_to now play well together (thanks to David Schein)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-27 18:52:54 +00:00
Adrian Holovaty a5fad0eb37 Fixed #1387 -- Fixed some XHTML errors in admin templates. Thanks, vineet
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-23 19:05:40 +00:00
Adrian Holovaty 23d2be1714 Fixed #1274 -- Fixed broken link in navigation in admin password-change template. Thanks, Brian Ray
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-27 15:45:10 +00:00
Wilson Miner 683c757c54 Removed example.com from default admin templates. One less thing to change in setup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-23 22:53:50 +00:00
Adrian Holovaty 60e3d1352d Fixed #1090 -- Added {% block content_title %} hook to admin base.html template. Thanks, Joseph Kocherhans
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-15 06:07:43 +00:00
Wilson Miner 11f8bd9d9a Added a link to admin docs in the userlinks block in admin templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-12 17:35:57 +00:00
Adrian Holovaty a5005c29be Fixed #1100 -- Admin RelatedObjectLookup JavaScript now works with OneToOneField. Thanks, Joseph Kocherhans
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-09 02:06:00 +00:00
Adrian Holovaty 632914f188 Fixed #1102 -- Fixed some HTML validation errors in admin templates. Thanks, Luke Plant
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-28 23:32:56 +00:00
Georg Bauer 787dea30c1 added missing translations to the file widget
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-17 21:27:54 +00:00
Adrian Holovaty 661613e529 Fixed #1008 -- Added {{ block.super }} in change_form.html admin template. Thanks, Kieran
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-09 02:29:56 +00:00
Adrian Holovaty cecd295187 Negligible quoting change to contrib/admin/templates/admin/change_form.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-09 02:15:23 +00:00
Adrian Holovaty 4ed33777be Fixed #926 -- Fixed spacing in admin index template/CSS to handle wider words
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-07 05:04:07 +00:00
Georg Bauer a841530a13 first take at admin JavaScript translation - translation hooks for the calendar and time picker are added and the german translation is updated
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-04 12:30:14 +00:00
Adrian Holovaty b5288e732c Fixed #951 -- Admin bookmarklets no longer assume admin is rooted at '/'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-01 07:03:23 +00:00
Adrian Holovaty 15ea158c96 Fixed #893 -- Admin 'change password' and 'log out' links no longer assume admin lives at '/admin/'. Thanks, deric@monowerks.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-01 06:52:16 +00:00
Adrian Holovaty 5a54455ac8 Negligible spacing fix to admin/templates/widget/foreign.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-29 05:50:31 +00:00
Adrian Holovaty 2e09e145c0 Fixed #950 -- Fixed typo in admin bookmarklets template. Thanks, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-28 14:28:21 +00:00
Georg Bauer bcc02c982f added a new translation tag for the search "go" button
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-28 10:29:41 +00:00
Adrian Holovaty 7548bfba64 Fixed bug in contrib/admin/templates/admin_doc/model_detail.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 23:16:26 +00:00
Adrian Holovaty 6a36699818 Fixed #917 -- Made admin change_list view overridable by custom templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 20:25:56 +00:00
Adrian Holovaty 4cdaf74cec Moved {% extends %} tag to top of template for admin/change_list.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 20:22:42 +00:00
Adrian Holovaty f237936a87 Fixed #928 -- Fixed admin documentation breakage after [1443]. Thanks for reporting, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 17:14:11 +00:00
Adrian Holovaty 2564f34c2b Fixed missing {% load i18n %} in admin/templates/admin_doc/bookmarklets.html
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 16:10:49 +00:00
Adrian Holovaty 3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 22:46:31 +00:00
Adrian Holovaty 9dda4abee1 MERGED NEW-ADMIN BRANCH (except for po/mo files, which will come in a separate commit)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 21:20:09 +00:00
Jacob Kaplan-Moss 4fe5c9b7ee Fixed #906 - thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 15:00:14 +00:00
Georg Bauer 834e7d3482 fixed a typo in a trans template tag. Thx David Ascher (on IRC)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 18:30:31 +00:00
Adrian Holovaty aae50fcce0 Fixed #758 -- HTML-escaped admin log items in admin index template. Thanks, Tom Tobin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-09 23:04:26 +00:00
Adrian Holovaty 6d1b5b3b1a Fixed #727 -- Fixed leftover %() syntax in password_reset_email template. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 22:30:01 +00:00
Jacob Kaplan-Moss 5cf8f68423 Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-04 04:59:46 +00:00
Adrian Holovaty c548955d29 Fixed admin template bug from [948]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-19 01:18:53 +00:00
Adrian Holovaty f07e5d4f5d Fixed #627 -- BACKWARDS-INCOMPATIBLE CHANGE. Admin is now an app, not a middleware. See BackwardsIncompatibleChanges for a full list of changes and information on how to update your code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-19 01:09:05 +00:00