10000 Merge pull request #38 from williln/master · djangocon/djangocon-us-docs@5834980 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5834980

Browse files
jefftriplettjefftriplett
authored
Merge pull request #38 from williln/master
📰 📝 Rearrange templates
2 parents 343293e + eab7c56 commit 5834980

23 files changed

+163
-63
lines changed

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ Please read and follow our [Code of Conduct](https://www.djangoproject.com/condu
1919

2020
## To run locally:
2121

22-
- Fork this repository
22+
- Fork [this repository]({{site.github_repo}})
2323
- Clone it to your machine
2424
- Run `gem install jekyll bundler`
25-
- Run `gem install just-the-docs`
2625
- Run `bundle exec jekyll serve`
2726
- View in browser at `http://localhost:4000`

‎_config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
2323
url: "" # the base hostname & protocol for your site, e.g. http://example.com
2424
twitter_username: djangocon
2525
github_username: djangocon
26+
github_repo: https://github.com/djangocon/djangocon-us-docs
2627

2728
# sass:
2829
# load_paths:
@@ -49,3 +50,8 @@ exclude:
4950
- vendor/cache/
5051
- vendor/gems/
5152
- vendor/ruby/
53+
54+
# Aux links for the upper right navigation
55+
aux_links:
56+
"DjangoCon US Docs on GitHub":
57+
- "https://github.com/djangocon/djangocon-us-docs"

‎archive/templates/conduct/coc_about.md renamed to ‎docs/drafts/coc_about.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: About the DjangoCon US Code of Conduct
1+
---
2+
layout: page
3+
title: CoC - About the Code of Conduct
4+
parent: Templates
5+
---
6+
7+
# Code of Conduct - About the Code of Conduct
8+
9+
## Subject: About the DjangoCon US Code of Conduct
210

311
Dear [name],
412

‎archive/templates/conduct/coc_complaint.md renamed to ‎docs/drafts/coc_complaint.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: Code of Conduct at DjangoCon US
1+
---
2+
layout: page
3+
title: CoC - Complaint About the Code of Conduct
4+
parent: Templates
5+
---
6+
7+
# Code of Conduct - Complaint About the Code of Conduct
8+
9+
## Subject: Code of Conduct at DjangoCon US
210

311
Dear [name],
412

‎archive/templates/conduct/coc_violation.md renamed to ‎docs/drafts/coc_violation.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: DjangoCon US Code of Conduct Violation
1+
---
2+
layout: page
3+
title: CoC - Response to Code of Conduct Report
4+
parent: Templates
5+
---
6+
7+
# Code of Conduct - Response to Code of Conduct Report
8+
9+
## Subject: Thank you for reporting
210

311
This template shouldn't be just copied and pasted. Every Code of Conduct incident is unique and should be handled sensitively and compassionately, and not with a form letter. This example exists to provide you with some useful wording in the unfortunate event that you need to respond to a Code of Conduct violation because coming up with the right words when you know someone has been hurt can be difficult. But again, please don't treat this example as a fill-in-the-blank form letter. Treat this example as a jumping-off point from which you can craft the right response to someone who has trusted you by reporting a Code of Conduct violation.
412

‎docs/drafts/drafts.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
layout: page
3+
title: Templates
4+
nav_order: 9
5+
has_children: true
6+
parent: Drafts
7+
permalink: /drafts
8+
---
9+
10+
# Templates and Drafts
11+
12+
This section contains drafts of emails, blog posts, responses to emails, and other written materials that we might need from year to year.
13+

‎archive/templates/program/email-tutorials-faqs.md renamed to ‎docs/drafts/email-tutorials-faqs.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
---
2+
layout: page
3+
title: Program - FAQs about Presenting a Tutorial
4+
parent: Templates
5+
---
6+
7+
# Proram - FAQs about Presenting a Tutorial
8+
19
Hello everyone,
210

311
DjangoCon US is {{tutorial_start_date|weeks}} weeks away and I wanted to go over a few things with everyone. My apologies for the delay.

‎archive/templates/finaid/finaid_accepted.md renamed to ‎docs/drafts/finaid_accepted.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: DjangoCon US Financial Aid Decision
1+
---
2+
layout: page
3+
title: Financial Aid - Accepted
4+
parent: Templates
5+
---
6+
7+
# Financial Aid - Accepted
8+
9+
## Subject: DjangoCon US Financial Aid Decision
210

311
Dear [name],
412

‎archive/templates/finaid/finaid_rejected.md renamed to ‎docs/drafts/finaid_rejected.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: DjangoCon US Financial Aid Decision
1+
---
2+
layout: page
3+
title: Financial Aid - Declined
4+
parent: Templates
5+
---
6+
7+
# Financial Aid - Declined
8+
9+
## Subject: DjangoCon US Financial Aid Decision
210

311
Dear name,
412

‎archive/templates/finaid/finaid_submitted.md renamed to ‎docs/drafts/finaid_submitted.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: DjangoCon US Financial Aid Application Submitted
1+
---
2+
layout: page
3+
title: Financial Aid - Application Submitted
4+
parent: Templates
5+
---
6+
7+
# Financial Aid - Application Submitted
8+
9+
## Subject: DjangoCon US Financial Aid Application Submitted
210

311
Dear [name],
412

‎archive/templates/program/recruiting.md renamed to ‎docs/drafts/recruiting.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: Want to speak at DjangoCon US?
1+
---
2+
layout: page
3+
title: Program - Recruit Speaker
4+
parent: Templates
5+
---
6+
7+
# Program - Recruit Speaker
8+
9+
## Subject: DjangoCon US CFP
210

311
Dear [Person],
412

‎archive/templates/program/talk_accepted.md renamed to ‎docs/drafts/talk_accepted.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: Speaking at DjangoCon US
1+
---
2+
layout: page
3+
title: Program - Accepted
4+
parent: Templates
5+
---
6+
7+
# Program - Accepted
8+
9+
## Subject: Speaking at DjangoCon US
210

311
Dear [name],
412

‎archive/templates/program/talk_rejected.md renamed to ‎docs/drafts/talk_rejected.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: DjangoCon US Proposal Decision
1+
---
2+
layout: page
3+
title: Program - Declined
4+
parent: Templates
5+
---
6+
7+
# Program - Declined
8+
9+
## Subject: DjangoCon US Proposal Decision
210

311
Dear [name],
412

‎archive/templates/program/talk_submitted.md renamed to ‎docs/drafts/talk_submitted.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: Thanks for submitting to DjangoCon US!
1+
---
2+
layout: page
3+
title: Program - Submission Received
4+
parent: Templates
5+
---
6+
7+
# Program - Submission Received
8+
9+
## Subject: Thanks for submitting to DjangoCon US!
210

311
Dear [name],
412

‎archive/templates/volunteer-info-email.md renamed to ‎docs/drafts/volunteer-info-email.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1+
---
2+
layout: page
3+
title: Experience - Informational Email to Volunteers
4+
parent: Templates
5+
---
6+
7+
# Experience - Informational Email to Volunteers
8+
19
Audience: Session chairs, session runners, registration staff
210

311
Hey there, volunteers!
412

513
Thank you so much for volunteering with DjangoCon US! We truly couldn't do this without your help, and we appreciate your time. Here are some things that might make your volunteer experience easier:
614

7-
815
- The [volunteer handbook](2016.djangocon.us/volunteers/handbook) is online. This includes contact information for the conference staff, important phone numbers, a schedule of events, locations of important rooms, and some tips for sessions chairs and session runners.
916
- Review the volunteer shifts you signed up for, and set yourself a reminder so you don't lose track of time. (It's easy to do at a conference where so many awesome things are going on!)
1017
- If you witness a Code of Conduct violation, or someone reports one to you, please call conference staff as soon as possible; let the person who reported the violation know you have done so; offer to stay with them until we arrive; offer to help them with contacting a friend, hotel security, law enforcement, or anyone else; and do not make any public statements about the event. Respect their privacy.

‎archive/templates/communication/volunteer.md renamed to ‎docs/drafts/volunteer.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
# Subject: Thanks for offering to help!
1+
---
2+
layout: page
3+
title: Experience - Offer to Volunteer
4+
parent: Templates
5+
---
6+
7+
# Experience - Offer to Volunteer
8+
9+
## Subject: Thanks for offering to help!
210

311
Hi [name]!
412

‎archive/templates/communication/why-to-attend.md renamed to ‎docs/drafts/why-to-attend.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
---
2+
layout: page
3+
title: Experience - Why to Attend
4+
parent: Templates
5+
---
6+
7+
# Experience - Why should I attend?
8+
19
*Sometimes we get the question, "What can I tell my manager to help them decide to let me attend DjangoCon?" before the schedule is up.*
210

311
Dear [name],

‎docs/experience/experience.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: page
3-
title: Attendee Experience
3+
title: Attendee Experience
44
nav_order: 4
55
has_children: true
66
parent: Attendee Experience

‎docs/logistics/budget.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ nav_order: 3
77

88
# Budget and Finance
99

10-
Team Size: 1. This role is generally filled by the DEFNA Treasurer
11-
12-
## Responsibilities
10+
The DEFNA Treasurer generally oversees the budget.
1311

1412
- Create and track the yearly conference budget, including:
1513
- Ticket pricing and sales

‎docs/logistics/logistics.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,33 @@ permalink: /logistics
1111

1212
## About organizing DjangoCon US
1313

14-
Some areas of responsibility come into play very early in the planning process. A website lead is needed very early on, for example. Other areas of responsibility only come into play at the conference itself, such as the registration coordinator. The conference chair(s) are selected very early in the process.
15-
16-
The list of responsibilities for each area is meant to be comprehensive, but not necessarily exhaustive. Other to-do items will come up in the planning process; every year is different. All organizers are free to help other areas as needed; organizers are not territorial about their areas.
17-
1814
The Django Software Foundation has published [guidelines](https://www.djangoproject.com/foundation/conferences/) for hosting an event that is branded "DjangoCon."
1915

20-
The guidelines in this GitBook are specific to DjangoCon US, which is a two-track conference that takes place over six days in North America.
16+
The guidelines in these docs are specific to DjangoCon US, which is a two-track conference that takes place over six days in North America. If you'd like to start your own DjangoCon or other Django conference, feel free to reach out. We'll do whatever we can to help.
17+
18+
Some areas of responsibility come into play very early in the planning process. A website lead is needed very early on, for example. Other areas of responsibility only come into play at the conference itself, such as the registration coordinator.
2119

22-
Some unpublished rules about hosting a DjangoCon will vary depending on the location of the DjangoCon; for example, in the United States, we are required to host our event a specific amount of time away from PyCon US and DjangoCon Europe. If you would like to host a DjangoCon or another Django event, please contact the DSF for more information.
20+
The responsibilities for each area described here are meant to be comprehensive, but not necessarily exhaustive. Other to-do items will come up in the planning process; every year is different. All organizers are free to help other areas as needed.
2321

2422
## Tools
2523

2624
| Tool | Usage |
2725
| --- | --- |
2826
| Bitbucket | Where we store private documents like Letter of Invitations and other sensitive documents |
29-
| GitHub | Github is our main code sharing tool |
30-
| Google Drive | We use one shared DjangoCon US folder to manage our files |
31-
| Google Hangouts<br />BlueJeans | Services we use to hold organizer meetings |
32-
| Mailchimp | Used for mass emails to attendees, sponsors, speakers, and people on our informational mailing list. See [Mailing Lists](docs/communications/mailing_lists.html) for more information. |
27+
| [GitHub](https://github.com/djangocon/) | Github is our main code sharing tool |
28+
| [Google Drive](https://drive.google.com/) | We use one shared DjangoCon US folder to manage our files |
29+
| [Google Hangouts](https://hangouts.google.com/)<br />BlueJeans | Services we use to hold organizer meetings |
30+
| [Mailchimp](https://mailchimp.com/) | Used for mass emails to attendees, sponsors, speakers, and people on our informational mailing list. See [Mailing Lists](docs/communications/mailing_lists.html) for more information. |
3331
| Google Groups mailing lists | Used for internal communication. See [Mailing Lists](docs/communications/mailing_lists.html) for more information. |
34-
| Slack | Our realtime and async communication medium. We have public and private channels for a wide variety of conference topics |
35-
| Trello | Our project management tool and todo list |
36-
| Tweetdeck <br /> Buffer | Tools we use to schedule promotional social media posts |
32+
| [Slack](https://slack.com/) | Our realtime and async communication medium. We have public and private channels for a wide variety of conference topics |
33+
| [Trello](https://trello.com/) | Our project management tool and todo list |
34+
| [Tweetdeck](https://tweetdeck.twitter.com/) <br /> Buffer | Tools we use to schedule promotional social media posts |
3735

3836
## Resources
3937

4038
- [The Less Obvious Conference Checklist](https://github.com/mxsasha/lessobviouschecklist)
4139
- [Handbook for open-source software community conference organisers](https://github.com/evildmp/conference-handbook) by [Daniele Procida](https://github.com/evildmp)
4240
- [List of well designed conferences](https://github.com/olasitarska/pretty-conferences) by [Ola Sitarska](https://github.com/olasitarska/pretty-conferences)
4341
- [MicroConf: Attendee’s Guide](http://doubleyouraudience.com/microconf-guide/)
44-
- [Write the Docs: Organizer Manual](https://github.com/writethedocs/organizer-manual) by [Eric Holscher](https://github.com/ericholscher)
45-
- [Write the Docs: Welcome Wagon](http://www.writethedocs.org/conf/na/2016/welcome-wagon/)
46-
- [From Python Import Conference](https://github.com/jnoller/conference) by [Jesse Noller](https://github.com/jnoller)
42+
- [Write the Docs: Organizer Manual](https://organizer-manual.readthedocs.io/en/latest/) by [Eric Holscher](https://github.com/ericholscher)
43+
- [Write the Docs: Welcome Wagon](http://www.writethedocs.org/conf/na/2016/welcome-wagon/)

‎docs/logistics/organizers.md

Lines changed: 5 additions & 5 deletions
37
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ nav_order: 6
2828

2929
There are all on a case by case basis, depending on the area the organizer is helping with.
3030

31-
1. Add to:
31+
- Add to:
3232
- [conduct@djangocon.us](https://groups.google.com/a/djangocon.us/forum/)
3333
- [reviewers@djangocon.us](https://groups.google.com/a/djangocon.us/forum/)
3434
- [sponsors@djangocon.us](https://groups.google.com/a/djangocon.us/forum/)
3535
- [financialaid@djangocon.us](https://groups.google.com/a/djangocon.us/forum/)
3636
- [visas@djangocon.us](https://groups.google.com/a/djangocon.us/forum/)
37-
2. Social media accounts
+
- Social media accounts
3838
- [TweetDeck](https://tweetdeck.twitter.com/)
3939
- [Facebook page](https://www.facebook.com/djangoconus/)
40-
3. Email marketing: [Mailchimp](http://mailchimp.com/)
41-
4. [1Password Team](https://djangocon.1password.com/signin)
42-
5. Ticket system: [Tito](https://ti.to/)
40+
- Email marketing: [Mailchimp](http://mailchimp.com/)
41+
- [1Password Team](https://djangocon.1password.com/signin)
42+
- Ticket system: [Tito](https://ti.to/)

‎docs/sponsors/sponsors.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
layout: page
33
title: Sponsors
4-
permalink: /sponsors/
54
nav_order: 6
65
has_children: true
76
parent: Sponsors

‎index.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0