mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 19:46:22 +00:00
Code Issues 30 Releases Wiki Activity
19,888 Commits 28 Branches 426 Tags 677 MiB
69c662c981
Commit Graph

44 Commits

Author SHA1 Message Date
Aymeric Augustin
69c662c981 [1.8.x] Documented how to set up the Jinja2 environment. 
This may also help with "Why do context processors not work in Jinja2
templates?" etc.

Backport of 9fbd302 from master
 2015-02-15 20:44:40 +01:00
Aymeric Augustin
ee8d5b91e9 Wrote main documentation for templates. 2015-01-10 20:16:19 +01:00
Aymeric Augustin
6c392bb2c0 Moved doc on the DTL's syntax to the ref/ section. 
This makes room for a more general introduction about templating.

Updated some links to point to the new location, but kept those that
didn't talk specifically about the DTL.
 2015-01-10 19:41:14 +01:00
Aymeric Augustin
d3a982556d Deprecated TEMPLATE_STRING_IF_INVALID. 2014-12-28 17:02:30 +01:00
Tim Graham
19242c675f Fixed #23735 -- Clarified that admindocs must be enabled to view template tag libraries in admin. 
Thanks Aymeric Augustin for the report.
 2014-10-30 19:04:10 -04:00
Tim Graham
08c5887f13 Fixed #23734 -- Replaced striptags in template filter overview since it has security implications. 
Thanks Aymeric Augustin for the suggestion.
 2014-10-30 18:26:13 -04:00
Duane Hilton
054bdfeff1 Fixed #17638 -- Added crosslinks between topic and reference guides. 
Thanks oinopion for the suggestion and jarus for the initial patch.
 2014-09-29 18:06:31 -04:00
Ola Sitarska
b9b8895acb Fixed #23527 -- Removed Cheetah references in docs 
Thanks to @aaugustin for submitting the ticket.
 2014-09-21 18:03:31 +02:00
Ola Sitarska
ee442e97da Fixed #23529 -- Replaced comments tag library with humanize in docs 2014-09-21 17:31:13 +02:00
Aymeric Augustin
d18579d219 Small fixes in templates topic guide. 
>>> from django.template.defaultfilters import register
>>> len(register.filters)
57
 2014-09-20 19:23:22 +02:00
Tim Graham
9432f1e750 Fixed some doc errors that caused syntax highlighting to fail. 2014-08-18 20:37:47 -04:00
Baptiste Mispelon
62c74abbb0 Fixed #23114 -- Clarified documentation of template lookups. 
Thanks to gmunumel and Tom Dalton for their help on the patch.
 2014-07-29 10:56:24 +02:00
Tim Graham
9e5033b302 Fixed #21747 -- Added {% elif %} to template topics guide. 
Thanks gcc for the suggestion.
 2014-01-16 07:07:53 -05:00
Claude Paroz
626bdf648a Updated a bunch of hyperlinks in documentation 2013-12-08 18:40:09 +01:00
Alex Gaynor
4e07d93325 Fixed some unnescesarily gendered language in the docs 2013-11-24 21:05:59 -06:00
minusf
70c080fcdb Misc doc cleanups. 2013-07-29 06:57:33 -04:00
Ramiro Morales
47ddd6a408 Fixed #19552 -- Enhanced makemessages handling of `{# #}`-style template comments. 
They are simply ignored now. This allows for a more correct behavior when
they are placed before translatable constructs on the same line.

Previously, the latter were wrongly ignored because the former were
preserved when converting template code to the internal Python-syntax
form later fed to xgettext but Python has no ``/* ... */``-style
comments.

Also, special comments directed to translators are now only taken in
account when they are located at the end of a line. e.g.::

  {# Translators: ignored #}{% trans "Literal A" %}{# Translators: valid, associated with "Literal B" below #}
  {% trans "Literal B" %}

Behavior of ``{% comment %}...{% endcomment %}``tags remains unchanged.

Thanks juneih at redpill-linpro dot com for the report and Claude for
his work on the issue.
 2013-01-29 19:13:23 -03:00
Ben Longden
55a2d5b577 Removes PHP references 2012-12-13 13:20:47 +00:00
Tim Graham
74c025d028 Fixed #13608 - Noted that template lookups use literal values. 2012-09-01 09:24:39 -04:00
Aymeric Augustin
06ea10e1f1 Fixed #18125 -- Explained caveat with filters 
Thanks ebrelsford AT gmail.com and oinopion.
 2012-06-08 10:25:42 +02:00
Aymeric Augustin
d171b3cc0b Fixed #16335 -- Clarified an unintuitive behavior. 
The DTL will perform dict lookup before method lookup, which yields
an unexpected result for defaultdicts.
 2012-05-10 22:34:03 +02:00
Aymeric Augustin
1adf8d4386 Fixed #17240 -- Replaced links to the online version of the docs by internal references. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-16 21:04:28 +00:00
Luke Plant
c61987d75a Removed use of non-standard indentation rules in docs, and the custom transform that supported them. 
Doc writers should be aware that we are now back to normal ReST rules
regarding blockquotes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 17:32:33 +00:00
Luke Plant
af244e47cc Fixed a bunch of ReST errors that resulted in interpretation as block quotations 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 15:32:01 +00:00
Julien Phalip
c2b9f6496e Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-03 08:06:01 +00:00
Alex Gaynor
5fbf5fd3dd Fixed #16793. Added more cross referencing to the load tag's documentation. Thanks to bluejeansummer for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 02:52:37 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Luke Plant
26cda43012 Switched to HTML5 doctype in all Django supplied templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 17:40:53 +00:00
Adrian Holovaty
94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:10:22 +00:00
Timo Graham
2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-26 00:37:14 +00:00
Gabriel Hurley
682f4cf9ed Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-07 09:21:55 +00:00
Jannis Leidel
e77f16144b Fixed #14281 -- A few documentation fixes. Thanks, Ramiro and Timo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:00:52 +00:00
Malcolm Tredinnick
783656cf5b Documented the permitted syntax for template variable names. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-13 05:08:24 +00:00
Malcolm Tredinnick
7c075440ea Add intro-user-level documentation about calling model methods from views. 
Patch from timo and shacker. Fixed #10903.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 20:34:11 +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
Adrian Holovaty
26dc654818 Fixed #11884 -- Clarified documentation to explain how to activate the built-in admin reference. Thanks, DmitryRisenberg and timo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 18:07:46 +00:00
Luke Plant
2c2f5aee4d Implemented 'smart if' template tag, allowing filters and various operators to be used in the 'if' tag 
Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis
of the parser methodology and Russell Keith-Magee for code reviews.

There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if
you were using the keywords 'and', 'or' or 'not' as variable names within
the 'if' expression, which was previously allowed in some cases.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-09 22:40:36 +00:00
James Bennett
0503442d2c Minor typo correction from [9279]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-26 03:10:13 +00:00
James Bennett
2d40c75acf Remove obsolete reference to "development version" in autoescaping docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-26 03:09:29 +00:00
Russell Keith-Magee
e820b54401 Fixed #9044: Corrected mistake in a closing tag in an example template. Thanks to Rick Vanderzwet for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-14 13:10:36 +00:00
Adrian Holovaty
74f386dba2 Fixed #8979 -- Made a bunch of typo/formatting fixes to the docs. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-09 01:54:20 +00:00
Jacob Kaplan-Moss
64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:40:42 +00:00
Jacob Kaplan-Moss
cba91997a2 Refactored Django's comment system. 
Much of this work was done by Thejaswi Puthraya as part of Google's Summer of Code project; much thanks to him for the work, and to them for the program.

This is a backwards-incompatible change; see the upgrading guide in docs/ref/contrib/comments/upgrade.txt for instructions if you were using the old comments system.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:14:22 +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