Merge pull request #38 from williln/master

📰 📝 Rearrange templates

Author: jefftriplett

README.md

@@ -19,9 +19,8 @@ Please read and follow our [Code of Conduct](https://www.djangoproject.com/condu
 
 ## To run locally: 
 
-- Fork this repository 
+- Fork [this repository]({{site.github_repo}})
 - Clone it to your machine 
 - Run `gem install jekyll bundler`
-- Run `gem install just-the-docs` 
 - Run `bundle exec jekyll serve` 
 - View in browser at `http://localhost:4000`

_config.yml

@@ -23,6 +23,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: djangocon
 github_username: djangocon
+github_repo: https://github.com/djangocon/djangocon-us-docs
 
 # sass:
 # load_paths:
@@ -49,3 +50,8 @@ exclude:
  - vendor/cache/
  - vendor/gems/
  - vendor/ruby/
+
+# Aux links for the upper right navigation
+aux_links:
+ "DjangoCon US Docs on GitHub":
+ - "https://github.com/djangocon/djangocon-us-docs"

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

@@ -1,4 +1,12 @@
-# Subject: About the DjangoCon US Code of Conduct 
+---
+layout: page
+title: CoC - About the Code of Conduct
+parent: Templates
+---
+
+# Code of Conduct - About the Code of Conduct
+
+## Subject: About the DjangoCon US Code of Conduct 
 
 Dear [name], 
 

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

@@ -1,4 +1,12 @@
-# Subject: Code of Conduct at DjangoCon US 
+---
+layout: page
+title: CoC - Complaint About the Code of Conduct
+parent: Templates
+---
+
+# Code of Conduct - Complaint About the Code of Conduct
+
+## Subject: Code of Conduct at DjangoCon US 
 
 Dear [name],
 

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

@@ -1,4 +1,12 @@
-# Subject: DjangoCon US Code of Conduct Violation 
+---
+layout: page
+title: CoC - Response to Code of Conduct Report
+parent: Templates
+---
+
+# Code of Conduct - Response to Code of Conduct Report
+
+## Subject: Thank you for reporting 
 
 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. 
 

docs/drafts/drafts.md

@@ -0,0 +1,13 @@
+---
+layout: page
+title: Templates
+nav_order: 9
+has_children: true
+parent: Drafts
+permalink: /drafts
+---
+
+# Templates and Drafts
+
+This section contains drafts of emails, blog posts, responses to emails, and other written materials that we might need from year to year. 
+

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

@@ -1,3 +1,11 @@
+---
+layout: page
+title: Program - FAQs about Presenting a Tutorial 
+parent: Templates
+---
+
+# Proram - FAQs about Presenting a Tutorial 
+
 Hello everyone,
 
 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

@@ -1,4 +1,12 @@
-# Subject: DjangoCon US Financial Aid Decision
+---
+layout: page
+title: Financial Aid - Accepted 
+parent: Templates
+---
+
+# Financial Aid - Accepted 
+
+## Subject: DjangoCon US Financial Aid Decision
 
 Dear [name],
 

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

@@ -1,4 +1,12 @@
-# Subject: DjangoCon US Financial Aid Decision
+---
+layout: page
+title: Financial Aid - Declined 
+parent: Templates
+---
+
+# Financial Aid - Declined 
+
+## Subject: DjangoCon US Financial Aid Decision
 
 Dear name,
 

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

@@ -1,4 +1,12 @@
-# Subject: DjangoCon US Financial Aid Application Submitted
+---
+layout: page
+title: Financial Aid - Application Submitted 
+parent: Templates
+---
+
+# Financial Aid - Application Submitted
+
+## Subject: DjangoCon US Financial Aid Application Submitted
 
 Dear [name],