Skip to content

Removed hard-coded/relative urls and updated CoC references #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarahboyce wants to merge 2 commits into
base: main
Choose a base branch
from
+116 −114
Open

Removed hard-coded/relative urls and updated CoC references #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b699a
Updated CoC as WG rather than committee and linked to team page.
sarahboyce Nov 28, 2025
802d737
Removed relative urls.
sarahboyce Nov 28, 2025
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
8 changes: 4 additions & 4 deletions djangoproject/templates/aggregator/ecosystem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base_community.html" %}
{% load i18n %}
{% load i18n hosts %}

{% block content %}

Expand Down Expand Up @@ -139,7 +139,7 @@ <h3 id="tutorials">
<ul>
<li>
<a href="https://tutorial.djangogirls.org/">DjangoGirls Tutorial</a>
&mdash; A great tutorial you can do in addition to the <a href="/en/dev/intro/tutorial/01/">official tutorial</a>.
&mdash; A great tutorial you can do in addition to the <a href="{% url 'document-detail' lang='en' version='stable' url='intro/tutorial/01/' host 'docs' %}">official tutorial</a>.
</li>
</ul>

Expand All @@ -152,10 +152,10 @@ <h3 id="miscellaneous">
<a href="https://builtwithdjango.com/projects/" rel="nofollow">Django-powered sites</a>
</li>
<li>
<a href="/community/badges/">Show your support with badges</a>
<a href="{% host_url "homepage" host "www" %}community/badges/">Show your support with badges</a>
</li>
<li>
<a href="/community/logos/">Download official logos</a>
<a href="{% host_url "homepage" host "www" %}community/logos/">Download official logos</a>
</li>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions djangoproject/templates/aggregator/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ <h3>{% translate "Package Ecosystem" %}</h3>

<h2 class="community-title">{% translate "Get Involved" %}</h2>
<div class="community-cta-wrapper">
<a href="https://docs.djangoproject.com/en/dev/internals/contributing/bugs-and-features/#reporting-bugs" class="community-cta-a">
<a href="{% url 'document-detail' lang='en' version='dev' url='internals/contributing/bugs-and-features' host 'docs' %}#reporting-bugs" class="community-cta-a">
<div class="community-cta">
<div>
{% include "svg_logos/bug.html" %}
</div>
<h3>{% translate "Report an issue" %}</h3>
</div>
</a>
<a href="https://docs.djangoproject.com/en/dev/internals/contributing/" class="community-cta-a">
<a href="{% url 'document-detail' lang='en' version='dev' url='internals/contributing' host 'docs' %}" class="community-cta-a">
<div class="community-cta">
<div>
{% include "svg_logos/notepad.html" %}
Expand Down
8 changes: 4 additions & 4 deletions djangoproject/templates/base_community.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load fundraising_extras i18n %}
{% load fundraising_extras i18n hosts %}

{% block og_title %}{% translate "Django Community" %}{% endblock %}
{% block og_description %}{% translate "Building the Django Community. Come join us!" %}{% endblock %}
Expand Down Expand Up @@ -45,7 +45,7 @@ <h3>{% translate "Dive In" %}</h3>
<dl class="list-links">
<dt><a href="https://code.djangoproject.com/">{% translate "Ticket System" %}</a></dt>
<dd>{% translate "View and update bug reports" %}</dd>
<dt><a href="https://dashboard.djangoproject.com/">{% translate "Development Dashboard" %}</a></dt>
<dt><a href="{% host_url 'dashboard-index' host 'dashboard' %}">{% translate "Development Dashboard" %}</a></dt>
<dd>{% translate "Statistics about Django development" %}</dd>
<dt><a href="https://groups.google.com/group/django-updates">{% translate "django-updates Mailing List" %}</a></dt>
<dd>{% translate "Get updated for each code and ticket change" %}</dd>
Expand All @@ -57,9 +57,9 @@ <h3>{% translate "More Links" %}</h3>
<dd>{% translate "Find third-party packages to supercharge your project" %}</dd>
<dt><a href="https://builtwithdjango.com/projects/" rel="nofollow">{% translate "Django-powered Sites" %}</a></dt>
<dd>{% translate "Add your site to the list" %}</dd>
<dt><a href="/community/badges/">{% translate "Django Badges" %}</a></dt>
<dt><a href="{% host_url "homepage" host "www" %}community/badges/">{% translate "Django Badges" %}</a></dt>
<dd>{% translate "Show your support (or wish longingly)" %}</dd>
<dt><a href="/community/logos/">{% translate "Django Logos" %}</a></dt>
<dt><a href="{% host_url "homepage" host "www" %}community/logos/">{% translate "Django Logos" %}</a></dt>
<dd>{% translate "Download official logos" %}</dd>
</dl>
</div>
Expand Down
10 changes: 5 additions & 5 deletions djangoproject/templates/base_foundation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load fundraising_extras meetings i18n %}
{% load fundraising_extras meetings i18n hosts %}

{% block og_title %}Django Software Foundation{% endblock %}

Expand All @@ -19,11 +19,11 @@ <h2 class="visuallyhidden" id="aside-header">{% translate "Additional Informatio

<h3>About the foundation</h3>
<ul class="list-links">
<li><a href="/foundation/faq/">FAQ</a></li>
<li><a href="/foundation/records/">Records</a></li>
<li><a href="{% host_url 'homepage' host 'www' %}foundation/faq/">FAQ</a></li>
<li><a href="{% host_url 'homepage' host 'www' %}foundation/records/">Records</a></li>
<li><a href="{% url 'contact_foundation' %}">Contact us</a></li>
<li><a href="/foundation/cla/">Contributor license agreements</a></li>
<li><a href="/foundation/conferences/">Organizing a Django conference</a></li>
<li><a href="{% host_url 'homepage' host 'www' %}foundation/cla/">Contributor license agreements</a></li>
<li><a href="{% host_url 'homepage' host 'www' %}foundation/conferences/">Organizing a Django conference</a></li>
</ul>
<h3>{% translate "Latest DSF meeting minutes" %}</h3>
<p> {% translate "The minutes from May 2025 onwards are stored in the repo" %}
Expand Down
4 changes: 2 additions & 2 deletions djangoproject/templates/base_weblog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load fundraising_extras i18n weblog %}
{% load fundraising_extras i18n weblog hosts %}
{% block layout_class %}sidebar-right{% endblock %}
{% block title %}{% translate "News &amp; Events" %}{% endblock %}

Expand Down Expand Up @@ -34,7 +34,7 @@ <h3>{% translate "Upcoming Events" %}</h3>
{% endfor %}
</ul>
{% endif %}
<p><a href="/foundation/conferences/">{% translate "Want your event listed here?" %}</a></p>
<p><a href="{% host_url 'homepage' host 'www' %}foundation/conferences/">{% translate "Want your event listed here?" %}</a></p>

{% comment %}
{# tags not implemented in backend yet #}
Expand Down
2 changes: 1 addition & 1 deletion djangoproject/templates/conduct/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h2 id="aside-header">{% translate "Django Community Code of Conduct" %}</h2>

<ul class="list-links">
<li><a href="{% url 'code_of_conduct' %}">{% translate "Code of Conduct" %}</a></li>
<li><a href="/foundation/committees/#conduct">{% translate "Committee" %}</a></li>
<li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Code of Conduct working group" %}</a></li>
<li><a href="{% url 'conduct_faq' %}">{% translate "Frequently Asked Questions" %}</a></li>
<li><a href="{% url 'conduct_reporting' %}">{% translate "Reporting Guide" %}</a></li>
<li><a href="{% url 'conduct_enforcement' %}">{% translate "Enforcement Manual" %}</a></li>
Expand Down
2 changes: 1 addition & 1 deletion djangoproject/templates/conduct/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>{% translate "Change control process" %}</h2>
associated documents the same way we track changes to code. All changes will
be proposed via a pull request to the
<a href="https://github.com/django/djangoproject.com">djangoproject.com repository
on GitHub</a>. Changes will be reviewed by the conduct committee first, and then
on GitHub</a>. Changes will be reviewed by the conduct working group first, and then
sent to the DSF and the Django community for comment.
We'll hold a comment period of at least one week, then the DSF board will vote on
the change. Approved changes will be merged, published, and noted below.{% endblocktranslate %}</p>
Expand Down
83 changes: 42 additions & 41 deletions djangoproject/templates/conduct/enforcement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,56 @@
{% block title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %}

{% block og_title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %}
{% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct Committee" %}{% endblock %}
{% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct working group" %}{% endblock %}

{% block content %}
<h1>{% translate "Django Code of Conduct - Enforcement Manual" %}</h1>

<h2 class="deck">
{% blocktranslate trimmed %}
This is the enforcement manual followed by Django's Code of
Conduct Committee. It's used when we respond to an issue to make sure we're
Conduct working group. It's used when we respond to an issue to make sure we're
consistent and fair. It should be considered an internal document, but we're
publishing it publicly in the interests of transparency.
{% endblocktranslate %}</h2>

<h3>{% translate "The Code of Conduct Committee" %}</h3>
<h3>{% translate "The Code of Conduct Working Group" %}</h3>

<p>
{% url 'members:teams' as teams_url %}
{% blocktranslate trimmed %}
All responses to reports of conduct violations will be managed by a
<a href="/foundation/committees/">Code of Conduct Committee</a> ("the committee").
All responses to reports of conduct violations will be managed by the
<a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct working group</a>.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The Django Software Foundation's Board of Directors ("the board") will establish
this committee, comprised of at least three members. One member will be
designated chair of the committee and will be responsible for all reports back to
this working group, comprised of at least three members. One member will be
designated chair of the working group and will be responsible for all reports back to
the board. The board will review membership on a regular basis.
{% endblocktranslate %}</p>

<h3>{% translate "How the committee will respond to reports" %}</h3>
<h3>{% translate "How the working group will respond to reports" %}</h3>

<p>
{% blocktranslate trimmed %}
When a report is sent to the committee they will immediately reply to the
When a report is sent to the working group they will immediately reply to the
report to confirm receipt. This reply must be sent within 24 hours, and the
committee should strive to respond much quicker than that.
working group should strive to respond much quicker than that.
{% endblocktranslate %}</p>

{% url 'conduct_reporting' as conduct_reporting %}
<p>
{% blocktranslate trimmed %}
See the <a href="{{ conduct_reporting }}">reporting guidelines</a> for details of
what reports should contain. If a report doesn't contain enough information, the
committee will obtain all relevant data before acting. The committee is
working group will obtain all relevant data before acting. The working group is
empowered to act on the DSF's behalf in contacting any individuals involved to
get a more complete account of events.
{% endblocktranslate %}</p>

<p>{% translate "The committee will then review the incident and determine, to the best of their ability:" %}
<p>{% translate "The working group will then review the incident and determine, to the best of their ability:" %}
<ul>
<li>{% translate "what happened" %}</li>
<li>{% translate "whether this event constitutes a code of conduct violation" %}</li>
Expand All @@ -64,14 +65,14 @@ <h3>{% translate "How the committee will respond to reports" %}</h3>
<p>
{% blocktranslate trimmed %}
This information will be collected in writing, and whenever possible the
committee's deliberations will be recorded and retained (i.e. chat transcripts, email
working group's deliberations will be recorded and retained (i.e. chat transcripts, email
discussions, recorded voice conversations, etc).
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The committee should aim to have a resolution agreed upon within one week.
In the event that a resolution can't be determined in that time, the committee will
The working group should aim to have a resolution agreed upon within one week.
In the event that a resolution can't be determined in that time, the working group will
respond to the reporter(s) with an update and projected timeline for resolution.
{% endblocktranslate %}</p>

Expand All @@ -80,98 +81,98 @@ <h3>{% translate "Acting Unilaterally" %}</h3>
<p>
{% blocktranslate trimmed %}
If the act is ongoing (such as someone engaging in harassment on the forum), or involves
a threat to anyone's safety (e.g. threats of violence), any committee member
a threat to anyone's safety (e.g. threats of violence), any working group member
may act immediately (before reaching consensus) to end the situation. In ongoing
situations, any member may at their discretion employ any of the tools available
to the committee, including bans and blocks.
to the working group, including bans and blocks.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
If the incident involves physical danger, any member of the committee may --
If the incident involves physical danger, any member of the working group may --
and should -- act unilaterally to protect safety. This can include contacting
law enforcement (or other local personnel) and speaking on behalf of the DSF.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
In situations where an individual committee member acts unilaterally, they must
report their actions to the committee for review within 24 hours.{% endblocktranslate %}</p>
In situations where an individual working group member acts unilaterally, they must
report their actions to the working group for review within 24 hours.{% endblocktranslate %}</p>

<h3>{% translate "Resolutions" %}</h3>

<p>
{% blocktranslate trimmed %}
The committee must agree on a resolution by consensus. If the committee cannot
reach consensus and deadlocks for over a week, the committee will turn the matter
The working group must agree on a resolution by consensus. If the working group cannot
reach consensus and deadlocks for over a week, the working group will turn the matter
over to the board for resolution.{% endblocktranslate %}</p>

<p>{% translate "Possible responses may include:" %}
<ul>
<li>{% translate "Taking no further action (if we determine no violation occurred)." %}</li>
<li>
{% blocktranslate trimmed %}
A private reprimand from the committee to the individual(s) involved.
In this case, a committee member will deliver that reprimand to the individual(s)
over email, cc'ing the committee.{% endblocktranslate %}</li>
A private reprimand from the working group to the individual(s) involved.
In this case, a working group member will deliver that reprimand to the individual(s)
over email, cc'ing the working group.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A public reprimand. In this case, a committee member will deliver that reprimand
A public reprimand. In this case, a working group member will deliver that reprimand
in the same venue that the violation occurred (i.e. in the forum for a forum violation;
email for an email violation, etc.). The committee may choose to publish this message
email for an email violation, etc.). The working group may choose to publish this message
elsewhere for posterity.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
An imposed vacation (i.e. asking someone to "take a week off" from the forum).
A committee member will communicate this "vacation" to the individual(s).
A working group member will communicate this "vacation" to the individual(s).
They'll be asked to take this vacation voluntarily, but if they don't agree then
a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A permanent or temporary ban from some or all Django spaces (the forum,
etc.). The committee will maintain records of all such bans so that they may be
etc.). The working group will maintain records of all such bans so that they may be
reviewed in the future, extended to new Django fora, or otherwise maintained.
{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A request for a public or private apology. a committee member will deliver this request.
The committee may, if it chooses, attach "strings" to this request: for example,
the committee may ask a violator to apologize in order to retain his or her membership
A request for a public or private apology. a working group member will deliver this request.
The working group may, if it chooses, attach "strings" to this request: for example,
the working group may ask a violator to apologize in order to retain his or her membership
on the forum.{% endblocktranslate %}</li>
</ul>
</p>

<p>
{% blocktranslate trimmed %}
Once a resolution is agreed upon, but before it is enacted, the committee
Once a resolution is agreed upon, but before it is enacted, the working group
will contact the original reporter and any other affected parties and explain
the proposed resolution. The committee will ask if this resolution is
acceptable, and must note feedback for the record. However, the committee is
the proposed resolution. The working group will ask if this resolution is
acceptable, and must note feedback for the record. However, the working group is
not required to act on this feedback.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
Finally the committee will make a report for the DSF board. In case the
incident or report involves a current member of the board, the committee will
Finally the working group will make a report for the DSF board. In case the
incident or report involves a current member of the board, the working group will
provide the report only to the other board members.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The committee will never publicly discuss the issue; all public statements
The working group will never publicly discuss the issue; all public statements
will be made by the DSF board.
{% endblocktranslate %}</p>

<h3>{% translate "Conflicts of Interest" %}</h3>
{% url 'conduct_reporting' as url%}
<p>
{% blocktranslate trimmed %}
In the event of any conflict of interest a committee member must immediately
In the event of any conflict of interest a working group member must immediately
notify the other members, and recuse themselves if necessary. If a report concerns
a possible violation by a current committee member, this member should be
a possible violation by a current working group member, this member should be
excluded from the response process. For these cases, anyone can make a report
directly to any of the committee chairs, as documented in the
directly to any of the working group chairs, as documented in the
<a href="{{ url }}">reporting guidelines</a>.
{% endblocktranslate %}</p>

Expand Down
Loading