LibrePlanet 2015
================
+This is the static HTML site for LibrePlanet 2015. Read on for
+instructions on how to setup your development environment.
+
The repository has a master (development) branch and a stable
(live) branch. To work on it, you'll edit your checkout of the
master branch until you are satisfied, push it to the master
then push that to the stable branch on the Web server
(<http://libreplanet.org>).
-This is the static HTML site for LibrePlanet 2015. Read on for
-instructions on how to setup your development environment.
-
Setting Up Apache
-----------------
Add the following to your new page (it should remain commented out, as that is the syntax for SSI):
```
-<!--#include virtual="/2015/header.html"-->
-<!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/header.html"-->
+<!--#include virtual="/server/2015/banner.html"-->
+<!--#include virtual="/server/2015/sidebar.html"-->
+<!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/close.html"-->
```
-This will include the header and footer, saving you from duplicating
-HTML.
+This will include the header, banner, sidebar, footer and closing tags
+saving you from duplicating HTML.
+
+If JS is needed for a page, then create a file, containing the JS
+includes, in `/server/2015/` & use SSI to include it in the page.
+
+Use `/server/2015/boilerplate.html` to start a new page.
### Add Your Markup
-Add HTML markup in-between the header and footer includes.
+Add HTML markup in-between the sidebar and footer includes.
### Enable SSI
A system of git hooks automates deployment to the staging and live
servers. When you push to the `master` branch, the site is deployed
-to <http://wiki-dev0.libreplanet.org>. When you push to the
+to <http://wiki-dev0.libreplanet.org/2015>. When you push to the
`stable` branch, the site is deployed to <http://libreplanet.org>.
When you're happy with the state of the master branch and want to