From 731c99c23c1d8dc3fae0753509f5b7720d5936bc Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Tue, 6 Sep 2016 13:09:46 +1200 Subject: [PATCH 1/8] Update README to reflect new repository structure (fixes #8) --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 From 7269dd53863ff064df7a2f7702db68f075115476 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Tue, 6 Sep 2016 13:11:38 +1200 Subject: [PATCH 2/8] Add note about selecting one programming workshop --- text/workshops-programming.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/text/workshops-programming.html b/text/workshops-programming.html index 374cf08..21b28e4 100644 --- a/text/workshops-programming.html +++ b/text/workshops-programming.html @@ -8,6 +8,8 @@

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.

+

For those who wish to attend a programming workshop, you will attend one workshop for the entirely of Monday and Tuesday.

+

Workshops available

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