Merge branch 'hotfix-2015.3'

uccser · Jul 17, 2015 · 48ea15d · 48ea15d
2 parents 7575f83 + 5c85cfe
commit 48ea15d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/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.2 (CS4HS 2015 pre-conference)
+**Current Version:** 2015.3 (CS4HS 2015 pre-conference)
 
 ## Overview
 

diff --git a/index.html b/index.html
@@ -11,8 +11,8 @@ <h2>Welcome!</h2>
     <p>The conference aims to cover:</p>
 
     <ul class="disc">
-        <li>Computer Science NCEA Standards (both introductions and analysis)</li>
-        <li>Programming NCEA Standards (both introductions and analysis)</li>
+        <li>Computer Science NCEA Standards</li>
+        <li>Programming NCEA Standards</li>
         <li>Student stories and industry visit</li>
         <li>Networking opportunities with other NZ educators</li>
         <li>How Computer Science can work at Years 9 &amp; 10</li>
@@ -48,7 +48,7 @@ <h2>Updates</h2>
      href="https://twitter.com/UCCSEd"
      data-widget-id="525448302553083904"
      data-chrome="noheader nofooter noscrollbar transparent"
-     height="900">
+     height="1200">
   </a>
   </div>
 </div>

diff --git a/register.html b/register.html
@@ -38,6 +38,10 @@ <h5>Mon 30th Nov 11:00am – Tue 1st Dec 5:00pm</h5>
     <p>Optional programming workshops on Mon - Tues (30 Nov - 1 Dec) before the main conference. Food is not provided on Monday/Tuesday as part of this package.</p>
   </div>
 
+  <p>
+    You are welcome to attend a programming workshop and not the main conference, however we cannot provide you a transport subsidy as Google only funds CS4HS attendees.
+  </p>
+
   <h4>Payment</h4>
 
   <p>

diff --git a/templates/footer.html b/templates/footer.html
@@ -10,7 +10,10 @@
           <a href="http://nzacditt.org.nz/"><img src="./img/nzacditt-logo.png" class="logo"></img></a>
       </p>
       <p>
-          2015 - Jack Morgan &amp; Jordan Griffiths
+        <a href="https://github.com/uccser/cs4hs">This website is open source and available on GitHub</a>
+      </p>
+      <p>
+          2015 - <a href="https://twitter.com/jackmorgannz">Jack Morgan</a> &amp; <a href="https://twitter.com/jgriffs_nz">Jordan Griffiths</a>
       </p>
     </div>
   </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,10 @@ <h5>Mon 30th Nov 11:00am – Tue 1st Dec 5:00pm</h5> @@
         <p>Optional programming workshops on Mon - Tues (30 Nov - 1 Dec) before the main conference. Food is not provided on Monday/Tuesday as part of this package.</p>
       </div>
+      <p>
+        You are welcome to attend a programming workshop and not the main conference, however we cannot provide you a transport subsidy as Google only funds CS4HS attendees.
+      </p>
       <h4>Payment</h4>
       <p>
@@ Expand Down @@