mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
9,569 Commits 28 Branches 426 Tags 666 MiB
07ef43082d
Commit Graph

19 Commits

Author SHA1 Message Date
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings. 
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:26 +00:00
Jannis Leidel
70edd4e103 Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:44:33 +00:00
Jannis Leidel
8e96584f63 Fixed #14524, #14582, #14617, #14665 and #14667 -- Tweaked staticfiles app. 
* Updated StaticFilesHandler and AdminMediaHandler
  to make use of the 404 handler if needed.

* Updated runserver management command to serve static files
  only in DEBUG mode (or if specified the --insecure option)
  and if the staticfiles app is in INSTALLED_APPS. Also added
  an option to disable serving completely (--nostatic).

* Added check in debug mode if STATICFILES_* settings are
  different to MEDIA_* settings.

* Removed a faulty PendingDeprecationWarning in AdminMediaHandler
  that is triggered every time runserver is used.

* Fixed an issue with the modification time checks when
  running collectstatic.

* Extended and refined documentation.

Thanks to everyone for input, especially to Carl Meyer, Ted Kaemming and
Adam Vandenberg for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:43:49 +00:00
Gabriel Hurley
298f3d300e Fixed #14562 -- corrected a typo in the static-files howto. Thanks to stephaner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 12:32:35 +00:00
Chris Beaven
82dca6d4af Replace an incorrect reference to collectmedia in the docs (the command is collectstatic) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 01:16:22 +00:00
Jannis Leidel
c1b3deedaa Fixed #14528 and #14538 -- Refined staticfiles documentation. Thanks, gremmie and romaniuk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-23 14:32:20 +00:00
Jacob Kaplan-Moss
14b52b95d2 Removes a mistaken note about the static media development helper. 
Turns out that when you write documentation without actually consulting the code
you get things wrong. Who knew?

Thanks to Waldemar Kornewald for catching my mistake.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 20:16:36 +00:00
Alex Gaynor
ec80e55cac Fixed #14514 -- fixed a typo in the static files docs, thanks to Andy McKay for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 17:57:37 +00:00
Jannis Leidel
cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 01:33:24 +00:00
Russell Keith-Magee
f611ffaab3 Fixed #13820 -- Started the deprecation process for mod_python. Thanks to Robert Coup for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 02:40:57 +00:00
Jacob Kaplan-Moss
728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Karen Tracey
8e7d2d2e68 Fixed #13530: Corrected a handful of doc typos. Thanks Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-12 22:53:23 +00:00
Russell Keith-Magee
94d8da31da Fixed #11780 -- Corrected a typo in the static file serving docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-12 22:48:20 +00:00
Jacob Kaplan-Moss
c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions. 
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 18:30:54 +00:00
Jacob Kaplan-Moss
516051bfd2 A whole lotta documentation fixes: Fixes #8704, #8826, #8980, #9243, #9343, #9529, 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 23:34:03 +00:00
Malcolm Tredinnick
d32c290846 Revised r9566 slightly to be backwards compatible with versions 1.0 - 1.0.2. 
Also documented the change. We prefer to load directory_index.html for static
directory listings, but if you have the (older style) "directory_index"
template and no .html version, we'll load that. This should stop a bunch of
mysterious breakages when people upgrade to Django 1.0.3 or Django 1.1. Also
keeps the docs in sync with released code.

Fixed #9993.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-09 12:41:07 +00:00
Gary Wilson Jr
235600c3c3 Fixed #9724 -- Added missing import to URLconf example, thanks shacker. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-08 05:35:20 +00:00
Malcolm Tredinnick
8cbf5d102c Fixed #8688 -- Added a note about using a settings variable for the static 
media viewer with the development server. Based on a suggestion from trodrigues.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-06 08:29:05 +00:00
Jacob Kaplan-Moss
97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 22:25:40 +00:00