mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[1.9.x] Removed redundant highlight/code-block directives in docs/ref/templates/builtins.txt.
Backport of 890938e756 from master
			
			
This commit is contained in:
		| @@ -12,7 +12,7 @@ documentation for any custom tags or filters installed. | |||||||
| Built-in tag reference | Built-in tag reference | ||||||
| ---------------------- | ---------------------- | ||||||
|  |  | ||||||
| .. highlightlang:: html+django | .. highlight:: html+django | ||||||
|  |  | ||||||
| .. templatetag:: autoescape | .. templatetag:: autoescape | ||||||
|  |  | ||||||
| @@ -560,9 +560,7 @@ operators, from lowest to highest, is as follows: | |||||||
| * ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=`` | * ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=`` | ||||||
|  |  | ||||||
| (This follows Python exactly). So, for example, the following complex | (This follows Python exactly). So, for example, the following complex | ||||||
| :ttag:`if` tag: | :ttag:`if` tag:: | ||||||
|  |  | ||||||
| .. code-block:: django |  | ||||||
|  |  | ||||||
|     {% if a == b or c == d and e %} |     {% if a == b or c == d and e %} | ||||||
|  |  | ||||||
| @@ -1999,9 +1997,7 @@ autoescaping is off, this filter has no effect. | |||||||
|  |  | ||||||
|     If you are chaining filters, a filter applied after ``safe`` can |     If you are chaining filters, a filter applied after ``safe`` can | ||||||
|     make the contents unsafe again. For example, the following code |     make the contents unsafe again. For example, the following code | ||||||
|     prints the variable as is, unescaped: |     prints the variable as is, unescaped:: | ||||||
|  |  | ||||||
|     .. code-block:: html+django |  | ||||||
|  |  | ||||||
|         {{ var|safe|escape }} |         {{ var|safe|escape }} | ||||||
|  |  | ||||||
| @@ -2519,29 +2515,21 @@ static | |||||||
| static | static | ||||||
| """""" | """""" | ||||||
|  |  | ||||||
| .. highlight:: html+django |  | ||||||
|  |  | ||||||
| To link to static files that are saved in :setting:`STATIC_ROOT` Django ships | To link to static files that are saved in :setting:`STATIC_ROOT` Django ships | ||||||
| with a :ttag:`static` template tag. You can use this regardless if you're | with a :ttag:`static` template tag. You can use this regardless if you're | ||||||
| using :class:`~django.template.RequestContext` or not. | using :class:`~django.template.RequestContext` or not. For example:: | ||||||
|  |  | ||||||
| .. code-block:: html+django |  | ||||||
|  |  | ||||||
|     {% load static %} |     {% load static %} | ||||||
|     <img src="{% static "images/hi.jpg" %}" alt="Hi!" /> |     <img src="{% static "images/hi.jpg" %}" alt="Hi!" /> | ||||||
|  |  | ||||||
| It is also able to consume standard context variables, e.g. assuming a | It is also able to consume standard context variables, e.g. assuming a | ||||||
| ``user_stylesheet`` variable is passed to the template: | ``user_stylesheet`` variable is passed to the template:: | ||||||
|  |  | ||||||
| .. code-block:: html+django |  | ||||||
|  |  | ||||||
|     {% load static %} |     {% load static %} | ||||||
|     <link rel="stylesheet" href="{% static user_stylesheet %}" type="text/css" media="screen" /> |     <link rel="stylesheet" href="{% static user_stylesheet %}" type="text/css" media="screen" /> | ||||||
|  |  | ||||||
| If you'd like to retrieve a static URL without displaying it, you can use a | If you'd like to retrieve a static URL without displaying it, you can use a | ||||||
| slightly different call: | slightly different call:: | ||||||
|  |  | ||||||
| .. code-block:: html+django |  | ||||||
|  |  | ||||||
|     {% load static %} |     {% load static %} | ||||||
|     {% static "images/hi.jpg" as myphoto %} |     {% static "images/hi.jpg" as myphoto %} | ||||||
| @@ -2565,8 +2553,6 @@ slightly different call: | |||||||
| get_static_prefix | get_static_prefix | ||||||
| """"""""""""""""" | """"""""""""""""" | ||||||
|  |  | ||||||
| .. highlight:: html+django |  | ||||||
|  |  | ||||||
| You should prefer the :ttag:`static` template tag, but if you need more control | You should prefer the :ttag:`static` template tag, but if you need more control | ||||||
| over exactly where and how :setting:`STATIC_URL` is injected into the template, | over exactly where and how :setting:`STATIC_URL` is injected into the template, | ||||||
| you can use the :ttag:`get_static_prefix` template tag:: | you can use the :ttag:`get_static_prefix` template tag:: | ||||||
| @@ -2588,8 +2574,6 @@ the value multiple times:: | |||||||
| get_media_prefix | get_media_prefix | ||||||
| """""""""""""""" | """""""""""""""" | ||||||
|  |  | ||||||
| .. highlight:: html+django |  | ||||||
|  |  | ||||||
| Similar to the :ttag:`get_static_prefix`, ``get_media_prefix`` populates a | Similar to the :ttag:`get_static_prefix`, ``get_media_prefix`` populates a | ||||||
| template variable with the media prefix :setting:`MEDIA_URL`, e.g.:: | template variable with the media prefix :setting:`MEDIA_URL`, e.g.:: | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user