Skip to content

Commit 300cbe3

Browse files
committed
Merge branch 'main' of github.com:djangocon/durham.djangocon.us
2 parents f7b3052 + 608ba9c commit 300cbe3

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

src/_data/site.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"visa_email": "[email protected]",
1212

1313
"cfp_application": "https://pretalx.com/djangocon-us-2024/cfp",
14-
"hotel_reservation_link": "https://www.marriott.com/en-us/hotels/rducv-durham-marriott-city-center/overview/",
14+
"hotel_reservation_link": "https://www.marriott.com/events/start.mi?id=1707512209729&key=GRP",
1515
"merchandise_link": "https://django.threadless.com/designs/djangocon-us-2024/mens/t-shirt/regular?variation=front&color=lemon",
1616
"opportunity_grant_application": "https://forms.gle/LamfHzoXULdv63h18",
1717
"slack_link": "",

src/about/conduct.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ <h2>Examples of Inappropriate Behavior</h2>
183183

184184
<h2>Photography</h2>
185185

186-
<p>In order to make DjangoCon US 2023 a great experience for everyone, do not photograph, video, or audio record anyone at DjangoCon without their express permission, sought in advance. If someone does not want to be photographed, video or audio recorded, please respect their wishes.</p>
186+
<p>In order to make DjangoCon US 2024 a great experience for everyone, do not photograph, video, or audio record anyone at DjangoCon without their express permission, sought in advance. If someone does not want to be photographed, video or audio recorded, please respect their wishes.</p>
187187

188188
<p>Crowd shots are permitted, but when only the faces of a few people are visible, permission should be sought from all of those individuals.</p>
189189

src/about/faq.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ <h2 class="mb-4 text-2xl font-bold font-heading lg:text-4xl">Opportunity Grants<
143143
<section>
144144
<hgroup class="mb-6">
145145
<h2 class="mb-8 text-2xl font-bold font-heading lg:text-4xl">Sponsors</h2>
146-
<p class="lead">More information is on our <a href="/sponsors/sponsors-information/" class="link">Become a Sponsor</a> page. Sponsorship signups for 2023 are now available!</p>
146+
<p class="lead">More information is on our <a href="/sponsors/sponsors-information/" class="link">Become a Sponsor</a> page. Sponsorship signups for 2024 are now available!</p>
147147
</hgroup>
148148

149149
<div class="prose lg:prose-lg">
150150
<ul>
151-
<li>Can I sign up as a sponsor for DjangoCon US 2023?</li>
151+
<li>Can I sign up as a sponsor for DjangoCon US 2024?</li>
152152
<li>Can I sign up as a sponsor for <a href="/opportunity-grants/#how-to-donate" class="link">Opportunity Grants</a>?</li>
153153
{% comment %}<li>Are any of the sponsors <a href="/job-board/" class="link">hiring</a>?</li>{% endcomment %}
154154
</ul>

src/about/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ <h3 class="text-lg font-bold lg:text-2xl font-heading" id="code-of-conduct">Code
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 2023 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=/about/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">

src/about/tickets.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1 class="mb-8 pageheading">{{ title }}</h1>
1515

1616
<div class="max-w-[60rem]">
1717
<p class="subheading">
18-
DjangoCon US 2023 tickets are no longer on sale, but if you want to see what they cost, or need to consult the refund policy, keep reading!
18+
DjangoCon US 2024 tickets are no longer on sale, but if you want to see what they cost, or need to consult the refund policy, keep reading!
1919
</p>
2020
</div>
2121
</header>
@@ -43,7 +43,7 @@ <h2 class="mb-8 text-xl font-medium font-heading lg:text-3xl">Which ticket shoul
4343
<section class="self-start p-8 prose bg-white border-4 rounded border-central-park-green lg:prose-lg">
4444
<h3 class="mb-8 text-lg font-bold font-heading lg:text-2xl">Don't Forget!</h3>
4545
<ul class="px-4 space-y-4 list-disc lg:text-xl">
46-
<li>Early bird tickets are on sale until they're gone.</li>
46+
<li>Early bird tickets are on sale through May 31st or until they're gone.</li>
4747
<li>If your employer is paying, please use the corporate rate.</li>
4848
</ul>
4949
{% comment %}
@@ -77,7 +77,7 @@ <h2 class="mb-8 text-2xl font-bold font-heading lg:text-4xl">Ticket Prices and T
7777
<tbody>
7878
<tr>
7979
<td class="font-medium">Individual</td>
80-
<td>$449</td>
80+
<td>$339</td>
8181
<td>$499</td>
8282
<td><div>People paying their own way</div><div>Companies with 5 or fewer employees</div></td>
8383
</tr>

src/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ <h1 class="mb-4 text-4xl font-extrabold leading-tight lg:text-5xl">
2424

2525
<div class="button-group">
2626
<a class="button" href="{{ site.ticket_link }}">Buy Tickets</a>
27-
<a class="button" href="{{ site.cfp_application }}">Submit Talk</a>
27+
<a
28+
class="button"
29+
href="{{ site.hotel_reservation_link }}"
30+
>Book a Room</a>
2831

2932
{% comment %}
33+
<a class="button" href="{{ site.cfp_application }}">Submit Talk</a>
3034
<a class="button" href="https://emails.djangocon.us/sendy/subscription?f=Gs892S6cdJ676370nkSBxLOWzUsgYKPBcwkEMMvt0rr70f3IeA7634kuMTKJCLrdcgOQHQHdzwqLwvmcETbcm6KWtu9g">Join Mailing List</a>
3135
<a class="button" href="/schedule/">Conference Schedule</a>
3236
{% endcomment %}

src/sponsors/information.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ <h3 id="other-sponsorship-opportunities">Other Sponsorship Opportunities</h3>
205205

206206
<h4 id="t-shirts-included-in-gold-tier-">T-Shirts! Included in Gold Tier +</h4>
207207

208-
<p>Sign your sponsorship contract and pay your invoice by August 15, 2023 to get your logo on our conference t-shirts for all sponsors Gold and up!* T-shirts are distributed at the conference for in-person attendees to wear at no cost to them. Online attendees will be able to purchase the t-shirt to have it delivered to them from a distributor. Logos will ideally be given in one color on a transparent background and be delivered in SVG format.</p>
208+
<p>Sign your sponsorship contract and pay your invoice by August 15, 2024 to get your logo on our conference t-shirts for all sponsors Gold and up!* T-shirts are distributed at the conference for in-person attendees to wear at no cost to them. Online attendees will be able to purchase the t-shirt to have it delivered to them from a distributor. Logos will ideally be given in one color on a transparent background and be delivered in SVG format.</p>
209209

210210
<h4 id="opening-party--10000-14000">Opening Party – $10,000-$14,000</h4>
211211

@@ -235,7 +235,7 @@ <h4 id="need-a-custom-sponsorship-package">Need a custom sponsorship package?</h
235235

236236
<p>We’ve helped sponsors host luncheons, throw parties, and add opportunity grant sponsorship and other perks to existing packages.</p>
237237

238-
<p>Whether you’re joining us in Durham or supporting us from afar, please consider sponsoring DjangoCon US 2023.</p>
238+
<p>Whether you’re joining us in Durham or supporting us from afar, please consider sponsoring DjangoCon US 2024.</p>
239239

240240
<p>We can’t do it without you and hope to see you there!</p>
241241

0 commit comments

Comments
 (0)