From f7cb61494fe8bd9c673a82d6f030d82aa7143a9d Mon Sep 17 00:00:00 2001
From: Peter Inglesby <peter.inglesby@gmail.com>
Date: Fri, 29 Jul 2016 11:11:08 +0100
Subject: [PATCH 1/2] Restructure everything to use django-amber

I have kept the same directory structure for content, templates, and
media.
---
 .gitignore                                    |   2 +
 Makefile                                      |   4 +-
 README.rst                                    |  43 ++-
 config                                        |   1 -
 content/CNAME                                 |   4 -
 content/de/{index.md => home.md}              |   4 -
 content/{index.html => en/home.html}          |  27 +-
 content/en/index.html                         | 304 ------------------
 content/en/{microbit/index.md => microbit.md} |   3 -
 .../index.md => raspberry-pi.md}              |   3 -
 manage.py                                     |  10 +
 pythonineducation/__init__.py                 |   0
 pythonineducation/migrations/0001_initial.py  |  31 ++
 pythonineducation/migrations/__init__.py      |   0
 pythonineducation/models.py                   |  15 +
 pythonineducation/settings.py                 | 101 ++++++
 pythonineducation/urls.py                     |   8 +
 pythonineducation/views.py                    |  20 ++
 pythonineducation/wsgi.py                     |  16 +
 requirements.in                               |   3 +-
 requirements.txt                              |  24 +-
 templates/base.html                           |  38 ++-
 templates/microbit_en.html                    |  25 --
 templates/none.html                           |   1 -
 templates/page_en.html                        |   1 -
 25 files changed, 270 insertions(+), 418 deletions(-)
 delete mode 100644 config
 delete mode 100644 content/CNAME
 rename content/de/{index.md => home.md} (50%)
 rename content/{index.html => en/home.html} (94%)
 delete mode 100644 content/en/index.html
 rename content/en/{microbit/index.md => microbit.md} (54%)
 rename content/en/{raspberry-pi/index.md => raspberry-pi.md} (50%)
 create mode 100755 manage.py
 create mode 100644 pythonineducation/__init__.py
 create mode 100644 pythonineducation/migrations/0001_initial.py
 create mode 100644 pythonineducation/migrations/__init__.py
 create mode 100644 pythonineducation/models.py
 create mode 100644 pythonineducation/settings.py
 create mode 100644 pythonineducation/urls.py
 create mode 100644 pythonineducation/views.py
 create mode 100644 pythonineducation/wsgi.py
 delete mode 100644 templates/microbit_en.html
 delete mode 100644 templates/none.html

diff --git a/.gitignore b/.gitignore
index 839cb60..e0bd030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ output
 *.pyc
 
 .DS_Store
+
+db.sqlite3
diff --git a/Makefile b/Makefile
index b439d6b..13393f1 100644
--- a/Makefile
+++ b/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
diff --git a/README.rst b/README.rst
index b4b8f5d..5b58586 100644
--- a/README.rst
+++ b/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,9 +66,7 @@ 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.
 
@@ -81,9 +74,10 @@ 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
diff --git a/config b/config
deleted file mode 100644
index ea06477..0000000
--- a/config
+++ /dev/null
@@ -1 +0,0 @@
-url_pattern: /{slug}/index.html
diff --git a/content/CNAME b/content/CNAME
deleted file mode 100644
index dc99818..0000000
--- a/content/CNAME
+++ /dev/null
@@ -1,4 +0,0 @@
-url: CNAME
-type: none
----
-pythonineducation.org
diff --git a/content/de/index.md b/content/de/home.md
similarity index 50%
rename from content/de/index.md
rename to content/de/home.md
index 35e91b7..d2cd523 100644
--- a/content/de/index.md
+++ b/content/de/home.md
@@ -1,7 +1,3 @@
-type: page_de
-category: home
-slug: index
-url: /de/index.html
 title: Python in der Bildung
 ---
 
diff --git a/content/index.html b/content/en/home.html
similarity index 94%
rename from content/index.html
rename to content/en/home.html
index 410b65c..fda7b1c 100644
--- a/content/index.html
+++ b/content/en/home.html
@@ -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">
diff --git a/content/en/index.html b/content/en/index.html
deleted file mode 100644
index 05e9829..0000000
--- a/content/en/index.html
+++ /dev/null
@@ -1,304 +0,0 @@
-type: page_en
-slug: home
-url: /en/index.html
-title: Python in Education
----
-<div class="about-block">
-    <div class="wrap">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-md-4 col">
-                    <div class="image-holder">
-                        <img src="/images/snake_learn.png"
-                            alt="A learning snake">
-                    </div>
-                    <h2>learn</h2>
-                    <p>Master the basics, progress to the fun stuff and achieve
-                    coding greatness with lessons for learners of all ages,
-                    levels and abilities.</p>
-                    <a href="#learn" class="more"><span>get started</span></a>
-                </div>
-                <div class="col-md-4 col">
-                    <div class="image-holder">
-                        <img src="/images/snake_teach.png"
-                            alt="A teaching snake">
-                    </div>
-                    <h2>teach</h2>
-                    <p>Inspire the next generation of Python programmers with
-                    fun resources, tested in the field by teachers and members
-                    of the global Python community.</p>
-                    <a href="#teach" class="more"><span>fun resources</span></a>
-                </div>
-                <div class="col-md-4 col">
-                    <div class="image-holder">
-                        <img src="/images/snake_build.png"
-                            alt="A building snake">
-                    </div>
-                    <h2>build</h2>
-                    <p>Discover all the technical details, designs and source
-                    code needed to build something amazing, create a cool
-                    project or make a contribution to our educational
-                    efforts.</p>
-                    <a href="#build" class="more"><span>lets go!</span></a>
-                </div>
-            </div>
-            <span class="sticker"></span>
-        </div>
-    </div>
-</div>
-<div class="illustration-block">
-    <img src="/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"
-                        alt="The Python programming language logo"
-                        width="187" height="186">
-                </div>
-                <div class="col-md-8 description">
-                    <h2>Python is a programming language:</h2>
-                    <p>It's very easy to learn. Python is used all over the
-                    world by all sorts of people from professional coders to
-                    complete beginners. Use Python to code cool stuff on your
-                    micro:bit, Raspberry Pi or other computer.</p>
-                </div>
-            </div>
-            <span class="sticker"></span>
-            <span class="sticker sticker-top"></span>
-        </div>
-    </div>
-</section>
-<section class="title-section" style="background: url(/images/learning_is_play.png) no-repeat 100% 100%;">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-xs-6 col-lg-7 heading-col separator1">
-                <h1>learning <span>is play</span></h1>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="info-section">
-    <div class="wrap">
-        <div class="container-fluid">
-            <span class="sticker sticker1"></span>
-            <h1 id="learn">learn</h1>
-            <div class="row">
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/tutorials.png"
-                            alt="A snake thinking about tutorials">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>tutorials</h2>
-                            <p>Start here for an introduction to Python,
-                            intermediate material that'll help you stretch your
-                            wings, and advanced features that'll have you
-                            building your world-changing project from the
-                            comfort of your own home in no time at all!</p>
-                            <a href="#" class="more"><span>try out a tutorial</span></a>
-                        </div>
-                    </div>
-                </div>
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/microbit.png" alt="A BBC micro:bit">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>micro:bit</h2>
-                            <p>The BBC micro:bit is a small programmable
-                            device. It aims to inspire a new generation of
-                            digital creators, makers and coders.  Thanks to
-                            the amazing
-                            <a href="http://micropython.org/">MicroPython</a>
-                            project, it runs a full re-implementation of
-                            Python 3.</p>
-                            <p>The device has two buttons, a 5x5 LED display,
-                            I/O pins, an accelerometer, compass, radio,
-                            micro-USB port, battery connector, ARM
-                            microprocessor and a heart of gold.</p>
-                            <a href="#" class="more"><span>code the future with micro:bit</span></a>
-                        </div>
-                    </div>
-                </div>
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/raspberry_pi.png"
-                            alt="The Raspberry Pi logo">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>raspberry pi</h2>
-                            <p>The Raspberry Pi is a unique phenomenon. It is
-                            the most successful computing-in-education project
-                            in history with over 6 million units delivered
-                            around the world.</p>
-                            <p>But it's not just about the hardware! Thanks to
-                            the amazing work of the Raspberry Pi Foundation's
-                            education team, Python is widely used on the device
-                            to do all sorts of fun stuff such as program games
-                            (like Minecraft), travel into space (to the
-                            International Space Station) and control
-                            peripherals plugged into the Pi via its GPIO
-                            pins.</p>
-                            <a href="#" class="more"><span>enjoy a slice of raspberry pi</span></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <span class="sticker"></span>
-        </div>
-    </div>
-</section>
-<section class="title-section center" style="background: url(/images/play_is_creativity.png) no-repeat 85% 50%;">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-xs-6 col-lg-7 heading-col separator2">
-                <h1>play is <span>creativity</span></h1>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="info-section">
-    <div class="wrap">
-        <div class="container-fluid">
-            <span class="sticker sticker2"></span>
-            <h1 id="teach">teach</h1>
-            <div class="row">
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/resources.png"
-                            alt="Pythonic resources">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>resources</h2>
-                            <p>Teachers and programmers from all over the world
-                            have created fun, engaging and challenging
-                            resources for teachers to use in their classrooms.
-                            These range from simple tasks for beginners to
-                            complicated projects to challenge the most advanced
-                            students. They include lesson plans, code, books,
-                            worksheets and online interactive courses.</p>
-                            <p>Most importantly, many of these resources are
-                            free for people to use, adopt and adapt.</p>
-                            <a href="#" class="more"><span>discover compelling and creative resources</span></a>
-                        </div>
-                    </div>
-                </div>
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/community.png"
-                            alt="Two snakes in community t-shirts">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>community</h2>
-                            <p>Community is Python's secret weapon.</p>
-                            <p>The Python community value openness, actively
-                            engage in outreach and give up their time for
-                            educational support (this site was written by
-                            volunteers). As one person put it, "I came for the
-                            programming language, but stayed for the
-                            community".</p>
-                            <p>The Python Software Foundation (PSF) ~ under
-                            whose auspices this site was created ~ support and
-                            organise conferences all over the world. There's a
-                            good chance there's one near you very soon.</p>
-                            <p>If you're looking for support, advice or just
-                            some friendly encouragement, get involved and say
-                            "hello".</p>
-                            <a href="#" class="more"><span>meet and make friends with your community</span></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="title-section" style="background: url(/images/creativity_is_exploration.png) no-repeat 91% 100%;">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-xs-6 col-lg-7 heading-col separator3">
-                <h1>creativity is <span>exploration</span></h1>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="info-section">
-    <div class="wrap">
-        <div class="container-fluid">
-            <h1 id="build">build</h1>
-            <div class="row">
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/docs_doge.png"
-                            alt="Documentation doge, much wow, so docs">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>documentation</h2>
-                            <p>Python has comprehensive and excellent
-                            documentation. In fact, many in the Python
-                            community spend lots of effort to make sure Python
-                            projects have comprehensive, detailed and easy to
-                            understand technical documentation.</p>
-                            <p>Need to know how to do something? Read the
-                            docs! Looking for the best way to use some code?
-                            Read the docs! Want to learn something new so you
-                            can impress your programming buddies with your
-                            knowledge? Read the docs!</p>
-                            <a href="#" class="more"><span>read the docs!</span></a>
-                        </div>
-                    </div>
-                </div>
-                <!-- product item -->
-                <div class="article">
-                    <div class="col-md-4 visual text-center">
-                        <img src="/images/code.png" alt="A coding prompt">
-                    </div>
-                    <div class="col-md-8">
-                        <div class="description">
-                            <h2>source code</h2>
-                            <p>Python is free software: it is given away for
-                            free (nobody pays to use Python), you are also free
-                            to use it as you see fit and the Python community
-                            actively encourages people to contribute code,
-                            documentation and resources for the benefit of
-                            others.</p>
-                            <p>For this to work you need access to the source
-                            code: the instructions for the computer that tell
-                            it how to do the stuff you want it to do.</p>
-                            <p>Perhaps you already know this stuff and you're
-                            just looking for a cool educational project to
-                            which you can contribute. If so, you've come to the
-                            right place!</p>
-                            <a href="#" class="more"><span>hack on code</span></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <span class="sticker sticker3"></span>
-        </div>
-    </div>
-</section>
-<section class="title-section" style="background: url(/images/explore_with_python.png) no-repeat 89% 100%;">
-    <div class="container-fluid">
-        <span class="sticker sticker-bottom"></span>
-        <div class="row">
-            <div class="col-xs-6 col-lg-8 heading-col separator4">
-                <h1>explore with <span>python</span></h1>
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/content/en/microbit/index.md b/content/en/microbit.md
similarity index 54%
rename from content/en/microbit/index.md
rename to content/en/microbit.md
index 569a95e..87358f9 100644
--- a/content/en/microbit/index.md
+++ b/content/en/microbit.md
@@ -1,6 +1,3 @@
-type: page_en
-slug: microbit
-url: /en/microbit/index.html
 title: Python on the BBC micro:bit
 ---
 
diff --git a/content/en/raspberry-pi/index.md b/content/en/raspberry-pi.md
similarity index 50%
rename from content/en/raspberry-pi/index.md
rename to content/en/raspberry-pi.md
index f41e6ed..bbcb1a5 100644
--- a/content/en/raspberry-pi/index.md
+++ b/content/en/raspberry-pi.md
@@ -1,6 +1,3 @@
-type: page_en
-slug: raspberry-pi
-url: /en/raspberry-pi/index.html
 title: Python on the Raspberry Pi
 ---
 
diff --git a/manage.py b/manage.py
new file mode 100755
index 0000000..f599d4d
--- /dev/null
+++ b/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pythonineducation.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/pythonineducation/__init__.py b/pythonineducation/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pythonineducation/migrations/0001_initial.py b/pythonineducation/migrations/0001_initial.py
new file mode 100644
index 0000000..63daab9
--- /dev/null
+++ b/pythonineducation/migrations/0001_initial.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-28 18:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Page',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+                ('content_format', models.CharField(max_length=255)),
+                ('title', models.CharField(max_length=255)),
+                ('slug', models.CharField(max_length=255)),
+                ('language', models.CharField(max_length=255)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/pythonineducation/migrations/__init__.py b/pythonineducation/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pythonineducation/models.py b/pythonineducation/models.py
new file mode 100644
index 0000000..5a9dbff
--- /dev/null
+++ b/pythonineducation/models.py
@@ -0,0 +1,15 @@
+from django.db import models
+from django_amber.models import ModelWithContent
+
+
+class Page(ModelWithContent):
+    title = models.CharField(max_length=255)
+    slug = models.CharField(max_length=255)
+    language = models.CharField(max_length=255)
+
+    dump_path_template =  'content/[language]/[slug].[content_format]'
+
+    key_field_names = ['language', 'slug']
+
+    def __str__(self):
+        return '{}/{}'.format(self.language, self.slug)
diff --git a/pythonineducation/settings.py b/pythonineducation/settings.py
new file mode 100644
index 0000000..b806fe3
--- /dev/null
+++ b/pythonineducation/settings.py
@@ -0,0 +1,101 @@
+"""
+Django settings for pythonineducation project.
+
+Generated by 'django-admin startproject' using Django 1.9.6.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'secret'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    # These two apps are required for Django to work properly, even though we
+    # don't use them directly.
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+
+    'django.contrib.staticfiles',
+    
+    'django_amber',
+    'markdown_deux',
+
+    'pythonineducation',
+]
+
+MIDDLEWARE_CLASSES = [
+]
+
+ROOT_URLCONF = 'pythonineducation.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'pythonineducation.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
+
+LANGUAGE_CODE = 'en-gb'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
+
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'media')]
+
+DJANGO_AMBER_CNAME = 'pythonineducation.org'
diff --git a/pythonineducation/urls.py b/pythonineducation/urls.py
new file mode 100644
index 0000000..4eba7a6
--- /dev/null
+++ b/pythonineducation/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+from .views import page_view
+
+urlpatterns = [
+    url(r'^$', page_view),
+    url(r'^(?P<language>[\w-]+)/(?P<slug>[\w-]+)/$', page_view),
+]
diff --git a/pythonineducation/views.py b/pythonineducation/views.py
new file mode 100644
index 0000000..b96ba12
--- /dev/null
+++ b/pythonineducation/views.py
@@ -0,0 +1,20 @@
+from django.shortcuts import get_object_or_404, render
+
+from .models import Page
+
+
+def page_view(request, language='en', slug='home'):
+    page = get_object_or_404(Page, language=language, slug=slug)
+
+    assert page.content_format in ['html', 'md'], 'Page content must use HTML or Markdown'
+
+    template = 'page_{}.html'.format(language)
+
+    context = {
+        'content': page.content,
+        'content_format': page.content_format,
+        'title': page.title,
+        'language': language,
+    }
+
+    return render(request, template, context)
diff --git a/pythonineducation/wsgi.py b/pythonineducation/wsgi.py
new file mode 100644
index 0000000..6e822b3
--- /dev/null
+++ b/pythonineducation/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for pythonineducation project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pythonineducation.settings")
+
+application = get_wsgi_application()
diff --git a/requirements.in b/requirements.in
index 957ff42..6aeef96 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1 +1,2 @@
-wok==1.1.1
+django-amber==0.2.0
+django-markdown-deux
diff --git a/requirements.txt b/requirements.txt
index b5db84d..a89f4c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,15 @@
 #
 # This file is autogenerated by pip-compile
-# Make changes in requirements.in, then run this to update:
+# To update, run:
 #
-#    pip-compile requirements.in
+#    pip-compile --output-file requirements.txt requirements.in
 #
-awesome-slugify==1.4      # via wok
-docutils==0.8.1           # via wok
-Jinja2==2.6               # via wok
-Markdown==2.1.1           # via wok
-py==1.4.31                # via pytest
-Pygments==1.4             # via wok
-pytest==2.5.2             # via wok
-PyYAML==3.10              # via wok
-regex==2016.3.2           # via awesome-slugify
-Unidecode==0.4.19         # via awesome-slugify
-wok==1.1.1
+django-amber==0.2.0
+django-markdown-deux==1.0.5
+Django==1.9.7             # via django-amber
+http-crawler==0.1.1       # via django-amber
+lxml==3.6.0               # via http-crawler
+markdown2==2.3.1          # via django-markdown-deux
+PyYAML==3.11              # via django-amber
+requests==2.10.0          # via django-amber, http-crawler
+tinycss==0.3              # via http-crawler
diff --git a/templates/base.html b/templates/base.html
index 52d7a90..b9ea799 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,25 +1,27 @@
+{% load markdown_deux_tags %}
+
 <!DOCTYPE html>
 <!--
 {% block secret %}{% endblock %}
 -->
 <html>
   <head>
-      <title>{% block title %}Python In Education - {% endblock %} {{ page.title }}</title>
+      <title>{% block title %}Python In Education - {% endblock %} {{ title }}</title>
       <meta charset="utf-8">
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
       <meta http-equiv="X-Clacks-Overhead" content="GNU John Pinner">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="stylesheet" href="/css/bootstrap-extended.css">
-      <link rel="stylesheet" href="/css/main.css">
+      <link rel="stylesheet" href="/static/css/bootstrap-extended.css">
+      <link rel="stylesheet" href="/static/css/main.css">
       <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300' rel='stylesheet' type='text/css'>
       <link href='https://fonts.googleapis.com/css?family=Permanent+Marker' rel='stylesheet' type='text/css'>
       <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js" defer></script>
       <script type="text/javascript">
-      window.jQuery || document.write('<script src="/js/jquery-1.11.2.min.js"><\/script>')
+      window.jQuery || document.write('<script src="/static/js/jquery-1.11.2.min.js"><\/script>')
       </script>
-      <script src="/js/bootstrap.min.js"></script>
+      <script src="/static/js/bootstrap.min.js"></script>
       <!--[if lt IE 9]>
-      <script src="/js/modernizr.js"></script>
+      <script src="/static/js/modernizr.js"></script>
       <![endif]-->
   </head>
   <body class="home">
@@ -37,20 +39,20 @@
                     <span class="icon-bar"></span>
                   </button>
                   <!-- page logo -->
-                  <a class="navbar-brand" href="/en/"><img alt="Python In Education" src="/images/logo.png"></a>
+                  <a class="navbar-brand" href="/{{ language }}/home/"><img alt="Python In Education" src="/static/images/logo.png"></a>
                 </div>
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                   <!-- main navigation of the page -->
                   <ul class="nav navbar-nav">
-                    <li><a href="/en/#learn">learn</a></li>
-                    <li><a href="/en/#teach">teach</a></li>
-                    <li><a href="/en/#build">build</a></li>
-                    <li><a href="#">micro:bit</a></li>
-                    <li><a href="#">raspberry_pi</a></li>
+                    <li><a href="#">learn</a></li>
+                    <li><a href="#">teach</a></li>
+                    <li><a href="#">build</a></li>
+                    <li><a href="/{{ language }}/microbit/">micro:bit</a></li>
+                    <li><a href="/{{ language }}/microbit/">raspberry_pi</a></li>
                   </ul>
                   <!-- switch language link -->
                   <div class="link-holder">
-                    <a class="language-link" href="#"><img alt="english" src="/images/bg-flag.png"><span>Change language</span></a>
+                    <a class="language-link" href="#"><img alt="english" src="/static/images/bg-flag.png"><span>Change language</span></a>
                   </div>
                 </div>
               </div>
@@ -60,7 +62,11 @@
       {% endblock %}
 
       <main role="main" id="main">
-      {% block content %}{% endblock %}
+        {% if content_format == 'md' %}
+          {{ content|markdown }}
+        {% else %}
+          {{ content|safe }}
+        {% endif %}
       </main>
     </div>
 
@@ -71,12 +77,12 @@
           <div class="footer-frame">
             <div class="container-fluid">
             <div class="col-copy">
-              <a href="/en/" class="logo-footer"><img alt="Python In Education" src="/images/logo.png"></a>
+              <a href="/en/" class="logo-footer"><img alt="Python In Education" src="/static/images/logo.png"></a>
               <div class="copy">
                 <p>&copy; 2016 The Python Software Foundation. <br>All rights reserved.</p>
                 <p>Design by <a href="https://www.blanc.ltd.uk/">Blanc</a></p>
               </div>
-              <a href="https://www.python.org/psf-landing/" class="logo-partner"><img alt="Python Software Foundation" src="/images/psf_logo.jpg"></a>
+              <a href="https://www.python.org/psf-landing/" class="logo-partner"><img alt="Python Software Foundation" src="/static/images/psf_logo.jpg"></a>
             </div>
               <div class="footer-nav">
                 <ul>
diff --git a/templates/microbit_en.html b/templates/microbit_en.html
deleted file mode 100644
index 5310b41..0000000
--- a/templates/microbit_en.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "base.html" %}
-
-{% block secret %}
-Congratulations! You have found "the source". :-)
-
-You're obviously inquisitive ~ and this is a good thing. If you want to know
-how this site really works you should visit:
-
-https://github.com/python/pythonineducation.org
-
-We welcome contributions from anyone, no matter who you are. If you're
-thinking, "but they don't mean me", WE ESPECIALLY MEAN YOU. For more
-information see:
-
-https://github.com/python/pythonineducation.org/blob/master/CONTRIBUTING.rst
-
-Best wishes!
-{% endblock %}
-
-{% block title %}Python on the BBC micro:bit- {% endblock %}
-
-{% block content %}
-    {{ page.content }}
-{% endblock %}
-
diff --git a/templates/none.html b/templates/none.html
deleted file mode 100644
index 95b3301..0000000
--- a/templates/none.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ page.content }}
diff --git a/templates/page_en.html b/templates/page_en.html
index 3dc8e36..085a643 100644
--- a/templates/page_en.html
+++ b/templates/page_en.html
@@ -22,4 +22,3 @@
 {% block content %}
     {{ page.content }}
 {% endblock %}
-

From 99a150eab2eb98203190bbb53adaed79457736de Mon Sep 17 00:00:00 2001
From: Peter Inglesby <peter.inglesby@gmail.com>
Date: Mon, 1 Aug 2016 15:33:04 +0100
Subject: [PATCH 2/2] Provide 1-1 mapping between contents and output

---
 content/{en/home.html => en.html}            | 0
 pythonineducation/migrations/0001_initial.py | 4 +---
 pythonineducation/models.py                  | 9 +--------
 pythonineducation/urls.py                    | 3 +--
 pythonineducation/views.py                   | 9 +++++++--
 requirements.in                              | 2 +-
 requirements.txt                             | 2 +-
 templates/base.html                          | 2 +-
 8 files changed, 13 insertions(+), 18 deletions(-)
 rename content/{en/home.html => en.html} (100%)

diff --git a/content/en/home.html b/content/en.html
similarity index 100%
rename from content/en/home.html
rename to content/en.html
diff --git a/pythonineducation/migrations/0001_initial.py b/pythonineducation/migrations/0001_initial.py
index 63daab9..f64e4d3 100644
--- a/pythonineducation/migrations/0001_initial.py
+++ b/pythonineducation/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-28 18:06
+# Generated by Django 1.9.7 on 2016-08-01 13:44
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -21,8 +21,6 @@ class Migration(migrations.Migration):
                 ('content', models.TextField()),
                 ('content_format', models.CharField(max_length=255)),
                 ('title', models.CharField(max_length=255)),
-                ('slug', models.CharField(max_length=255)),
-                ('language', models.CharField(max_length=255)),
             ],
             options={
                 'abstract': False,
diff --git a/pythonineducation/models.py b/pythonineducation/models.py
index 5a9dbff..6ec8c94 100644
--- a/pythonineducation/models.py
+++ b/pythonineducation/models.py
@@ -4,12 +4,5 @@
 
 class Page(ModelWithContent):
     title = models.CharField(max_length=255)
-    slug = models.CharField(max_length=255)
-    language = models.CharField(max_length=255)
 
-    dump_path_template =  'content/[language]/[slug].[content_format]'
-
-    key_field_names = ['language', 'slug']
-
-    def __str__(self):
-        return '{}/{}'.format(self.language, self.slug)
+    dump_dir_path = 'content'
diff --git a/pythonineducation/urls.py b/pythonineducation/urls.py
index 4eba7a6..19102e1 100644
--- a/pythonineducation/urls.py
+++ b/pythonineducation/urls.py
@@ -3,6 +3,5 @@
 from .views import page_view
 
 urlpatterns = [
-    url(r'^$', page_view),
-    url(r'^(?P<language>[\w-]+)/(?P<slug>[\w-]+)/$', page_view),
+    url(r'^(?P<key>.*?)/?$', page_view),
 ]
diff --git a/pythonineducation/views.py b/pythonineducation/views.py
index b96ba12..4f0a16e 100644
--- a/pythonineducation/views.py
+++ b/pythonineducation/views.py
@@ -3,11 +3,16 @@
 from .models import Page
 
 
-def page_view(request, language='en', slug='home'):
-    page = get_object_or_404(Page, language=language, slug=slug)
+def page_view(request, key):
+    if not key:
+        key = 'en'
+
+    page = get_object_or_404(Page, key=key)
 
     assert page.content_format in ['html', 'md'], 'Page content must use HTML or Markdown'
 
+    language = key.split('/')[0]
+
     template = 'page_{}.html'.format(language)
 
     context = {
diff --git a/requirements.in b/requirements.in
index 6aeef96..aaa0568 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,2 +1,2 @@
-django-amber==0.2.0
+django-amber==0.3.0
 django-markdown-deux
diff --git a/requirements.txt b/requirements.txt
index a89f4c7..8d1785e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
-django-amber==0.2.0
+django-amber==0.3.0
 django-markdown-deux==1.0.5
 Django==1.9.7             # via django-amber
 http-crawler==0.1.1       # via django-amber
diff --git a/templates/base.html b/templates/base.html
index b9ea799..6315b2f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -39,7 +39,7 @@
                     <span class="icon-bar"></span>
                   </button>
                   <!-- page logo -->
-                  <a class="navbar-brand" href="/{{ language }}/home/"><img alt="Python In Education" src="/static/images/logo.png"></a>
+                  <a class="navbar-brand" href="/{{ language }}/"><img alt="Python In Education" src="/static/images/logo.png"></a>
                 </div>
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                   <!-- main navigation of the page -->