Skip to content

Commit 3a6311d

Browse files
authored
Merge pull request #13 from djangocon/redirects
Adds redirects, permalinks, and CoC
2 parents 0704a9e + 6b37cef commit 3a6311d

15 files changed

+195
-24
lines changed

CODE_OF_CONDUCT.md

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# Code of Conduct
2+
3+
DjangoCon US is dedicated to providing a fun harassment-free conference experience for everyone, regardless of gender, gender identity, sexual orientation, disability, physical appearance, body size, race, or religion.
4+
5+
Be kind to others. Do not insult or put down other attendees. Behave professionally.
6+
7+
Remember that harassment and sexist, racist, or exclusionary jokes are not appropriate for DjangoCon US.
8+
9+
Attendees violating these rules may be asked to leave the conference without a refund at the sole discretion of the conference organizers.
10+
11+
Thank you for helping make this a welcoming, friendly event for all.
12+
13+
## Full Code of Conduct
14+
15+
_To make clear what is expected, all delegates/attendees, speakers,
16+
exhibitors, organizers and volunteers at any DjangoCon US event are required
17+
to conform to the following Code of Conduct. Organizers will enforce this code
18+
throughout the event._
19+
20+
### What the conference is
21+
22+
DjangoCon US is a community conference intended for networking and
23+
collaboration in the developer community.
24+
25+
We value the participation of each member of the Django community and want all
26+
attendees to have an enjoyable and fulfilling experience. Accordingly, all
27+
attendees are expected to show respect and courtesy to other attendees
28+
throughout the conference, at all conference events, and in all conference
29+
online spaces (such as Slack), whether officially sponsored by DjangoCon US or
30+
not.
31+
32+
### Be Kind To Others
33+
34+
Do not insult or put down other attendees. Behave professionally. Remember
35+
that harassment and sexist, racist, or exclusionary jokes are not appropriate
36+
for DjangoCon US. Attendees violating these rules may be asked to leave the
37+
conference without a refund at the sole discretion of the conference
38+
organizers.
39+
40+
### Be Respectful
41+
42+
Not all of us will agree all the time, but disagreement is no excuse for poor
43+
behavior and poor manners. We do not tolerate harassment of conference
44+
participants in any form.
45+
46+
Harassment includes: offensive verbal comments related to gender, gender
47+
identity, sexual orientation, disability, physical appearance, body size,
48+
race, religion; sexual images in public spaces; deliberate intimidation,
49+
stalking, or following; harassing photography or recording; sustained
50+
disruption of talks or other events; inappropriate physical contact; and
51+
unwelcome sexual attention.
52+
53+
## Choose Your Words
54+
55+
Be careful in the words that you choose. Remember that sexist, racist, and
56+
other exclusionary jokes can be offensive to those around you. Excessive
57+
swearing and offensive jokes are not appropriate for DjangoCon US. We are all
58+
adults, capable of having adult conversations. Preface your presentation with
59+
appropriate Trigger/Content Warnings, if necessary.
60+
61+
All communication should be appropriate for a professional audience including
62+
people of many different backgrounds. Sexual language and imagery is not
63+
appropriate for any conference venue, including talks.
64+
65+
Participants asked to stop any harassing behavior are expected to comply
66+
immediately.
67+
68+
Exhibitors in the expo hall, sponsor or vendor booths, or similar activities
69+
are also subject to the anti-harassment policy. In particular, exhibitors
70+
should not use sexualized images, activities, or other material. Booth staff
71+
(including volunteers) should not use sexualized clothing/uniforms/costumes,
72+
or otherwise create a sexualized environment.
73+
74+
## Examples of Inappropriate Behavior
75+
76+
- Harassment of any participants in any form
77+
- Deliberate intimidation, stalking, or following
78+
- Logging or taking screenshots of online activity for harassment purposes
79+
- Publishing others’ private information, such as a physical or electronic address, without explicit permission
80+
- Violent threats or language directed against another person
81+
- Incitement of violence or harassment towards any individual, including encouraging a person to commit suicide or to engage in self-harm
82+
- Creating additional online accounts in order to harass another person or circumvent a ban
83+
- Sexual language and imagery in online communities or in any conference venue, including talks
84+
- Insults, put downs, or jokes that are based upon stereotypes, that are exclusionary, or that hold others up for ridicule
85+
- Excessive swearing
86+
- Unwelcome sexual attention or advances
87+
- Unwelcome physical contact, including simulated physical contact (eg, textual descriptions like “hug” or “backrub”) without consent or after a request to stop
88+
- Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others
89+
- Sustained disruption of online community discussions, in-person presentations, or other in-person events
90+
- Continued one-on-one communication after requests to cease
91+
- Other conduct that is inappropriate for a professional audience including people of many different backgrounds
92+
93+
This list is not an exhaustive list of all inappropriate behavior that is unacceptable at DjangoCon US. Community members asked to stop any inappropriate behavior are expected to comply immediately.
94+
95+
## Photography
96+
97+
In order to make DjangoCon US 2023 a great experience for everyone, do not
98+
photograph, video, or audio record anyone at DjangoCon without their express
99+
permission, sought in advance. If someone does not want to be photographed,
100+
video or audio recorded, please respect their wishes.
101+
102+
Crowd shots are permitted, but when only the faces of a few people are
103+
visible, permission should be sought from all of those individuals.
104+
105+
_If a participant engages in behavior that violates this code of conduct, the
106+
conference organizers may take any action they deem appropriate, including
107+
warning the offender or expulsion from the conference with no refund._
108+
109+
## License
110+
111+
This Code of Conduct was forked from the example policy from the [Geek
112+
Feminism wiki](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy), created by the Ada Initiative and other volunteers, which
113+
is under a Creative Commons Zero license.
114+
115+
This Code of Conduct also incorporates portions from PyCon's Code of Conduct, which is licensed under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](https://creativecommons.org/licenses/by-sa/3.0/).
116+
117+
Conference Code of Conduct by
118+
[2024.djangocon.us/conduct/](https://2024.djangocon.us/conduct/) is licensed under a
119+
[Creative Commons Attribution 3.0 Unported
120+
License](http://creativecommons.org/licenses/by/3.0/).

src/_content/posts/early-bird-tickets-on-sale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This year we have limited early-bird pricing for individual tickets and corporat
2424

2525
Purchasing your tickets early not only saves you money, but it also helps organizers prepare for the conference. Besides the obvious factors of knowing how many meals to order and what size projector screens we'll need, it offsets the early payments made to vendors and gives us confidence to enhance and expand the conference experience. If you're able to commit to attending DjangoCon US early, that's fantastic. If you need more time, don't worry; that works for us too.
2626

27-
And lastly, if you're ecstatic about the idea of attending DjangoCon US but need financial assistance to do so, our [Opportunity Grant CFP](/about/opportunity-grants/) is open until April 29th.
27+
And lastly, if you're ecstatic about the idea of attending DjangoCon US but need financial assistance to do so, our [Opportunity Grant CFP](/opportunity-grants/) is open until April 29th.
2828

2929
We can’t wait to see you in Durham!
3030

src/_content/posts/opportunity-grant-last-call.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ title: "Heads Up! End of our Opportunity Grants is coming up!"
1414

1515
**UPDATE**: The application window has been extended to Monday, April 29th at Noon EDT!
1616

17-
Here to remind you that the [opportunity grants](https://2024.djangocon.us/about/opportunity-grants/) will be closing on April 29, 2024 at [12 PM EDT](https://time.is/1200PM_29_Apr_2024_in_New_York?DjangoCon_US_2024_CFP_closes).
17+
Here to remind you that the [opportunity grants](https://2024.djangocon.us/opportunity-grants/) will be closing on April 29, 2024 at [12 PM EDT](https://time.is/1200PM_29_Apr_2024_in_New_York?DjangoCon_US_2024_CFP_closes).
1818

1919
If you haven't already applied, make sure to fill the [opportunity grant application form](https://forms.gle/Pi12J6vFQHq2CSAy5) soon.
2020

@@ -33,6 +33,6 @@ Anyone, anyone who needs financial support attending our conference.
3333

3434
You will be notified by **June 14, 2024**.
3535

36-
If you would like more information on opportunity grants, click [here](https://2024.djangocon.us/about/opportunity-grants/) to go to the grants information page.
36+
If you would like more information on opportunity grants, click [here](https://2024.djangocon.us/opportunity-grants/) to go to the grants information page.
3737

3838
Happy Scrolling!

src/_includes/nav.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<ul
88
data-menu-list
99
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-ice-cream-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[24ch] lg:p-6 rounded font-medium">
10-
<li><a href="/about/" role="menuitem">About DjangoCon US</a></li>
11-
<li><a href="/about/tickets/" role="menuitem">Tickets</a></li>
12-
<li><a href="/about/faq/" role="menuitem">FAQ</a></li>
13-
<li><a href="/about/conduct/" role="menuitem">Code of Conduct</a></li>
14-
<li><a href="/about/public-health/" role="menuitem">Public Health</a></li>
15-
<li><a href="/about/opportunity-grants/" role="menuitem">Opportunity Grants</a></li>
16-
<li><a href="/about/visas/" role="menuitem">Visa Support</a></li>
17-
<li><a href="/about/organizers/" role="menuitem">Organizers</a></li>
10+
<li><a href="/" role="menuitem">About DjangoCon US</a></li>
11+
<li><a href="/tickets/" role="menuitem">Tickets</a></li>
12+
<li><a href="/faq/" role="menuitem">FAQ</a></li>
13+
<li><a href="/conduct/" role="menuitem">Code of Conduct</a></li>
14+
<li><a href="/public-health/" role="menuitem">Public Health</a></li>
15+
<li><a href="/opportunity-grants/" role="menuitem">Opportunity Grants</a></li>
16+
<li><a href="/visas/" role="menuitem">Visa Support</a></li>
17+
<li><a href="/organizers/" role="menuitem">Organizers</a></li>
1818
</ul>
1919
</li>
2020
{% comment %}<li><a href="/schedule/">Schedule</a></li>{% endcomment %}

src/about/conduct.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
title: Code of Conduct
44
description: >
55
DjangoCon US is dedicated to providing a fun harassment-free conference experience for everyone, regardless of gender, gender identity, sexual orientation, disability, physical appearance, body size, race, or religion.
6+
7+
permalink: /conduct/
8+
redirect_from: /coc/
69
---
710

811
<div class="hero">

src/about/faq.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
title: Frequently Asked Questions
55
description: >
66
Common questions and answers about DjangoCon US.
7+
8+
permalink: /faq/
79
---
810

911
<div class="hero">
@@ -32,7 +34,7 @@ <h2 class="mb-6 subheading">
3234
<hgroup class="mb-6">
3335
<h2 class="mb-4 text-xl font-bold font-heading lg:text-3xl">Tickets</h2>
3436
<p class="lead">
35-
Tickets are on sale now! More information is on our <a href="/about/tickets" class="link">Tickets</a> page.
37+
Tickets are on sale now! More information is on our <a href="/tickets" class="link">Tickets</a> page.
3638
{% comment %}Conference tickets are sold out for 2024, but tutorial tickets may still be available.{% endcomment %}
3739
</p>
3840
</hgroup>
@@ -129,7 +131,7 @@ <h2 class="mb-4 text-xl font-bold font-heading lg:text-3xl">Accessibility</h2>
129131
<section>
130132
<hgroup class="mb-6">
131133
<h2 class="mb-4 text-2xl font-bold font-heading lg:text-4xl">Opportunity Grants</h2>
132-
<p class="lead">More information is on our <a href="/about/opportunity-grants/" class="link">Opportunity Grants</a> page.</p>
134+
<p class="lead">More information is on our <a href="/opportunity-grants/" class="link">Opportunity Grants</a> page.</p>
133135
</hgroup>
134136

135137
<div class="prose lg:prose-lg">
@@ -149,7 +151,7 @@ <h2 class="mb-8 text-2xl font-bold font-heading lg:text-4xl">Sponsors</h2>
149151
<div class="prose lg:prose-lg">
150152
<ul>
151153
<li>Can I sign up as a sponsor for DjangoCon US 2024?</li>
152-
<li>Can I sign up as a sponsor for <a href="/about/opportunity-grants/" class="link">Opportunity Grants</a>?</li>
154+
<li>Can I sign up as a sponsor for <a href="/opportunity-grants/" class="link">Opportunity Grants</a>?</li>
153155
{% comment %}<li>Are any of the sponsors <a href="/job-board/" class="link">hiring</a>?</li>{% endcomment %}
154156
</ul>
155157
</div>

src/about/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ <h2 class="mb-8 text-2xl font-bold text-center font-heading lg:text-5xl">Confere
118118
<section class="flex flex-col gap-4 p-6 bg-white border-2 rounded">
119119
<img src="/assets/img/theme/icons/People.svg" alt="Two people. One person is standing slightly in front of the other." class="w-16 h-16 icon" />
120120
<h3 class="text-lg font-bold lg:text-2xl font-heading" id="code-of-conduct">Code of Conduct</h3>
121-
<p class="lg:text-lg">We’re committed to providing a safe and friendly environment for everyone to learn, meet, and enjoy the conference. All organizers, attendees, speakers and sponsors must follow the <strong><a href="/about/conduct/" class="link">Code of Conduct</a></strong>.</p>
121+
<p class="lg:text-lg">We’re committed to providing a safe and friendly environment for everyone to learn, meet, and enjoy the conference. All organizers, attendees, speakers and sponsors must follow the <strong><a href="/conduct/" class="link">Code of Conduct</a></strong>.</p>
122122
</section>
123123

124124
<section class="flex flex-col gap-4 p-6 bg-white border-2 rounded">
125125
<img src="/assets/img/theme/icons/Heart.svg" alt="A heart." class="w-16 h-16 icon" />
126126
<h3 class="text-lg font-bold lg:text-2xl font-heading" id="commitment-to-diversity">Commitment to Diversity</h3>
127-
<p class="lg:text-lg">It is a core aim of DjangoCon US 2024 to encourage diversity, enforce our <strong><a href=/about/conduct/" class="link">Code of Conduct</a></strong>, and make our event as inclusive and accessible as possible.</p>
127+
<p class="lg:text-lg">It is a core aim of DjangoCon US 2024 to encourage diversity, enforce our <strong><a href=/conduct/" class="link">Code of Conduct</a></strong>, and make our event as inclusive and accessible as possible.</p>
128128
</section>
129129

130130
<section class="flex flex-col gap-4 p-6 bg-white border-2 rounded">
131131
<img src="/assets/img/theme/icons/Document.svg" alt="An official document with words written on it." class="w-16 h-16 icon" />
132132
<h3 class="text-lg font-bold lg:text-2xl font-heading" id="opportunity-grants">COVID-19 Safety</h3>
133-
<p class="lg:text-lg">As part of our commitment to the safety of our attendees, we have a <strong><a href="/about/public-health/" class="link">COVID-19 Policy</a></strong> and require all attendees to be vaccinated and masked, and have a negative COVID test prior to attending.</p>
133+
<p class="lg:text-lg">As part of our commitment to the safety of our attendees, we have a <strong><a href="/public-health/" class="link">COVID-19 Policy</a></strong> and require all attendees to be vaccinated and masked, and have a negative COVID test prior to attending.</p>
134134
</section>
135135
</div>
136136
</div>

src/about/opportunity-grants.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
title: Opportunity Grants
55
description: >
66
As part of our commitment to diversity, we are thrilled to announce that we will be supporting individuals who need opportunity grants to attend DjangoCon US.
7+
8+
permalink: /opportunity-grants/
79
---
810

911

@@ -17,10 +19,10 @@ <h1 class="pageheading">{{ title }}</h1>
1719
<div class="wrapper">
1820
<div class="prose lg:prose-lg">
1921
<p>The application window is now closed. Decision notifications will be sent by July 8th, 2024.</p>
20-
22+
2123
{% comment %}
2224
<p><strong>UPDATE</strong>: The application window has been extended to Monday, April 29th at Noon EDT!</p>
23-
25+
2426
<p>Our <a href="https://forms.gle/Pi12J6vFQHq2CSAy5">opportunity grant application</a> is open until April 29, 2024 at <a href="https://time.is/1200PM_29_Apr_2024_in_New_York?DjangoCon_US_2024_CFP_closes">12 PM EDT</a>.</p>
2527
{% endcomment %}
2628

@@ -68,7 +70,7 @@ <h3 id="is-there-anything-i-should-know-if-i-am-traveling-into-the-us-from-anoth
6870

6971
<p>If you are traveling into the United States, we strongly encourage you to wait to purchase airfare or book a hotel room until after your visa has been accepted.</p>
7072

71-
<p>Find out more details and get your invitation letter at our <a href="/about/visas/">Visa information page</a>.</p>
73+
<p>Find out more details and get your invitation letter at our <a href="/visas/">Visa information page</a>.</p>
7274

7375
<h3 id="what-if-there-is-an-emergency-and-i-cannot-attend">What if there is an emergency and I cannot attend?</h3>
7476

src/about/organizers.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
title: Conference Organizers
33
layout: default
4+
5+
permalink: /organizers/
46
---
57

68
<div class="pt-16 pb-6">

src/about/public-health.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
title: Public Health Policy
55
description: >
66
DjangoCon US 2024's public health policy includes required testing and a mask recommendation.
7+
8+
permalink: /public-health/
9+
redirect_from: /covid/
710
---
811

912
<div class="block-container">

src/about/tickets.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
description: >
77
Information about buying tickets to DjangoCon US
8+
9+
permalink: /tickets/
810
---
911

1012

src/about/visas.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
title: Visa Support at DjangoCon US
55
description: >
66
Information about obtaining a Visa to visit DjangoCon US
7+
8+
permalink: /visas/
79
---
810

911
<div class="hero">

src/feed.xml

Whitespace-only changes.

src/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ <h1 class="mb-4 text-4xl font-extrabold leading-tight lg:text-5xl">
5353
<div class="grid-1-2">
5454
<section class="flex flex-col items-start justify-center mb-6 sm:mb-0">
5555
<h2 class="mb-4 text-3xl font-bold leading-relaxed font-heading lg:text-5xl">For Django fans<br/> of all&nbsp;levels</h2>
56-
<p class="text-xl lg:text-2xl mb-6">
56+
<p class="mb-6 text-xl lg:text-2xl">
5757
DjangoCon US has something for everyone, from the person who develops Django applications for a living to the person who just tinkers in their spare time.
5858
</p>
59-
<a class="button" href="/about/">About DjangoCon US</a>
59+
<a class="button" href="/about">About DjangoCon US</a>
6060
</section>
6161
<div>
6262
<ul class="space-y-10">
@@ -98,13 +98,13 @@ <h2 class="mb-8 text-2xl font-bold text-center font-heading lg:text-5xl max-w-[2
9898
<section class="flex flex-col gap-4 p-6 bg-white border-4 rounded">
9999
<img src="/assets/img/theme/icons/People.svg" alt="Two people. One person is standing slightly in front of the other." class="w-16 h-16 icon" />
100100
<h3 class="text-lg font-bold lg:text-2xl font-heading">Code of Conduct</h3>
101-
<p class="lg:text-lg">Participants are expected to be respectful to each other. For details on our expectations, and who to contact if you need assistance, see our <strong><a href="/about/conduct/" class="link">Code of Conduct</a></strong>.</p>
101+
<p class="lg:text-lg">Participants are expected to be respectful to each other. For details on our expectations, and who to contact if you need assistance, see our <strong><a href="/conduct/" class="link">Code of Conduct</a></strong>.</p>
102102
</section>
103103

104104
<section class="flex flex-col gap-4 p-6 bg-white border-4 rounded">
105105
<img src="/assets/img/theme/icons/Document.svg" alt="An official document with words written on it." class="w-16 h-16 icon" />
106106
<h3 class="text-lg font-bold lg:text-2xl font-heading">COVID-19</h3>
107-
<p class="lg:text-lg">Read our <strong><a href="/about/public-health" class="link">COVID-19 Policy</a></strong>, including mask and testing requirements.</p>
107+
<p class="lg:text-lg">Read our <strong><a href="/public-health" class="link">COVID-19 Policy</a></strong>, including mask and testing requirements.</p>
108108
</section>
109109

110110
<section class="flex flex-col gap-4 p-6 bg-white border-4 rounded">

0 commit comments

Comments
 (0)