Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 36 additions & 40 deletions djangoproject/templates/includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,68 +1,66 @@
{% load i18n %}
{% load hosts %}

<footer>
<div class="subfooter">
<div class="container">
<h2 class="visuallyhidden">Django Links</h2>
<h2 class="visuallyhidden">{% trans "Django Links" %}</h2>
<div class="column-container">
<div class="col-learn-more">
<h3>Learn More</h3>
<h3>{% trans "Learn More" %}</h3>
<ul>
<li><a href="{% url 'overview' %}">About Django</a></li>
<li><a href="{% url 'overview' %}">{% trans "About Django" %}</a></li>
{% comment %}<li><a href="{% url 'case_study_index' %}">Case Studies</a></li>{% endcomment %}
<li><a href="{% url 'start' %}">Getting Started with Django</a></li>
<li><a href="{% url 'members:teams' %}">Team Organization</a></li>
<li><a href="{% url 'homepage' %}foundation/">Django Software Foundation</a></li>
<li><a href="{% url 'code_of_conduct' %}">Code of Conduct</a></li>
<li><a href="{% url 'diversity' %}">Diversity Statement</a></li>
<li><a href="{% url 'start' %}">{% trans "Getting Started with Django" %}</a></li>
<li><a href="{% url 'members:teams' %}">{% trans "Team Organization" %}</a></li>
<li><a href="{% url 'homepage' %}foundation/">{% trans "Django Software Foundation" %}</a></li>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off topic: Lots of hardcoded URLs in here.

<li><a href="{% url 'code_of_conduct' %}">{% trans "Code of Conduct" %}</a></li>
<li><a href="{% url 'diversity' %}">{% trans "Diversity Statement" %}</a></li>
</ul>
</div>

<div class="col-get-involved">
<h3>Get Involved</h3>
<h3>{% trans "Get Involved" %}</h3>
<ul>
<li><a href="{% url 'community-index' %}">Join a Group</a></li>
<li><a href="{% url 'document-detail' lang='en' version='dev' url="internals/contributing" host 'docs' %}">Contribute
to Django</a></li>
<li><a href="{% url 'community-index' %}">{% trans "Join a Group" %}</a></li>
<li><a href="{% url 'document-detail' lang='en' version='dev' url="internals/contributing" host 'docs' %}">{% trans "Contribute to Django" %}</a></li>
<li><a
href="{% url 'document-detail' lang='en' version='dev' url="internals/contributing/bugs-and-features" host 'docs' %}">Submit
a Bug</a></li>
href="{% url 'document-detail' lang='en' version='dev' url="internals/contributing/bugs-and-features" host 'docs' %}">{% trans "Submit a Bug" %}</a></li>
<li><a
href="{% url 'document-detail' lang='en' version='dev' url="internals/security" host 'docs' %}#reporting-security-issues">Report
a Security Issue</a></li>
<li><a href="{% url 'members:individual-members' %}">Individual membership</a></li>
href="{% url 'document-detail' lang='en' version='dev' url="internals/security" host 'docs' %}#reporting-security-issues">{% trans "Report a Security Issue" %}</a></li>
<li><a href="{% url 'members:individual-members' %}">{% trans "Individual membership" %}</a></li>
</ul>
</div>

<div class="col-get-help">
<h3>Get Help</h3>
<h3>{% trans "Get Help" %}</h3>
<ul>
<li><a href="{% url 'document-detail' lang='en' version='stable' url='faq' host 'docs' %}">Getting Help FAQ</a>
<li><a href="{% url 'document-detail' lang='en' version='stable' url='faq' host 'docs' %}">{% trans "Getting Help FAQ" %}</a>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<li><a href="{% url 'document-detail' lang='en' version='stable' url='faq' host 'docs' %}">{% trans "Getting Help FAQ" %}</a>
<li><a href="{% url 'document-detail' lang='en' version='stable' url='faq' host 'docs' %}">{% trans "Getting Help & FAQ" %}</a>

</li>
<li><a href="https://chat.djangoproject.com" target="_blank">Django Discord</a></li>
<li><a href="https://forum.djangoproject.com/" target="_blank">Official Django Forum</a></li>
<li><a href="https://chat.djangoproject.com" target="_blank">{% trans "Django Discord" %}</a></li>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're at it:

Suggested change
<li><a href="https://chat.djangoproject.com" target="_blank">{% trans "Django Discord" %}</a></li>
<li><a href="https://chat.djangoproject.com" target="_blank">{% trans "Django's Discord Server" %}</a></li>

<li><a href="https://forum.djangoproject.com/" target="_blank">{% trans "Official Django Forum" %}</a></li>
</ul>
</div>

<div class="col-follow-us">
<h3>Follow Us</h3>
<h3>{% trans "Follow Us" %}</h3>
<ul>
<li><a href="https://github.com/django">GitHub</a></li>
<li><a href="https://x.com/djangoproject">X</a></li>
<li><a href="https://fosstodon.org/@django" rel="me">Fediverse (Mastodon)</a></li>
<li><a href="https://bsky.app/profile/djangoproject.com">Bluesky</a></li>
<li><a href="https://www.linkedin.com/company/django-software-foundation">LinkedIn</a></li>
<li><a href="{% url 'weblog-feed' %}">News RSS</a></li>
<li><a href="https://github.com/django">{% trans "GitHub" %}</a></li>
<li><a href="https://x.com/djangoproject">{% trans "X" %}</a></li>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off Topic: Do we still do X? Doesn't that inherently violate the CoC? 😏

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off Topic: Do we still do X? Doesn't that inherently violate the CoC? 😏

Thanks for the note! I’m working on the other suggested changes. Regarding X, my understanding is that it refers to the current name for Twitter. I’ve kept the existing link as-is for now, but I’m happy to update or remove it if the maintainers prefer a different approach.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, this was a joke. Since X formerly Twitter, largely abandoned content moderation. Whereas this community stands much firmer on its values.

<li><a href="https://fosstodon.org/@django" rel="me">{% trans "Fediverse (Mastodon)" %}</a></li>
<li><a href="https://bsky.app/profile/djangoproject.com">{% trans "Bluesky" %}</a></li>
<li><a href="https://www.linkedin.com/company/django-software-foundation">{% trans "LinkedIn" %}</a></li>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since those are brand names, I don't believe they need a translation.

<li><a href="{% url 'weblog-feed' %}">{% trans "News RSS" %}</a></li>
</ul>
</div>

<div class="col-support-us">
<h3>Support Us</h3>
<h3>{% trans "Support Us" %}</h3>
<ul>
<li><a href="{% url "fundraising:index" %}">Sponsor Django</a></li>
<li><a href="{% url 'members:corporate-members' %}">Corporate membership</a></li>
<li><a href="https://django.threadless.com/" target="_blank">Official merchandise store</a></li>
<li><a href="{% url 'fundraising:index' %}#benevity-giving">Benevity Workplace Giving Program</a></li>
<li><a href="{% url "fundraising:index" %}">{% trans "Sponsor Django" %}</a></li>
<li><a href="{% url 'members:corporate-members' %}">{% trans "Corporate membership" %}</a></li>
<li><a href="https://django.threadless.com/" target="_blank">{% trans "Official merchandise store" %}</a></li>
<li><a href="{% url 'fundraising:index' %}#benevity-giving">{% trans "Benevity Workplace Giving Program" %}</a></li>
</ul>
</div>
</div>
Expand All @@ -75,17 +73,15 @@ <h3>Support Us</h3>
</div>
<ul class="thanks">
<li>
<span>Hosting by</span> <a class="in-kind-donors" href="{% url 'fundraising:index' %}#in-kind-donors">In-kind
donors</a>
<span>{% trans "Hosting by" %}</span> <a class="in-kind-donors" href="{% url 'fundraising:index' %}#in-kind-donors">{% trans "In-kind donors" %}</a>
</li>
<li class="design"><span>Design by</span> <a class="threespot" href="https://www.threespot.com">Threespot</a>
<li class="design"><span>{% trans "Design by" %}</span> <a class="threespot" href="https://www.threespot.com">Threespot</a>
<span class="ampersand">&amp;</span> <a class="andrevv" href="http://andrevv.com/">andrevv</a></li>
</ul>
<p class="copyright">&copy; 2005-{% now "Y" %}
<a href="{% host_url "homepage" host "www" %}foundation/"> Django Software
Foundation</a> and individual contributors. Django is a
<a href="{% host_url "homepage" host "www" %}trademarks/">registered
trademark</a> of the Django Software Foundation.
<a href="{% host_url "homepage" host "www" %}foundation/"> {% trans "Django Software Foundation" %}</a> {% trans "and individual contributors. Django is a" %}
<a href="{% host_url "homepage" host "www" %}trademarks/">{% trans "registered trademark" %}</a> {% trans "of the Django Software Foundation." %}

</p>
</div>
</div>
Expand Down
25 changes: 13 additions & 12 deletions djangoproject/templates/includes/header.html
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
{% load i18n %}
{% load docs %}
{% if 'preview.djangoproject.com' in request.get_host %}
<div class="copy-banner" style="background: #fff78e; padding: 10px;"></div>
{% endif %}
<header id="top">
<div class="container container--flex--wrap--mobile">
<a class="logo" href="{% url 'homepage' %}">Django</a>
<p class="meta">The web framework for perfectionists with deadlines.</p>
<p class="meta">{% trans "The web framework for perfectionists with deadlines." %}</p>
<button class="menu-button">
<i class="icon icon-reorder"></i>
<span class="visuallyhidden">Menu</span>
<span class="visuallyhidden">{% trans "Menu" %}</span>
</button>
<nav aria-labelledby="navigation-header">
<span id="navigation-header" class="visuallyhidden">Main navigation</span>
<span id="navigation-header" class="visuallyhidden">{% trans "Main navigation" %}</span>
<ul>
<li{% if 'start' in request.path %} class="active"{% endif %}>
<a href="{% url 'overview' %}">Overview</a>
<a href="{% url 'overview' %}">{% trans "Overview" %}</a>
</li>
<li{% if 'download' in request.path %} class="active"{% endif %}>
<a href="{% url 'download' %}">Download</a>
<a href="{% url 'download' %}">{% trans "Download" %}</a>
</li>
<li{% if request.host.name == 'docs' and 'search' not in request.path %} class="active"{% endif %}>
<a href="{% block doc_url %}{% url 'homepage' host 'docs' %}{% endblock %}">Documentation</a>
<a href="{% block doc_url %}{% url 'homepage' host 'docs' %}{% endblock %}">{% trans "Documentation" %}</a>
</li>
<li{% if 'weblog' in request.path %} class="active"{% endif %}>
<a href="{% url 'weblog:index' %}">News</a>
<a href="{% url 'weblog:index' %}">{% trans "News" %}</a>
</li>
<li>
<a href="https://github.com/django/django" target="_blank" rel="noopener">Code</a>
<a href="https://github.com/django/django" target="_blank" rel="noopener">{% trans "Code" %}</a>
</li>
<li>
<a href="https://code.djangoproject.com/">Issues</a>
<a href="https://code.djangoproject.com/">{% trans "Issues" %}</a>
</li>
<li{% if 'community' in request.path or 'conduct' in request.path %} class="active"{% endif %}>
<a href="{% url 'community-index' %}">Community</a>
<a href="{% url 'community-index' %}">{% trans "Community" %}</a>
</li>
<li{% if 'foundation' in request.path %} class="active"{% endif %}>
<a href="{% url 'homepage' %}foundation/">Foundation</a>
<a href="{% url 'homepage' %}foundation/">{% trans "Foundation" %}</a>
</li>
<li{% if 'fundraising' in request.path %} class="active"{% endif %}>
<a href="{% url 'fundraising:index' %}">&#9829; Donate</a>
<a href="{% url 'fundraising:index' %}">{% trans "♥ Donate" %}</a>
</li>
</ul>
</nav>
Expand Down
4 changes: 2 additions & 2 deletions djangoproject/templates/search_form.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% load i18n %}
<search class="search form-input" aria-labelledby="docs-search-label">
<form action="{% url 'document-search' version=version lang=lang host 'docs' %}">
<label id="docs-search-label" class="visuallyhidden" for="{{ form.q.id_for_label }}">{{ form.q.field.widget.attrs.placeholder }}</label>
<label id="docs-search-label" class="visuallyhidden" for="{{ form.q.id_for_label }}">{% trans "Search" %}</label>
{{ form.q }}
<input type="hidden" name="category" value="{{ active_category }}">

<button type="submit">
<i class="icon icon-search" aria-hidden="true"></i>
<span class="visuallyhidden">{% translate "Submit" %}</span>
<span class="visuallyhidden">{% trans "Submit" %}</span>
</button>
</form>
</search>
Loading