Skip to content
This repository has been archived by the owner on Aug 5, 2018. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
JackMorganNZ committed Jan 10, 2016
2 parents e2d3e7c + f22aeae commit ed110d3
Show file tree
Hide file tree
Showing 19 changed files with 361 additions and 93 deletions.
9 changes: 5 additions & 4 deletions accommodation.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ <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!
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! 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>

<h3>Information for those staying at University Hall</h3>

<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.)
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.
Please also read the <a href="./files/uca-house-rules.pdf">Accommodation House Rules</a>.
</p>
</div>
<div class="small-12 medium-5 columns">
Expand Down
3 changes: 3 additions & 0 deletions css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,6 @@ body {
div.alert > a {
color: #600000;
}
#homepage-well {
margin-bottom: 1rem !important;
}
23 changes: 23 additions & 0 deletions css/display.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,26 @@
width: auto;
border: 0;
}
.display-three-background {
background-color: #0a83bb;
height: 100vh;
display: table;
width: 100%;
}
.display-three-large-text {
font-size: 20rem;
padding-bottom: 5rem;
}
.display-three-small-text {
font-size: 7rem;
}
.display-three-align {
display: table-cell;
vertical-align: middle;
}
.no-padding {
padding: 0 !important;
}
#display-three-body {
overflow: hidden;
}
196 changes: 196 additions & 0 deletions display-three.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
{% extends 'layout.html' %}

{% block title %}CS4HS Christchurch 2015{% endblock %}

{% block head %}
{{ super() }}
<link rel="stylesheet" href="css/display.css">
<!-- Reload page every 5 minutes to refresh timetable -->
<meta http-equiv="refresh" content="300">
{% endblock head %}

{% block body_start %}
<body id="display-three-body">
{% endblock body_start %}

{% block body %}
<div class="row">
<div class="small-4 columns">
<h1 class="text-center">Upcoming Events</h1>
{% raw %}
<div id="current">
<script id="schedule-template" type="text/x-handlebars-template">
<div class="event">
{{#ifSameDate cells.DateTimeStart}}
<h2 class="text-center event-day">{{prettifyDate cells.DateTimeStart "dddd Do MMMM"}}</h3>
{{/ifSameDate}}
{{#ifDifferentTimeLine cells.DateTimeStart}}
<span class="small-12 columns underline"></span>
{{else}}
<span class="small-8 small-offset-2 medium-10 medium-offset-2 columns underline"></span>
{{/ifDifferentTimeLine}}
<div class="row current-event">
<span class="small-12 medium-4 columns medium-text-right">
{{#ifDifferentTime cells.DateTimeStart}}
<h3 class="event-time">{{prettifyDate cells.DateTimeStart "h:mma"}}<br>
<small>until {{prettifyDate cells.DateTimeEnd "h:mma"}}</small></h3>
{{else}}
<h4 class="text-center">or</h4>
{{/ifDifferentTime}}
<p>
{{#if cells.Location}}
<b>Location:</b> {{cells.Location}}
{{/if}}
{{#if cells.Speaker}}
<br><b>Presenter:</b> {{cells.Speaker}}
{{/if}}
</p>
</span>
<span class="small-12 medium-8 columns">
<h4>{{cells.Title}}</h4>
<p class="description">{{cells.Description}}</p>
</span>
</div>
</div>
</script>
</div>
{% endraw %}
<div id="schedule-loading">
<h3 class="text-center">Loading events...</h3>
</div>
</div>
<div class="small-4 columns text-center no-padding">
<div class="display-three-background">
<div class="display-three-align">
<h1 class="title display-three-large-text">CS<span class="logo-number">4</span>HS</h1>
<h4 class="title display-three-small-text">Christchurch</h4>
<h4 class="title display-three-small-text">30 Nov - 4 Dec</h4>
</div>
</div>
</div>
<div class="small-2 columns text-center">
<h2>Sponsors</h2>
<ul id="sponsor-slideshow" class="text-center">
<li><img src="./img/google-logo-colour.png"></img></li>
<li><img src="./img/canterbury-logo.png"></img></li>
<li><img src="./img/catalyst-logo.png"></img></li>
<li><img src="./img/nzacditt-logo.png"></img></li>
<li><img src="./img/microsoft-logo.png"></img></li>
<li><img src="./img/telogis-logo.png"></img></li>
<li><img src="./img/orion-health-logo.png"></img></li>
<li><img src="./img/cerebral-fix-logo.png"></img></li>
<li><img src="./img/allied-telesis-logo.png"></img></li>
</ul>

<h2>Updates</h2>
<a class="twitter-timeline"
href="https://twitter.com/UCCSEd"
data-widget-id="525448302553083904"
data-chrome="noheader nofooter noscrollbar transparent"
height="1200">
</a>
</div>
<div class="small-2 columns text-center">
<h2>#CS4HSchch</h2>
<a class="twitter-timeline"
data-dnt="true"
href="https://twitter.com/hashtag/CS4HSchch"
data-widget-id="522159625521487872"
data-chrome="noheader nofooter noscrollbar transparent"
height="1200">
</a>
</div>
</div>
{% endblock body %}

{% block scripts %}
<!-- Load Handlebars.js -->
<script src="./js/sheetrock.min.js"></script>
<!-- Load Handlebars.js -->
<script src="./js/handlebars.min.js"></script>
<!-- Load Moment.js -->
<script src="./js/moment.min.js"></script>
<script type="text/javascript">
// Compile the Handlebars template.
var source = $('#schedule-template').html();
var CurrentTemplate = Handlebars.compile(source);

var defaultDate = new Date(500);
var SameDate = defaultDate;
var SameDateTime = defaultDate;
var Time = defaultDate;
var TimeLine = defaultDate;

function parseDate(date_string) {
date = date_string.slice(5,-1);
date = date.split(',');
date = new Date(date[0], date[1], date[2], date[3], date[4], date[5]);
return date;
}

Handlebars.registerHelper("prettifyDate", function(timestamp, formatString) {
timestamp = parseDate(timestamp);
return moment(timestamp).format(formatString);
});

Handlebars.registerHelper('ifSameDate', function(v1, options) {
v1 = parseDate(v1);
if(v1.getDate() !== SameDate.getDate()) {
SameDate = v1;
return options.fn(this);
}
});

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('ifDifferentTimeLine', function(v1, options) {
v1 = parseDate(v1);
if(v1 !== TimeLine) {
TimeLine = v1;
return options.fn(this);
} else {
return options.inverse(this);
}
});

var now = moment().format('YYYY-MM-DD HH:mm:ss');

// Load an entire sheet.
$('#current').sheetrock({
url: 'https://docs.google.com/spreadsheets/d/15y3r_9IPnL9d6fa61T7-RtTQqyJc_Y2gXIJ9oGc_Y_w/edit#gid=0',
query: 'select A,B,C,D,E,F where B >= datetime "' + now + '"',
rowTemplate: CurrentTemplate,
callback: removeLoading
});

function removeLoading() {
$("#schedule-loading").addClass('hide');
}
</script>
<!-- Twitter script -->
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
<!-- Slideshow script -->
<script type="text/javascript" src="./js/responsiveslides.min.js"></script>
<script>
$(function() {
$("#sponsor-slideshow").responsiveSlides({
auto: true, // Boolean: Animate automatically, true or false
speed: 500, // Integer: Speed of the transition, in milliseconds
timeout: 4000, // Integer: Time between slide transitions, in milliseconds
pager: false, // Boolean: Show pager, true or false
nav: false, // Boolean: Show navigation, true or false
random: false, // Boolean: Randomize the order of the slides, true or false
pause: false, // Boolean: Pause on hover, true or false
pauseControls: false // Boolean: Pause when hovering controls, true or false
});
});
</script>
{% endblock scripts %}
5 changes: 3 additions & 2 deletions display.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +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/telogis-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/catalyst-logo.png"></img></li>
Expand Down Expand Up @@ -152,12 +153,12 @@ <h2>#CS4HSchch</h2>
}
});

var now = moment().subtract(10, 'minutes').format('YYYY-MM-DD HH:mm:ss');
var now = moment().format('YYYY-MM-DD HH:mm:ss');

// Load an entire sheet.
$('#current').sheetrock({
url: 'https://docs.google.com/spreadsheets/d/15y3r_9IPnL9d6fa61T7-RtTQqyJc_Y2gXIJ9oGc_Y_w/edit#gid=0',
query: 'select A,B,C,D,E,F where A >= datetime "' + now + '"',
query: 'select A,B,C,D,E,F where B >= datetime "' + now + '"',
rowTemplate: CurrentTemplate,
callback: removeLoading
});
Expand Down
Binary file added files/complexity-tractability-julie-mcmahon.pdf
Binary file not shown.
22 changes: 22 additions & 0 deletions files/level-3-neil-chat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
"""
Python Chatbot based on javascript from:
https://computationalthinkingcourse.withgoogle.com/unit?lesson=17&unit=7
"""
def main():
print("Hello")
chat()
print("TTFN")

def chat():
question = input().lower()
while not("bye!" in question):
if 'who' in question:
print('My name is StupidBot.')
elif 'when' in question:
print('I was born in 2015.')
elif 'you are' in question:
ans = "Why do you say I am {}?".format(question.split('you are')[-1])
print(ans)
else:
print("I don't understand. Ask me another question.")
question = input().lower()
Binary file added files/level-3-neil-slides.pdf
Binary file not shown.
Binary file added files/software-engineering-julie-mcmahon.pdf
Binary file not shown.
Binary file added files/uca-house-rules.pdf
Binary file not shown.
Binary file added img/telogis-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@
<div class="small-12 medium-8 columns text-justify">
<h2>Welcome!</h2>

<div class="row panel radius" id="homepage-well">
<p>CS4HS 2015 is now over! If you were an attendee at the conference, please fill out the following forms:</p>

<div class="small-12 medium-6 columns">
<a class="expand button radius" href="https://docs.google.com/forms/d/11ep9k_D9bPHHPWHPjSdf6-5vQIeySNPN_DYCyOTrMEI/viewform">Post Conference survey</a>
</div>
<div class="small-12 medium-6 columns">
<a class="expand button radius" href="https://docs.google.com/forms/d/1l_Z6T1GrXkx9FiE0GULe-d1krfRaZEdT295YiipRnoI/viewform">Motivational Mail form</a>
</div>
</div>

<p>Welcome to the website for the Christchurch Computer Science for High Schools conference, at the University of Canterbury in December 2015. Our conference is focused on preparing for the computer science and programming achievement standards for NCEA. We have received funding through Google's <a href="http://www.cs4hs.com/">CS4HS Grant Program</a> for the event, and are planning to run the main conference over three days from the 2nd to 4th of December 2015, with optional programming workshops occurring on the 30th November and 1st December.</p>

<p>The conference aims to cover:</p>
Expand Down
4 changes: 2 additions & 2 deletions location.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h4 id="address-details">Address Details</h4>
function initialize() {
var mapOptions = {
center: { lat: -43.521531073306576, lng: 172.58072521537542},
zoom: 17
zoom: 16
};
var map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);

Expand Down Expand Up @@ -103,7 +103,7 @@ <h4 id="address-details">Address Details</h4>
var markerCarPark = new MarkerWithLabel({
position: new google.maps.LatLng(-43.52508286377655, 172.58607923984528),
map: map,
labelContent: "Free Parking",
labelContent: "Fine Arts Parking",
labelClass: "map-label map-label-minor",
labelAnchor: new google.maps.Point(40, 40),
});
Expand Down
12 changes: 7 additions & 5 deletions register.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<div class="small-12 columns">
<h2>Register</h2>

<p>
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 alert radius">
Registrations for the 2015 conference are now closed. Keep an eye on this website in early 2016 to reserve you place at our 2016 conference!
</div>

<div data-alert class="alert-box warning radius">
<!-- <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>
Expand All @@ -22,7 +22,9 @@ <h2>Register</h2>
<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>
</p> -->

<h3>2015 Conference Events</h3>

<div class="panel radius clearfix">
<h4 class="right">FREE</h4>
Expand Down
Loading

0 comments on commit ed110d3

Please sign in to comment.