From 38a2444277a84eb6b74425f0e324d1dceb7d2ef1 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 30 Jun 2011 09:06:19 +0000 Subject: [PATCH] Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'. Thanks to Jacob for the review and general help. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/__init__.py | 5 +- django/conf/global_settings.py | 5 - django/conf/project_template/settings.py | 5 - django/contrib/admin/helpers.py | 5 +- django/contrib/admin/options.py | 30 +-- .../{media => static/admin}/css/base.css | 64 ++--- .../admin}/css/changelists.css | 10 +- .../{media => static/admin}/css/dashboard.css | 0 .../{media => static/admin}/css/forms.css | 12 +- .../admin/{media => static/admin}/css/ie.css | 2 +- .../{media => static/admin}/css/login.css | 0 .../admin/{media => static/admin}/css/rtl.css | 4 +- .../{media => static/admin}/css/widgets.css | 40 +-- .../admin => static/admin/img}/arrow-down.gif | Bin .../admin => static/admin/img}/arrow-up.gif | Bin .../admin/img}/changelist-bg.gif | Bin .../admin/img}/changelist-bg_rtl.gif | Bin .../admin => static/admin/img}/chooser-bg.gif | Bin .../admin/img}/chooser_stacked-bg.gif | Bin .../admin/img}/default-bg-reverse.gif | Bin .../admin => static/admin/img}/default-bg.gif | Bin .../admin/img}/deleted-overlay.gif | Bin .../admin}/img/gis/move_vertex_off.png | Bin .../admin}/img/gis/move_vertex_on.png | Bin .../admin => static/admin/img}/icon-no.gif | Bin .../admin/img}/icon-unknown.gif | Bin .../admin => static/admin/img}/icon-yes.gif | Bin .../admin/img}/icon_addlink.gif | Bin .../admin => static/admin/img}/icon_alert.gif | Bin .../admin/img}/icon_calendar.gif | Bin .../admin/img}/icon_changelink.gif | Bin .../admin => static/admin/img}/icon_clock.gif | Bin .../admin => static/admin/img}/icon_cog.gif | Bin .../admin/img}/icon_deletelink.gif | Bin .../admin => static/admin/img}/icon_error.gif | Bin .../admin/img}/icon_searchbox.png | Bin .../admin/img}/icon_success.gif | Bin .../admin/img}/inline-delete-8bit.png | Bin .../admin/img}/inline-delete.png | Bin .../admin/img}/inline-restore-8bit.png | Bin .../admin/img}/inline-restore.png | Bin .../admin/img}/inline-splitter-bg.gif | Bin .../admin/img}/nav-bg-grabber.gif | Bin .../admin/img}/nav-bg-reverse.gif | Bin .../admin/img}/nav-bg-selected.gif | Bin .../img/admin => static/admin/img}/nav-bg.gif | Bin .../admin/img}/selector-add.gif | Bin .../admin/img}/selector-addall.gif | Bin .../admin/img}/selector-remove.gif | Bin .../admin/img}/selector-removeall.gif | Bin .../admin/img}/selector-search.gif | Bin .../admin/img}/selector_stacked-add.gif | Bin .../admin/img}/selector_stacked-remove.gif | Bin .../admin => static/admin/img}/tool-left.gif | Bin .../admin/img}/tool-left_over.gif | Bin .../admin => static/admin/img}/tool-right.gif | Bin .../admin/img}/tool-right_over.gif | Bin .../admin/img}/tooltag-add.gif | Bin .../admin/img}/tooltag-add_over.gif | Bin .../admin/img}/tooltag-arrowright.gif | Bin .../admin/img}/tooltag-arrowright_over.gif | Bin .../admin}/js/LICENSE-JQUERY.txt | 0 .../{media => static/admin}/js/SelectBox.js | 0 .../admin}/js/SelectFilter2.js | 4 +- .../{media => static/admin}/js/actions.js | 0 .../{media => static/admin}/js/actions.min.js | 0 .../admin}/js/admin/DateTimeShortcuts.js | 4 +- .../admin}/js/admin/RelatedObjectLookups.js | 0 .../admin}/js/admin/ordering.js | 0 .../{media => static/admin}/js/calendar.js | 0 .../{media => static/admin}/js/collapse.js | 0 .../admin}/js/collapse.min.js | 0 .../{media => static/admin}/js/compress.py | 0 .../admin/{media => static/admin}/js/core.js | 0 .../admin}/js/getElementsBySelector.js | 0 .../{media => static/admin}/js/inlines.js | 0 .../{media => static/admin}/js/inlines.min.js | 0 .../{media => static/admin}/js/jquery.init.js | 0 .../{media => static/admin}/js/jquery.js | 0 .../{media => static/admin}/js/jquery.min.js | 0 .../{media => static/admin}/js/prepopulate.js | 0 .../admin}/js/prepopulate.min.js | 0 .../{media => static/admin}/js/timeparse.js | 0 .../{media => static/admin}/js/urlify.js | 0 .../admin/auth/user/change_password.html | 4 +- .../contrib/admin/templates/admin/base.html | 10 +- .../admin/templates/admin/change_form.html | 4 +- .../admin/templates/admin/change_list.html | 6 +- .../templates/admin/change_list_results.html | 5 +- .../templates/admin/edit_inline/stacked.html | 6 +- .../templates/admin/edit_inline/tabular.html | 6 +- .../contrib/admin/templates/admin/index.html | 4 +- .../contrib/admin/templates/admin/login.html | 4 +- .../admin/templates/admin/search_form.html | 5 +- .../registration/password_change_form.html | 4 +- .../contrib/admin/templatetags/admin_list.py | 7 +- .../contrib/admin/templatetags/adminmedia.py | 4 + django/contrib/admin/widgets.py | 34 +-- django/contrib/gis/admin/widgets.py | 11 +- .../gis/templates/gis/admin/openlayers.html | 5 +- django/contrib/staticfiles/storage.py | 9 +- django/core/servers/basehttp.py | 13 +- django/templatetags/static.py | 20 +- docs/howto/static-files.txt | 28 +- docs/internals/deprecation.txt | 5 + docs/ref/contrib/staticfiles.txt | 45 +--- docs/ref/settings.txt | 14 - docs/ref/templates/api.txt | 2 + docs/ref/templates/builtins.txt | 239 +++++++++++------- docs/releases/1.4.txt | 36 +++ tests/regressiontests/admin_util/tests.py | 2 +- tests/regressiontests/admin_widgets/tests.py | 19 +- tests/regressiontests/forms/tests/media.py | 39 ++- tests/regressiontests/servers/tests.py | 27 +- .../site_media/static/test/storage.txt | 1 - .../staticfiles_tests/tests.py | 90 +++---- tests/regressiontests/templates/tests.py | 3 + tests/runtests.py | 2 + 118 files changed, 485 insertions(+), 418 deletions(-) rename django/contrib/admin/{media => static/admin}/css/base.css (83%) rename django/contrib/admin/{media => static/admin}/css/changelists.css (92%) rename django/contrib/admin/{media => static/admin}/css/dashboard.css (100%) rename django/contrib/admin/{media => static/admin}/css/forms.css (93%) rename django/contrib/admin/{media => static/admin}/css/ie.css (91%) rename django/contrib/admin/{media => static/admin}/css/login.css (100%) rename django/contrib/admin/{media => static/admin}/css/rtl.css (95%) rename django/contrib/admin/{media => static/admin}/css/widgets.css (84%) rename django/contrib/admin/{media/img/admin => static/admin/img}/arrow-down.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/arrow-up.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/changelist-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/changelist-bg_rtl.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/chooser-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/chooser_stacked-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/default-bg-reverse.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/default-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/deleted-overlay.gif (100%) rename django/contrib/admin/{media => static/admin}/img/gis/move_vertex_off.png (100%) rename django/contrib/admin/{media => static/admin}/img/gis/move_vertex_on.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon-no.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon-unknown.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon-yes.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_addlink.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_alert.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_calendar.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_changelink.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_clock.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_cog.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_deletelink.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_error.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_searchbox.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/icon_success.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/inline-delete-8bit.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/inline-delete.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/inline-restore-8bit.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/inline-restore.png (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/inline-splitter-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/nav-bg-grabber.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/nav-bg-reverse.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/nav-bg-selected.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/nav-bg.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector-add.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector-addall.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector-remove.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector-removeall.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector-search.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector_stacked-add.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/selector_stacked-remove.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tool-left.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tool-left_over.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tool-right.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tool-right_over.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tooltag-add.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tooltag-add_over.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tooltag-arrowright.gif (100%) rename django/contrib/admin/{media/img/admin => static/admin/img}/tooltag-arrowright_over.gif (100%) rename django/contrib/admin/{media => static/admin}/js/LICENSE-JQUERY.txt (100%) rename django/contrib/admin/{media => static/admin}/js/SelectBox.js (100%) rename django/contrib/admin/{media => static/admin}/js/SelectFilter2.js (97%) rename django/contrib/admin/{media => static/admin}/js/actions.js (100%) rename django/contrib/admin/{media => static/admin}/js/actions.min.js (100%) rename django/contrib/admin/{media => static/admin}/js/admin/DateTimeShortcuts.js (98%) rename django/contrib/admin/{media => static/admin}/js/admin/RelatedObjectLookups.js (100%) rename django/contrib/admin/{media => static/admin}/js/admin/ordering.js (100%) rename django/contrib/admin/{media => static/admin}/js/calendar.js (100%) rename django/contrib/admin/{media => static/admin}/js/collapse.js (100%) rename django/contrib/admin/{media => static/admin}/js/collapse.min.js (100%) rename django/contrib/admin/{media => static/admin}/js/compress.py (100%) rename django/contrib/admin/{media => static/admin}/js/core.js (100%) rename django/contrib/admin/{media => static/admin}/js/getElementsBySelector.js (100%) rename django/contrib/admin/{media => static/admin}/js/inlines.js (100%) rename django/contrib/admin/{media => static/admin}/js/inlines.min.js (100%) rename django/contrib/admin/{media => static/admin}/js/jquery.init.js (100%) rename django/contrib/admin/{media => static/admin}/js/jquery.js (100%) rename django/contrib/admin/{media => static/admin}/js/jquery.min.js (100%) rename django/contrib/admin/{media => static/admin}/js/prepopulate.js (100%) rename django/contrib/admin/{media => static/admin}/js/prepopulate.min.js (100%) rename django/contrib/admin/{media => static/admin}/js/timeparse.js (100%) rename django/contrib/admin/{media => static/admin}/js/urlify.js (100%) delete mode 100644 tests/regressiontests/staticfiles_tests/project/site_media/static/test/storage.txt diff --git a/django/conf/__init__.py b/django/conf/__init__.py index c99b307c6d..4337bd4c11 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -68,8 +68,11 @@ class BaseSettings(object): """ def __setattr__(self, name, value): if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'): - warnings.warn('If set, %s must end with a slash' % name, + warnings.warn("If set, %s must end with a slash" % name, DeprecationWarning) + elif name == "ADMIN_MEDIA_PREFIX": + warnings.warn("The ADMIN_MEDIA_PREFIX setting has been removed; " + "use STATIC_URL instead.", DeprecationWarning) object.__setattr__(self, name, value) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index fedea55bac..5ee12d715f 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -593,8 +593,3 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', # 'django.contrib.staticfiles.finders.DefaultStorageFinder', ) - -# URL prefix for admin media -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index 794522b202..3a2243fbc6 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -62,11 +62,6 @@ STATIC_ROOT = '' # Example: "http://media.lawrence.com/static/" STATIC_URL = '/static/' -# URL prefix for admin static files -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' - # Additional locations of static files STATICFILES_DIRS = ( # Put strings here, like "/home/html/static" or "C:/www/django/static". diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 0c2f287fe5..d15716b909 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -1,5 +1,4 @@ from django import forms -from django.conf import settings from django.contrib.admin.util import (flatten_fieldsets, lookup_field, display_for_field, label_for_field, help_text_for_field) from django.contrib.contenttypes.models import ContentType @@ -75,8 +74,8 @@ class Fieldset(object): def _media(self): if 'collapse' in self.classes: - js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/collapse.min.js'] - return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) + js = ['jquery.min.js', 'jquery.init.js', 'collapse.min.js'] + return forms.Media(js=['admin/js/%s' % url for url in js]) return forms.Media() media = property(_media) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 6d33239292..703421f1bc 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -349,19 +349,19 @@ class ModelAdmin(BaseModelAdmin): urls = property(urls) def _media(self): - from django.conf import settings - - js = ['js/core.js', 'js/admin/RelatedObjectLookups.js', - 'js/jquery.min.js', 'js/jquery.init.js'] + js = [ + 'core.js', + 'admin/RelatedObjectLookups.js', + 'jquery.min.js', + 'jquery.init.js' + ] if self.actions is not None: - js.extend(['js/actions.min.js']) + js.append('actions.min.js') if self.prepopulated_fields: - js.append('js/urlify.js') - js.append('js/prepopulate.min.js') + js.extend(['urlify.js', 'prepopulate.min.js']) if self.opts.get_ordered_objects(): - js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js']) - - return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) + js.extend(['getElementsBySelector.js', 'dom-drag.js' , 'admin/ordering.js']) + return forms.Media(js=['admin/js/%s' % url for url in js]) media = property(_media) def has_add_permission(self, request): @@ -1321,14 +1321,12 @@ class InlineModelAdmin(BaseModelAdmin): self.verbose_name_plural = self.model._meta.verbose_name_plural def _media(self): - from django.conf import settings - js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/inlines.min.js'] + js = ['jquery.min.js', 'jquery.init.js', 'inlines.min.js'] if self.prepopulated_fields: - js.append('js/urlify.js') - js.append('js/prepopulate.min.js') + js.extend(['urlify.js, prepopulate.min.js']) if self.filter_vertical or self.filter_horizontal: - js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js']) - return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) + js.extend(['SelectBox.js', 'SelectFilter2.js']) + return forms.Media(js=['admin/js/%s' % url for url in js]) media = property(_media) def get_formset(self, request, obj=None, **kwargs): diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/static/admin/css/base.css similarity index 83% rename from django/contrib/admin/media/css/base.css rename to django/contrib/admin/static/admin/css/base.css index 6d1b673b90..23fddafd7a 100644 --- a/django/contrib/admin/media/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -259,7 +259,7 @@ tfoot td { color: #666; padding: 2px 5px; font-size: 11px; - background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x; border-left: 1px solid #ddd; border-bottom: 1px solid #ddd; } @@ -311,7 +311,7 @@ thead th a:link, thead th a:visited { } thead th.sorted { - background: #c5c5c5 url(../img/admin/nav-bg-selected.gif) top left repeat-x; + background: #c5c5c5 url(../img/nav-bg-selected.gif) top left repeat-x; } table thead th.sorted a { @@ -319,11 +319,11 @@ table thead th.sorted a { } table thead th.ascending a { - background: url(../img/admin/arrow-up.gif) right .4em no-repeat; + background: url(../img/arrow-up.gif) right .4em no-repeat; } table thead th.descending a { - background: url(../img/admin/arrow-down.gif) right .4em no-repeat; + background: url(../img/arrow-down.gif) right .4em no-repeat; } table thead th.sorted a span.text { @@ -368,7 +368,7 @@ table thead th.sorted a span.clear { #sorting-popup-div .cancel { font-size: 10px; - background: #e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x; border-top: 1px solid #ddd; text-align: center; } @@ -386,7 +386,7 @@ table.orderable tbody tr td:hover { table.orderable tbody tr td:first-child { padding-left: 14px; - background-image: url(../img/admin/nav-bg-grabber.gif); + background-image: url(../img/nav-bg-grabber.gif); background-repeat: repeat-y; } @@ -416,7 +416,7 @@ input[type=text], input[type=password], textarea, select, .vTextField { /* FORM BUTTONS */ .button, input[type=submit], input[type=button], .submit-row input { - background: white url(../img/admin/nav-bg.gif) bottom repeat-x; + background: white url(../img/nav-bg.gif) bottom repeat-x; padding: 3px 5px; color: black; border: 1px solid #bbb; @@ -424,31 +424,31 @@ input[type=text], input[type=password], textarea, select, .vTextField { } .button:active, input[type=submit]:active, input[type=button]:active { - background-image: url(../img/admin/nav-bg-reverse.gif); + background-image: url(../img/nav-bg-reverse.gif); background-position: top; } .button[disabled], input[type=submit][disabled], input[type=button][disabled] { - background-image: url(../img/admin/nav-bg.gif); + background-image: url(../img/nav-bg.gif); background-position: bottom; opacity: 0.4; } .button.default, input[type=submit].default, .submit-row input.default { border: 2px solid #5b80b2; - background: #7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x; + background: #7CA0C7 url(../img/default-bg.gif) bottom repeat-x; font-weight: bold; color: white; float: right; } .button.default:active, input[type=submit].default:active { - background-image: url(../img/admin/default-bg-reverse.gif); + background-image: url(../img/default-bg-reverse.gif); background-position: top; } .button[disabled].default, input[type=submit][disabled].default, input[type=button][disabled].default { - background-image: url(../img/admin/default-bg.gif); + background-image: url(../img/default-bg.gif); background-position: bottom; opacity: 0.4; } @@ -485,7 +485,7 @@ input[type=text], input[type=password], textarea, select, .vTextField { font-size: 11px; text-align: left; font-weight: bold; - background: #7CA0C7 url(../img/admin/default-bg.gif) top left repeat-x; + background: #7CA0C7 url(../img/default-bg.gif) top left repeat-x; color: white; } @@ -507,15 +507,15 @@ ul.messagelist li { margin: 0 0 3px 0; border-bottom: 1px solid #ddd; color: #666; - background: #ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; + background: #ffc url(../img/icon_success.gif) 5px .3em no-repeat; } ul.messagelist li.warning{ - background-image: url(../img/admin/icon_alert.gif); + background-image: url(../img/icon_alert.gif); } ul.messagelist li.error{ - background-image: url(../img/admin/icon_error.gif); + background-image: url(../img/icon_error.gif); } .errornote { @@ -525,7 +525,7 @@ ul.messagelist li.error{ margin: 0 0 3px 0; border: 1px solid red; color: red; - background: #ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; + background: #ffc url(../img/icon_error.gif) 5px .3em no-repeat; } ul.errorlist { @@ -540,7 +540,7 @@ ul.errorlist { margin: 0 0 3px 0; border: 1px solid red; color: white; - background: red url(../img/admin/icon_alert.gif) 5px .3em no-repeat; + background: red url(../img/icon_alert.gif) 5px .3em no-repeat; } .errorlist li a { @@ -576,7 +576,7 @@ div.system-message p.system-message-title { padding: 4px 5px 4px 25px; margin: 0; color: red; - background: #ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; + background: #ffc url(../img/icon_error.gif) 5px .3em no-repeat; } .description { @@ -587,7 +587,7 @@ div.system-message p.system-message-title { /* BREADCRUMBS */ div.breadcrumbs { - background: white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; + background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x; padding: 2px 8px 3px 8px; font-size: 11px; color: #999; @@ -600,17 +600,17 @@ div.breadcrumbs { .addlink { padding-left: 12px; - background: url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; + background: url(../img/icon_addlink.gif) 0 .2em no-repeat; } .changelink { padding-left: 12px; - background: url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; + background: url(../img/icon_changelink.gif) 0 .2em no-repeat; } .deletelink { padding-left: 12px; - background: url(../img/admin/icon_deletelink.gif) 0 .25em no-repeat; + background: url(../img/icon_deletelink.gif) 0 .25em no-repeat; } a.deletelink:link, a.deletelink:visited { @@ -645,14 +645,14 @@ a.deletelink:hover { .object-tools li { display: block; float: left; - background: url(../img/admin/tool-left.gif) 0 0 no-repeat; + background: url(../img/tool-left.gif) 0 0 no-repeat; padding: 0 0 0 8px; margin-left: 2px; height: 16px; } .object-tools li:hover { - background: url(../img/admin/tool-left_over.gif) 0 0 no-repeat; + background: url(../img/tool-left_over.gif) 0 0 no-repeat; } .object-tools a:link, .object-tools a:visited { @@ -661,29 +661,29 @@ a.deletelink:hover { color: white; padding: .1em 14px .1em 8px; height: 14px; - background: #999 url(../img/admin/tool-right.gif) 100% 0 no-repeat; + background: #999 url(../img/tool-right.gif) 100% 0 no-repeat; } .object-tools a:hover, .object-tools li:hover a { - background: #5b80b2 url(../img/admin/tool-right_over.gif) 100% 0 no-repeat; + background: #5b80b2 url(../img/tool-right_over.gif) 100% 0 no-repeat; } .object-tools a.viewsitelink, .object-tools a.golink { - background: #999 url(../img/admin/tooltag-arrowright.gif) top right no-repeat; + background: #999 url(../img/tooltag-arrowright.gif) top right no-repeat; padding-right: 28px; } .object-tools a.viewsitelink:hover, .object-tools a.golink:hover { - background: #5b80b2 url(../img/admin/tooltag-arrowright_over.gif) top right no-repeat; + background: #5b80b2 url(../img/tooltag-arrowright_over.gif) top right no-repeat; } .object-tools a.addlink { - background: #999 url(../img/admin/tooltag-add.gif) top right no-repeat; + background: #999 url(../img/tooltag-add.gif) top right no-repeat; padding-right: 28px; } .object-tools a.addlink:hover { - background: #5b80b2 url(../img/admin/tooltag-add_over.gif) top right no-repeat; + background: #5b80b2 url(../img/tooltag-add_over.gif) top right no-repeat; } /* OBJECT HISTORY */ @@ -818,7 +818,7 @@ table#change-history tbody th { } #content-related .module h2 { - background: #eee url(../img/admin/nav-bg.gif) bottom left repeat-x; + background: #eee url(../img/nav-bg.gif) bottom left repeat-x; color: #666; } diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css similarity index 92% rename from django/contrib/admin/media/css/changelists.css rename to django/contrib/admin/static/admin/css/changelists.css index 315b8c7a38..8eeca3d60d 100644 --- a/django/contrib/admin/media/css/changelists.css +++ b/django/contrib/admin/static/admin/css/changelists.css @@ -20,7 +20,7 @@ } .change-list .filtered { - background: white url(../img/admin/changelist-bg.gif) top right repeat-y !important; + background: white url(../img/changelist-bg.gif) top right repeat-y !important; } .change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { @@ -40,7 +40,7 @@ color: #666; border-top: 1px solid #eee; border-bottom: 1px solid #eee; - background: white url(../img/admin/nav-bg.gif) 0 180% repeat-x; + background: white url(../img/nav-bg.gif) 0 180% repeat-x; overflow: hidden; } @@ -82,7 +82,7 @@ #changelist #toolbar { padding: 3px; border-bottom: 1px solid #ddd; - background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x; color: #666; } @@ -156,7 +156,7 @@ .change-list ul.toplinks { display: block; - background: white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; + background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x; border-top: 1px solid white; float: left; padding: 0 !important; @@ -246,7 +246,7 @@ padding: 3px; border-top: 1px solid #fff; border-bottom: 1px solid #ddd; - background: white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; + background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x; } #changelist .actions.selected { diff --git a/django/contrib/admin/media/css/dashboard.css b/django/contrib/admin/static/admin/css/dashboard.css similarity index 100% rename from django/contrib/admin/media/css/dashboard.css rename to django/contrib/admin/static/admin/css/dashboard.css diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/static/admin/css/forms.css similarity index 93% rename from django/contrib/admin/media/css/forms.css rename to django/contrib/admin/static/admin/css/forms.css index 5149732719..0ecfca784c 100644 --- a/django/contrib/admin/media/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -140,7 +140,7 @@ fieldset.collapsed h2, fieldset.collapsed { } fieldset.collapsed h2 { - background-image: url(../img/admin/nav-bg.gif); + background-image: url(../img/nav-bg.gif); background-position: bottom left; color: #999; } @@ -161,7 +161,7 @@ fieldset.monospace textarea { .submit-row { padding: 5px 7px; text-align: right; - background: white url(../img/admin/nav-bg.gif) 0 100% repeat-x; + background: white url(../img/nav-bg.gif) 0 100% repeat-x; border: 1px solid #ccc; margin: 5px 0; overflow: hidden; @@ -184,7 +184,7 @@ body.popup .submit-row { } .submit-row .deletelink { - background: url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; + background: url(../img/icon_deletelink.gif) 0 50% no-repeat; padding-left: 14px; } @@ -251,7 +251,7 @@ body.popup .submit-row { color: #666; padding: 3px 5px; font-size: 11px; - background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x; border-bottom: 1px solid #ddd; } @@ -336,7 +336,7 @@ body.popup .submit-row { color: #666; padding: 3px 5px; border-bottom: 1px solid #ddd; - background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x; } .inline-group .tabular tr.add-row td { @@ -347,7 +347,7 @@ body.popup .submit-row { .inline-group ul.tools a.add, .inline-group div.add-row a, .inline-group .tabular tr.add-row td a { - background: url(../img/admin/icon_addlink.gif) 0 50% no-repeat; + background: url(../img/icon_addlink.gif) 0 50% no-repeat; padding-left: 14px; font-size: 11px; outline: 0; /* Remove dotted border around link */ diff --git a/django/contrib/admin/media/css/ie.css b/django/contrib/admin/static/admin/css/ie.css similarity index 91% rename from django/contrib/admin/media/css/ie.css rename to django/contrib/admin/static/admin/css/ie.css index 5fd1ce364b..3776e991ff 100644 --- a/django/contrib/admin/media/css/ie.css +++ b/django/contrib/admin/static/admin/css/ie.css @@ -53,5 +53,5 @@ /* IE doesn't know alpha transparency in PNGs */ .inline-deletelink { - background: transparent url(../img/admin/inline-delete-8bit.png) no-repeat; + background: transparent url(../img/inline-delete-8bit.png) no-repeat; } \ No newline at end of file diff --git a/django/contrib/admin/media/css/login.css b/django/contrib/admin/static/admin/css/login.css similarity index 100% rename from django/contrib/admin/media/css/login.css rename to django/contrib/admin/static/admin/css/login.css diff --git a/django/contrib/admin/media/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css similarity index 95% rename from django/contrib/admin/media/css/rtl.css rename to django/contrib/admin/static/admin/css/rtl.css index ec2bb2a9da..c32fcf0808 100644 --- a/django/contrib/admin/media/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -113,7 +113,7 @@ table thead th.sorted a span.sortpos { } .change-list .filtered { - background: white url(../img/admin/changelist-bg_rtl.gif) top left repeat-y !important; + background: white url(../img/changelist-bg_rtl.gif) top left repeat-y !important; } .change-list .filtered table { @@ -170,7 +170,7 @@ table thead th.sorted a span.sortpos { } .submit-row .deletelink { - background: url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; + background: url(../img/icon_deletelink.gif) 0 50% no-repeat; padding-right: 14px; } diff --git a/django/contrib/admin/media/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css similarity index 84% rename from django/contrib/admin/media/css/widgets.css rename to django/contrib/admin/static/admin/css/widgets.css index 26400fac50..4f4ea0a8f5 100644 --- a/django/contrib/admin/media/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -22,7 +22,7 @@ } .selector .selector-available h2 { - background: white url(../img/admin/nav-bg.gif) bottom left repeat-x; + background: white url(../img/nav-bg.gif) bottom left repeat-x; color: #666; } @@ -49,7 +49,7 @@ float: left; width: 22px; height: 50px; - background: url(../img/admin/chooser-bg.gif) top center no-repeat; + background: url(../img/chooser-bg.gif) top center no-repeat; margin: 8em 3px 0 3px; padding: 0; } @@ -74,12 +74,12 @@ } .selector-add { - background: url(../img/admin/selector-add.gif) top center no-repeat; + background: url(../img/selector-add.gif) top center no-repeat; margin-bottom: 2px; } .selector-remove { - background: url(../img/admin/selector-remove.gif) top center no-repeat; + background: url(../img/selector-remove.gif) top center no-repeat; } a.selector-chooseall, a.selector-clearall { @@ -99,11 +99,11 @@ a.selector-chooseall:hover, a.selector-clearall:hover { a.selector-chooseall { width: 7em; - background: url(../img/admin/selector-addall.gif) left center no-repeat; + background: url(../img/selector-addall.gif) left center no-repeat; } a.selector-clearall { - background: url(../img/admin/selector-removeall.gif) left center no-repeat; + background: url(../img/selector-removeall.gif) left center no-repeat; } @@ -135,7 +135,7 @@ a.selector-clearall { height: 22px; width: 50px; margin: 0 0 3px 40%; - background: url(../img/admin/chooser_stacked-bg.gif) top center no-repeat; + background: url(../img/chooser_stacked-bg.gif) top center no-repeat; } .stacked .selector-chooser li { @@ -148,11 +148,11 @@ a.selector-clearall { } .stacked .selector-add { - background-image: url(../img/admin/selector_stacked-add.gif); + background-image: url(../img/selector_stacked-add.gif); } .stacked .selector-remove { - background-image: url(../img/admin/selector_stacked-remove.gif); + background-image: url(../img/selector_stacked-remove.gif); } @@ -246,7 +246,7 @@ span.clearable-file-input label { color: #666; padding: 2px 3px; text-align: center; - background: #e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x; border-bottom: 1px solid #ddd; } @@ -314,7 +314,7 @@ span.clearable-file-input label { position: absolute; font-weight: bold; font-size: 12px; - background: #C9DBED url(../img/admin/default-bg.gif) bottom left repeat-x; + background: #C9DBED url(../img/default-bg.gif) bottom left repeat-x; padding: 1px 4px 2px 4px; color: white; } @@ -337,7 +337,7 @@ span.clearable-file-input label { margin: 0 !important; padding: 0; font-size: 10px; - background: #e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) 0 50% repeat-x; border-top: 1px solid #ddd; } @@ -374,7 +374,7 @@ ul.orderer li { border-width: 0 1px 1px 0; white-space: nowrap; overflow: hidden; - background: #e2e2e2 url(../img/admin/nav-bg-grabber.gif) repeat-y; + background: #e2e2e2 url(../img/nav-bg-grabber.gif) repeat-y; } ul.orderer li:hover { @@ -406,7 +406,7 @@ ul.orderer li.selected { } ul.orderer li.deleted { - background: #bbb url(../img/admin/deleted-overlay.gif); + background: #bbb url(../img/deleted-overlay.gif); } ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited { @@ -414,7 +414,7 @@ ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited { } ul.orderer li.deleted .inline-deletelink { - background-image: url(../img/admin/inline-restore.png); + background-image: url(../img/inline-restore.png); } ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { @@ -426,7 +426,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { .inline-deletelink { float: right; text-indent: -9999px; - background: transparent url(../img/admin/inline-delete.png) no-repeat; + background: transparent url(../img/inline-delete.png) no-repeat; width: 15px; height: 15px; border: 0px none; @@ -465,11 +465,11 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { } .editinline tr.deleted { - background: #ddd url(../img/admin/deleted-overlay.gif); + background: #ddd url(../img/deleted-overlay.gif); } .editinline tr.deleted .inline-deletelink { - background-image: url(../img/admin/inline-restore.png); + background-image: url(../img/inline-restore.png); } .editinline tr.deleted td:hover { @@ -500,13 +500,13 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { .editinline-stacked .inline-splitter { float: left; width: 9px; - background: #f8f8f8 url(../img/admin/inline-splitter-bg.gif) 50% 50% no-repeat; + background: #f8f8f8 url(../img/inline-splitter-bg.gif) 50% 50% no-repeat; border-right: 1px solid #ccc; } .editinline-stacked .controls { clear: both; - background: #e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; + background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x; padding: 3px 4px; font-size: 11px; border-top: 1px solid #ddd; diff --git a/django/contrib/admin/media/img/admin/arrow-down.gif b/django/contrib/admin/static/admin/img/arrow-down.gif similarity index 100% rename from django/contrib/admin/media/img/admin/arrow-down.gif rename to django/contrib/admin/static/admin/img/arrow-down.gif diff --git a/django/contrib/admin/media/img/admin/arrow-up.gif b/django/contrib/admin/static/admin/img/arrow-up.gif similarity index 100% rename from django/contrib/admin/media/img/admin/arrow-up.gif rename to django/contrib/admin/static/admin/img/arrow-up.gif diff --git a/django/contrib/admin/media/img/admin/changelist-bg.gif b/django/contrib/admin/static/admin/img/changelist-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/changelist-bg.gif rename to django/contrib/admin/static/admin/img/changelist-bg.gif diff --git a/django/contrib/admin/media/img/admin/changelist-bg_rtl.gif b/django/contrib/admin/static/admin/img/changelist-bg_rtl.gif similarity index 100% rename from django/contrib/admin/media/img/admin/changelist-bg_rtl.gif rename to django/contrib/admin/static/admin/img/changelist-bg_rtl.gif diff --git a/django/contrib/admin/media/img/admin/chooser-bg.gif b/django/contrib/admin/static/admin/img/chooser-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/chooser-bg.gif rename to django/contrib/admin/static/admin/img/chooser-bg.gif diff --git a/django/contrib/admin/media/img/admin/chooser_stacked-bg.gif b/django/contrib/admin/static/admin/img/chooser_stacked-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/chooser_stacked-bg.gif rename to django/contrib/admin/static/admin/img/chooser_stacked-bg.gif diff --git a/django/contrib/admin/media/img/admin/default-bg-reverse.gif b/django/contrib/admin/static/admin/img/default-bg-reverse.gif similarity index 100% rename from django/contrib/admin/media/img/admin/default-bg-reverse.gif rename to django/contrib/admin/static/admin/img/default-bg-reverse.gif diff --git a/django/contrib/admin/media/img/admin/default-bg.gif b/django/contrib/admin/static/admin/img/default-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/default-bg.gif rename to django/contrib/admin/static/admin/img/default-bg.gif diff --git a/django/contrib/admin/media/img/admin/deleted-overlay.gif b/django/contrib/admin/static/admin/img/deleted-overlay.gif similarity index 100% rename from django/contrib/admin/media/img/admin/deleted-overlay.gif rename to django/contrib/admin/static/admin/img/deleted-overlay.gif diff --git a/django/contrib/admin/media/img/gis/move_vertex_off.png b/django/contrib/admin/static/admin/img/gis/move_vertex_off.png similarity index 100% rename from django/contrib/admin/media/img/gis/move_vertex_off.png rename to django/contrib/admin/static/admin/img/gis/move_vertex_off.png diff --git a/django/contrib/admin/media/img/gis/move_vertex_on.png b/django/contrib/admin/static/admin/img/gis/move_vertex_on.png similarity index 100% rename from django/contrib/admin/media/img/gis/move_vertex_on.png rename to django/contrib/admin/static/admin/img/gis/move_vertex_on.png diff --git a/django/contrib/admin/media/img/admin/icon-no.gif b/django/contrib/admin/static/admin/img/icon-no.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon-no.gif rename to django/contrib/admin/static/admin/img/icon-no.gif diff --git a/django/contrib/admin/media/img/admin/icon-unknown.gif b/django/contrib/admin/static/admin/img/icon-unknown.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon-unknown.gif rename to django/contrib/admin/static/admin/img/icon-unknown.gif diff --git a/django/contrib/admin/media/img/admin/icon-yes.gif b/django/contrib/admin/static/admin/img/icon-yes.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon-yes.gif rename to django/contrib/admin/static/admin/img/icon-yes.gif diff --git a/django/contrib/admin/media/img/admin/icon_addlink.gif b/django/contrib/admin/static/admin/img/icon_addlink.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_addlink.gif rename to django/contrib/admin/static/admin/img/icon_addlink.gif diff --git a/django/contrib/admin/media/img/admin/icon_alert.gif b/django/contrib/admin/static/admin/img/icon_alert.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_alert.gif rename to django/contrib/admin/static/admin/img/icon_alert.gif diff --git a/django/contrib/admin/media/img/admin/icon_calendar.gif b/django/contrib/admin/static/admin/img/icon_calendar.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_calendar.gif rename to django/contrib/admin/static/admin/img/icon_calendar.gif diff --git a/django/contrib/admin/media/img/admin/icon_changelink.gif b/django/contrib/admin/static/admin/img/icon_changelink.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_changelink.gif rename to django/contrib/admin/static/admin/img/icon_changelink.gif diff --git a/django/contrib/admin/media/img/admin/icon_clock.gif b/django/contrib/admin/static/admin/img/icon_clock.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_clock.gif rename to django/contrib/admin/static/admin/img/icon_clock.gif diff --git a/django/contrib/admin/media/img/admin/icon_cog.gif b/django/contrib/admin/static/admin/img/icon_cog.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_cog.gif rename to django/contrib/admin/static/admin/img/icon_cog.gif diff --git a/django/contrib/admin/media/img/admin/icon_deletelink.gif b/django/contrib/admin/static/admin/img/icon_deletelink.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_deletelink.gif rename to django/contrib/admin/static/admin/img/icon_deletelink.gif diff --git a/django/contrib/admin/media/img/admin/icon_error.gif b/django/contrib/admin/static/admin/img/icon_error.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_error.gif rename to django/contrib/admin/static/admin/img/icon_error.gif diff --git a/django/contrib/admin/media/img/admin/icon_searchbox.png b/django/contrib/admin/static/admin/img/icon_searchbox.png similarity index 100% rename from django/contrib/admin/media/img/admin/icon_searchbox.png rename to django/contrib/admin/static/admin/img/icon_searchbox.png diff --git a/django/contrib/admin/media/img/admin/icon_success.gif b/django/contrib/admin/static/admin/img/icon_success.gif similarity index 100% rename from django/contrib/admin/media/img/admin/icon_success.gif rename to django/contrib/admin/static/admin/img/icon_success.gif diff --git a/django/contrib/admin/media/img/admin/inline-delete-8bit.png b/django/contrib/admin/static/admin/img/inline-delete-8bit.png similarity index 100% rename from django/contrib/admin/media/img/admin/inline-delete-8bit.png rename to django/contrib/admin/static/admin/img/inline-delete-8bit.png diff --git a/django/contrib/admin/media/img/admin/inline-delete.png b/django/contrib/admin/static/admin/img/inline-delete.png similarity index 100% rename from django/contrib/admin/media/img/admin/inline-delete.png rename to django/contrib/admin/static/admin/img/inline-delete.png diff --git a/django/contrib/admin/media/img/admin/inline-restore-8bit.png b/django/contrib/admin/static/admin/img/inline-restore-8bit.png similarity index 100% rename from django/contrib/admin/media/img/admin/inline-restore-8bit.png rename to django/contrib/admin/static/admin/img/inline-restore-8bit.png diff --git a/django/contrib/admin/media/img/admin/inline-restore.png b/django/contrib/admin/static/admin/img/inline-restore.png similarity index 100% rename from django/contrib/admin/media/img/admin/inline-restore.png rename to django/contrib/admin/static/admin/img/inline-restore.png diff --git a/django/contrib/admin/media/img/admin/inline-splitter-bg.gif b/django/contrib/admin/static/admin/img/inline-splitter-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/inline-splitter-bg.gif rename to django/contrib/admin/static/admin/img/inline-splitter-bg.gif diff --git a/django/contrib/admin/media/img/admin/nav-bg-grabber.gif b/django/contrib/admin/static/admin/img/nav-bg-grabber.gif similarity index 100% rename from django/contrib/admin/media/img/admin/nav-bg-grabber.gif rename to django/contrib/admin/static/admin/img/nav-bg-grabber.gif diff --git a/django/contrib/admin/media/img/admin/nav-bg-reverse.gif b/django/contrib/admin/static/admin/img/nav-bg-reverse.gif similarity index 100% rename from django/contrib/admin/media/img/admin/nav-bg-reverse.gif rename to django/contrib/admin/static/admin/img/nav-bg-reverse.gif diff --git a/django/contrib/admin/media/img/admin/nav-bg-selected.gif b/django/contrib/admin/static/admin/img/nav-bg-selected.gif similarity index 100% rename from django/contrib/admin/media/img/admin/nav-bg-selected.gif rename to django/contrib/admin/static/admin/img/nav-bg-selected.gif diff --git a/django/contrib/admin/media/img/admin/nav-bg.gif b/django/contrib/admin/static/admin/img/nav-bg.gif similarity index 100% rename from django/contrib/admin/media/img/admin/nav-bg.gif rename to django/contrib/admin/static/admin/img/nav-bg.gif diff --git a/django/contrib/admin/media/img/admin/selector-add.gif b/django/contrib/admin/static/admin/img/selector-add.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector-add.gif rename to django/contrib/admin/static/admin/img/selector-add.gif diff --git a/django/contrib/admin/media/img/admin/selector-addall.gif b/django/contrib/admin/static/admin/img/selector-addall.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector-addall.gif rename to django/contrib/admin/static/admin/img/selector-addall.gif diff --git a/django/contrib/admin/media/img/admin/selector-remove.gif b/django/contrib/admin/static/admin/img/selector-remove.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector-remove.gif rename to django/contrib/admin/static/admin/img/selector-remove.gif diff --git a/django/contrib/admin/media/img/admin/selector-removeall.gif b/django/contrib/admin/static/admin/img/selector-removeall.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector-removeall.gif rename to django/contrib/admin/static/admin/img/selector-removeall.gif diff --git a/django/contrib/admin/media/img/admin/selector-search.gif b/django/contrib/admin/static/admin/img/selector-search.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector-search.gif rename to django/contrib/admin/static/admin/img/selector-search.gif diff --git a/django/contrib/admin/media/img/admin/selector_stacked-add.gif b/django/contrib/admin/static/admin/img/selector_stacked-add.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector_stacked-add.gif rename to django/contrib/admin/static/admin/img/selector_stacked-add.gif diff --git a/django/contrib/admin/media/img/admin/selector_stacked-remove.gif b/django/contrib/admin/static/admin/img/selector_stacked-remove.gif similarity index 100% rename from django/contrib/admin/media/img/admin/selector_stacked-remove.gif rename to django/contrib/admin/static/admin/img/selector_stacked-remove.gif diff --git a/django/contrib/admin/media/img/admin/tool-left.gif b/django/contrib/admin/static/admin/img/tool-left.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tool-left.gif rename to django/contrib/admin/static/admin/img/tool-left.gif diff --git a/django/contrib/admin/media/img/admin/tool-left_over.gif b/django/contrib/admin/static/admin/img/tool-left_over.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tool-left_over.gif rename to django/contrib/admin/static/admin/img/tool-left_over.gif diff --git a/django/contrib/admin/media/img/admin/tool-right.gif b/django/contrib/admin/static/admin/img/tool-right.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tool-right.gif rename to django/contrib/admin/static/admin/img/tool-right.gif diff --git a/django/contrib/admin/media/img/admin/tool-right_over.gif b/django/contrib/admin/static/admin/img/tool-right_over.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tool-right_over.gif rename to django/contrib/admin/static/admin/img/tool-right_over.gif diff --git a/django/contrib/admin/media/img/admin/tooltag-add.gif b/django/contrib/admin/static/admin/img/tooltag-add.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tooltag-add.gif rename to django/contrib/admin/static/admin/img/tooltag-add.gif diff --git a/django/contrib/admin/media/img/admin/tooltag-add_over.gif b/django/contrib/admin/static/admin/img/tooltag-add_over.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tooltag-add_over.gif rename to django/contrib/admin/static/admin/img/tooltag-add_over.gif diff --git a/django/contrib/admin/media/img/admin/tooltag-arrowright.gif b/django/contrib/admin/static/admin/img/tooltag-arrowright.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tooltag-arrowright.gif rename to django/contrib/admin/static/admin/img/tooltag-arrowright.gif diff --git a/django/contrib/admin/media/img/admin/tooltag-arrowright_over.gif b/django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif similarity index 100% rename from django/contrib/admin/media/img/admin/tooltag-arrowright_over.gif rename to django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif diff --git a/django/contrib/admin/media/js/LICENSE-JQUERY.txt b/django/contrib/admin/static/admin/js/LICENSE-JQUERY.txt similarity index 100% rename from django/contrib/admin/media/js/LICENSE-JQUERY.txt rename to django/contrib/admin/static/admin/js/LICENSE-JQUERY.txt diff --git a/django/contrib/admin/media/js/SelectBox.js b/django/contrib/admin/static/admin/js/SelectBox.js similarity index 100% rename from django/contrib/admin/media/js/SelectBox.js rename to django/contrib/admin/static/admin/js/SelectBox.js diff --git a/django/contrib/admin/media/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js similarity index 97% rename from django/contrib/admin/media/js/SelectFilter2.js rename to django/contrib/admin/static/admin/js/SelectFilter2.js index 92eff2ecfa..b7bc9d5f8f 100644 --- a/django/contrib/admin/media/js/SelectFilter2.js +++ b/django/contrib/admin/static/admin/js/SelectFilter2.js @@ -50,7 +50,7 @@ var SelectFilter = { var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + "_input", 'style', 'width:16px;padding:2px'); - var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_media_prefix + 'img/admin/selector-search.gif'); + var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_media_prefix + 'img/selector-search.gif'); search_selector_img.alt = gettext("Filter"); filter_p.appendChild(document.createTextNode(' ')); @@ -75,7 +75,7 @@ var SelectFilter = { quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s'), [field_name])); var selector_filter = quickElement('p', selector_chosen, gettext('Select your choice(s) and click ')); selector_filter.className = 'selector-filter'; - quickElement('img', selector_filter, '', 'src', admin_media_prefix + (is_stacked ? 'img/admin/selector_stacked-add.gif':'img/admin/selector-add.gif'), 'alt', 'Add'); + quickElement('img', selector_filter, '', 'src', admin_media_prefix + (is_stacked ? 'img/selector_stacked-add.gif':'img/selector-add.gif'), 'alt', 'Add'); var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name')); to_box.className = 'filtered'; var clear_all = quickElement('a', selector_chosen, gettext('Clear all'), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()'); diff --git a/django/contrib/admin/media/js/actions.js b/django/contrib/admin/static/admin/js/actions.js similarity index 100% rename from django/contrib/admin/media/js/actions.js rename to django/contrib/admin/static/admin/js/actions.js diff --git a/django/contrib/admin/media/js/actions.min.js b/django/contrib/admin/static/admin/js/actions.min.js similarity index 100% rename from django/contrib/admin/media/js/actions.min.js rename to django/contrib/admin/static/admin/js/actions.min.js diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js similarity index 98% rename from django/contrib/admin/media/js/admin/DateTimeShortcuts.js rename to django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js index a4293b305b..f22cc7a8ed 100644 --- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js @@ -50,7 +50,7 @@ var DateTimeShortcuts = { var clock_link = document.createElement('a'); clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); clock_link.id = DateTimeShortcuts.clockLinkName + num; - quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_clock.gif', 'alt', gettext('Clock')); + quickElement('img', clock_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_clock.gif', 'alt', gettext('Clock')); shortcuts_span.appendChild(document.createTextNode('\240')); shortcuts_span.appendChild(now_link); shortcuts_span.appendChild(document.createTextNode('\240|\240')); @@ -138,7 +138,7 @@ var DateTimeShortcuts = { var cal_link = document.createElement('a'); cal_link.setAttribute('href', 'javascript:DateTimeShortcuts.openCalendar(' + num + ');'); cal_link.id = DateTimeShortcuts.calendarLinkName + num; - quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/admin/icon_calendar.gif', 'alt', gettext('Calendar')); + quickElement('img', cal_link, '', 'src', DateTimeShortcuts.admin_media_prefix + 'img/icon_calendar.gif', 'alt', gettext('Calendar')); shortcuts_span.appendChild(document.createTextNode('\240')); shortcuts_span.appendChild(today_link); shortcuts_span.appendChild(document.createTextNode('\240|\240')); diff --git a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from django/contrib/admin/media/js/admin/RelatedObjectLookups.js rename to django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js diff --git a/django/contrib/admin/media/js/admin/ordering.js b/django/contrib/admin/static/admin/js/admin/ordering.js similarity index 100% rename from django/contrib/admin/media/js/admin/ordering.js rename to django/contrib/admin/static/admin/js/admin/ordering.js diff --git a/django/contrib/admin/media/js/calendar.js b/django/contrib/admin/static/admin/js/calendar.js similarity index 100% rename from django/contrib/admin/media/js/calendar.js rename to django/contrib/admin/static/admin/js/calendar.js diff --git a/django/contrib/admin/media/js/collapse.js b/django/contrib/admin/static/admin/js/collapse.js similarity index 100% rename from django/contrib/admin/media/js/collapse.js rename to django/contrib/admin/static/admin/js/collapse.js diff --git a/django/contrib/admin/media/js/collapse.min.js b/django/contrib/admin/static/admin/js/collapse.min.js similarity index 100% rename from django/contrib/admin/media/js/collapse.min.js rename to django/contrib/admin/static/admin/js/collapse.min.js diff --git a/django/contrib/admin/media/js/compress.py b/django/contrib/admin/static/admin/js/compress.py similarity index 100% rename from django/contrib/admin/media/js/compress.py rename to django/contrib/admin/static/admin/js/compress.py diff --git a/django/contrib/admin/media/js/core.js b/django/contrib/admin/static/admin/js/core.js similarity index 100% rename from django/contrib/admin/media/js/core.js rename to django/contrib/admin/static/admin/js/core.js diff --git a/django/contrib/admin/media/js/getElementsBySelector.js b/django/contrib/admin/static/admin/js/getElementsBySelector.js similarity index 100% rename from django/contrib/admin/media/js/getElementsBySelector.js rename to django/contrib/admin/static/admin/js/getElementsBySelector.js diff --git a/django/contrib/admin/media/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js similarity index 100% rename from django/contrib/admin/media/js/inlines.js rename to django/contrib/admin/static/admin/js/inlines.js diff --git a/django/contrib/admin/media/js/inlines.min.js b/django/contrib/admin/static/admin/js/inlines.min.js similarity index 100% rename from django/contrib/admin/media/js/inlines.min.js rename to django/contrib/admin/static/admin/js/inlines.min.js diff --git a/django/contrib/admin/media/js/jquery.init.js b/django/contrib/admin/static/admin/js/jquery.init.js similarity index 100% rename from django/contrib/admin/media/js/jquery.init.js rename to django/contrib/admin/static/admin/js/jquery.init.js diff --git a/django/contrib/admin/media/js/jquery.js b/django/contrib/admin/static/admin/js/jquery.js similarity index 100% rename from django/contrib/admin/media/js/jquery.js rename to django/contrib/admin/static/admin/js/jquery.js diff --git a/django/contrib/admin/media/js/jquery.min.js b/django/contrib/admin/static/admin/js/jquery.min.js similarity index 100% rename from django/contrib/admin/media/js/jquery.min.js rename to django/contrib/admin/static/admin/js/jquery.min.js diff --git a/django/contrib/admin/media/js/prepopulate.js b/django/contrib/admin/static/admin/js/prepopulate.js similarity index 100% rename from django/contrib/admin/media/js/prepopulate.js rename to django/contrib/admin/static/admin/js/prepopulate.js diff --git a/django/contrib/admin/media/js/prepopulate.min.js b/django/contrib/admin/static/admin/js/prepopulate.min.js similarity index 100% rename from django/contrib/admin/media/js/prepopulate.min.js rename to django/contrib/admin/static/admin/js/prepopulate.min.js diff --git a/django/contrib/admin/media/js/timeparse.js b/django/contrib/admin/static/admin/js/timeparse.js similarity index 100% rename from django/contrib/admin/media/js/timeparse.js rename to django/contrib/admin/static/admin/js/timeparse.js diff --git a/django/contrib/admin/media/js/urlify.js b/django/contrib/admin/static/admin/js/urlify.js similarity index 100% rename from django/contrib/admin/media/js/urlify.js rename to django/contrib/admin/static/admin/js/urlify.js diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 5a2036d1dc..c280f50d60 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -1,11 +1,11 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_modify adminmedia %} +{% load i18n static admin_modify %} {% load url from future %} {% block extrahead %}{{ block.super }} {% url 'admin:jsi18n' as jsi18nurl %} {% endblock %} -{% block extrastyle %}{{ block.super }}{% endblock %} +{% block extrastyle %}{{ block.super }}{% endblock %} {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} {% block breadcrumbs %}{% if not is_popup %}
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index d0f8e52753..9034ae8522 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -1,12 +1,12 @@ -{% load url from future %} +{% load static %}{% load url from future %} {% block title %}{% endblock %} - + {% block extrastyle %}{% endblock %} - -{% if LANGUAGE_BIDI %}{% endif %} - + +{% if LANGUAGE_BIDI %}{% endif %} + {% block extrahead %}{% endblock %} {% block blockbots %}{% endblock %} diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index b32f76d2c2..c5e428d174 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_modify adminmedia %} +{% load i18n static admin_modify %} {% load url from future %} {% block extrahead %}{{ block.super }} @@ -8,7 +8,7 @@ {{ media }} {% endblock %} -{% block extrastyle %}{{ block.super }}{% endblock %} +{% block extrastyle %}{{ block.super }}{% endblock %} {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 33b5201665..29af47ff79 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -1,11 +1,11 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n %} +{% load i18n static admin_list %} {% load url from future %} {% block extrastyle %} {{ block.super }} - + {% if cl.formset %} - + {% endif %} {% if cl.formset or action_form %} {% url 'admin:jsi18n' as jsi18nurl %} diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html index 738ff28190..233d4e12d0 100644 --- a/django/contrib/admin/templates/admin/change_list_results.html +++ b/django/contrib/admin/templates/admin/change_list_results.html @@ -1,5 +1,4 @@ -{% load adminmedia %} -{% load i18n %} +{% load i18n static %} {% if result_hidden_fields %}
{# DIV for HTML validation #} {% for item in result_hidden_fields %}{{ item }}{% endfor %} @@ -16,7 +15,7 @@ {{ header.text|capfirst }} {% if header.sortable %} {% if header.sort_pos > 0 %} - {% if header.sort_pos == 1 %} {% endif %} + {% if header.sort_pos == 1 %} {% endif %} {{ header.sort_pos }} {% endif %} diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index ff628c0bbf..7e69450866 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -1,4 +1,4 @@ -{% load i18n adminmedia %} +{% load i18n static %}

{{ inline_admin_formset.opts.verbose_name_plural|title }}

{{ inline_admin_formset.formset.management_form }} @@ -40,11 +40,11 @@ if (typeof SelectFilter != "undefined"){ $(".selectfilter").each(function(index, value){ var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% admin_media_prefix %}"); + SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% static "admin/" %}"); }); $(".selectfilterstacked").each(function(index, value){ var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% admin_media_prefix %}"); + SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% static "admin/" %}"); }); } } diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index 5b9d2dca12..829422711d 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -1,4 +1,4 @@ -{% load i18n adminmedia admin_modify %} +{% load i18n static admin_modify %}
{{ inline_admin_formset.formset.management_form }} @@ -86,11 +86,11 @@ if (typeof SelectFilter != "undefined"){ $(".selectfilter").each(function(index, value){ var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% admin_media_prefix %}"); + SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% static "admin/" %}"); }); $(".selectfilterstacked").each(function(index, value){ var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% admin_media_prefix %}"); + SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% static "admin/" %}"); }); } } diff --git a/django/contrib/admin/templates/admin/index.html b/django/contrib/admin/templates/admin/index.html index d392f075ad..0f81a1a4fe 100644 --- a/django/contrib/admin/templates/admin/index.html +++ b/django/contrib/admin/templates/admin/index.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} -{% load i18n %} +{% load i18n static %} -{% block extrastyle %}{{ block.super }}{% endblock %} +{% block extrastyle %}{{ block.super }}{% endblock %} {% block coltype %}colMS{% endblock %} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index ad7b14e965..a95cfd8e6b 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} -{% load i18n %} +{% load i18n static %} -{% block extrastyle %}{% load adminmedia %}{{ block.super }}{% endblock %} +{% block extrastyle %}{{ block.super }}{% endblock %} {% block bodyclass %}login{% endblock %} diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index 3e14a110eb..2b23a215fb 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -1,9 +1,8 @@ -{% load adminmedia %} -{% load i18n %} +{% load i18n static %} {% if cl.search_fields %}