Release 2015.1 website by merge to master

.gitignore

@@ -0,0 +1,9 @@
+# Ignore everything within output folder
+output/*
+!output/.gitkeep
+
+# Ignore Python module cache files
+*.pyc
+
+# Ignore Windows image file caches
+Thumbs.db

README.md

@@ -2,40 +2,52 @@
 
 This project generates the website for the CS4HS Conference held at the University of Canterbury, New Zealand located at [cosc.canterbury.ac.nz/cs4hs](http://www.cosc.canterbury.ac.nz/cs4hs/index.html).
 
+**Current Version:** 2015.1 (CS4HS 2015 pre-conference)
+
 ## Overview
 
 Running `generate.py` will produce all the necessary files for the website, that can be copied and placed on the appropriate web server. The script will generate HTML pages using Jinja2, and copy all images, files, css, and js into the output folder as well.
 
     cs4hs/
-    ├── templates/
-    │   └── HTML files used by the template engine Jinja2
-    ├── output/
-    │   └── Files produced by the website generator. Ignored by Git.
+    ├── css/
+    │   └── CSS files
     ├── files/
-    │   └── Files available for download
+    │   └── Files available for users to download
     ├── img/
     │   └── Images files
-    ├── css/
-    │   └── CSS files
     ├── js/
     │   └── JavaScript files
+    ├── output/
+    │   └── Files and folders produced by the website generator (ignored by Git)
+    ├── templates/
+    │   └── HTML files used by the template engine Jinja2
     ├── generate.py
-    ├── README.md
     ├── LICENSE
+    ├── README.md
     └── HTML files to be processed
 
+### Why use a template engine?
+
+Over the past few years the CS4HS website has been created with 'hard coded' pages (created in the amazing [Brackets](http://brackets.io/)). We now want to use a template engine to manage repetitive code, and this small Python script using Jinja2 achieves this. This project also prepares us for the website creation aspect of the [CSFG](https://github.com/uccser/cs-field-guide) project.
+
+### Future plans
+
+- Minify CSS on output.
+- Use SCSS for managing CSS.
+
 ## Usage
 
 Run `generate.py` and the website will be located within the the `output` folder.
 
 ## Requirements
 
 - Python 3.4 or higher
+- Jinja2 2.7.3 or higher (this is installed by the `generate.py` script if not installed already)
 
 ## Found a problem?
 
 If you notice a problem, raise an [issue here](https://github.com/uccser/cs4hs/issues).
 
 ## Contributing
 
-Forks and pull requests are welcome.
+Forks and pull requests are welcome. We use [Vincent Driessen's Git Branching Model](http://nvie.com/posts/a-successful-git-branching-model/) for managing development.

about.html

@@ -0,0 +1,77 @@
+{% extends 'layout.html' %}
+
+{% block title %}About - CS4HS{% endblock %}
+
+{% block content %}
+<div class="small-12 large-6 columns">
+  <h2>About</h2>
+  <p>This year there are four independent CS4HS workshops running throughout New Zealand. Our conference in Christchurch is focused on the Computer Science and Programming Achievement standards, for teachers who are at beginner/intermediate level, so the discussions will be more focussed on getting started.</p>
+
+  <p>The Victoria one would be more general, looking more at areas of computer science that are of general interest, even if they are outside the standards (this is the model used for CS4HS overseas, and gives a broader view of the topic, which would be more suitable for those already teaching the standards.) Unitec will be running a CS4HS workshop this year in Auckland, which is likely to cover mobile applications and devices, cyber-security, artificial intelligence, and robotics. In Dunedin, Google is funding teachers to learn some robotics, held at the University of Otago. Details for these conferences can be found at the links below.</p>
+
+  <p>While the organisers of the three events will be working together to coordinate, the events will essentially be independent and covering different areas, so it's fine to apply to go to more than one (if you have the time!).</p>
+
+
+  <h2>Useful Links</h2>
+  <h4>Previous Conference Websites</h4>
+  <p><a href="./2014/index.html">2014 conference website</a></p>
+  <p><a href="./2013/index.html">2013 conference website</a></p>
+
+  <h4>Other New Zealand CS4HS Conferences</h4>
+  <p><a href="http://cs4hs.unitec.ac.nz/"><strong>Auckland</strong> - Date TBA</a></p>
+  <p><a href="http://ecs.victoria.ac.nz/Events/CS4HS2015"><strong>Wellington</strong> - Date TBA</a></p>
+  <p><a href="http://robocupjunior.org.nz/regions/teacher_workshops.php"><strong>Dunedin</strong> - Various dates</a></p>
+
+  <h4>Contacts</h4>
+  <div class="row">
+  <span class="small-12 medium-6 columns">
+      <address>
+          <strong>Jack Morgan</strong><br>
+          For general and website enquiries email: <a href="mailto:[email protected]">[email protected]</a>
+      </address>
+  </span>
+  <span class="small-12 medium-6 columns">
+      <address>
+          <strong>Tim Bell</strong><br>
+          For press enquiries email: <a href="mailto:[email protected]">[email protected]</a>
+      </address>
+  </span>
+  </div>
+</div>
+<div class="small-12 large-6 columns">
+  <h2>Frequently Asked Questions</h2>
+
+  {% raw %}
+  <div id="faq">
+  <script id="faq-template" type="text/x-handlebars-template">
+      <h4>{{cells.Question}}</h4>
+      <p>{{cells.Answer}}</p>
+  </script>
+  </div>
+  {% endraw %}
+  <div id="faq-loading">
+      <h4 class="text-center">Loading FAQ...</h4>
+  </div>
+</div>
+{% endblock content %}
+
+{% block scripts %}
+<!-- Load Handlebars.js -->
+<script src="./js/sheetrock.min.js"></script>
+<!-- Load Handlebars.js -->
+<script src="./js/handlebars.min.js"></script>
+<script type="text/javascript">
+  // Compile the Handlebars template.
+  var faqTemplate = Handlebars.compile($('#faq-template').html());
+  // Load an entire sheet.
+  $('#faq').sheetrock({
+      url: 'https://docs.google.com/spreadsheets/d/1zwzSnuplPI8KPinU_n72Vc3pGgKx_ldNwucipSOgcEQ/edit#gid=0',
+      query: 'select A,B',
+      rowTemplate: faqTemplate,
+      callback: removeLoading
+  });
+  function removeLoading() {
+      $("#faq-loading").addClass('hide');
+  }
+</script>
+{% endblock scripts %}

accommodation.html

@@ -0,0 +1,26 @@
+{% extends 'layout.html' %}
+
+{% block title %}Accommodation - CS4HS Christchurch 2015{% endblock %}
+
+{% block content %}
+<div class="small-12 columns">
+  <h2>Accommodation</h2>
+</div>
+<div class="small-12 medium-7 columns">
+  <p>
+    For those travelling to the conference from outside of Christchurch, accommodation is provided at <a href="http://www.canterbury.ac.nz/future-students/accommodation/halls-of-residence-and-villages/university-hall/#tab2">University Hall</a>. We organise all bookings and payments, so all you need to do is turn up!
+  </p>
+
+  <p>
+    If you are arriving at the beginning of a day, please do not check into your accommodation but come straight to the conference. We will look after your bags in a secure room and have them transported to the hall for you to pick up in the evening. At the end of the day you can head over to the University
+    Hall office and receive your room key. Wireless internet will be available in common areas (you will be provided with an account for internet access when you arrive.)
+  </p>
+
+  <p>
+    If you require a room with special requirements, we recommended booking at the Academy Motor Lodge (directly across the road from the conference), however we currently cannot cover the cost of these bookings.
+  </p>
+</div>
+<div class="small-12 medium-5 columns">
+  <img src="img/university-hall.jpg">
+</div>
+{% endblock content %}