Merge branch 'develop'

README.md

@@ -8,30 +8,31 @@ Running `generate.py` will produce all the necessary files for the website, that
 
     cs4hs/
     ├── css/
-    │   └── CSS files
+    │   └── Files to style the website output
     ├── files/
-    │   └── Files available for users to download
+    │   └── Files available for users to download through the website
     ├── img/
-    │   └── Images files
+    │   └── Images to display on the website
     ├── js/
-    │   └── JavaScript files
+    │   └── JavaScript used in the website output
     ├── output/
     │   └── Files and folders produced by the website generator (ignored by Git)
     ├── templates/
     │   └── HTML files used by the template engine Jinja2
+    ├── text/
+    │   └── HTML files used to create pages by the template engine Jinja2
+    ├── .gitignore
     ├── generate.py
     ├── LICENSE
-    ├── README.md
-    └── HTML files to be processed
+    └── README.md
 
 ### 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 prepared 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.
+- Switch to an existing static site generator (Middleman, Jekyll, etc)
 
 ## Usage
 

templates/footer.html

@@ -2,17 +2,20 @@
   <div class="row">
     <div class="small-12 columns">
       <p>
-          A big thank you to our sponsors for helping us run this event!
-      </p>
-      <p>
-          <a href="http://www.cs4hs.com/"><img src="./img/google-logo-colour.png" class="logo" style="max-width:16em;"></img></a>
-          <a href="http://www.canterbury.ac.nz/"><img src="./img/canterbury-logo.png" class="logo" style="max-height:6em;"></img></a>
-      </p>
-      <p>
-          <a href="http://www.catalyst.net.nz/"><img src="./img/catalyst-logo.png" class="logo" style="max-height:2.1em;"></img></a>
-          <a href="https://www.microsoft.com/en-nz/"><img src="./img/microsoft-logo.png" class="logo" style="max-height:2.5em;"></img></a>
-          <a href="http://nzacditt.org.nz/"><img src="./img/nzacditt-logo.png" class="logo" style="max-height:3em;"></img></a>
+        A big thank you to our sponsors for helping us run this event!
       </p>
+      <div>
+        <a href="http://www.canterbury.ac.nz/"><img src="./img/uc-computer-science-education-logo.png" class="logo" style="max-height:5em;"></img></a>
+        <a href="http://www.cs4hs.com/"><img src="./img/google-logo-colour.png" class="logo" style="max-width:16em;"></img></a>
+      </div>
+      <div>
+        <a href="http://www.catalyst.net.nz/"><img src="./img/catalyst-logo.png" class="logo" style="max-height:2.1em;"></img></a>
+        <a href="https://www.microsoft.com/en-nz/"><img src="./img/microsoft-logo.png" class="logo" style="max-height:2.5em;"></img></a>
+        <a href="http://nzacditt.org.nz/"><img src="./img/nzacditt-logo.png" class="logo" style="max-height:3em;"></img></a>
+      </div>
+      <div>
+        <a href="http://www.telogis.com/"><img src="./img/telogis-logo.png" class="logo" style="max-height:2.8em;"></img></a>
+      </div>
       <p>
         For general and website enquiries: <a href="mailto:[email protected]">[email protected]</a>
       </p>

text/index.html

@@ -4,7 +4,9 @@
 <div class="small-12 medium-8 columns text-justify">
     <h2>Welcome!</h2>
 
-    <p>Welcome to the website for the Christchurch Computer Science for High Schools event, held at the University of Canterbury in 2016. The event is a collection of workshops focused on preparing educators for teaching the computer science and programming achievement standards for NCEA. We have received funding for this event through Google's <a href="http://www.cs4hs.com/">CS4HS Grant Program</a>, and through other generous sponsors, and are running the workshops over three days from the 30th November to 2nd of December 2016, with an optional programming workshop occurring on the 28th and 28th of November.</p>
+    <p>Welcome to the website for the Christchurch Computer Science for High Schools event, held at the University of Canterbury in 2016. The event is a collection of workshops focused on preparing New Zealand educators for teaching the computer science and programming achievement standards for NCEA. We have received funding for this event through Google's <a href="http://www.cs4hs.com/">CS4HS Grant Program</a>, and through other generous sponsors, and are running the workshops over three days from the 30th November to 2nd of December 2016, with optional programming workshops occurring on the 28th and 29th of November.</p>
+
+    <p>Thanks to generous funding, we are able to provide accommodation and food at no charge to New Zealand educators attending the main workshops. We are also able to provide travel subsidies to those travelling large distances to attend the event.</p>
 
     <p>The workshops aims to cover:</p>
 

text/people.html

@@ -8,9 +8,7 @@ <h2>People</h2>
 
     <p>The following people are involved in CS4HS at Christchurch. This list will be updated as speakers confirm sessions.</p>
 
-    <div data-alert class="alert-box info radius">
-        <strong>Note:</strong> General event queries should be emailed to <a href="mailto:[email protected]">[email protected]</a>.
-    </div>
+    <p><strong>Note:</strong> General event queries should be emailed to <a href="mailto:[email protected]">[email protected]</a>.</p>
 
     <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4 text-center">
       <li>

text/schedule.html

@@ -54,7 +54,7 @@ <h4 class="text-right">or</h4>
 
           <span class="small-12 medium-8 columns">
               <h4>{{cells.Title}}</h4>
-              <p class="description">{{cells.Description}}</p>
+              <p class="description">{{{cells.Description}}}</p>
           </span>
       </div>
 
@@ -100,16 +100,6 @@ <h3>Loading events...</h3>
       }
   });
 
-  // Handlebars.registerHelper('ifDifferentTime', function(v1, options) {
-  //     v1 = parseDate(v1);
-  //     if(v1 !== Time) {
-  //         Time = v1;
-  //         return options.fn(this);
-  //     } else {
-  //         return options.inverse(this);
-  //     }
-  // });
-  //
   Handlebars.registerHelper('ifLaterTime', function(datestring, options) {
       date = momentDateString(datestring);
       if(date.isAfter(currentTime)) {

text/workshops-computer-science.html

@@ -11,16 +11,16 @@ <h1>Computer Science Workshops</h1>
   <h2>Workshops available</h2>
   <p>Click a link to see the full details about the workshop:</p>
   <ul>
-    <li><a href="#cs-1-2">Computer Science Workshop - Level 1 &amp; 2</a></li>
-    <li><a href="#cs-3">Computer Science Workshop - Level 3</a></li>
+    <li><a href="#cs-1-2">Introduction to 1.44 &amp; 2.44</a></li>
+    <li><a href="#cs-hands-on-practice">Hands on practice with 1.44, 2.44, or 3.44</a></li>
   </ul>
 
   <h2>Workshop details</h2>
 
   <div class="panel radius clearfix" id="cs-1-2">
     <div class="text-center">
-      <img src="./img/canterbury-logo.png" class="logo text-center" style="max-height:6em;"></img>
-      <h3>Computer Science Workshop - Level 1 &amp; 2</h3>
+      <img src="./img/uc-computer-science-education-logo.png" class="logo text-center" style="max-height:5em;"></img>
+      <h3>Introduction to 1.44 &amp; 2.44</h3>
       <h5>AS91074 and AS91371</h5>
     </div>
 
@@ -35,21 +35,48 @@ <h4>Workshop description</h4>
         <p>For those who have had an introduction to Computer Science and wish to cover level 1 and 2 (1.44/AS91074 and 2.44/AS91371) at a faster pace over the three days. Tim will cover the content, provide steps on how to teach concepts, and introduce the assessment guides.</p>
 
         <p>This workshop is recommended for those who have never taught Computer Science before to those who want a refresher on levels 1 &amp; 2.</p>
+
+        <h4>Workshop leaders</h4>
+        <p>Lead by Tim Bell and Cailtin Duncan</p>
       </div>
     </div>
   </div>
 
-  <div class="panel radius clearfix" id="cs-3">
+  <div class="panel radius clearfix" id="cs-hands-on-practice">
     <div class="text-center">
-      <img src="./img/canterbury-logo.png" class="logo text-center" style="max-height:6em;"></img>
-      <h3>Computer Science Workshop - Level 3</h3>
-      <h5>AS91636</h5>
+      <img src="./img/uc-computer-science-education-logo.png" class="logo text-center" style="max-height:5em;"></img>
+      <h3>Hands on practice with 1.44, 2.44, or 3.44</h3>
     </div>
 
     <div class="row">
-      <div class="small-12 columns">
+      <div class="small-12 medium-6 columns">
         <h4>Workshop description</h4>
-        <p>For those who are interested in level 3 (3.44/AS91636), this workshop will provide refresher on available Computer Science topics, guidance on using the material for assessments, and allow time for you to discuss with other educators about their experiences.</p>
+        <p>
+          Already know a bit about 1.44, 2.44, or 3.44 and want to jump in with some hands on practice?
+        </p>
+        <p>
+          This workshop will allow you to pick one of the 3 CS external standards (1.44, 2.44, or 3.44), and work in a group to carry out relevant activities, and then write a report on it. Most of the workshop will consist of working in groups with tutor help, although there will be a general presentation on writing good reports, avoiding plagarism, and optional presentations on teaching 3.44.
+        </p>
+      </div>
+      <div class="small-12 medium-6 columns">
+        <h4>Prerequisite knowledge</h4>
+        <p>
+          <ul>
+            <li>
+              To focus on 1.44, you will need to be familiar with the 1.44 content.
+            </li>
+            <li>
+              To focus on 2.44, you will need to be familiar with the 2.44 content.
+            </li>
+            <li>
+              To focus on 3.44, you will need to have confidently taught 1.44 or 2.44 or 3.44, no prior 3.44 experience is required.
+            </li>
+          </ul>
+        </p>
+
+
+        <h4>Workshop leader</h4>
+        <p>Lead by Heidi Newton</p>
     </div>
   </div>
 </div>

text/workshops-programming.html

@@ -9,6 +9,11 @@ <h1>Programming Workshops</h1>
   <p>These optional full day workshops focus on learning the programming content and occur on the Monday and Tuesday before the main workshops. These are <em>optional paid</em> workshops ($200 without accommodation or $265 with accommodation), see the <a href="register.html">register page</a> for more details.</p>
 
   <h2>Workshops available</h2>
+
+  <div data-alert class="alert-box warning radius">
+      For those who wish to attend a programming workshop, you will <strong>attend one workshop for the entirely of Monday and Tuesday</strong> (not one workshop each day).
+  </div>
+
   <p>Click a link to see the full details about the workshop:</p>
   <ul>
     <li><a href="#uc">Just for Starters: Scratch and Python</a> with University of Canterbury</li>
@@ -22,7 +27,7 @@ <h2>Workshop details</h2>
 
   <div class="panel radius clearfix" id="uc">
     <div class="text-center">
-      <img src="./img/canterbury-logo.png" class="logo text-center" style="max-height:6em;"></img>
+      <img src="./img/uc-computer-science-education-logo.png" class="logo text-center" style="max-height:5em;"></img>
       <h3>Just for Starters: Scratch and Python</h3>
     </div>
 

text/workshops-teaching.html

@@ -21,7 +21,7 @@ <h2>Workshop details</h2>
 
   <div class="panel radius clearfix" id="uc">
     <div class="text-center">
-      <img src="./img/canterbury-logo.png" class="logo text-center" style="max-height:6em;"></img>
+      <img src="./img/uc-computer-science-education-logo.png" class="logo text-center" style="max-height:5em;"></img>
       <h3>Helping students understand programming</h3>
     </div>