Commit Graph

35 Commits

Author SHA1 Message Date
Jannis Leidel d138906ad9 Fixed #15974 -- Correctly link to static files handling in deployment docs. Thanks, RogueBean.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-01 15:18:42 +00:00
Jannis Leidel 38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location.
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-30 09:06:19 +00:00
Jannis Leidel e008fde23e Fixed #16273 -- Fixed typo in staticfiles docs. Thanks, BernhardEssl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 15:27:11 +00:00
Jannis Leidel 091c9b530e Fixed #15983 and #16032 -- Another pass over the staticfiles docs. Many thanks to Frank Wiles and EvilDMP.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-18 09:51:24 +00:00
Simon Meers 5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 04:33:42 +00:00
Simon Meers 8122ce7c76 Fixed #15989 -- typo in static-files howto. Thanks luizvital.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 22:30:31 +00:00
Jannis Leidel 6a5548cf83 Corrected another part of the staticfiles docs which was missed in r15913. Refs #15681.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 17:58:13 +00:00
Jannis Leidel 8ddf5ba66f Fixed #15681 -- Fixed a documentation error regarding the default value of the STATIC_URL setting. Thanks, Chris Drackett.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 17:52:32 +00:00
Jannis Leidel ad4118be44 Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:21 +00:00
Simon Meers 2dfbe92d7c Fix typo in staticfiles docs (not ticketed).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 11:54:03 +00:00
Gabriel Hurley 5edb61438e Fixed #15310 -- Corrected a view path in the static files how to docs. Thanks to Bradley Ayers for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-17 02:11:44 +00:00
Jannis Leidel a26034ffbf Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 01:42:26 +00:00
Carl Meyer 0bf5fbfa76 Some tweaks to the staticfiles docs to clarify things for new users. Thanks Jannis and brutasse for review and discussion.
* Rearranged 'in a nutshell' usage docs to clarify app-dirs vs STATICFILES_DIRS, initially focus on the simplest path to working local dev, and remove the need for repetitive 'you don't need this in local dev' notes.
* Added docs on using staticfiles serve view for non-staticfiles (e.g. user-uploaded files).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 22:06:53 +00:00
Jannis Leidel 6361a242af Fixed typo in staticfiles documentation introduced in [15369]. Thanks, harijay.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 23:29:25 +00:00
Jannis Leidel 8fe42053bc Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:25 +00:00
Timo Graham 1ebd6860b6 Fixed #15080 - Add -v0 to collectstatic fabric example. Thanks hvdklauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 21:49:01 +00:00
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