Merge branch 'hotfix-2015.6'

README.md

@@ -2,7 +2,7 @@
 
 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.5 (CS4HS 2015 pre-conference)
+**Current Version:** 2015.6 (CS4HS 2015 pre-conference)
 
 ## Overview
 

css/app.css

@@ -245,7 +245,7 @@ body {
     color: #fff;
 }
 #map-canvas {
-    height: 100vh;
+    height: 80vh;
 }
 .map-label {
     background-color: #FF786E;

display.html

@@ -19,7 +19,7 @@ <h1 class="title">CS<span class="logo-number">4</span>HS</h1>
 <div class="small-4 columns text-center">
   <h2>Sponsors</h2>
   <ul id="sponsor-slideshow" class="text-center">
-    <li><img src="./img/google-logo.png"></img></li>
+    <li><img src="./img/google-logo-colour.png"></img></li>
     <li><img src="./img/canterbury-logo.png"></img></li>
     <li><img src="./img/nzacditt-logo.png"></img></li>
   </ul>

location.html

@@ -23,8 +23,9 @@ <h4 id="address-details">Address Details</h4>
 
   <p>
     <address>
-    <strong>NZi3 Building</strong><br>
-      69 Creyke Road, Ilam<br>
+    <strong>C Lecture Theatre Block</strong><br>
+      University of Canterbury<br>
+      Ilam Campus<br>
       Christchurch 8041<br>
     </address>
   </p>
@@ -65,10 +66,13 @@ <h4 id="address-details">Address Details</h4>
 				new google.maps.LatLng(-43.52167645528233, 172.5794642418623),
 				new google.maps.LatLng(-43.521925402868725, 172.5795353204012),
 				new google.maps.LatLng(-43.52210530575856, 172.57966574281454),
-  			new google.maps.LatLng(-43.52256381258966, 172.58071515709162),
-  			new google.maps.LatLng(-43.520122454551036, 172.5828206911683),
-				new google.maps.LatLng(-43.520351959055525, 172.58321933448315),
-				new google.maps.LatLng(-43.52047157334527, 172.583102658391)
+  			new google.maps.LatLng(-43.52305635104029, 172.58184000849724),
+  			new google.maps.LatLng(-43.52310108286228, 172.58188292384148),
+				new google.maps.LatLng(-43.5232216641303, 172.5822101533413),
+				new google.maps.LatLng(-43.523293623804435, 172.58222356438637),
+				new google.maps.LatLng(-43.523248892125196, 172.58265540003777),
+				new google.maps.LatLng(-43.52335391427614, 172.58292898535728),
+				new google.maps.LatLng(-43.52313609035202, 172.58311942219734)
 			];
 
 			var walkingPath = new google.maps.Polyline({
@@ -80,25 +84,6 @@ <h4 id="address-details">Address Details</h4>
 
 			walkingPath.setMap(map);
 
-      var shortWalkingPathCoordinates = [
-				new google.maps.LatLng(-43.52064953563017, 172.57936768233776),
-				new google.maps.LatLng(-43.520594104810826, 172.57946357131004),
-				new google.maps.LatLng(-43.520403500201326, 172.5804264843464),
-				new google.maps.LatLng(-43.52049296774608, 172.5814564526081),
-				new google.maps.LatLng(-43.52047157334527, 172.58158519864082),
-				new google.maps.LatLng(-43.519781113609675, 172.58227184414864),
-				new google.maps.LatLng(-43.520122454551036, 172.5828206911683)
-			];
-
-			var shortWalkingPath = new google.maps.Polyline({
-				path: shortWalkingPathCoordinates,
-				geodesic: true,
-				strokeColor: '#FF786E',
-				strokeWeight: 4
-			});
-
-      shortWalkingPath.setMap(map);
-
 			var markerErskine = new MarkerWithLabel({
 				position: new google.maps.LatLng(-43.52264306633343, 172.5814675167203),
 				map: map,
@@ -108,21 +93,13 @@ <h4 id="address-details">Address Details</h4>
 			});
 
 			var markerErskine = new MarkerWithLabel({
-				position: new google.maps.LatLng(-43.520494912691234, 172.58302219212055),
+				position: new google.maps.LatLng(-43.523130255, 172.583657205),
 				map: map,
-				labelContent: "NZi3",
+				labelContent: "C Block",
 			  labelClass: "map-label map-label-major",
 				labelAnchor: new google.maps.Point(40, 40),
 			});
 
-      // var markerABlock = new MarkerWithLabel({
-			// 	position: new google.maps.LatLng(-43.52410267801679, 172.5836344063282),
-			// 	map: map,
-			// 	labelContent: "A Block",
-			//   labelClass: "map-label map-label-major",
-			// 	labelAnchor: new google.maps.Point(40, 40),
-			// });
-
 			var markerCarPark = new MarkerWithLabel({
 				position: new google.maps.LatLng(-43.52508286377655, 172.58607923984528),
 				map: map,
@@ -147,14 +124,6 @@ <h4 id="address-details">Address Details</h4>
 				labelAnchor: new google.maps.Point(40, 40),
 			});
 
-			// var markerUndercroft = new MarkerWithLabel({
-			// 	position: new google.maps.LatLng(-43.52373607667117, 172.582830414176),
-			// 	map: map,
-			// 	labelContent: "Undercroft",
-			//   labelClass: "map-label map-label-major",
-			// 	labelAnchor: new google.maps.Point(40, 40),
-			// });
-
 			var markerRR = new MarkerWithLabel({
 				position: new google.maps.LatLng(-43.52034904163086, 172.57872730493546),
 				map: map,
@@ -171,13 +140,13 @@ <h4 id="address-details">Address Details</h4>
 				labelAnchor: new google.maps.Point(40, 40),
 			});
 
-      // var markerBus = new MarkerWithLabel({
-			// 	position: new google.maps.LatLng(-43.523970429512374, 172.5842486321926),
-			// 	map: map,
-			// 	labelContent: "Cafe 101",
-			//   labelClass: "map-label map-label-minor",
-			// 	labelAnchor: new google.maps.Point(40, 40),
-			// });
+      var markerBus = new MarkerWithLabel({
+				position: new google.maps.LatLng(-43.523970429512374, 172.5842486321926),
+				map: map,
+				labelContent: "Cafe 101",
+			  labelClass: "map-label map-label-minor",
+				labelAnchor: new google.maps.Point(40, 40),
+			});
 
       var markerBus = new MarkerWithLabel({
 				position: new google.maps.LatLng(-43.522446633550736, 172.5809297338128),

register.html

@@ -7,7 +7,21 @@
   <h2>Register</h2>
 
   <p>
-    Registrations will be sent out to those on the waiting list in August 2015 (<a href="#waitlist">add your name to the waitlist here</a>). Funded places in this event are limited and are offered on a first-in first-served basis so please add yourself to the waitlist as early as possible. It's ok to fine-tune parts of registration later e.g. changing the exact number of nights you'll be staying, contact <a href="mailto:[email protected]">Jack Morgan</a> if you need to change your registration.
+    Registrations are now open and will close on <strong>Friday, 6th November 2015</strong>. If you wish to attend CS4HS, but your school is having severe issues in funding you to attend: <a href="mailto:[email protected]">let us know</a> as hardship subsidies are available.
+  </p>
+
+  <div data-alert class="alert-box warning radius">
+      At present we still can provide all accommodation free of charge, however we are unable to provide a transport subsidy for travel costs. We are actively seeking more funding from sponsors, and if we receive sufficient funding, we may be able to provide a subsidy for your travel costs (subsidies are given on a first-in first-served basis, we will contact you if you become eligible). <a href="#" class="close">&times;</a>
+  </div>
+
+  <div class="row">
+    <div class="small-12 medium-6 small-centered columns">
+      <a href="https://cs4hs-christchurch-2015.lilregie.com/" class="button expand radius"><strong>Click here to register for CS4HS</strong></a>
+    </div>
+  </div>
+
+  <p>
+    It's ok to fine-tune parts of registration later e.g. changing the exact number of nights you'll be staying, contact <a href="mailto:[email protected]">Jack Morgan</a> if you need to change your registration.
   </p>
 
   <div class="panel radius clearfix">
@@ -66,10 +80,7 @@ <h2 id="subsidy">Subsidy Levels</h2>
   <h3 id="waitlist">Expression of Interest Waitlist</h3>
 
   <p>
-    You are able to express interest in attending our conference. Be aware this does not register you for the conference, but by filling out this form you will be given a chance to register before registrations are made public.
+    The waitlist is now closed as public registrations are open.
   </p>
-  <a href="https://docs.google.com/forms/d/1u0yLVcUZFMxtM1pTkzdOIG_DxxnyYNIVShuuW2Ic2K8/viewform" class="button radius">Click here to express interest in attending</a>
-
-
 </div>
 {% endblock content %}

workshops.html

@@ -34,26 +34,31 @@ <h2 id="programming-workshops">Programming Workshops (Optional)</h2>
 
   <div class="panel radius clearfix">
     <h4>Just for starters - Scratch and Python <small>with Tim Bell - University of Canterbury</small></h4>
+    <h5>Location: Lab 4 (Room 136), Erskine Building</h5>
     <p>For those with absolutely no experience, programming concepts are taught gently using Scratch and Python at the same time. Intended for those with no programming experience, this session will mainly orient you around what is available, and give information on how to get up to speed in programming.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Crash course in Python <small>with Tanya Gray - Gather Workshops</small></h4>
+    <h5>Location: Lab 2 (Room 133), Erskine Building</h5>
     <p>This workshop will explore Python programming via a series of small projects. At the end of the two days you will walk away with a selection of programs which use Python to demonstrate a variety of programming concepts. If you already know a variable from a function and a String from an Integer but you're not really sure what to do with it all, then this workshop is for you.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Building Apps and Games with JavaScript <small>with Michael Walmsley - Code Avengers</small></h4>
+    <h5>Location: Lab 1 (Room 131), Erskine Building</h5>
     <p>For those who are looking for using JavaScript to learn programming concepts, Michael will take teachers through building games and apps with the Code Avengers material. These lessons are also suitable for digital media, or junior programming courses. Please bring headphones to this workshop to hear game sounds (this is optional).</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Databases for Level 2 &amp; 3 <small>with Amit Sarkar - CPIT</small></h4>
+    <h5>Location: Room 248, Erskine Building</h5>
     <p>This workshop will cover important parts of achievement standard 2.41 (AS91368): "designing and constructing a database" with a well-organised table structure, relational database design, "using tools of the software to integrate data from a database...", and cover 3.41 (AS91633): "creating queries which combine data from multiple tables" (joins in SQL), and "creating queries which insert, update or delete to modify data" (CRUD). In addition to these we will write assessment, we will share number of database examples and we will build database solutions for them and will also share resources available to help teach databases to High School students.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Electronics with the Raspberry Pi <small>with Ross Petersen, Andrew Hornblow and Les Black - Skills Choice</small></h4>
+    <h5>Location: Lab 3 (Room 134), Erskine Building</h5>
     <p>For those wishing to look at electronics and simple programming, this interactive workshop will introduce the popular PICAXE microcontroller and Raspberry-Pi and explore how these could connect to the Electronics and Infrastructure standards.</p>
   </div>
 
@@ -63,16 +68,19 @@ <h2 id="computer-science-workshops">Computer Science Workshops</h2>
 
   <div class="panel radius clearfix">
     <h4>Computer Science Level 1 - What &amp; How? <small>with Caitlin Duncan - University of Canterbury</small></h4>
+    <h5>Location: C2 Lecture Theatre</h5>
     <p>For those who have never used the level 1 computer science standard before (1.44/AS91074) Caitlin will go over the purpose of this standard, investigate the topic, show some examples of how to get students engaged with the ideas in it, and cover the teacher assessment guides. Recommended for first timers.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Computer Science Level 1 &amp; 2 - Quick Overview <small>with Tim Bell - University of Canterbury</small></h4>
+    <h5>Location: C1 Lecture Theatre</h5>
     <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>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Computer Science Level 3 - Teacher's Experiences <small>with Jack Morgan - University of Canterbury</small></h4>
+    <h5>Location: Room 111, Erskine Building</h5>
     <p>For those who are interested in level 3 (3.44/AS91636) come hear different experiences teachers have had with a variety of topics. We will also hear about report writing specifically for level 3. Do be aware that this session is different to previous years and focuses on teacher experiences, rather than teaching level 3 topics, as there is not enough time for this at CS4HS.</p>
   </div>
 
@@ -82,21 +90,24 @@ <h2 id="teaching-workshops">Teaching Workshops</h2>
 
   <div class="panel radius clearfix">
     <h4>Helping Students Understand Programming <small>with Tim Bell &amp; Caitlin Duncan - University of Canterbury</small></h4>
+    <h5>Location: Lab 2 (Room 131), Erskine Building</h5>
     <p>When students take on programming for the first time, a wide range of ideas and misconceptions arise. This course will look at key ideas that are important to get right, and also different approachs to teaching introductory concepts.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Programming Planning &amp; Assessments <small>with Jack Morgan - University of Canterbury</small></h4>
+    <h5>Location: C2 Lecture Theatre</h5>
     <p>What are some good approaches for teaching planning with programming? What makes a good assessment? What is programming style? We will discuss these questions and more in this workshop focusing on the level 2 and 3 standards.</p>
   </div>
 
   <div class="panel radius clearfix">
     <h4>Python Basics with Code Avengers <small>with Michael Walmsley - Code Avengers</small></h4>
+    <h5>Location: Lab 1 (Room 131), Erskine Building</h5>
     <p>Cover the programming concepts of Python required for level 1 &amp; level 2 using Code Avengers exercises. This workshop also has teachers trying lessons and practising exercises, and also covers using the Code Avengers teacher tools like class setup and marking.</p>
   </div>
 
   <h2 id="unconference">Unconference</h2>
-
+  <h5>Locations: To be announced</h5>
   <p>In the Unconference, attendees and presenters converge on topics of mutual interest that they would like to discuss or learn more about. It's also a chance to spend more time on topics from earlier sessions if there's interest. Information about available unconference streams will become available during the conference, and listed on the schedule page.</p>
 
 </div>