innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Proofread new django-admin 'adminmedia' option from [3811] and [3812] 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-09-25 17:50:36 +00:00
parent f32318be98
commit 7cfe56524b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management.py
View File

@ -1274,7 +1274,7 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
parser.add_option('--verbosity', action='store', dest='verbosity', default='2', parser.add_option('--verbosity', action='store', dest='verbosity', default='2',
type='choice', choices=['0', '1', '2'], type='choice', choices=['0', '1', '2'],
help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'), help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
parser.add_option('--adminmedia', dest='admin_media_path', default='', help='Lets you manually specify the directory to serve admin media from when running the development server.'), parser.add_option('--adminmedia', dest='admin_media_path', default='', help='Specifies the directory from which to serve admin media for runserver.'),
options, args = parser.parse_args(argv[1:]) options, args = parser.parse_args(argv[1:])

2
django/core/servers/basehttp.py
View File

@ -594,7 +594,7 @@ class AdminMediaHandler(object):
Use this ONLY LOCALLY, for development! This hasn't been tested for Use this ONLY LOCALLY, for development! This hasn't been tested for
security and is not super efficient. security and is not super efficient.
""" """
def __init__(self, application, media_dir = None): def __init__(self, application, media_dir=None):
from django.conf import settings from django.conf import settings
self.application = application self.application = application
if not media_dir: if not media_dir:

8
docs/django-admin.txt
View File

@ -392,10 +392,10 @@ and `2` is verbose output.
Example usage:: Example usage::
django-admin.py manage.py --adminmedia=/tmp/new-admin-style/ django-admin.py manage.py --adminmedia=/tmp/new-admin-style/
Tell Django where to find the various stylesheets and Javascript files for the Tells Django where to find the various CSS and JavaScript files for the admin
admin interface when running the development server. Normally these files are interface when running the development server. Normally these files are served
served out of the Django source tree, but since some designers change these out of the Django source tree, but because some designers customize these files
files for their site, this option allows you to test against custom versions. for their site, this option allows you to test against custom versions.
Extra niceties Extra niceties
============== ==============