diff --git a/README.md b/README.md index 80906f6..e3d1da6 100644 --- a/README.md +++ b/README.md @@ -8,21 +8,23 @@ 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? @@ -30,8 +32,7 @@ Over the past few years the CS4HS website has been created with 'hard coded' pag ### Future plans -- Minify CSS on output. -- Use SCSS for managing CSS. +- Switch to an existing static site generator (Middleman, Jekyll, etc) ## Usage diff --git a/img/canterbury-logo.png b/img/canterbury-logo.png deleted file mode 100644 index 6e8a276..0000000 Binary files a/img/canterbury-logo.png and /dev/null differ diff --git a/img/telogis-logo.png b/img/telogis-logo.png new file mode 100644 index 0000000..2c83373 Binary files /dev/null and b/img/telogis-logo.png differ diff --git a/img/uc-computer-science-education-logo.png b/img/uc-computer-science-education-logo.png new file mode 100644 index 0000000..84f1241 Binary files /dev/null and b/img/uc-computer-science-education-logo.png differ diff --git a/templates/footer.html b/templates/footer.html index 35a2fd0..7f399a1 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -2,17 +2,20 @@

- A big thank you to our sponsors for helping us run this event! -

-

- - -

-

- - - + A big thank you to our sponsors for helping us run this event!

+
+ + +
+
+ + + +
+
+ +

For general and website enquiries: csse-teacher-events@canterbury.ac.nz

diff --git a/text/index.html b/text/index.html index c581730..ed75790 100644 --- a/text/index.html +++ b/text/index.html @@ -4,7 +4,9 @@

Welcome!

-

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 CS4HS Grant Program, 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.

+

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 CS4HS Grant Program, 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.

+ +

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.

The workshops aims to cover:

diff --git a/text/people.html b/text/people.html index 3e555b4..2de965f 100644 --- a/text/people.html +++ b/text/people.html @@ -8,9 +8,7 @@

People

The following people are involved in CS4HS at Christchurch. This list will be updated as speakers confirm sessions.

-
- Note: General event queries should be emailed to csse-teacher-events@canterbury.ac.nz. -
+

Note: General event queries should be emailed to csse-teacher-events@canterbury.ac.nz.

  • diff --git a/text/schedule.html b/text/schedule.html index 89d4ee2..540d494 100644 --- a/text/schedule.html +++ b/text/schedule.html @@ -54,7 +54,7 @@

    or

    {{cells.Title}}

    -

    {{cells.Description}}

    +

    {{{cells.Description}}}
@@ -100,16 +100,6 @@

Loading events...

} }); - // 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)) { diff --git a/text/workshops-computer-science.html b/text/workshops-computer-science.html index 4caa9c9..5c7c39f 100644 --- a/text/workshops-computer-science.html +++ b/text/workshops-computer-science.html @@ -11,16 +11,16 @@

Computer Science Workshops

Workshops available

Click a link to see the full details about the workshop:

Workshop details

- -

Computer Science Workshop - Level 1 & 2

+ +

Introduction to 1.44 & 2.44

AS91074 and AS91371
@@ -35,21 +35,48 @@

Workshop description

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.

This workshop is recommended for those who have never taught Computer Science before to those who want a refresher on levels 1 & 2.

+ +

Workshop leaders

+

Lead by Tim Bell and Cailtin Duncan

-
+
- -

Computer Science Workshop - Level 3

-
AS91636
+ +

Hands on practice with 1.44, 2.44, or 3.44

-
+

Workshop description

-

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.

+

+ Already know a bit about 1.44, 2.44, or 3.44 and want to jump in with some hands on practice? +

+

+ 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. +

+
+
+

Prerequisite knowledge

+

+

    +
  • + To focus on 1.44, you will need to be familiar with the 1.44 content. +
    • +
  • + To focus on 2.44, you will need to be familiar with the 2.44 content. +
    • +
  • + 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. +
    • +
+

+ + +

Workshop leader

+

Lead by Heidi Newton

diff --git a/text/workshops-programming.html b/text/workshops-programming.html index 374cf08..a8c98d3 100644 --- a/text/workshops-programming.html +++ b/text/workshops-programming.html @@ -9,6 +9,11 @@

Programming Workshops

These optional full day workshops focus on learning the programming content and occur on the Monday and Tuesday before the main workshops. These are optional paid workshops ($200 without accommodation or $265 with accommodation), see the register page for more details.

Workshops available

+ +
+ For those who wish to attend a programming workshop, you will attend one workshop for the entirely of Monday and Tuesday (not one workshop each day). +
+

Click a link to see the full details about the workshop: