Changeset 108

Timestamp:

07/16/05 11:38:28 (3 years ago)

Author:

adrian

Message:

Added ADMIN_MEDIA_PREFIX setting instead of hard-coding /m/

Files:

• django/trunk/django/conf/admin_templates/base.html (modified) (1 diff)
• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/conf/project_template/settings/admin.py (modified) (1 diff)
• django/trunk/django/templatetags/adminmedia.py (added)
• django/trunk/django/views/admin/main.py (modified) (7 diffs)

django/trunk/django/conf/admin_templates/base.html

@@ -4 +4 @@
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>{% block title %}{% endblock %}</title>
-/m/
+{% load adminmedia %}{% admin_media_prefix %}
-{% block extrastyle %}{% endblock %}
-{% block extrahead %}{% endblock %}

django/trunk/django/conf/global_settings.py

@@ -54 +54 @@
-# List of locations of the template source files, in search order.
-TEMPLATE_DIRS = ()
+
+# 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/'
-
-# Default e-mail address to use for various automated correspondence from

django/trunk/django/conf/project_template/settings/admin.py

@@ -11 +11 @@
-    '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/'

django/trunk/django/views/admin/main.py

@@ -8 +8 @@
-from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect
-from django.utils.text import get_text_list
+from django.conf.settings import ADMIN_MEDIA_PREFIX
-import operator
-
@@ -277 +278 @@
-    if lookup_opts.admin.search_fields:
-        raw_template.append('<div id="toolbar">\n<form id="changelist-search" action="" method="get">\n')
-/m/img/admin/icon_searchbox.png" /></label> '
+%simg/admin/icon_searchbox.png" /></label> ' % ADMIN_MEDIA_PREFIX
-        raw_template.append('<input type="text" size="40" name="%s" value="%s" id="searchbar" /> ' % \
-            (SEARCH_VAR, escape(query)))
@@ -408 +409 @@
-                    elif isinstance(f, meta.BooleanField) or isinstance(f, meta.NullBooleanField):
-                        BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
-/m/img/admin/icon-%s.gif" alt="%s" />' % (
+%simg/admin/icon-%s.gif" alt="%s" />' % (ADMIN_MEDIA_PREFIX, 
-                    # ImageFields are special: Use a thumbnail.
-                    elif isinstance(f, meta.ImageField):
@@ -537 +538 @@
-
-    # Put in any necessary JavaScript imports.
-/m/js/core.js', '/m/js/admin/RelatedObjectLookups.js'
+%sjs/core.js' % ADMIN_MEDIA_PREFIX, '%sjs/admin/RelatedObjectLookups.js' % ADMIN_MEDIA_PREFIX
-    if 'collapse' in ' '.join([f[1].get('classes', '') for f in opts.admin.fields]):
-/m/js/admin/CollapsedFieldsets.js'
+%sjs/admin/CollapsedFieldsets.js' % ADMIN_MEDIA_PREFIX
-    if auto_populated_fields:
-/m/js/urlify.js'
+%sjs/urlify.js' % ADMIN_MEDIA_PREFIX
-    if opts.has_field_type(meta.DateTimeField) or opts.has_field_type(meta.TimeField) or opts.has_field_type(meta.DateField):
-/m/js/calendar.js', '/m/js/admin/DateTimeShortcuts.js'
+%sjs/calendar.js' % ADMIN_MEDIA_PREFIX, '%sjs/admin/DateTimeShortcuts.js' % ADMIN_MEDIA_PREFIX
-    if ordered_objects:
-/m/js/getElementsBySelector.js', '/m/js/dom-drag.js', '/m/js/admin/ordering.js'
+%sjs/getElementsBySelector.js' % ADMIN_MEDIA_PREFIX, '%sjs/dom-drag.js' % ADMIN_MEDIA_PREFIX, '%sjs/admin/ordering.js' % ADMIN_MEDIA_PREFIX
-    if opts.admin.js:
-        javascript_imports.extend(opts.admin.js)
@@ -553 +554 @@
-                for f in field_list:
-                    if f.rel and isinstance(f, meta.ManyToManyField) and f.rel.filter_interface:
-/m/js/SelectBox.js', '/m/js/SelectFilter2.js'
+%sjs/SelectBox.js' % ADMIN_MEDIA_PREFIX, '%sjs/SelectFilter2.js' % ADMIN_MEDIA_PREFIX
-                        raise StopIteration
-        except StopIteration:
@@ -738 +739 @@
-        t.append(' <a href="../../../%s/%s/" class="related-lookup" id="lookup_%s" onclick="return showRelatedObjectLookupPopup(this);">' % \
-                    (field.rel.to.app_label, field.rel.to.module_name, field_id))
-/m/img/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>'
+%simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>' % ADMIN_MEDIA_PREFIX
-    # fields with relationships to editable objects get an "add another" link,
-    # but only if the field doesn't have raw_admin ('cause in that case they get
@@ -746 +747 @@
-        t.append(' <a href="../../../%s/%s/add/" class="add-another" id="add_%s" onclick="return showAddAnotherPopup(this);">' % \
-                    (field.rel.to.app_label, field.rel.to.module_name, field_id))
-/m/img/admin/icon_addlink.gif" width="10" height="10" alt="Add Another" /></a>'
+%simg/admin/icon_addlink.gif" width="10" height="10" alt="Add Another" /></a>' % ADMIN_MEDIA_PREFIX
-        t.append('{% endif %}')
-    return ''.join(t)