Skip to content

Commit 781378c

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 830c779 commit 781378c

File tree

1 file changed

+186
-186
lines changed

1 file changed

+186
-186
lines changed

‎docs/templates/docs/doc.html‎

Lines changed: 186 additions & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -38,198 +38,198 @@
3838
{% if release.is_dev %}
3939
{% if "internals" not in docurl %}{# The dev version is canonical for internals/. #}
4040
<div id="dev-warning" class="doc-floating-warning">
41-
<<<<<<< HEAD
41+
<<<<<<< HEAD
4242
{% blocktrans trimmed %}
4343
This document is for Django's development version, which can be significantly different from previous releases.
4444
<a href="{% url 'docs_version' version='stable %}" style="font-weight : bold; text-decoration: underline;"> Click here for the stable version </a>
45-
=======
46-
{% blocktrans trimmed %}
47-
This document is for Django's development version, which can be significantly different from previous releases.
48-
<a href="/en/stable/" style="font-weight : bold; text-decoration: underline;"> Click here for the stable version </a>
49-
>>>>>>> ead4fc41 (use relative links to stable docs in warning alert (fixes env issue))
50-
{% endblocktrans %}
45+
=======
46+
{% blocktrans trimmed %}
47+
This document is for Django's development version, which can be significantly different from previous releases.
48+
<a href="/en/stable/" style="font-weight : bold; text-decoration: underline;"> Click here for the stable version </a>
49+
>>>>>>> ead4fc41 (use relative links to stable docs in warning alert (fixes env issue))
50+
{% endblocktrans %}
51+
</div>
52+
{% endif %}
53+
{% elif release.is_preview %}
54+
<div id="dev-warning" class="doc-floating-warning">
55+
{% trans "This document is for a preview release of Django, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %}
56+
</div>
57+
{% elif not release.is_supported %}
58+
<div id="outdated-warning" class="doc-floating-warning">
59+
{% trans "This document is for an insecure version of Django that is no longer supported. Please upgrade to a newer release!" %}
5160
</div>
5261
{% endif %}
53-
{% elif release.is_preview %}
54-
<div id="dev-warning" class="doc-floating-warning">
55-
{% trans "This document is for a preview release of Django, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %}
56-
</div>
57-
{% elif not release.is_supported %}
58-
<div id="outdated-warning" class="doc-floating-warning">
59-
{% trans "This document is for an insecure version of Django that is no longer supported. Please upgrade to a newer release!" %}
62+
{% endblock body_extra %}
63+
64+
{% block content %}
65+
<div id="version-switcher">
66+
<ul id="faq-link">
67+
<li class="current-link">
68+
<a href="{% url 'document-detail' lang=lang version=version url='faq/help' host 'docs' %}">
69+
<span>{% trans "Getting Help" %}</span>
70+
</a>
71+
</li>
72+
</ul>
73+
<ul id="doc-languages" class="language-switcher doc-switcher">
74+
{% for available_lang in available_languages %}
75+
{% if lang != available_lang %}
76+
<li class="other">
77+
{% if docurl %}
78+
{% url 'document-detail' lang=available_lang version=version url=docurl host 'docs' as other_url %}
79+
{% else %}
80+
{% url 'document-index' lang=available_lang version=version host 'docs' as other_url %}
81+
{% endif %}
82+
<a href="{{ other_url }}{% if searchparams %}search/?{{ searchparams }}{% endif %}">{{ available_lang }}</a>
83+
</li>
84+
{% endif %}
85+
{% endfor %}
86+
<li class="current"
87+
title="{% blocktrans %}Click on the links on the left to switch to another language.{% endblocktrans %}">
88+
<span>{% trans "Language:" %} <strong>{{ lang }}</strong></span>
89+
</li>
90+
</ul>
91+
92+
{% get_all_doc_versions docurl as other_versions %}
93+
<ul id="doc-versions" class="version-switcher doc-switcher">
94+
{% for other_version in other_versions %}
95+
{% if version != other_version %}
96+
<li class="other">
97+
{% if docurl %}
98+
{% url 'document-detail' lang=lang version=other_version url=docurl host 'docs' as other_url %}
99+
{% else %}
100+
{% url 'document-index' lang=lang version=other_version host 'docs' as other_url %}
101+
{% endif %}
102+
<a href="{{ other_url }}{% if searchparams %}search/?{{ searchparams }}{% endif %}">{{ other_version }}</a>
103+
</li>
104+
{% endif %}
105+
{% endfor %}
106+
<li class="current{% if release.is_dev %} dev{% endif %}"
107+
title="{% if release.is_dev %}{% blocktrans trimmed %}
108+
This document is for Django's development version, which can be significantly different from previous releases.
109+
{% endblocktrans %}{% else %}{% blocktrans trimmed %}
110+
This document describes Django {{ version }}.
111+
{% endblocktrans %}{% endif %} {% blocktrans trimmed %}
112+
Click on the links on the left to see other versions.
113+
{% endblocktrans %}">
114+
<span>{% trans "Documentation version:" %}
115+
<strong>{% if release.is_dev %}development{% else %}{{ version }}{% endif %}</strong>
116+
</span>
117+
</li>
118+
</ul>
119+
<ul id="backtotop-link">
120+
<li class="current-link">
121+
<a href="#top" aria-label="Back to top" class="icon-chevron-up-align"><i class="icon icon-chevron-up"></i></a>
122+
</li>
123+
</ul>
60124
</div>
61-
{% endif %}
62-
{% endblock body_extra %}
63-
64-
{% block content %}
65-
<div id="version-switcher">
66-
<ul id="faq-link">
67-
<li class="current-link">
68-
<a href="{% url 'document-detail' lang=lang version=version url='faq/help' host 'docs' %}">
69-
<span>{% trans "Getting Help" %}</span>
70-
</a>
71-
</li>
72-
</ul>
73-
<ul id="doc-languages" class="language-switcher doc-switcher">
74-
{% for available_lang in available_languages %}
75-
{% if lang != available_lang %}
76-
<li class="other">
77-
{% if docurl %}
78-
{% url 'document-detail' lang=available_lang version=version url=docurl host 'docs' as other_url %}
79-
{% else %}
80-
{% url 'document-index' lang=available_lang version=version host 'docs' as other_url %}
81-
{% endif %}
82-
<a href="{{ other_url }}{% if searchparams %}search/?{{ searchparams }}{% endif %}">{{ available_lang }}</a>
83-
</li>
125+
126+
{% block body %}
127+
<article id="docs-content">
128+
{{ doc.body|safe }}
129+
</article>
130+
{% endblock body %}
131+
132+
{% if doc.prev or doc.next %}
133+
<nav class="browse-horizontal" aria-labelledby="browse-horizontal-header">
134+
<span id="browse-horizontal-header" class="visuallyhidden">{% translate "Previous page and next page" %}</span>
135+
{% if doc.prev %}
136+
<div class="left"><a rel="prev" href="{{ doc.prev.link }}"><i class="icon icon-chevron-left"></i> {{ doc.prev.title|safe }}</a></div>
84137
{% endif %}
85-
{% endfor %}
86-
<li class="current"
87-
title="{% blocktrans %}Click on the links on the left to switch to another language.{% endblocktrans %}">
88-
<span>{% trans "Language:" %} <strong>{{ lang }}</strong></span>
89-
</li>
90-
</ul>
91-
92-
{% get_all_doc_versions docurl as other_versions %}
93-
<ul id="doc-versions" class="version-switcher doc-switcher">
94-
{% for other_version in other_versions %}
95-
{% if version != other_version %}
96-
<li class="other">
97-
{% if docurl %}
98-
{% url 'document-detail' lang=lang version=other_version url=docurl host 'docs' as other_url %}
99-
{% else %}
100-
{% url 'document-index' lang=lang version=other_version host 'docs' as other_url %}
101-
{% endif %}
102-
<a href="{{ other_url }}{% if searchparams %}search/?{{ searchparams }}{% endif %}">{{ other_version }}</a>
103-
</li>
138+
{% if doc.next %}
139+
<div class="right"><a rel="next" href="{{ doc.next.link }}">{{ doc.next.title|safe }} <i class="icon icon-chevron-right"></i></a></div>
104140
{% endif %}
105-
{% endfor %}
106-
<li class="current{% if release.is_dev %} dev{% endif %}"
107-
title="{% if release.is_dev %}{% blocktrans trimmed %}
108-
This document is for Django's development version, which can be significantly different from previous releases.
109-
{% endblocktrans %}{% else %}{% blocktrans trimmed %}
110-
This document describes Django {{ version }}.
111-
{% endblocktrans %}{% endif %} {% blocktrans trimmed %}
112-
Click on the links on the left to see other versions.
113-
{% endblocktrans %}">
114-
<span>{% trans "Documentation version:" %}
115-
<strong>{% if release.is_dev %}development{% else %}{{ version }}{% endif %}</strong>
116-
</span>
117-
</li>
118-
</ul>
119-
<ul id="backtotop-link">
120-
<li class="current-link">
121-
<a href="#top" aria-label="Back to top" class="icon-chevron-up-align"><i class="icon icon-chevron-up"></i></a>
122-
</li>
123-
</ul>
124-
</div>
125-
126-
{% block body %}
127-
<article id="docs-content">
128-
{{ doc.body|safe }}
129-
</article>
130-
{% endblock body %}
131-
132-
{% if doc.prev or doc.next %}
133-
<nav class="browse-horizontal" aria-labelledby="browse-horizontal-header">
134-
<span id="browse-horizontal-header" class="visuallyhidden">{% translate "Previous page and next page" %}</span>
135-
{% if doc.prev %}
136-
<div class="left"><a rel="prev" href="{{ doc.prev.link }}"><i class="icon icon-chevron-left"></i> {{ doc.prev.title|safe }}</a></div>
137-
{% endif %}
138-
{% if doc.next %}
139-
<div class="right"><a rel="next" href="{{ doc.next.link }}">{{ doc.next.title|safe }} <i class="icon icon-chevron-right"></i></a></div>
140-
{% endif %}
141-
</nav>
142-
{% endif %}
143-
144-
{% endblock content %}
145-
146-
147-
{% block content-related %}
148-
<div role="complementary">
149-
<h2 class="visuallyhidden" id="aside-header">{% translate "Additional Information" %}</h2>
150-
151-
{% donation_snippet %}
152-
153-
{% block toc-wrapper %}
154-
<h3>{% trans "Contents" %}</h3>
155-
{% block toc %}
156-
{{ doc.toc|safe }}
157-
{% endblock toc %}
158-
{% endblock toc-wrapper %}
159-
160-
{% block browse-wrapper %}
161-
<nav aria-labelledby="browse-header">
162-
<h3 id="browse-header">{% trans "Browse" %}</h3>
163-
<ul>
164-
{% block browse %}
165-
{% if doc.prev %}
166-
<li>{% trans "Prev:" %} <a rel="prev" href="{{ doc.prev.link }}">{{ doc.prev.title|safe }}</a></li>
167-
{% endif %}
168-
{% if doc.next %}
169-
<li>{% trans "Next:" %} <a rel="next" href="{{ doc.next.link }}">{{ doc.next.title|safe }}</a></li>
170-
{% endif %}
171-
<li><a href="{% url 'document-detail' lang=lang version=version url="contents" host 'docs' %}">{% trans "Table of contents" %}</a></li>
172-
{% for doc, title, accesskey, shorttitle in env.rellinks %}
173-
<li><a href="{% url 'document-detail' lang=lang version=version url=doc host 'docs' %}">{{ title }}</a></li>
174-
{% endfor %}
175-
{% endblock browse %}
176-
</ul>
177141
</nav>
178-
{% endblock browse-wrapper %}
179-
180-
{% block breadcrumbs-wrapper %}
181-
<nav aria-labelledby="breadcrumbs-header">
182-
<h3 id="breadcrumbs-header">{% trans "You are here:" %}</h3>
183-
<ul>
184-
<li>
185-
<a href="{% url 'document-index' lang=lang version=version host 'docs' %}">{% blocktrans %}Django {{ version }} documentation{% endblocktrans %}</a>
186-
{% for p in doc.parents %}
187-
<ul><li><a href="{{ p.link }}">{{ p.title|safe }}</a>
188-
{% endfor %}
189-
<ul><li>{% block current-page-title %}{{ doc.title|safe }}{% endblock current-page-title %}</li></ul>
190-
{% for p in doc.parents %}</li></ul>{% endfor %}
191-
</li>
192-
</ul>
193-
</nav>
194-
{% endblock breadcrumbs-wrapper %}
195-
196-
{% block help-wrapper %}
197-
<section aria-labelledby="getting-help-sidebar">
198-
<h3 id="getting-help-sidebar">{% trans "Getting help" %}</h3>
199-
<dl class="list-links">
200-
<dt><a href="{% url 'document-detail' lang=lang version=version url="faq" host 'docs' %}">{% trans "FAQ" %}</a></dt>
201-
<dd>{% blocktrans %}Try the FAQ — it's got answers to many common questions.{% endblocktrans %}</dd>
202-
203-
<dt><a href="/en/stable/genindex/">{% trans "Index" %}</a>, <a href="/en/stable/py-modindex/">{% trans "Module Index" %}</a>, or <a href="/en/stable/contents/">{% trans "Table of Contents" %}</a></dt>
204-
<dd>{% blocktrans %}Handy when looking for specific information.{% endblocktrans %}</dd>
205-
206-
<dt><a href="https://chat.djangoproject.com">{% trans "Django Discord Server" %}</a></dt>
207-
<dd>{% blocktrans %}Join the Django Discord Community.{% endblocktrans %}</dd>
208-
209-
<dt><a href="https://forum.djangoproject.com/">{% trans "Official Django Forum" %}</a></dt>
210-
<dd>{% blocktrans %}Join the community on the Django Forum.{% endblocktrans %}</dd>
211-
212-
<dt><a href="https://code.djangoproject.com/">{% trans "Ticket tracker" %}</a></dt>
213-
<dd>{% blocktrans %}Report bugs with Django or Django documentation in our ticket tracker.{% endblocktrans %}</dd>
214-
</dl>
215-
</section>
216-
{% endblock help-wrapper %}
217-
218-
{% block links-wrapper %}
219-
<section aria-labelledby="links-wrapper-header">
220-
<h3 id="links-wrapper-header">{% trans "Download:" %}</h3>
221-
<p>
222-
{% if version == "dev" %}{% trans "Offline (development version):" %}
223-
{% else %}{% blocktrans %}Offline (Django {{ version }}):{% endblocktrans %}{% endif %}
224-
<a href="{{ MEDIA_URL }}docs/django-docs-{{ version }}-{{ lang }}.zip">HTML</a> |
225-
<a href="https://media.readthedocs.org/pdf/django/{{ rtd_version }}/django.pdf">PDF</a> |
226-
<a href="https://media.readthedocs.org/epub/django/{{ rtd_version }}/django.epub">ePub</a>
227-
<br>
228-
<span class="quiet">
229-
{% blocktrans %}Provided by <a href="https://readthedocs.org/">Read the Docs</a>.{% endblocktrans %}
230-
</span>
231-
</p>
232-
</section>
233-
{% endblock links-wrapper %}
234-
</div>
235-
{% endblock content-related %}
142+
{% endif %}
143+
144+
{% endblock content %}
145+
146+
147+
{% block content-related %}
148+
<div role="complementary">
149+
<h2 class="visuallyhidden" id="aside-header">{% translate "Additional Information" %}</h2>
150+
151+
{% donation_snippet %}
152+
153+
{% block toc-wrapper %}
154+
<h3>{% trans "Contents" %}</h3>
155+
{% block toc %}
156+
{{ doc.toc|safe }}
157+
{% endblock toc %}
158+
{% endblock toc-wrapper %}
159+
160+
{% block browse-wrapper %}
161+
<nav aria-labelledby="browse-header">
162+
<h3 id="browse-header">{% trans "Browse" %}</h3>
163+
<ul>
164+
{% block browse %}
165+
{% if doc.prev %}
166+
<li>{% trans "Prev:" %} <a rel="prev" href="{{ doc.prev.link }}">{{ doc.prev.title|safe }}</a></li>
167+
{% endif %}
168+
{% if doc.next %}
169+
<li>{% trans "Next:" %} <a rel="next" href="{{ doc.next.link }}">{{ doc.next.title|safe }}</a></li>
170+
{% endif %}
171+
<li><a href="{% url 'document-detail' lang=lang version=version url="contents" host 'docs' %}">{% trans "Table of contents" %}</a></li>
172+
{% for doc, title, accesskey, shorttitle in env.rellinks %}
173+
<li><a href="{% url 'document-detail' lang=lang version=version url=doc host 'docs' %}">{{ title }}</a></li>
174+
{% endfor %}
175+
{% endblock browse %}
176+
</ul>
177+
</nav>
178+
{% endblock browse-wrapper %}
179+
180+
{% block breadcrumbs-wrapper %}
181+
<nav aria-labelledby="breadcrumbs-header">
182+
<h3 id="breadcrumbs-header">{% trans "You are here:" %}</h3>
183+
<ul>
184+
<li>
185+
<a href="{% url 'document-index' lang=lang version=version host 'docs' %}">{% blocktrans %}Django {{ version }} documentation{% endblocktrans %}</a>
186+
{% for p in doc.parents %}
187+
<ul><li><a href="{{ p.link }}">{{ p.title|safe }}</a>
188+
{% endfor %}
189+
<ul><li>{% block current-page-title %}{{ doc.title|safe }}{% endblock current-page-title %}</li></ul>
190+
{% for p in doc.parents %}</li></ul>{% endfor %}
191+
</li>
192+
</ul>
193+
</nav>
194+
{% endblock breadcrumbs-wrapper %}
195+
196+
{% block help-wrapper %}
197+
<section aria-labelledby="getting-help-sidebar">
198+
<h3 id="getting-help-sidebar">{% trans "Getting help" %}</h3>
199+
<dl class="list-links">
200+
<dt><a href="{% url 'document-detail' lang=lang version=version url="faq" host 'docs' %}">{% trans "FAQ" %}</a></dt>
201+
<dd>{% blocktrans %}Try the FAQ — it's got answers to many common questions.{% endblocktrans %}</dd>
202+
203+
<dt><a href="/en/stable/genindex/">{% trans "Index" %}</a>, <a href="/en/stable/py-modindex/">{% trans "Module Index" %}</a>, or <a href="/en/stable/contents/">{% trans "Table of Contents" %}</a></dt>
204+
<dd>{% blocktrans %}Handy when looking for specific information.{% endblocktrans %}</dd>
205+
206+
<dt><a href="https://chat.djangoproject.com">{% trans "Django Discord Server" %}</a></dt>
207+
<dd>{% blocktrans %}Join the Django Discord Community.{% endblocktrans %}</dd>
208+
209+
<dt><a href="https://forum.djangoproject.com/">{% trans "Official Django Forum" %}</a></dt>
210+
<dd>{% blocktrans %}Join the community on the Django Forum.{% endblocktrans %}</dd>
211+
212+
<dt><a href="https://code.djangoproject.com/">{% trans "Ticket tracker" %}</a></dt>
213+
<dd>{% blocktrans %}Report bugs with Django or Django documentation in our ticket tracker.{% endblocktrans %}</dd>
214+
</dl>
215+
</section>
216+
{% endblock help-wrapper %}
217+
218+
{% block links-wrapper %}
219+
<section aria-labelledby="links-wrapper-header">
220+
<h3 id="links-wrapper-header">{% trans "Download:" %}</h3>
221+
<p>
222+
{% if version == "dev" %}{% trans "Offline (development version):" %}
223+
{% else %}{% blocktrans %}Offline (Django {{ version }}):{% endblocktrans %}{% endif %}
224+
<a href="{{ MEDIA_URL }}docs/django-docs-{{ version }}-{{ lang }}.zip">HTML</a> |
225+
<a href="https://media.readthedocs.org/pdf/django/{{ rtd_version }}/django.pdf">PDF</a> |
226+
<a href="https://media.readthedocs.org/epub/django/{{ rtd_version }}/django.epub">ePub</a>
227+
<br>
228+
<span class="quiet">
229+
{% blocktrans %}Provided by <a href="https://readthedocs.org/">Read the Docs</a>.{% endblocktrans %}
230+
</span>
231+
</p>
232+
</section>
233+
{% endblock links-wrapper %}
234+
</div>
235+
{% endblock content-related %}

0 commit comments

Comments
 (0)