Restructure everything to use django-amber

I have kept the same directory structure for content, templates, and
media.

Author: inglesp

.gitignore

@@ -5,3 +5,5 @@ output
 *.pyc
 
 .DS_Store
+
+db.sqlite3

Makefile

@@ -11,10 +11,10 @@ help:
 	@echo ''
 
 build:
-	wok
+	python manage.py buildsite
 
 serve:
-	wok --serve
+	python manage.py serve 8000
 
 test:
 	./pre-flight-checks.sh

README.rst

@@ -15,27 +15,22 @@ more details).
 Development
 ~~~~~~~~~~~
 
-This site uses wok_. To install wok and other dependencies, run
-``pip install -r requirements.txt``. wok currently only works with Python 2.7.
+This site uses django-amber_. To install django-amber and other dependencies,
+run ``pip install -r requirements.txt``. django-amber is only known to work
+with Python 3.5.
 
-wok builds the site by assembling several components:
+django-amber builds the site by assembling several components:
 
-* Pages are found in ``content/``. Pages may be HTML, Markdown_ or reStrcturedText_, and contain some YAML metadata.
-* Statuc files are found in ``media/``.
-* The various jinja2_ templates for pages can be found in ``templates/``.
+* Pages are found in ``content/``. Pages may be HTML or Markdown_, and contain
+  some YAML metadata.
+* Static files are found in ``media/``.
+* The various Django templates for pages can be found in ``templates/``.
 
-To build the site, run ``make build``. This pulls together all the components
-into a set of HTML files in ``output/``.
+To build the site, run ``python manage.py buildsite``. This pulls together all
+the components into a set of HTML files in ``output/``.
 
-Windows users: you need to run the (extensionless) ``wok`` script in
-``c:\pythonxx\scripts``. e.g. ``py -2 c:\python27\scripts\wok``.
-
-Alternatively, if you run ``make serve``, wok will build the site, serve the
-built site on port 8000, and watch for changes.
-
-Windows users: you ned to run the (extensionless) ``work`` script with the
-``--serve`` parameter in ``c:\pythonxx\scripts``. e.g.
-``py -2 c:\python27\scripts\wok --serve``.
+Alternatively, if you run ``python manage.py serve``, django-amber will build
+the site, serve the built site on port 8000, and watch for changes.
 
 You can test that the site contains no broken links and that various common
 mis-spellings are caught correctly (hint, it's a "BBC micro:bit" for example)
@@ -71,19 +66,18 @@ works:
   the ISO 639-1 language code. They contain the content for this website in
   the langauge referenced by the language code in the name of the directory.
   For example, the English content is found in the ``content/en/`` directory
-  whereas the German content is in ``content/de/``. You must make sure that
-  the ``type`` field in the YAML header for the content is set to the correct
-  page template for the language.
+  whereas the German content is in ``content/de/``.
 * If in doubt, just look at what happens in the English version of the site and
   adapt to the desired language.
 
 Deployment
 ~~~~~~~~~~
 
 The site is hosted as a Project Page on GitHub Pages, and so it is the
-``gh-pages`` branch of the repository that gets served. wok generates the site
-in the ``output/`` directory, and Travis is configured to push any changes to
-the ``output/`` directory to this branch. See ``deploy.sh`` for details.
+``gh-pages`` branch of the repository that gets served. django-amber generates
+the site in the ``output/`` directory, and Travis is configured to push any
+changes to the ``output/`` directory to this branch. See ``deploy.sh`` for
+details.
 
 This should be done automatically by Travis after it has built the ``master``
 branch, but in case this does not happen, somebody with commit access to the
@@ -99,9 +93,8 @@ for the project.
 Note: this is tied to a single user on GitHub, however any other GitHub user
 with valid permissions can replace the key on Travis.
 
-.. _wok: http://wok.mythmon.com/
+.. _django-amber: https://github.com/inglesp/django-amber
 .. _Markdown: https://pythonhosted.org/Markdown/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
-.. _jinja2: http://jinja.pocoo.org/
 .. _issue: https://github.com/python/pythonineducation.org/issues
 .. _CONTRIBUTING.rst: ./CONTRIBUTING.rst

config

@@ -1,7 +1,3 @@
-type: page_de
-category: home
-slug: index
-url: /de/index.html
 title: Python in der Bildung
 ---
 

content/CNAME

@@ -1,6 +1,3 @@
-type: page_en
-slug: home
-url: index.html
 title: Python in Education
 ---
 <div class="about-block">
@@ -9,7 +6,7 @@
             <div class="row">
                 <div class="col-md-4 col">
                     <div class="image-holder">
-                        <img src="/images/snake_learn.png"
+                        <img src="/static/images/snake_learn.png"
                             alt="A learning snake">
                     </div>
                     <h2>learn</h2>
@@ -20,7 +17,7 @@ <h2>learn</h2>
                 </div>
                 <div class="col-md-4 col">
                     <div class="image-holder">
-                        <img src="/images/snake_teach.png"
+                        <img src="/static/images/snake_teach.png"
                             alt="A teaching snake">
                     </div>
                     <h2>teach</h2>
@@ -31,7 +28,7 @@ <h2>teach</h2>
                 </div>
                 <div class="col-md-4 col">
                     <div class="image-holder">
-                        <img src="/images/snake_build.png"
+                        <img src="/static/images/snake_build.png"
                             alt="A building snake">
                     </div>
                     <h2>build</h2>
@@ -47,14 +44,14 @@ <h2>build</h2>
     </div>
 </div>
 <div class="illustration-block">
-    <img src="/images/pythonic_world.jpg" alt="A Pythonic World" width="1440" height="942">
+    <img src="/static/images/pythonic_world.jpg" alt="A Pythonic World" width="1440" height="942">
 </div>
 <section class="text-section">
     <div class="wrap">
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-4 visual text-center">
-                    <img src="/images/python_logo.png"
+                    <img src="/static/images/python_logo.png"
                         alt="The Python programming language logo"
                         width="187" height="186">
                 </div>
@@ -89,7 +86,7 @@ <h1 id="learn">learn</h1>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/tutorials.png"
+                        <img src="/static/images/tutorials.png"
                             alt="A snake thinking about tutorials">
                     </div>
                     <div class="col-md-8">
@@ -107,7 +104,7 @@ <h2>tutorials</h2>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/microbit.png" alt="A BBC micro:bit">
+                        <img src="/static/images/microbit.png" alt="A BBC micro:bit">
                     </div>
                     <div class="col-md-8">
                         <div class="description">
@@ -130,7 +127,7 @@ <h2>micro:bit</h2>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/raspberry_pi.png"
+                        <img src="/static/images/raspberry_pi.png"
                             alt="The Raspberry Pi logo">
                     </div>
                     <div class="col-md-8">
@@ -175,7 +172,7 @@ <h1 id="teach">teach</h1>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/resources.png"
+                        <img src="/static/images/resources.png"
                             alt="Pythonic resources">
                     </div>
                     <div class="col-md-8">
@@ -197,7 +194,7 @@ <h2>resources</h2>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/community.png"
+                        <img src="/static/images/community.png"
                             alt="Two snakes in community t-shirts">
                     </div>
                     <div class="col-md-8">
@@ -242,7 +239,7 @@ <h1 id="build">build</h1>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/docs_doge.png"
+                        <img src="/static/images/docs_doge.png"
                             alt="Documentation doge, much wow, so docs">
                     </div>
                     <div class="col-md-8">
@@ -265,7 +262,7 @@ <h2>documentation</h2>
                 <!-- product item -->
                 <div class="article">
                     <div class="col-md-4 visual text-center">
-                        <img src="/images/code.png" alt="A coding prompt">
+                        <img src="/static/images/code.png" alt="A coding prompt">
                     </div>
                     <div class="col-md-8">
                         <div class="description">