From f07e5d4f5df5ca9ca3366d7ecc4b01c490c13198 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 19 Oct 2005 01:09:05 +0000 Subject: 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 --- django/conf/admin_media/css/base.css | 2 - django/conf/admin_media/css/changelists.css | 44 --- django/conf/admin_media/css/global.css | 335 --------------------- django/conf/admin_media/img/admin/arrow-down.gif | Bin 80 -> 0 bytes django/conf/admin_media/img/admin/arrow-up.gif | Bin 838 -> 0 bytes .../conf/admin_media/img/admin/changelist-bg.gif | Bin 58 -> 0 bytes django/conf/admin_media/img/admin/chooser-bg.gif | Bin 199 -> 0 bytes .../admin_media/img/admin/chooser_stacked-bg.gif | Bin 212 -> 0 bytes .../admin_media/img/admin/default-bg-reverse.gif | Bin 843 -> 0 bytes django/conf/admin_media/img/admin/default-bg.gif | Bin 844 -> 0 bytes django/conf/admin_media/img/admin/icon-no.gif | Bin 176 -> 0 bytes django/conf/admin_media/img/admin/icon-yes.gif | Bin 299 -> 0 bytes django/conf/admin_media/img/admin/icon_addlink.gif | Bin 119 -> 0 bytes django/conf/admin_media/img/admin/icon_alert.gif | Bin 145 -> 0 bytes .../conf/admin_media/img/admin/icon_calendar.gif | Bin 192 -> 0 bytes .../conf/admin_media/img/admin/icon_changelink.gif | Bin 119 -> 0 bytes django/conf/admin_media/img/admin/icon_clock.gif | Bin 390 -> 0 bytes .../conf/admin_media/img/admin/icon_deletelink.gif | Bin 181 -> 0 bytes django/conf/admin_media/img/admin/icon_error.gif | Bin 319 -> 0 bytes .../conf/admin_media/img/admin/icon_searchbox.png | Bin 667 -> 0 bytes django/conf/admin_media/img/admin/icon_success.gif | Bin 341 -> 0 bytes .../conf/admin_media/img/admin/nav-bg-grabber.gif | Bin 116 -> 0 bytes .../conf/admin_media/img/admin/nav-bg-reverse.gif | Bin 186 -> 0 bytes django/conf/admin_media/img/admin/nav-bg.gif | Bin 273 -> 0 bytes django/conf/admin_media/img/admin/selector-add.gif | Bin 606 -> 0 bytes .../conf/admin_media/img/admin/selector-addall.gif | Bin 358 -> 0 bytes .../conf/admin_media/img/admin/selector-remove.gif | Bin 398 -> 0 bytes .../admin_media/img/admin/selector-removeall.gif | Bin 355 -> 0 bytes .../conf/admin_media/img/admin/selector-search.gif | Bin 552 -> 0 bytes .../admin_media/img/admin/selector_stacked-add.gif | Bin 612 -> 0 bytes .../img/admin/selector_stacked-remove.gif | Bin 401 -> 0 bytes django/conf/admin_media/img/admin/tool-left.gif | Bin 197 -> 0 bytes .../conf/admin_media/img/admin/tool-left_over.gif | Bin 203 -> 0 bytes django/conf/admin_media/img/admin/tool-right.gif | Bin 198 -> 0 bytes .../conf/admin_media/img/admin/tool-right_over.gif | Bin 200 -> 0 bytes django/conf/admin_media/img/admin/tooltag-add.gif | Bin 932 -> 0 bytes .../admin_media/img/admin/tooltag-add_over.gif | Bin 336 -> 0 bytes .../admin_media/img/admin/tooltag-arrowright.gif | Bin 351 -> 0 bytes .../img/admin/tooltag-arrowright_over.gif | Bin 354 -> 0 bytes django/conf/admin_media/js/SelectBox.js | 109 ------- django/conf/admin_media/js/SelectFilter.js | 81 ----- django/conf/admin_media/js/SelectFilter2.js | 114 ------- .../admin_media/js/admin/CollapsedFieldsets.js | 85 ------ .../conf/admin_media/js/admin/DateTimeShortcuts.js | 201 ------------- .../admin_media/js/admin/RelatedObjectLookups.js | 40 --- django/conf/admin_media/js/admin/ordering.js | 137 --------- django/conf/admin_media/js/calendar.js | 139 --------- django/conf/admin_media/js/core.js | 138 --------- django/conf/admin_media/js/dateparse.js | 227 -------------- .../conf/admin_media/js/getElementsBySelector.js | 167 ---------- django/conf/admin_media/js/timeparse.js | 94 ------ django/conf/admin_media/js/urlify.js | 16 - django/conf/admin_templates/404.html | 11 - django/conf/admin_templates/500.html | 11 - .../conf/admin_templates/admin_object_history.html | 42 --- django/conf/admin_templates/base.html | 50 --- django/conf/admin_templates/base_site.html | 10 - .../delete_confirmation_generic.html | 21 -- django/conf/admin_templates/doc/bookmarklets.html | 30 -- django/conf/admin_templates/doc/index.html | 28 -- .../conf/admin_templates/doc/missing_docutils.html | 17 -- django/conf/admin_templates/doc/model_detail.html | 46 --- django/conf/admin_templates/doc/model_index.html | 44 --- .../conf/admin_templates/doc/template_detail.html | 21 -- .../admin_templates/doc/template_filter_index.html | 50 --- .../admin_templates/doc/template_tag_index.html | 49 --- django/conf/admin_templates/doc/view_detail.html | 26 -- django/conf/admin_templates/doc/view_index.html | 44 --- django/conf/admin_templates/index.html | 65 ---- django/conf/admin_templates/login.html | 31 -- .../admin_templates/registration/logged_out.html | 11 - .../registration/password_change_done.html | 13 - .../registration/password_change_form.html | 25 -- .../registration/password_reset_done.html | 13 - .../registration/password_reset_email.html | 14 - .../registration/password_reset_form.html | 18 -- .../conf/admin_templates/template_validator.html | 31 -- django/conf/project_template/settings.py | 58 ++++ django/conf/project_template/settings/__init__.py | 0 django/conf/project_template/settings/admin.py | 18 -- django/conf/project_template/settings/main.py | 52 ---- .../project_template/settings/urls/__init__.py | 0 .../conf/project_template/settings/urls/admin.py | 6 - django/conf/project_template/settings/urls/main.py | 6 - django/conf/project_template/urls.py | 9 + django/conf/urls/admin.py | 57 ---- django/contrib/admin/media/css/base.css | 2 + django/contrib/admin/media/css/changelists.css | 44 +++ django/contrib/admin/media/css/global.css | 335 +++++++++++++++++++++ .../contrib/admin/media/img/admin/arrow-down.gif | Bin 0 -> 80 bytes django/contrib/admin/media/img/admin/arrow-up.gif | Bin 0 -> 838 bytes .../admin/media/img/admin/changelist-bg.gif | Bin 0 -> 58 bytes .../contrib/admin/media/img/admin/chooser-bg.gif | Bin 0 -> 199 bytes .../admin/media/img/admin/chooser_stacked-bg.gif | Bin 0 -> 212 bytes .../admin/media/img/admin/default-bg-reverse.gif | Bin 0 -> 843 bytes .../contrib/admin/media/img/admin/default-bg.gif | Bin 0 -> 844 bytes django/contrib/admin/media/img/admin/icon-no.gif | Bin 0 -> 176 bytes django/contrib/admin/media/img/admin/icon-yes.gif | Bin 0 -> 299 bytes .../contrib/admin/media/img/admin/icon_addlink.gif | Bin 0 -> 119 bytes .../contrib/admin/media/img/admin/icon_alert.gif | Bin 0 -> 145 bytes .../admin/media/img/admin/icon_calendar.gif | Bin 0 -> 192 bytes .../admin/media/img/admin/icon_changelink.gif | Bin 0 -> 119 bytes .../contrib/admin/media/img/admin/icon_clock.gif | Bin 0 -> 390 bytes .../admin/media/img/admin/icon_deletelink.gif | Bin 0 -> 181 bytes .../contrib/admin/media/img/admin/icon_error.gif | Bin 0 -> 319 bytes .../admin/media/img/admin/icon_searchbox.png | Bin 0 -> 667 bytes .../contrib/admin/media/img/admin/icon_success.gif | Bin 0 -> 341 bytes .../admin/media/img/admin/nav-bg-grabber.gif | Bin 0 -> 116 bytes .../admin/media/img/admin/nav-bg-reverse.gif | Bin 0 -> 186 bytes django/contrib/admin/media/img/admin/nav-bg.gif | Bin 0 -> 273 bytes .../contrib/admin/media/img/admin/selector-add.gif | Bin 0 -> 606 bytes .../admin/media/img/admin/selector-addall.gif | Bin 0 -> 358 bytes .../admin/media/img/admin/selector-remove.gif | Bin 0 -> 398 bytes .../admin/media/img/admin/selector-removeall.gif | Bin 0 -> 355 bytes .../admin/media/img/admin/selector-search.gif | Bin 0 -> 552 bytes .../admin/media/img/admin/selector_stacked-add.gif | Bin 0 -> 612 bytes .../media/img/admin/selector_stacked-remove.gif | Bin 0 -> 401 bytes django/contrib/admin/media/img/admin/tool-left.gif | Bin 0 -> 197 bytes .../admin/media/img/admin/tool-left_over.gif | Bin 0 -> 203 bytes .../contrib/admin/media/img/admin/tool-right.gif | Bin 0 -> 198 bytes .../admin/media/img/admin/tool-right_over.gif | Bin 0 -> 200 bytes .../contrib/admin/media/img/admin/tooltag-add.gif | Bin 0 -> 932 bytes .../admin/media/img/admin/tooltag-add_over.gif | Bin 0 -> 336 bytes .../admin/media/img/admin/tooltag-arrowright.gif | Bin 0 -> 351 bytes .../media/img/admin/tooltag-arrowright_over.gif | Bin 0 -> 354 bytes django/contrib/admin/media/js/SelectBox.js | 109 +++++++ django/contrib/admin/media/js/SelectFilter.js | 81 +++++ django/contrib/admin/media/js/SelectFilter2.js | 114 +++++++ .../admin/media/js/admin/CollapsedFieldsets.js | 85 ++++++ .../admin/media/js/admin/DateTimeShortcuts.js | 201 +++++++++++++ .../admin/media/js/admin/RelatedObjectLookups.js | 40 +++ django/contrib/admin/media/js/admin/ordering.js | 137 +++++++++ django/contrib/admin/media/js/calendar.js | 139 +++++++++ django/contrib/admin/media/js/core.js | 138 +++++++++ django/contrib/admin/media/js/dateparse.js | 227 ++++++++++++++ .../admin/media/js/getElementsBySelector.js | 167 ++++++++++ django/contrib/admin/media/js/timeparse.js | 94 ++++++ django/contrib/admin/media/js/urlify.js | 16 + django/contrib/admin/templates/admin/404.html | 11 + django/contrib/admin/templates/admin/500.html | 11 + django/contrib/admin/templates/admin/base.html | 50 +++ .../contrib/admin/templates/admin/base_site.html | 10 + .../admin/templates/admin/delete_confirmation.html | 21 ++ django/contrib/admin/templates/admin/index.html | 65 ++++ django/contrib/admin/templates/admin/login.html | 31 ++ .../admin/templates/admin/object_history.html | 42 +++ .../admin/templates/admin/template_validator.html | 31 ++ .../admin/templates/admin_doc/bookmarklets.html | 30 ++ .../contrib/admin/templates/admin_doc/index.html | 28 ++ .../templates/admin_doc/missing_docutils.html | 17 ++ .../admin/templates/admin_doc/model_detail.html | 46 +++ .../admin/templates/admin_doc/model_index.html | 44 +++ .../admin/templates/admin_doc/template_detail.html | 21 ++ .../templates/admin_doc/template_filter_index.html | 50 +++ .../templates/admin_doc/template_tag_index.html | 49 +++ .../admin/templates/admin_doc/view_detail.html | 26 ++ .../admin/templates/admin_doc/view_index.html | 44 +++ .../admin/templates/registration/logged_out.html | 11 + .../registration/password_change_done.html | 13 + .../registration/password_change_form.html | 25 ++ .../registration/password_reset_done.html | 13 + .../registration/password_reset_email.html | 14 + .../registration/password_reset_form.html | 18 ++ django/contrib/admin/templatetags/adminapplist.py | 57 ++++ django/contrib/admin/templatetags/adminmedia.py | 17 ++ django/contrib/admin/templatetags/log.py | 51 ++++ django/contrib/admin/urls/admin.py | 57 ++++ django/contrib/admin/views/main.py | 12 +- django/contrib/admin/views/template.py | 2 +- django/core/management.py | 13 +- django/core/servers/basehttp.py | 2 +- django/middleware/admin.py | 126 -------- django/models/auth.py | 46 --- django/templatetags/adminapplist.py | 57 ---- django/templatetags/adminmedia.py | 17 -- django/templatetags/log.py | 51 ---- docs/django-admin.txt | 4 +- docs/faq.txt | 3 +- docs/middleware.txt | 21 +- docs/modpython.txt | 32 +- docs/settings.txt | 10 +- docs/tutorial01.txt | 27 +- docs/tutorial02.txt | 93 +++--- docs/tutorial03.txt | 43 ++- 184 files changed, 3006 insertions(+), 3241 deletions(-) delete mode 100644 django/conf/admin_media/css/base.css delete mode 100644 django/conf/admin_media/css/changelists.css delete mode 100644 django/conf/admin_media/css/global.css delete mode 100644 django/conf/admin_media/img/admin/arrow-down.gif delete mode 100644 django/conf/admin_media/img/admin/arrow-up.gif delete mode 100644 django/conf/admin_media/img/admin/changelist-bg.gif delete mode 100644 django/conf/admin_media/img/admin/chooser-bg.gif delete mode 100644 django/conf/admin_media/img/admin/chooser_stacked-bg.gif delete mode 100644 django/conf/admin_media/img/admin/default-bg-reverse.gif delete mode 100644 django/conf/admin_media/img/admin/default-bg.gif delete mode 100644 django/conf/admin_media/img/admin/icon-no.gif delete mode 100644 django/conf/admin_media/img/admin/icon-yes.gif delete mode 100644 django/conf/admin_media/img/admin/icon_addlink.gif delete mode 100644 django/conf/admin_media/img/admin/icon_alert.gif delete mode 100644 django/conf/admin_media/img/admin/icon_calendar.gif delete mode 100644 django/conf/admin_media/img/admin/icon_changelink.gif delete mode 100644 django/conf/admin_media/img/admin/icon_clock.gif delete mode 100644 django/conf/admin_media/img/admin/icon_deletelink.gif delete mode 100644 django/conf/admin_media/img/admin/icon_error.gif delete mode 100644 django/conf/admin_media/img/admin/icon_searchbox.png delete mode 100644 django/conf/admin_media/img/admin/icon_success.gif delete mode 100644 django/conf/admin_media/img/admin/nav-bg-grabber.gif delete mode 100644 django/conf/admin_media/img/admin/nav-bg-reverse.gif delete mode 100644 django/conf/admin_media/img/admin/nav-bg.gif delete mode 100644 django/conf/admin_media/img/admin/selector-add.gif delete mode 100644 django/conf/admin_media/img/admin/selector-addall.gif delete mode 100644 django/conf/admin_media/img/admin/selector-remove.gif delete mode 100644 django/conf/admin_media/img/admin/selector-removeall.gif delete mode 100644 django/conf/admin_media/img/admin/selector-search.gif delete mode 100644 django/conf/admin_media/img/admin/selector_stacked-add.gif delete mode 100644 django/conf/admin_media/img/admin/selector_stacked-remove.gif delete mode 100644 django/conf/admin_media/img/admin/tool-left.gif delete mode 100644 django/conf/admin_media/img/admin/tool-left_over.gif delete mode 100644 django/conf/admin_media/img/admin/tool-right.gif delete mode 100644 django/conf/admin_media/img/admin/tool-right_over.gif delete mode 100644 django/conf/admin_media/img/admin/tooltag-add.gif delete mode 100644 django/conf/admin_media/img/admin/tooltag-add_over.gif delete mode 100644 django/conf/admin_media/img/admin/tooltag-arrowright.gif delete mode 100644 django/conf/admin_media/img/admin/tooltag-arrowright_over.gif delete mode 100644 django/conf/admin_media/js/SelectBox.js delete mode 100644 django/conf/admin_media/js/SelectFilter.js delete mode 100644 django/conf/admin_media/js/SelectFilter2.js delete mode 100644 django/conf/admin_media/js/admin/CollapsedFieldsets.js delete mode 100644 django/conf/admin_media/js/admin/DateTimeShortcuts.js delete mode 100644 django/conf/admin_media/js/admin/RelatedObjectLookups.js delete mode 100644 django/conf/admin_media/js/admin/ordering.js delete mode 100644 django/conf/admin_media/js/calendar.js delete mode 100644 django/conf/admin_media/js/core.js delete mode 100644 django/conf/admin_media/js/dateparse.js delete mode 100644 django/conf/admin_media/js/getElementsBySelector.js delete mode 100644 django/conf/admin_media/js/timeparse.js delete mode 100644 django/conf/admin_media/js/urlify.js delete mode 100644 django/conf/admin_templates/404.html delete mode 100644 django/conf/admin_templates/500.html delete mode 100644 django/conf/admin_templates/admin_object_history.html delete mode 100644 django/conf/admin_templates/base.html delete mode 100644 django/conf/admin_templates/base_site.html delete mode 100644 django/conf/admin_templates/delete_confirmation_generic.html delete mode 100644 django/conf/admin_templates/doc/bookmarklets.html delete mode 100644 django/conf/admin_templates/doc/index.html delete mode 100644 django/conf/admin_templates/doc/missing_docutils.html delete mode 100644 django/conf/admin_templates/doc/model_detail.html delete mode 100644 django/conf/admin_templates/doc/model_index.html delete mode 100644 django/conf/admin_templates/doc/template_detail.html delete mode 100644 django/conf/admin_templates/doc/template_filter_index.html delete mode 100644 django/conf/admin_templates/doc/template_tag_index.html delete mode 100644 django/conf/admin_templates/doc/view_detail.html delete mode 100644 django/conf/admin_templates/doc/view_index.html delete mode 100644 django/conf/admin_templates/index.html delete mode 100644 django/conf/admin_templates/login.html delete mode 100644 django/conf/admin_templates/registration/logged_out.html delete mode 100644 django/conf/admin_templates/registration/password_change_done.html delete mode 100644 django/conf/admin_templates/registration/password_change_form.html delete mode 100644 django/conf/admin_templates/registration/password_reset_done.html delete mode 100644 django/conf/admin_templates/registration/password_reset_email.html delete mode 100644 django/conf/admin_templates/registration/password_reset_form.html delete mode 100644 django/conf/admin_templates/template_validator.html create mode 100644 django/conf/project_template/settings.py delete mode 100644 django/conf/project_template/settings/__init__.py delete mode 100644 django/conf/project_template/settings/admin.py delete mode 100644 django/conf/project_template/settings/main.py delete mode 100644 django/conf/project_template/settings/urls/__init__.py delete mode 100644 django/conf/project_template/settings/urls/admin.py delete mode 100644 django/conf/project_template/settings/urls/main.py create mode 100644 django/conf/project_template/urls.py delete mode 100644 django/conf/urls/admin.py create mode 100644 django/contrib/admin/media/css/base.css create mode 100644 django/contrib/admin/media/css/changelists.css create mode 100644 django/contrib/admin/media/css/global.css create mode 100644 django/contrib/admin/media/img/admin/arrow-down.gif create mode 100644 django/contrib/admin/media/img/admin/arrow-up.gif create mode 100644 django/contrib/admin/media/img/admin/changelist-bg.gif create mode 100644 django/contrib/admin/media/img/admin/chooser-bg.gif create mode 100644 django/contrib/admin/media/img/admin/chooser_stacked-bg.gif create mode 100644 django/contrib/admin/media/img/admin/default-bg-reverse.gif create mode 100644 django/contrib/admin/media/img/admin/default-bg.gif create mode 100644 django/contrib/admin/media/img/admin/icon-no.gif create mode 100644 django/contrib/admin/media/img/admin/icon-yes.gif create mode 100644 django/contrib/admin/media/img/admin/icon_addlink.gif create mode 100644 django/contrib/admin/media/img/admin/icon_alert.gif create mode 100644 django/contrib/admin/media/img/admin/icon_calendar.gif create mode 100644 django/contrib/admin/media/img/admin/icon_changelink.gif create mode 100644 django/contrib/admin/media/img/admin/icon_clock.gif create mode 100644 django/contrib/admin/media/img/admin/icon_deletelink.gif create mode 100644 django/contrib/admin/media/img/admin/icon_error.gif create mode 100644 django/contrib/admin/media/img/admin/icon_searchbox.png create mode 100644 django/contrib/admin/media/img/admin/icon_success.gif create mode 100644 django/contrib/admin/media/img/admin/nav-bg-grabber.gif create mode 100644 django/contrib/admin/media/img/admin/nav-bg-reverse.gif create mode 100644 django/contrib/admin/media/img/admin/nav-bg.gif create mode 100644 django/contrib/admin/media/img/admin/selector-add.gif create mode 100644 django/contrib/admin/media/img/admin/selector-addall.gif create mode 100644 django/contrib/admin/media/img/admin/selector-remove.gif create mode 100644 django/contrib/admin/media/img/admin/selector-removeall.gif create mode 100644 django/contrib/admin/media/img/admin/selector-search.gif create mode 100644 django/contrib/admin/media/img/admin/selector_stacked-add.gif create mode 100644 django/contrib/admin/media/img/admin/selector_stacked-remove.gif create mode 100644 django/contrib/admin/media/img/admin/tool-left.gif create mode 100644 django/contrib/admin/media/img/admin/tool-left_over.gif create mode 100644 django/contrib/admin/media/img/admin/tool-right.gif create mode 100644 django/contrib/admin/media/img/admin/tool-right_over.gif create mode 100644 django/contrib/admin/media/img/admin/tooltag-add.gif create mode 100644 django/contrib/admin/media/img/admin/tooltag-add_over.gif create mode 100644 django/contrib/admin/media/img/admin/tooltag-arrowright.gif create mode 100644 django/contrib/admin/media/img/admin/tooltag-arrowright_over.gif create mode 100644 django/contrib/admin/media/js/SelectBox.js create mode 100644 django/contrib/admin/media/js/SelectFilter.js create mode 100644 django/contrib/admin/media/js/SelectFilter2.js create mode 100644 django/contrib/admin/media/js/admin/CollapsedFieldsets.js create mode 100644 django/contrib/admin/media/js/admin/DateTimeShortcuts.js create mode 100644 django/contrib/admin/media/js/admin/RelatedObjectLookups.js create mode 100644 django/contrib/admin/media/js/admin/ordering.js create mode 100644 django/contrib/admin/media/js/calendar.js create mode 100644 django/contrib/admin/media/js/core.js create mode 100644 django/contrib/admin/media/js/dateparse.js create mode 100644 django/contrib/admin/media/js/getElementsBySelector.js create mode 100644 django/contrib/admin/media/js/timeparse.js create mode 100644 django/contrib/admin/media/js/urlify.js create mode 100644 django/contrib/admin/templates/admin/404.html create mode 100644 django/contrib/admin/templates/admin/500.html create mode 100644 django/contrib/admin/templates/admin/base.html create mode 100644 django/contrib/admin/templates/admin/base_site.html create mode 100644 django/contrib/admin/templates/admin/delete_confirmation.html create mode 100644 django/contrib/admin/templates/admin/index.html create mode 100644 django/contrib/admin/templates/admin/login.html create mode 100644 django/contrib/admin/templates/admin/object_history.html create mode 100644 django/contrib/admin/templates/admin/template_validator.html create mode 100644 django/contrib/admin/templates/admin_doc/bookmarklets.html create mode 100644 django/contrib/admin/templates/admin_doc/index.html create mode 100644 django/contrib/admin/templates/admin_doc/missing_docutils.html create mode 100644 django/contrib/admin/templates/admin_doc/model_detail.html create mode 100644 django/contrib/admin/templates/admin_doc/model_index.html create mode 100644 django/contrib/admin/templates/admin_doc/template_detail.html create mode 100644 django/contrib/admin/templates/admin_doc/template_filter_index.html create mode 100644 django/contrib/admin/templates/admin_doc/template_tag_index.html create mode 100644 django/contrib/admin/templates/admin_doc/view_detail.html create mode 100644 django/contrib/admin/templates/admin_doc/view_index.html create mode 100644 django/contrib/admin/templates/registration/logged_out.html create mode 100644 django/contrib/admin/templates/registration/password_change_done.html create mode 100644 django/contrib/admin/templates/registration/password_change_form.html create mode 100644 django/contrib/admin/templates/registration/password_reset_done.html create mode 100644 django/contrib/admin/templates/registration/password_reset_email.html create mode 100644 django/contrib/admin/templates/registration/password_reset_form.html create mode 100644 django/contrib/admin/templatetags/adminapplist.py create mode 100644 django/contrib/admin/templatetags/adminmedia.py create mode 100644 django/contrib/admin/templatetags/log.py create mode 100644 django/contrib/admin/urls/admin.py delete mode 100644 django/middleware/admin.py delete mode 100644 django/templatetags/adminapplist.py delete mode 100644 django/templatetags/adminmedia.py delete mode 100644 django/templatetags/log.py diff --git a/django/conf/admin_media/css/base.css b/django/conf/admin_media/css/base.css deleted file mode 100644 index d50e5d43f5..0000000000 --- a/django/conf/admin_media/css/base.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url(global.css); -@import url(changelists.css); \ No newline at end of file diff --git a/django/conf/admin_media/css/changelists.css b/django/conf/admin_media/css/changelists.css deleted file mode 100644 index 7ff59c5e6b..0000000000 --- a/django/conf/admin_media/css/changelists.css +++ /dev/null @@ -1,44 +0,0 @@ -/* - DJANGO Admin Changelist Styles - by Wilson Miner wilson@lawrence.com - Copyright (c) 2005 Lawrence Journal-World -*/ - -#changelist { position:relative; width:100%; } -#changelist table { width:100%; } -.change-list .filtered table { border-right:1px solid #ddd; } -.change-list .filtered { min-height:400px; _height:400px; } -.change-list .filtered { background:white url(../img/admin/changelist-bg.gif) top right repeat-y !important; } -.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:160px !important; width:auto !important; } -.change-list .filtered table tbody th { padding-right:10px; } -#changelist .toplinks { border-bottom:1px solid #ccc !important; } -#changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/admin/nav-bg.gif) 0 180% repeat-x; overflow:hidden; } -.change-list .filtered .paginator { border-right:1px solid #ddd; } - -/* CHANGELIST TABLES */ -#changelist table thead th { white-space:nowrap; } -#changelist table tbody td { border-left: 1px solid #ddd; } -#changelist table tfoot { color: #666; } - -/* TOOLBAR */ -#changelist #toolbar { padding:3px; border-bottom:1px solid #ddd; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; color:#666; } -#changelist #toolbar form input { font-size:11px; padding:1px 2px; } -#changelist #toolbar form #searchbar { padding:2px; } -#changelist #changelist-search img { vertical-align:middle; } - -/* FILTER COLUMN */ -#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:160px; border-left:1px solid #ddd; background:#efefef; margin:0; } -#changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; } -#changelist-filter h3 { font-size:12px; margin-bottom:0; } -#changelist-filter ul { padding-left:0;margin-left:10px;_margin-right:-10px; } -#changelist-filter li { list-style-type:none; margin-left:0; padding-left:0; } -#changelist-filter a { color:#999; } -#changelist-filter a:hover { color:#036; } -#changelist-filter li.selected { border-left:5px solid #ccc; padding-left:5px;margin-left:-10px; } -#changelist-filter li.selected a { color:#5b80b2 !important; } - -/* DATE DRILLDOWN */ -.change-list ul.toplinks { display:block; background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; border-top:1px solid white; float:left; padding:0 !important; margin:0 !important; width:100%; } -.change-list ul.toplinks li { float: left; width: 9em; padding:3px 6px; font-weight: bold; list-style-type:none; } -.change-list ul.toplinks .date-back a { color:#999; } -.change-list ul.toplinks .date-back a:hover { color:#036; } diff --git a/django/conf/admin_media/css/global.css b/django/conf/admin_media/css/global.css deleted file mode 100644 index 453998c363..0000000000 --- a/django/conf/admin_media/css/global.css +++ /dev/null @@ -1,335 +0,0 @@ -/* - DJANGO Admin Global Styles - by Wilson Miner wilson@lawrence.com - Copyright (c) 2005 Lawrence Journal-World -*/ - -body { margin:0; padding:0; font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; } - -/* LINKS */ -a:link, a:visited { color: #5b80b2; text-decoration:none; } -a:hover { color: #036; } -a img { border:none; } - -/* GLOBAL DEFAULTS */ -p, ol, ul, dl { margin:.2em 0 .8em 0; font-size:12px; } -p { padding:0; line-height:140%; } -h1,h2,h3,h4,h5 { font-weight:bold; } -h1 { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; } -h2 { font-size:16px; margin:1em 0 .5em 0; } -h2.subhead { font-weight:normal;margin-top:0; } -h3 { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; } -h4 { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; } -h5 { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; } -ul li { list-style-type:square; padding:1px 0; } -ul.plainlist { margin-left:0 !important; } -ul.plainlist li { list-style-type:none; } -li ul { margin-bottom:0; } -li, dt, dd { font-size:11px; line-height:14px; } -dt { font-weight:bold; margin-top:4px; } -dd { margin-left:0; } -form { margin:0; padding:0; } -fieldset { margin:0; padding:0; } -blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } -code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } -pre.literal-block { margin:10px; background:#eee; padding:6px 8px; } -code strong { color:#930; } -hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } -div.system-message { background: #ffc; margin: 10px; padding: 6px 8px; font-size: .8em; } -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; } - -/* PAGE STRUCTURE */ -#container { position:relative; width:100%; min-width:720px; } -#header { text-align:left; min-height:55px; _height:55px; } -#content { margin:10px 15px; } -#content-main { float:left; } -#content-related { float:right; } -#footer { clear:both; padding:10px; } - -/* COLUMN TYPES */ -.colMS, .colM, .colSM, .colM #content-main, .colM #content-main .xfull { width:758px; } /* master site width for fixed-width pages */ -.colMS #content-main, .colSM #content-main, .colMS #content-main .xfull, .colSM #content-main .xfull { width:519px; } /* main column width for 2-column pages */ -.colMS #content-related, .colSM #content-related, .colSMS #content-related { width:220px; } /* sidebar column width */ -.colSM #content-related { float:left; } .colSM #content-main { float:right; } /* swaps left and right columns */ -.colSMS #content-main { width:298px; } -.popup .colM { width:95%; } -.popup #content-main, .flex #content-main, .flex .xfull { width:100% !important; } /* main column width for liquid-width pages */ -.popup .flex #content-main, .popup .colM #content-main { width:100% !important; } -.subcol { float:left; width:46%; margin-right:15px; } - -/* WIDTHS */ -.x50 { width:50px; } -.x75 { width:75px; } -.x100 { width:100px; } -.x150 { width:150px; } -.x200 { width:200px; } -.x250 { width:250px; } -.x300 { width:300px; } -.x400 { width:400px; } -.x500 { width:500px; } - -/* HEADER */ -#header { background:#417690; color:#ffc; } -#header a:link, #header a:visited { color:white; } -#header a:hover { text-decoration:underline; } -#branding { float:left; width:480px; } -#branding h1 /* client name */ { padding:8px 0 0 10px; margin:0; font-size:18px; font-weight:normal; color:#f4f379; } -#branding h2 /* site name */ { font-size:14px; padding:0 0 8px 10px; margin:0; font-weight:normal; color:#ffc; } -#user-tools { font-size:11px; padding:8px 8px 0 5px; text-align:right; } - - -/* SIDEBAR */ -#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; } -#content-related h4 { font-size:11px; } - -/* TABLES */ -table { border-collapse:collapse; border-color:#ccc; } -td, th { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; } -th { text-align:left; font-size:12px; } -thead th { font-weight:bold; color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; } -thead th:first-child { border-left:none !important; } -.superwide table th, .superwide table td, .superwide table input, .superwide table select { font-size:10px; } -.module table { border-collapse: collapse; } -thead th.optional { font-weight:normal !important; } -#home-page table.module tr:hover { background:#EDF3FE; } -fieldset table { border-right:1px solid #eee; } -tr.row-label td { font-size:9px; padding-top:2px; padding-bottom:0; border-bottom:none; color:#666; margin-top:-1px; } -tr.alt { background:#f6f6f6; } -.row1 { background:#EDF3FE; } -.row2 { background:white; } -table#change-history { width:100%; } -table#change-history tbody th { width:16em; } - -/* TABLE SORTING */ -thead th a:link, thead th a:visited { color:#666; display:block; } -table thead th.sorted { background-position:bottom left !important; } -table thead th.sorted a { padding-right:13px; } -table thead th.ascending a { background:url(../img/admin/arrow-down.gif) right .4em no-repeat; } -table thead th.descending a { background:url(../img/admin/arrow-up.gif) right .4em no-repeat; } - -/* MODULES */ -.module { border:1px solid #ccc; margin-bottom:5px; background:white; } -.module p, .module ul, .module h3, .module h4, .module dl, .module pre { padding-left:10px; padding-right:10px; } -.module blockquote { margin-left:12px; } -.module ul, .module ol { margin-left:1.5em; } -.module h2, .module caption { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; background:#7CA0C7 url(../img/admin/default-bg.gif) left top repeat-x; color:white; font-weight:bold; } -.module caption { border:1px solid #ccc; border-bottom:none; } -.module h3 { margin-top:.6em; } -#content-related .module h2 { background:#eee url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } -#content-main .verbose .actionlist { float:right; font-size:10px; width:17em; position:relative; top:-1.6em; margin:0 8px; } -.dashboard .module table { width:100%; } - -/* RECENT ACTIONS MODULE */ - -.module ul.actionlist { margin-left:0; } -ul.actionlist li { list-style-type:none; } - -/* FORM DEFAULTS */ - -input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; border:1px solid #ccc; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } -textarea { vertical-align:top !important; } -input[type=checkbox], input[type=radio] { border:none; } - -/* FORM BUTTONS */ -input[type=submit], input[type=button], .submit-row input { background:white url(../img/admin/nav-bg.gif) bottom repeat-x; padding:3px; } -input[type=submit]:active, input[type=button]:active { background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top; } -input[type=submit].default, .submit-row input.default { border:2px solid #5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x; font-weight:bold; color:white; } -input[type=submit].default:active { background-image:url(../img/admin/default-bg-reverse.gif); background-position:top; } -.submit-row { padding:5px 7px; text-align:right; background:#ffc; border:1px solid #ccc; margin:5px 0; } -.submit-row input { margin:0 0 0 5px; } -.submit-row .float-left { padding-top:.1em; } - -/* FORM ROWS */ -.form-row { clear:both; padding:8px 12px; font-size:11px; } -html>body .form-row { border-bottom:1px solid #eee; } -.form-row:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.form-row img, .form-row input { vertical-align:middle; } -form .form-row p { padding-left:0; font-size:11px; } - -/* FORM LABELS */ -form h4 { margin:0 !important; padding:0 !important; border:none !important; } -label { font-weight:normal !important; color:#666; font-size:12px; } -label.inline { margin-left:20px; } -.required label, label.required { font-weight:bold !important; color:#333 !important; } - -/* RADIO BUTTONS */ -form ul.radiolist li { list-style-type:none; } -form ul.radiolist label { float:none; display:inline; } -form ul.inline { margin-left:0; padding:0; } -form ul.inline li { float:left; padding-right:7px; } - -/* ALIGNED FIELDSETS */ -.aligned label { display:block; padding:0 1em 3px 0; float:left; text-align:left; width:8em; } -.aligned label.inline { display:inline; float:none; } -.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; } -form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } -form .aligned table p { margin-left:0; padding-left:0; } -form .aligned p.help { padding-left:38px; } -.aligned .vCheckboxLabel { float:none !important; display:inline; } -.colM .aligned .vLargeTextField, colM .aligned .vXMLLargeTextField { width:610px; } -.checkbox-row p.help { margin-left:0; padding-left:0 !important; } - -/* WIDE FIELDSETS */ -.wide label { width:15em !important; } -form .wide p { margin-left:15em; } -form .wide p.help { padding-left:38px; } -.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { width:450px; } - -/* COLLAPSED FIELDSETS */ -fieldset.collapsed * { display:none; } -fieldset.collapsed h2, fieldset.collapsed { display:block !important; } -fieldset.collapsed .collapse-toggle { display: inline !important; } -fieldset.collapse h2 a.collapse-toggle { color:#ffc; } -fieldset.collapse h2 a.collapse-toggle:hover { text-decoration:underline; } -.hidden { display:none; } - -/* MESSAGES & ERRORS */ -ul.messagelist { padding:0 0 5px 0; margin:0; } -ul.messagelist li { font-size:12px; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border-bottom:1px solid #ddd; color:#666; background:#ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; } -.errornote { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; } -ul.errorlist { margin:0 !important; padding:0 !important; } -.errorlist li { font-size:12px !important; display:block; padding:4px 5px 4px 25px; margin:0 0 3px 0; border:1px solid red; color:white; background:red url(../img/admin/icon_alert.gif) 5px .3em no-repeat; } -td ul.errorlist { margin:0 !important; padding:0 !important; } -td ul.errorlist li { margin:0 !important; } -.error { background:#ffc; } -.error input, .error select { border:1px solid red; } - -/* ACTION ICONS */ -.addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; } -.changelink { padding-left:12px; background:url(../img/admin/icon_changelink.gif) 0 .2em no-repeat; } -.deletelink { padding-left:12px; background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; } -a.deletelink:link, a.deletelink:visited { color:#CC3434; } -a.deletelink:hover { color:#993333; } - -/* OBJECT TOOLS */ -.object-tools { font-size:10px; font-weight:bold; font-family:Arial,Helvetica,sans-serif; padding-left:0; margin-bottom:5px; float:right; position:relative; margin-top:-2.4em; margin-bottom:-2em; } -.form-row .object-tools { margin-top:0; margin-bottom:0; } -.object-tools li { display:block; float:left; background:url(../img/admin/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; } -.object-tools a:link, .object-tools a:visited { display:block; float:left; color:white; padding:.1em 14px .1em 8px; height:14px; background:#999 url(../img/admin/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; } -.object-tools a.viewsitelink, .object-tools a.golink { background:#999 url(../img/admin/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; } -.object-tools a.addlink { background:#999 url(../img/admin/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; } - -/* INLINE CONTROLS */ -#inline-controls { font-weight:bold; font-size:12px; } -#inline-specific-controls { margin-left:6px; padding:0 8px; border-left:6px solid #ccc; } - -/* BREADCRUMBS */ -p.breadcrumbs { font-size:11px; color:#ccc;text-align:left; } /* old breadcrumbs style */ -div.breadcrumbs { background:white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x; padding:2px 8px 3px 8px; font-size:11px; color:#999; border-top:1px solid white; border-bottom:1px solid #ccc; text-align:left; } - -/* SELECTOR (FILTER INTERFACE) */ -.selector { width:580px; float:left; } -.selector select { width:270px; height:170px; } -.selector-available, .selector-chosen { float:left; width:270px; text-align:center; margin-bottom:5px; } -.selector-available h2, .selector-chosen h2 { border:1px solid #ccc; } -.selector .selector-available h2 { background:white url(../img/admin/nav-bg.gif) bottom left repeat-x; color:#666; } -.selector .selector-filter { background:white; border:1px solid #ccc; border-width:0 1px; padding:3px; color:#999; font-size:10px; margin:0; text-align:left; } -.selector .selector-chosen .selector-filter { padding:4px 5px; } -.selector .selector-available input { width:230px; } -.selector ul.selector-chooser { float:left; width:22px; height:50px; background:url(../img/admin/chooser-bg.gif) top center no-repeat; margin:13% 3px 0 3px; padding:0; } -.selector-chooser li { margin:0; padding:3px; list-style-type:none; } -.selector select { margin-bottom:5px; margin-top:0; } -.selector-add, .selector-remove { width:16px; height:16px; display:block; text-indent:-3000px; } -.selector-add { background:url(../img/admin/selector-add.gif) top center no-repeat; margin-bottom:2px; } -.selector-remove { background:url(../img/admin/selector-remove.gif) top center no-repeat; } -a.selector-chooseall, a.selector-clearall { display:block; width:6em; text-align:left; margin-left:auto; margin-right:auto; font-weight:bold; color:#666; padding:3px 0 3px 18px; } -a.selector-chooseall:hover, a.selector-clearall:hover { color:#036; } -a.selector-chooseall { width:7em; background:url(../img/admin/selector-addall.gif) left center no-repeat; } -a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left center no-repeat; } - -/* Stacked selectors for long items */ -.stacked { float:left; width:500px; } -.stacked select { width:480px; height:100px; } -.stacked .selector-available, .stacked .selector-chosen { width:480px; } -.stacked .selector-available { margin-bottom:0; } -.stacked .selector-available input { width:442px; } -.stacked ul.selector-chooser { height:22px; width:50px; margin:0 0 3px 40%; background:url(../img/admin/chooser_stacked-bg.gif) top center no-repeat; } -.stacked .selector-chooser li { float:left; padding:3px 3px 3px 5px; } -.stacked .selector-chooseall, .stacked .selector-clearall { display:none; } -.stacked .selector-add { background-image:url(../img/admin/selector_stacked-add.gif); } -.stacked .selector-remove { background-image:url(../img/admin/selector_stacked-remove.gif); } - -/* DATE AND TIME */ -p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } -.datetime span { font-size:11px; font-weight:normal; white-space:nowrap; } -.vDateField { margin-left:4px; } -table p.datetime { font-size:10px; margin-left:0; padding-left:0; } - -/* FILE UPLOADS */ -p.file-upload { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } -.file-upload a { font-weight:normal; } -.file-upload .deletelink { margin-left:5px; } - -/* CALENDARS & CLOCKS */ -.calendarbox, .clockbox { margin:5px auto; width: 10em; text-align: center; background:white; position:relative; } -.clockbox { width:6em; } -.calendar { margin:0; padding: 0; } -.calendar table { margin: 0; padding: 0; border-collapse:collapse; background:white; width:99%; } -.calendar caption, .calendarbox h2 { margin: 0; font-size:11px; text-align:center; border-top:none; } -.calendar th { font-size:10px; color:#666; padding:2px 3px; text-align:center; background:#e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; border-bottom:1px solid #ddd; } -.calendar td { font-size:11px; text-align: center; padding: 0; border-top:1px solid #eee; border-bottom:none; } -.calendar td.selected a { background: #C9DBED; } -.calendar td.nonday { background:#efefef; } -.calendar td.today a { background:#ffc; } -.calendar td a, .timelist a { display: block; font-weight:bold; padding:4px; text-decoration: none; color:#444; } -.calendar td a:hover, .timelist a:hover { background: #5b80b2; color:white; } -.calendar td a:active, .timelist a:active { background: #036; color:white; } -.calendarnav { font-size:10px; text-align: center; color:#ccc; margin:0; padding:1px 3px; } -.calendarnav a:link, #calendarnav a:visited, #calendarnav a:hover { color: #999; } -.calendar-shortcuts { background:white; font-size:10px; line-height:11px; border-top:1px solid #eee; padding:3px 0 4px; color:#ccc; } -.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { display:block; position:absolute; font-weight:bold; font-size:12px; background:#C9DBED url(../img/admin/default-bg.gif) bottom left repeat-x; padding:1px 4px 2px 4px; color:white; } -.calendarnav-previous:hover, .calendarnav-next:hover { background:#036; } -.calendarnav-previous { top:0; left:0; } -.calendarnav-next { top:0; right:0; } -.calendar-cancel { margin:0 !important; padding:0; font-size:10px; background:#e1e1e1 url(../img/admin/nav-bg.gif) 0 50% repeat-x; border-top:1px solid #ddd; } -.calendar-cancel a { padding:2px; color:#999; } -ul.timelist, .timelist li { list-style-type:none; margin:0; padding:0; } -.timelist a { padding:2px; } - -/* ORDERING WIDGET */ -ul#orderthese { padding:0; margin:0; list-style-type:none; } -ul#orderthese li { list-style-type:none; display:block; padding:0; margin:6px 0; width:214px; background:#f6f6f6; white-space:nowrap; overflow:hidden; } -ul#orderthese li span { display:block; border:1px solid #e7e7e7; background:transparent url(../img/admin/nav-bg-grabber.gif) top left repeat-y; font-size:10px !important; padding:4px 6px 4px 12px; } -ul#orderthese span:hover { background-color:#efefef; } - -/* PAGINATOR */ -.paginator { font-size:11px; padding-top:10px; padding-bottom:10px; line-height:22px; margin:0; border-top:1px solid #ddd; } -.paginator a:link, .paginator a:visited { padding:2px 6px; border:solid 1px #ccc; background:white; text-decoration:none; } -.paginator a.showall { padding:0 !important; border:none !important; } -.paginator a.showall:hover { color:#036 !important; background:transparent !important; } -.paginator .end { border-width:2px !important; margin-right:6px; } -.paginator .this-page { padding:2px 6px; font-weight:bold; font-size:13px; vertical-align:top; } -.paginator a:hover { color:white; background:#5b80b2; border-color:#036; } - -/* TEXT STYLES & MODIFIERS */ -.small { font-size:11px; } -.tiny { font-size:10px; } -p.tiny { margin-top:-2px; } -.mini { font-size:9px; } -p.mini { margin-top:-3px; } -.help, p.help { font-size:10px !important; color:#999; } -p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align:middle; } -.quiet, a.quiet:link, a.quiet:visited { color:#999 !important;font-weight:normal !important; } -.quiet strong { font-weight:bold !important; } -.float-right { float:right; } -.float-left { float:left; } -.clear { clear:both; } -.align-left { text-align:left; } -.align-right { text-align:right; } -.example { margin:10px 0; padding:5px 10px; background:#efefef; } -.nowrap { white-space:nowrap; } - -/* CUSTOM FORM FIELDS */ -.vSelectMultipleField { vertical-align:top !important; } -.vCheckboxField { border:none; } -.vDateField, .vTimeField { margin-right:2px; } -.vFileUploadField { border:none; } -.vURLField { width:380px; } -.vLargeTextField, .vXMLLargeTextField { width:480px; } -.colM .vLargeTextField, .colM .vXMLLargeTextField { width:720px; } -body.core-flatfile #id_content { height: 400px; } -.module table .vPositiveSmallIntegerField { width: 22px; } diff --git a/django/conf/admin_media/img/admin/arrow-down.gif b/django/conf/admin_media/img/admin/arrow-down.gif deleted file mode 100644 index a967b9fd55..0000000000 Binary files a/django/conf/admin_media/img/admin/arrow-down.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/arrow-up.gif b/django/conf/admin_media/img/admin/arrow-up.gif deleted file mode 100644 index 3fe4851399..0000000000 Binary files a/django/conf/admin_media/img/admin/arrow-up.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/changelist-bg.gif b/django/conf/admin_media/img/admin/changelist-bg.gif deleted file mode 100644 index 7f4699470a..0000000000 Binary files a/django/conf/admin_media/img/admin/changelist-bg.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/chooser-bg.gif b/django/conf/admin_media/img/admin/chooser-bg.gif deleted file mode 100644 index 30e83c2518..0000000000 Binary files a/django/conf/admin_media/img/admin/chooser-bg.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/chooser_stacked-bg.gif b/django/conf/admin_media/img/admin/chooser_stacked-bg.gif deleted file mode 100644 index 5d104b6d98..0000000000 Binary files a/django/conf/admin_media/img/admin/chooser_stacked-bg.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/default-bg-reverse.gif b/django/conf/admin_media/img/admin/default-bg-reverse.gif deleted file mode 100644 index 0873281e51..0000000000 Binary files a/django/conf/admin_media/img/admin/default-bg-reverse.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/default-bg.gif b/django/conf/admin_media/img/admin/default-bg.gif deleted file mode 100644 index 003aeca59f..0000000000 Binary files a/django/conf/admin_media/img/admin/default-bg.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon-no.gif b/django/conf/admin_media/img/admin/icon-no.gif deleted file mode 100644 index 1b4ee58145..0000000000 Binary files a/django/conf/admin_media/img/admin/icon-no.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon-yes.gif b/django/conf/admin_media/img/admin/icon-yes.gif deleted file mode 100644 index 7399282740..0000000000 Binary files a/django/conf/admin_media/img/admin/icon-yes.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_addlink.gif b/django/conf/admin_media/img/admin/icon_addlink.gif deleted file mode 100644 index ee70e1adba..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_addlink.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_alert.gif b/django/conf/admin_media/img/admin/icon_alert.gif deleted file mode 100644 index a1dde26254..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_alert.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_calendar.gif b/django/conf/admin_media/img/admin/icon_calendar.gif deleted file mode 100644 index 7587b305a4..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_calendar.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_changelink.gif b/django/conf/admin_media/img/admin/icon_changelink.gif deleted file mode 100644 index e1b9afde65..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_changelink.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_clock.gif b/django/conf/admin_media/img/admin/icon_clock.gif deleted file mode 100644 index ff2d57e0a3..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_clock.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_deletelink.gif b/django/conf/admin_media/img/admin/icon_deletelink.gif deleted file mode 100644 index 72523e3a3b..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_deletelink.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_error.gif b/django/conf/admin_media/img/admin/icon_error.gif deleted file mode 100644 index 3730a00b26..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_error.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_searchbox.png b/django/conf/admin_media/img/admin/icon_searchbox.png deleted file mode 100644 index 8ab579e526..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_searchbox.png and /dev/null differ diff --git a/django/conf/admin_media/img/admin/icon_success.gif b/django/conf/admin_media/img/admin/icon_success.gif deleted file mode 100644 index 5cf90a15aa..0000000000 Binary files a/django/conf/admin_media/img/admin/icon_success.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/nav-bg-grabber.gif b/django/conf/admin_media/img/admin/nav-bg-grabber.gif deleted file mode 100644 index 0a784fa769..0000000000 Binary files a/django/conf/admin_media/img/admin/nav-bg-grabber.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/nav-bg-reverse.gif b/django/conf/admin_media/img/admin/nav-bg-reverse.gif deleted file mode 100644 index f11029f90f..0000000000 Binary files a/django/conf/admin_media/img/admin/nav-bg-reverse.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/nav-bg.gif b/django/conf/admin_media/img/admin/nav-bg.gif deleted file mode 100644 index f8402b809d..0000000000 Binary files a/django/conf/admin_media/img/admin/nav-bg.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector-add.gif b/django/conf/admin_media/img/admin/selector-add.gif deleted file mode 100644 index 50132d1c43..0000000000 Binary files a/django/conf/admin_media/img/admin/selector-add.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector-addall.gif b/django/conf/admin_media/img/admin/selector-addall.gif deleted file mode 100644 index d6e7c639bb..0000000000 Binary files a/django/conf/admin_media/img/admin/selector-addall.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector-remove.gif b/django/conf/admin_media/img/admin/selector-remove.gif deleted file mode 100644 index 2b9b0a2ac3..0000000000 Binary files a/django/conf/admin_media/img/admin/selector-remove.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector-removeall.gif b/django/conf/admin_media/img/admin/selector-removeall.gif deleted file mode 100644 index 5a4421926d..0000000000 Binary files a/django/conf/admin_media/img/admin/selector-removeall.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector-search.gif b/django/conf/admin_media/img/admin/selector-search.gif deleted file mode 100644 index 6d5f4c7492..0000000000 Binary files a/django/conf/admin_media/img/admin/selector-search.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector_stacked-add.gif b/django/conf/admin_media/img/admin/selector_stacked-add.gif deleted file mode 100644 index 7426169652..0000000000 Binary files a/django/conf/admin_media/img/admin/selector_stacked-add.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/selector_stacked-remove.gif b/django/conf/admin_media/img/admin/selector_stacked-remove.gif deleted file mode 100644 index 60412cee19..0000000000 Binary files a/django/conf/admin_media/img/admin/selector_stacked-remove.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tool-left.gif b/django/conf/admin_media/img/admin/tool-left.gif deleted file mode 100644 index 011490ff3a..0000000000 Binary files a/django/conf/admin_media/img/admin/tool-left.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tool-left_over.gif b/django/conf/admin_media/img/admin/tool-left_over.gif deleted file mode 100644 index 937e07bb1a..0000000000 Binary files a/django/conf/admin_media/img/admin/tool-left_over.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tool-right.gif b/django/conf/admin_media/img/admin/tool-right.gif deleted file mode 100644 index cdc140cc59..0000000000 Binary files a/django/conf/admin_media/img/admin/tool-right.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tool-right_over.gif b/django/conf/admin_media/img/admin/tool-right_over.gif deleted file mode 100644 index 4db977e838..0000000000 Binary files a/django/conf/admin_media/img/admin/tool-right_over.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tooltag-add.gif b/django/conf/admin_media/img/admin/tooltag-add.gif deleted file mode 100644 index 8b53d49ae5..0000000000 Binary files a/django/conf/admin_media/img/admin/tooltag-add.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tooltag-add_over.gif b/django/conf/admin_media/img/admin/tooltag-add_over.gif deleted file mode 100644 index bfc52f10de..0000000000 Binary files a/django/conf/admin_media/img/admin/tooltag-add_over.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tooltag-arrowright.gif b/django/conf/admin_media/img/admin/tooltag-arrowright.gif deleted file mode 100644 index cdaaae77ed..0000000000 Binary files a/django/conf/admin_media/img/admin/tooltag-arrowright.gif and /dev/null differ diff --git a/django/conf/admin_media/img/admin/tooltag-arrowright_over.gif b/django/conf/admin_media/img/admin/tooltag-arrowright_over.gif deleted file mode 100644 index 7163189604..0000000000 Binary files a/django/conf/admin_media/img/admin/tooltag-arrowright_over.gif and /dev/null differ diff --git a/django/conf/admin_media/js/SelectBox.js b/django/conf/admin_media/js/SelectBox.js deleted file mode 100644 index af8de204cb..0000000000 --- a/django/conf/admin_media/js/SelectBox.js +++ /dev/null @@ -1,109 +0,0 @@ -var SelectBox = { - cache: new Object(), - init: function(id) { - var box = document.getElementById(id); - var node; - SelectBox.cache[id] = new Array(); - var cache = SelectBox.cache[id]; - for (var i = 0; (node = box.options[i]); i++) { - cache.push({ value: node.value, text: node.text, displayed: 1 }); - } - }, - redisplay: function(id) { - // Repopulate HTML select box from cache - var box = document.getElementById(id); - box.options.length = 0; // clear all options - for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) { - var node = SelectBox.cache[id][i]; - if (node.displayed) { - box.options[box.options.length] = new Option(node.text, node.value, false, false); - } - } - }, - filter: function(id, text) { - // Redisplay the HTML select box, displaying only the choices containing ALL - // the words in text. (It's an AND search.) - var tokens = text.toLowerCase().split(/\s+/); - var node, token; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { - node.displayed = 1; - for (var j = 0; (token = tokens[j]); j++) { - if (node.text.toLowerCase().indexOf(token) == -1) { - node.displayed = 0; - } - } - } - SelectBox.redisplay(id); - }, - delete_from_cache: function(id, value) { - var node, delete_index = null; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { - if (node.value == value) { - delete_index = i; - break; - } - } - var j = SelectBox.cache[id].length - 1; - for (var i = delete_index; i < j; i++) { - SelectBox.cache[id][i] = SelectBox.cache[id][i+1]; - } - SelectBox.cache[id].length--; - }, - add_to_cache: function(id, option) { - SelectBox.cache[id].push({ value: option.value, text: option.text, displayed: 1 }); - }, - cache_contains: function(id, value) { - // Check if an item is contained in the cache - var node; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { - if (node.value == value) { - return true; - } - } - return false; - }, - move: function(from, to) { - var from_box = document.getElementById(from); - var to_box = document.getElementById(to); - var option; - for (var i = 0; (option = from_box.options[i]); i++) { - if (option.selected && SelectBox.cache_contains(from, option.value)) { - SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); - SelectBox.delete_from_cache(from, option.value); - } - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - move_all: function(from, to) { - var from_box = document.getElementById(from); - var to_box = document.getElementById(to); - var option; - for (var i = 0; (option = from_box.options[i]); i++) { - SelectBox.add_to_cache(to, { value: option.value, text: option.text, displayed: 1 }); - SelectBox.delete_from_cache(from, option.value); - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - sort: function(id) { - SelectBox.cache[id].sort( function(a, b) { - a = a.text.toLowerCase(); - b = b.text.toLowerCase(); - try { - if (a > b) return 1; - if (a < b) return -1; - } - catch (e) { - // silently fail on IE 'unknown' exception - } - return 0; - } ); - }, - select_all: function(id) { - var box = document.getElementById(id); - for (var i = 0; i < box.options.length; i++) { - box.options[i].selected = 'selected'; - } - } -} diff --git a/django/conf/admin_media/js/SelectFilter.js b/django/conf/admin_media/js/SelectFilter.js deleted file mode 100644 index 0501920608..0000000000 --- a/django/conf/admin_media/js/SelectFilter.js +++ /dev/null @@ -1,81 +0,0 @@ -/* -SelectFilter - Turns a multiple-select box into a filter interface. - -Requires SelectBox.js and addevent.js. -*/ - -function findForm(node) { - // returns the node of the form containing the given node - if (node.tagName.toLowerCase() != 'form') { - return findForm(node.parentNode); - } - return node; -} - -var SelectFilter = { - init: function(field_id) { - var from_box = document.getElementById(field_id); - from_box.id += '_from'; // change its ID - // Create the INPUT input box - var input_box = document.createElement('input'); - input_box.id = field_id + '_input'; - input_box.setAttribute('type', 'text'); - from_box.parentNode.insertBefore(input_box, from_box); - from_box.parentNode.insertBefore(document.createElement('br'), input_box.nextSibling); - // Create the TO box - var to_box = document.createElement('select'); - to_box.id = field_id + '_to'; - to_box.setAttribute('multiple', 'multiple'); - to_box.setAttribute('size', from_box.size); - from_box.parentNode.insertBefore(to_box, from_box.nextSibling); - to_box.setAttribute('name', from_box.getAttribute('name')); - from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); - // Give the filters a CSS hook - from_box.setAttribute('class', 'filtered'); - to_box.setAttribute('class', 'filtered'); - // Set up the JavaScript event handlers for the select box filter interface - addEvent(input_box, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); - addEvent(input_box, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); - addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); }); - addEvent(from_box, 'focus', function() { input_box.focus(); }); - addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); }); - addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); - SelectBox.init(field_id + '_from'); - SelectBox.init(field_id + '_to'); - // Move selected from_box options to to_box - SelectBox.move(field_id + '_from', field_id + '_to'); - }, - filter_key_up: function(event, field_id) { - from = document.getElementById(field_id + '_from'); - // don't submit form if user pressed Enter - if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) { - from.selectedIndex = 0; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = 0; - return false; - } - var temp = from.selectedIndex; - SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); - from.selectedIndex = temp; - return true; - }, - filter_key_down: function(event, field_id) { - from = document.getElementById(field_id + '_from'); - // right arrow -- move across - if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) { - var old_index = from.selectedIndex; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index; - return false; - } - // down arrow -- wrap around - if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) { - from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; - } - // up arrow -- wrap around - if ((event.which && event.which == 38) || (event.keyCode && event.keyCode == 38)) { - from.selectedIndex = (from.selectedIndex == 0) ? from.length - 1 : from.selectedIndex - 1; - } - return true; - } -} diff --git a/django/conf/admin_media/js/SelectFilter2.js b/django/conf/admin_media/js/SelectFilter2.js deleted file mode 100644 index 380ae72c91..0000000000 --- a/django/conf/admin_media/js/SelectFilter2.js +++ /dev/null @@ -1,114 +0,0 @@ -/* -SelectFilter2 - Turns a multiple-select box into a filter interface. - -Different than SelectFilter because this is coupled to the admin framework. - -Requires core.js, SelectBox.js and addevent.js. -*/ - -function findForm(node) { - // returns the node of the form containing the given node - if (node.tagName.toLowerCase() != 'form') { - return findForm(node.parentNode); - } - return node; -} - -var SelectFilter = { - init: function(field_id, field_name, is_stacked, admin_media_prefix) { - var from_box = document.getElementById(field_id); - from_box.id += '_from'; // change its ID - from_box.className = 'filtered'; - - // Remove

, because it just gets in the way. - var ps = from_box.parentNode.getElementsByTagName('p'); - for (var i=0; i or

- var selector_div = quickElement('div', from_box.parentNode); - selector_div.className = is_stacked ? 'selector stacked' : 'selector'; - - //
- var selector_available = quickElement('div', selector_div, ''); - selector_available.className = 'selector-available'; - quickElement('h2', selector_available, 'Available ' + field_name); - var filter_p = quickElement('p', selector_available, ''); - filter_p.className = 'selector-filter'; - quickElement('img', filter_p, '', 'src', admin_media_prefix + 'img/admin/selector-search.gif'); - filter_p.appendChild(document.createTextNode(' ')); - var filter_input = quickElement('input', filter_p, '', 'type', 'text'); - filter_input.id = field_id + '_input'; - selector_available.appendChild(from_box); - var choose_all = quickElement('a', selector_available, 'Choose all', 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); })()'); - choose_all.className = 'selector-chooseall'; - - //
    - var selector_chooser = quickElement('ul', selector_div, ''); - selector_chooser.className = 'selector-chooser'; - var add_link = quickElement('a', quickElement('li', selector_chooser, ''), 'Add', 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to");})()'); - add_link.className = 'selector-add'; - var remove_link = quickElement('a', quickElement('li', selector_chooser, ''), 'Remove', 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from");})()'); - remove_link.className = 'selector-remove'; - - //
    - var selector_chosen = quickElement('div', selector_div, ''); - selector_chosen.className = 'selector-chosen'; - quickElement('h2', selector_chosen, 'Chosen ' + field_name); - var selector_filter = quickElement('p', selector_chosen, 'Select your choice(s) and click '); - selector_filter.className = 'selector-filter'; - quickElement('img', selector_filter, '', 'src', admin_media_prefix + 'img/admin/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, 'Clear all', 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()'); - clear_all.className = 'selector-clearall'; - - from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); - - // Set up the JavaScript event handlers for the select box filter interface - addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); - addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); - addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); }); - addEvent(from_box, 'focus', function() { filter_input.focus(); }); - addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); }); - addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); - SelectBox.init(field_id + '_from'); - SelectBox.init(field_id + '_to'); - // Move selected from_box options to to_box - SelectBox.move(field_id + '_from', field_id + '_to'); - }, - filter_key_up: function(event, field_id) { - from = document.getElementById(field_id + '_from'); - // don't submit form if user pressed Enter - if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) { - from.selectedIndex = 0; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = 0; - return false; - } - var temp = from.selectedIndex; - SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); - from.selectedIndex = temp; - return true; - }, - filter_key_down: function(event, field_id) { - from = document.getElementById(field_id + '_from'); - // right arrow -- move across - if ((event.which && event.which == 39) || (event.keyCode && event.keyCode == 39)) { - var old_index = from.selectedIndex; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = (old_index == from.length) ? from.length - 1 : old_index; - return false; - } - // down arrow -- wrap around - if ((event.which && event.which == 40) || (event.keyCode && event.keyCode == 40)) { - from.selectedIndex = (from.length == from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; - } - // up arrow -- wrap around - if ((event.which && event.which == 38) || (event.keyCode && event.keyCode == 38)) { - from.selectedIndex = (from.selectedIndex == 0) ? from.length - 1 : from.selectedIndex - 1; - } - return true; - } -} diff --git a/django/conf/admin_media/js/admin/CollapsedFieldsets.js b/django/conf/admin_media/js/admin/CollapsedFieldsets.js deleted file mode 100644 index 0b3ad9e421..0000000000 --- a/django/conf/admin_media/js/admin/CollapsedFieldsets.js +++ /dev/null @@ -1,85 +0,0 @@ -// Finds all fieldsets with class="collapse", collapses them, and gives each -// one a "Show" link that uncollapses it. The "Show" link becomes a "Hide" -// link when the fieldset is visible. - -function findForm(node) { - // returns the node of the form containing the given node - if (node.tagName.toLowerCase() != 'form') { - return findForm(node.parentNode); - } - return node; -} - -var CollapsedFieldsets = { - collapse_re: /\bcollapse\b/, // Class of fieldsets that should be dealt with. - collapsed_re: /\bcollapsed\b/, // Class that fieldsets get when they're hidden. - collapsed_class: 'collapsed', - init: function() { - var fieldsets = document.getElementsByTagName('fieldset'); - var collapsed_seen = false; - for (var i = 0, fs; fs = fieldsets[i]; i++) { - // Collapse this fieldset if it has the correct class, and if it - // doesn't have any errors. (Collapsing shouldn't apply in the case - // of error messages.) - if (fs.className.match(CollapsedFieldsets.collapse_re) && !CollapsedFieldsets.fieldset_has_errors(fs)) { - collapsed_seen = true; - // Give it an additional class, used by CSS to hide it. - fs.className += ' ' + CollapsedFieldsets.collapsed_class; - // (Show) - var collapse_link = document.createElement('a'); - collapse_link.className = 'collapse-toggle'; - collapse_link.id = 'fieldsetcollapser' + i; - collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;'); - collapse_link.href = '#'; - collapse_link.innerHTML = 'Show'; - var h2 = fs.getElementsByTagName('h2')[0]; - h2.appendChild(document.createTextNode(' (')); - h2.appendChild(collapse_link); - h2.appendChild(document.createTextNode(')')); - } - } - if (collapsed_seen) { - // Expand all collapsed fieldsets when form is submitted. - addEvent(findForm(document.getElementsByTagName('fieldset')[0]), 'submit', function() { CollapsedFieldsets.uncollapse_all(); }); - } - }, - fieldset_has_errors: function(fs) { - // Returns true if any fields in the fieldset have validation errors. - var divs = fs.getElementsByTagName('div'); - for (var i=0; i -// - -var DateTimeShortcuts = { - calendars: [], - calendarInputs: [], - clockInputs: [], - calendarDivName1: 'calendarbox', // name of calendar
    that gets toggled - calendarDivName2: 'calendarin', // name of
    that contains calendar - clockDivName: 'clockbox', // name of clock
    that gets toggled - admin_media_prefix: '', - init: function() { - // Deduce admin_media_prefix by looking at the -
    -{% endblock %} diff --git a/django/conf/admin_templates/registration/logged_out.html b/django/conf/admin_templates/registration/logged_out.html deleted file mode 100644 index 92cf77e35b..0000000000 --- a/django/conf/admin_templates/registration/logged_out.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base_site" %} - -{% block breadcrumbs %}
    Home
    {% endblock %} - -{% block content %} - -

    Thanks for spending some quality time with the Web site today.

    - -

    Log in again

    - -{% endblock %} diff --git a/django/conf/admin_templates/registration/password_change_done.html b/django/conf/admin_templates/registration/password_change_done.html deleted file mode 100644 index 8028c9f0d9..0000000000 --- a/django/conf/admin_templates/registration/password_change_done.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base_site" %} - -{% block breadcrumbs %}
    Home › Password change
    {% endblock %} - -{% block title %}Password change successful{% endblock %} - -{% block content %} - -

    Password change successful

    - -

    Your password was changed.

    - -{% endblock %} diff --git a/django/conf/admin_templates/registration/password_change_form.html b/django/conf/admin_templates/registration/password_change_form.html deleted file mode 100644 index 8ceefed86e..0000000000 --- a/django/conf/admin_templates/registration/password_change_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base_site" %} - -{% block breadcrumbs %}
    Home › Password change
    {% endblock %} - -{% block title %}Password change{% endblock %} - -{% block content %} - -

    Password change

    - -

    Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.

    - -
    - -{% if form.old_password.errors %}{{ form.old_password.html_error_list }}{% endif %} -

    {{ form.old_password }}

    -{% if form.new_password1.errors %}{{ form.new_password1.html_error_list }}{% endif %} -

    {{ form.new_password1 }}

    -{% if form.new_password2.errors %}{{ form.new_password2.html_error_list }}{% endif %} -

    {{ form.new_password2 }}

    - -

    -
    - -{% endblock %} diff --git a/django/conf/admin_templates/registration/password_reset_done.html b/django/conf/admin_templates/registration/password_reset_done.html deleted file mode 100644 index 5c41d9f1d5..0000000000 --- a/django/conf/admin_templates/registration/password_reset_done.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base_site" %} - -{% block breadcrumbs %}
    Home › Password reset
    {% endblock %} - -{% block title %}Password reset successful{% endblock %} - -{% block content %} - -

    Password reset successful

    - -

    We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly.

    - -{% endblock %} diff --git a/django/conf/admin_templates/registration/password_reset_email.html b/django/conf/admin_templates/registration/password_reset_email.html deleted file mode 100644 index 4a5bb920d6..0000000000 --- a/django/conf/admin_templates/registration/password_reset_email.html +++ /dev/null @@ -1,14 +0,0 @@ -You're receiving this e-mail because you requested a password reset -for your user account at {{ site_name }}. - -Your new password is: {{ new_password }} - -Feel free to change this password by going to this page: - -http://{{ domain }}/password_change/ - -Your username, in case you've forgotten, is {{ user.username }} - -Thanks for using our site! - -The {{ site_name }} team diff --git a/django/conf/admin_templates/registration/password_reset_form.html b/django/conf/admin_templates/registration/password_reset_form.html deleted file mode 100644 index c2dae2a5b3..0000000000 --- a/django/conf/admin_templates/registration/password_reset_form.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base_site" %} - -{% block breadcrumbs %}
    Home › Password reset
    {% endblock %} - -{% block title %}Password reset{% endblock %} - -{% block content %} - -

    Password reset

    - -

    Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you.

    - -
    -{% if form.email.errors %}{{ form.email.html_error_list }}{% endif %} -

    {{ form.email }}

    -
    - -{% endblock %} diff --git a/django/conf/admin_templates/template_validator.html b/django/conf/admin_templates/template_validator.html deleted file mode 100644 index ddd9775f9f..0000000000 --- a/django/conf/admin_templates/template_validator.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "base_site" %} - -{% block content %} - -
    - -
    - -{% if form.error_dict %} -

    Your template had {{ form.error_dict.items|length }} error{{ form.error_dict.items|pluralize }}:

    -{% endif %} - -
    -
    - {% if form.site.errors %}{{ form.site.html_error_list }}{% endif %} -

    {{ form.site }}

    -
    -
    - {% if form.template.errors %}{{ form.template.html_error_list }}{% endif %} -

    {{ form.template }}

    -
    -
    - -
    - -
    - -
    -
    - -{% endblock %} diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py new file mode 100644 index 0000000000..838375cbb7 --- /dev/null +++ b/django/conf/project_template/settings.py @@ -0,0 +1,58 @@ +# Django settings for {{ project_name }} project. + +DEBUG = True + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +MANAGERS = ADMINS + +LANGUAGE_CODE = 'en-us' + +DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. +DATABASE_NAME = '' # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. + +SITE_ID = 1 + +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. +# Example: "http://media.lawrence.com" +MEDIA_URL = '' + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +ADMIN_MEDIA_PREFIX = '/media/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.core.template.loaders.filesystem.load_template_source', + 'django.core.template.loaders.app_directories.load_template_source', +# 'django.core.template.loaders.eggs.load_template_source', +) + +MIDDLEWARE_CLASSES = ( + "django.middleware.common.CommonMiddleware", + "django.middleware.sessions.SessionMiddleware", + "django.middleware.doc.XViewMiddleware", +) + +ROOT_URLCONF = '{{ project_name }}.urls' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates". +) + +INSTALLED_APPS = ( +) diff --git a/django/conf/project_template/settings/__init__.py b/django/conf/project_template/settings/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/conf/project_template/settings/admin.py b/django/conf/project_template/settings/admin.py deleted file mode 100644 index 603886a5f2..0000000000 --- a/django/conf/project_template/settings/admin.py +++ /dev/null @@ -1,18 +0,0 @@ -# Django settings for {{ project_name }} project admin site. - -from main import * - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates". -) -ROOT_URLCONF = '{{ project_name }}.settings.urls.admin' -MIDDLEWARE_CLASSES = ( - 'django.middleware.sessions.SessionMiddleware', - 'django.middleware.admin.AdminUserRequired', - 'django.middleware.common.CommonMiddleware', -) - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' diff --git a/django/conf/project_template/settings/main.py b/django/conf/project_template/settings/main.py deleted file mode 100644 index 1bde7df10a..0000000000 --- a/django/conf/project_template/settings/main.py +++ /dev/null @@ -1,52 +0,0 @@ -# Django settings for {{ project_name }} project. - -DEBUG = True - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -LANGUAGE_CODE = 'en-us' - -DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. -DATABASE_NAME = '' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. - -SITE_ID = 1 - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. -# Example: "http://media.lawrence.com" -MEDIA_URL = '' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = '' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( -# 'django.core.template.loaders.app_directories.load_template_source', - 'django.core.template.loaders.filesystem.load_template_source', -# 'django.core.template.loaders.eggs.load_template_source', -) - -MIDDLEWARE_CLASSES = ( - "django.middleware.common.CommonMiddleware", - "django.middleware.doc.XViewMiddleware", -) - -ROOT_URLCONF = '{{ project_name }}.settings.urls.main' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates". -) - -INSTALLED_APPS = ( -) diff --git a/django/conf/project_template/settings/urls/__init__.py b/django/conf/project_template/settings/urls/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/conf/project_template/settings/urls/admin.py b/django/conf/project_template/settings/urls/admin.py deleted file mode 100644 index c3eb86d3cb..0000000000 --- a/django/conf/project_template/settings/urls/admin.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.conf.urls.defaults import * - -urlpatterns = patterns('', - (r'^admin/', include('django.conf.urls.admin')), - (r'^r/', include('django.conf.urls.shortcut')), -) diff --git a/django/conf/project_template/settings/urls/main.py b/django/conf/project_template/settings/urls/main.py deleted file mode 100644 index f9b993a52c..0000000000 --- a/django/conf/project_template/settings/urls/main.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.conf.urls.defaults import * - -urlpatterns = patterns('', - # Example: - # (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')), -) diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py new file mode 100644 index 0000000000..fe77ea1867 --- /dev/null +++ b/django/conf/project_template/urls.py @@ -0,0 +1,9 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('', + # Example: + # (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')), + + # Uncomment this for admin: +# (r'^admin/', include('django.contrib.admin.urls.admin')), +) diff --git a/django/conf/urls/admin.py b/django/conf/urls/admin.py deleted file mode 100644 index d03b88ceb4..0000000000 --- a/django/conf/urls/admin.py +++ /dev/null @@ -1,57 +0,0 @@ -from django.conf.urls.defaults import * -from django.conf.settings import INSTALLED_APPS - -urlpatterns = ( - ('^$', 'django.contrib.admin.views.main.index'), - ('^logout/$', 'django.views.auth.login.logout'), - ('^password_change/$', 'django.views.registration.passwords.password_change'), - ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'), - ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'), - - # Documentation - ('^doc/$', 'django.contrib.admin.views.doc.doc_index'), - ('^doc/bookmarklets/$', 'django.contrib.admin.views.doc.bookmarklets'), - ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'), - ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'), - ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'), - ('^doc/views/jump/$', 'django.contrib.admin.views.doc.jump_to_view'), - ('^doc/views/(?P[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'), - ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'), - ('^doc/models/(?P[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'), -# ('^doc/templates/$', 'django.views.admin.doc.template_index'), - ('^doc/templates/(?P