mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
4,394 Commits 28 Branches 426 Tags 667 MiB
31a17467eb
Commit Graph

83 Commits

Author SHA1 Message Date
Adrian Holovaty
4a3084f3fc Edited templates.txt and templates_python.txt auto-escaping changes from [6671] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 18:38:12 +00:00
Malcolm Tredinnick
e2b03bd0c2 Fixed #5955 -- Made a bunch of ReST fixes. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-29 18:15:38 +00:00
Malcolm Tredinnick
86ca11dd6d Rewrote the section about writing autoescaping-aware filters, based on feedback 
from Ivan Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-18 07:19:11 +00:00
Malcolm Tredinnick
356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Malcolm Tredinnick
7ab381972e Fixed an RST formatting typo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-07 16:35:27 +00:00
Jacob Kaplan-Moss
2570954a9a Fixed #3453: introduced a new template variable resolution system by Brian Harring (thanks!). The upshot is that variable resolution is about 25% faster, and you should see a measurable performance increase any time you've got long or deeply nested loops. 
Variable resolution has changed behind the scenes -- see the note in templates_python.txt -- but template.resolve_variable() still exists. This should be fully backwards-compatible.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-21 04:00:32 +00:00
Adrian Holovaty
d3c2dd30d6 Fixed #5484 -- Documented render_to_string. Thanks, ubernostrum 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 18:39:44 +00:00
Adrian Holovaty
e86d35879f Edited docs/templates_python.txt change from [6143] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 04:04:51 +00:00
Malcolm Tredinnick
1b0e588118 Fixed #4793 -- Tweaked custom filter documentation a little to possibly reduce some confusion. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-13 23:30:26 +00:00
Malcolm Tredinnick
3b9b87792a Fixed #5187 -- Minor doc tweaks. Thanks, Daniel Hahler. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-18 05:43:38 +00:00
Russell Keith-Magee
ab368c9c75 Fixed #4640 -- Fixed import to stringfilter in docs. Proposed solution to move stringfilter into django.template.__init__ introduces a circular import problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-12 13:23:11 +00:00
Adrian Holovaty
4c958b15b2 Converted some tabs to four spaces in two docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-03 19:26:34 +00:00
Adrian Holovaty
3d6785fb8e Fixed tabs -> spaces in [5598] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-03 19:21:33 +00:00
Adrian Holovaty
107dd89385 Fixed an error in a RequestContext example in docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-03 19:20:56 +00:00
Malcolm Tredinnick
85f6f15263 Fixed #4668, #4669, #4670, #4671 -- Fixed a group of ReST markup errors. Thanks, Richard House. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-25 16:11:32 +00:00
Malcolm Tredinnick
880e3cfaa6 Backed out the changes in [5482] for a bit whilst some more investigation into 
side-effects is done. Refs #4565.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-22 07:15:04 +00:00
Malcolm Tredinnick
bccb8897e6 Fixed #4565 -- Changed template rendering to use iterators, rather than 
creating large strings, as much as possible. This is all backwards compatible.
Thanks, Brian Harring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-17 07:11:37 +00:00
Adrian Holovaty
007ca57374 Negligible spacing change to docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-01 17:03:14 +00:00
Malcolm Tredinnick
a3b6e4e7d3 Fixed #4423 -- Typo fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-01 09:38:32 +00:00
Russell Keith-Magee
d9f6470f2d Fixed #1278 -- Added a context processor that puts MEDIA_URL in the context, and added that context processor to the default set. Thanks to Ubernostrum for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-29 11:09:24 +00:00
Malcolm Tredinnick
de5f67f17e Fixed #4267 -- In example code, extract the template tag name correctly in 
error messages where Token.split_contents() has failed. Thanks,
keisuke.nishida@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-11 08:50:54 +00:00
Malcolm Tredinnick
faa31732ca Fixed #3753 -- Allow optional display of invalid variable name in 
TEMPLATE_STRING_IF_INVALID. Thanks, Matt McClanahan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 03:36:16 +00:00
Malcolm Tredinnick
ce0084fbfc Fixed #4202 -- Corrected namespacing of exception in one of the examples. 
Thanks, luftyluft@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 02:48:38 +00:00
Adrian Holovaty
0b265e6a2b Fixed #4139 -- Fixed typo in docs/templates_python.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-02 20:24:36 +00:00
Malcolm Tredinnick
6f78709985 Changed all references to tutorial1/ to be tutorial01/ (and similarly for 
tutorials 2, 3 and 4). This matches the canonical name we use under
djangoproject.com/documentation/ as well as the source filename. Should avoid
problems with archived documentation and missing HTTP redirects. Refs #4013.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-20 09:15:30 +00:00
Jacob Kaplan-Moss
a01f852d2e Fixed documentation from [4558] to be correct. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 20:50:53 +00:00
Jacob Kaplan-Moss
36512d5d73 Fixed #343: filters that take strings now handle non-strings correctly. Thanks to Boffbowsh for the original patch, and to SmileyChris for the updated patch and tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 18:02:51 +00:00
Adrian Holovaty
c61d7e195f Renamed date_to_format function in docs/templates_python.txt example so as to make it not sound like a conversion function. Thanks, linoj 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 15:44:04 +00:00
Malcolm Tredinnick
fefcbbfe37 Fixed #2655 -- added documentation about resolve_variable() for custom template 
tags. Thanks dave@thebarproject.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 08:29:34 +00:00
Adrian Holovaty
8e54c49784 Fixed #3333 -- Docs now use relative links, not hard-coded djangoproject.com links. Thanks for the patch, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-24 20:08:47 +00:00
Adrian Holovaty
5d8c6cf651 Fixed typo in docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-10 15:28:32 +00:00
Adrian Holovaty
7988a48583 Made small edits to docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-24 16:23:05 +00:00
Malcolm Tredinnick
3f4179464f Fixed #2837 -- Documented the context_instance parameter to 
render_to_response().


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-23 07:39:19 +00:00
Russell Keith-Magee
73a6eb8ed0 Fixes #2384,#2566 -- Clarify the role that TEMPLATE_STRING_IF_INVALID plays in the template system, and the problems that can occur if it is used on a production site. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-13 14:26:08 +00:00
Malcolm Tredinnick
fa8a1d252a Fixed #2845 -- Corrected a few spelling errors in the docs and changed a 
couple of correctly spelt words to their North American counterparts for
consistency. Thanks, treborhudson@gmail.com


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-29 02:30:42 +00:00
Adrian Holovaty
5e21888822 Fixed #2744 -- Added 'Writing your own context processors' to docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 15:38:44 +00:00
Malcolm Tredinnick
d85ee1c01e Fixed #2556 -- Documented that simple_tag functions can take any number of 
arguments, not just one.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-21 11:41:18 +00:00
Adrian Holovaty
8f79523b62 Corrected spelling of 'behavior' in docs/templates_python.txt from [3714] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-04 23:40:28 +00:00
Russell Keith-Magee
cfe77946d7 Fixes #2637 -- Clarified handling of TEMPLATE_STRING_IF_INVALID, especially with regards to filtering of invalid values. Modified unit tests to test both empty and non-empty values for TEMPLATE_STRING_IF_INVALID. Thanks to SmileyChris for identifying and helping to resolve this bug. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-04 14:02:11 +00:00
Adrian Holovaty
5e69536f7c Fixed #2610 -- Clarified docs on 'messages' variable for auth context processor 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-31 03:50:59 +00:00
Jacob Kaplan-Moss
33637e3b03 Fixed #2610 -- corrected documentation about the auth context processor (thanks, ubernostrum). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-28 16:41:26 +00:00
Adrian Holovaty
0a9a59f4d1 Made small change to docs/templates_python.txt to explicitly define 'context processors', for the benefit of searches 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-18 03:40:47 +00:00
Adrian Holovaty
f121772de9 Removed section in docs/templates_python.txt about Django 0.91 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-28 21:44:42 +00:00
Adrian Holovaty
571ee77dfe Fixed legacy mention of DjangoContext in docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-24 01:51:15 +00:00
Adrian Holovaty
4872e16d1c Decimated 'whilst' in docs/templates_python.txt from [3308] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-10 14:22:04 +00:00
Malcolm Tredinnick
9af47730da Typo fixing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-10 10:50:04 +00:00
Malcolm Tredinnick
927d87d732 Fixed #2320 -- corrected numerous errors in the custom tag examples in 
python_templates.txt. Also fixed an argument parsing error for such tags.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-10 10:48:08 +00:00
Malcolm Tredinnick
25ffce4c83 Fixed #2235 -- corrected a couple of typos pointed out by jvinet@zeroflux.org. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-26 03:02:42 +00:00
Adrian Holovaty
448becefdf Fixed #2096 -- Fixed small error in docs/templates_python.txt. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-07 02:38:37 +00:00
Adrian Holovaty
c18dc3d759 Fixed #1870 -- Clarified (hopefully) the TEMPLATE_DIRS section of docs/templates_python.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-02 05:06:36 +00:00