From db0001d2da3e4aa9fc2cb15b79a646d289cff188 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 09:54:35 +1200 Subject: [PATCH 1/8] Set jumbrotron images to be positioned in center --- static/css/website.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/website.css b/static/css/website.css index a6e06fd..3adb782 100644 --- a/static/css/website.css +++ b/static/css/website.css @@ -39,6 +39,7 @@ footer > .container { } .bg-size-cover { background-size: cover; + background-position: center; } .list-style-flame { list-style: none; From 74cba3567d2a78d2eb2242c54c47992880514fbe Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 09:58:20 +1200 Subject: [PATCH 2/8] Update pikau --- pikau/content/pikau-courses.yaml | 2 +- .../assessment-items.md | 0 .../introduction-to-pikau.md | 36 +++++++++++++++++++ .../metadata.yaml | 2 +- .../overview.md | 6 ++-- .../introduction-to-pikau.md | 25 ------------- 6 files changed, 41 insertions(+), 30 deletions(-) rename pikau/content/pikau-courses/{getting-the-most-out-of-your-time => getting-the-most-out-of-pikau}/assessment-items.md (100%) create mode 100644 pikau/content/pikau-courses/getting-the-most-out-of-pikau/introduction-to-pikau.md rename pikau/content/pikau-courses/{getting-the-most-out-of-your-time => getting-the-most-out-of-pikau}/metadata.yaml (86%) rename pikau/content/pikau-courses/{getting-the-most-out-of-your-time => getting-the-most-out-of-pikau}/overview.md (69%) delete mode 100644 pikau/content/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md diff --git a/pikau/content/pikau-courses.yaml b/pikau/content/pikau-courses.yaml index efef247..c8949d9 100644 --- a/pikau/content/pikau-courses.yaml +++ b/pikau/content/pikau-courses.yaml @@ -1,3 +1,3 @@ courses: - example-pikau-course - - getting-the-most-out-of-your-time + - getting-the-most-out-of-pikau diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/assessment-items.md b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/assessment-items.md similarity index 100% rename from pikau/content/pikau-courses/getting-the-most-out-of-your-time/assessment-items.md rename to pikau/content/pikau-courses/getting-the-most-out-of-pikau/assessment-items.md diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-pikau/introduction-to-pikau.md b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/introduction-to-pikau.md new file mode 100644 index 0000000..f91eb82 --- /dev/null +++ b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/introduction-to-pikau.md @@ -0,0 +1,36 @@ +# Introduction to pīkau + +At the beginning of each pīkau there will be an introduction section. +It will include a video with information about what is in the pīkau you are about to enter so you can decide if it is the right one for you. +Regardless of if you are working on a pīkau because you are at Hika - ignition, or Whitawhita - blazing, in your digital readiness, we’ll have practical activities that you can implement into your learning space. +You will also know how much time you should put aside to complete the pīkau. + +Pīkau means ‘backpack’. +By the end of this readiness program (kiatakatū-ā-matihiko) you’ll have a pīkau/backpack of resources to use for the new content in the Digital Technologies learning area. + +{image file-path="images/pikau/maui-face.png" alignment="center" caption="true"} + +Māui + +{image end} + +We’d like to acknowledge that we all have different learning styles. +You might be like Māui: curious, a bit of a risk taker, adaptable, playful… You can move around within each pīkau however you like. +Watch all the videos, then do the readings. +You might even want to start with the assessment activities, although we wouldn’t recommend that! + +{image file-path="images/pikau/mahuika-face.png" alignment="center" caption="true"} + +Mahuika + +{image end} + +You might be like Mahuika: a protector, patient, insightful. +You might want to work methodically through the pīkau, considering indepth what is being asked of your students. + +Or you might be a mixture of both. +Whatever works for you, do that! +We also encourage you to grow and find a balance between the attributes of these two **tipuna**. + +We know some of our teachers may be a bit nervous about this new Digital Technologies content, while others could be wondering why it took so long to come in. +Either way, we know you are busy, so we want to maximise your learning through fun, hands-on experiences. diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/metadata.yaml b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml similarity index 86% rename from pikau/content/pikau-courses/getting-the-most-out-of-your-time/metadata.yaml rename to pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml index b9538e6..ff3540f 100644 --- a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/metadata.yaml +++ b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml @@ -1,4 +1,4 @@ -name: Getting the most out of your time +name: Getting the most out of pīkau status: 6 overview: overview.md language: en diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/overview.md b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/overview.md similarity index 69% rename from pikau/content/pikau-courses/getting-the-most-out-of-your-time/overview.md rename to pikau/content/pikau-courses/getting-the-most-out-of-pikau/overview.md index 77ed0ca..ac6b5e9 100644 --- a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/overview.md +++ b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/overview.md @@ -1,11 +1,11 @@ -This pīkau guides you through how to get the most from the time you are investing into Kiatakatū-ā-matikhiko / Digital Readiness for the new content in the Digital Technologies (DT) Technology learning area. +This pīkau guides you through how to get the most from the time you are investing into the Kiatakatū-ā-matikhiko / Digital Readiness program to prepare you for teaching the new Digital Technologies content. Kiatakatū has been written by a diverse group of people, ranging from international award for services to computer science education winner Tim Bell, to at-the-whiteboard classroom teachers. The material has been trialed and refined to what we know works for learners. Our aim is to support you to feel confident to effectively implement the new Digital Technologies content, and to have fun while doing so. -By the end of this pīkau you should know how to identify: +By the end of this pīkau you should be able to: -- How to get the most from the time you spend on each pīkau. +- Identify how to efficiently get the most from each pīkau. **This particular pīkau can be completed be either watching the introduction video above, or reading the text contents.** diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md b/pikau/content/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md deleted file mode 100644 index e49892f..0000000 --- a/pikau/content/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md +++ /dev/null @@ -1,25 +0,0 @@ -# Introduction to pīkau - -At the beginning of each pīkau there will be an introduction section. It will include a video like this with information about what is in the pīkau you are about to enter so you can decide if it is the right one for you. Regardless of if you are working on a pīkau because you are at Hika - ignition, or Whitawhita - blaze, in your digital readiness, we’ll have practical activities that you can implement into your learning space. You will also know how much time you should put aside to complete the pīkau. - -Pīkau means ‘backpack’. By the end of this readiness program (kiatakatū-ā-matihiko) you’ll have a pīkau/backpack of resources to use for the new content in the Digital Technologies learning area. - -{image file-path="images/pikau/maui-face.png" alignment="center" caption="true"} - -Māui - -{image end} - -We’d like to acknowledge that we all have different learning styles. You might be like Māui: curious, a bit of a risk taker, adaptable, playful… You can move around within each pīkau however you like. Watch all the videos, then do the readings. You might even want to start with the assessment activities, although we wouldn’t recommend that! - -{image file-path="images/pikau/mahuika-face.png" alignment="center" caption="true"} - -Mahuika - -{image end} - -You might be like Mahuika: a protector, patient, insightful. You might want to work methodically through the pīkau, considering indepth what is being asked of your students. - -Or you might be a mixture of both. Whatever works for you, do that! We also encourage you to grow and find a balance between the attributes of these two **tipuna**. - -We know some of our teachers may be a bit nervous about this new Digital Technologies content, while others could be wondering why it took so long to come in. Either way, we know you are busy, so we want to maximise your learning through fun, hands-on experiences. From 682bd298719c5d7866d77a7cd93ee96eb2f43952 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 09:59:28 +1200 Subject: [PATCH 3/8] Update pikau name --- .../pikau-courses/getting-the-most-out-of-pikau/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml index ff3540f..c0d6040 100644 --- a/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml +++ b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml @@ -1,4 +1,4 @@ -name: Getting the most out of pīkau +name: Intro 1: Getting the most out of pīkau status: 6 overview: overview.md language: en From d069de57b80c63714f4f8b4307bb01f2d20824f5 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:00:41 +1200 Subject: [PATCH 4/8] Increment version number to 0.4.2 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 3ba5830..8961578 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -1,3 +1,3 @@ """Module for Django system configuration.""" -__version__ = "0.4.1" +__version__ = "0.4.2" From 4fd2496235f857e8b0b216f158e1d2bcd785be32 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:02:00 +1200 Subject: [PATCH 5/8] Update CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2284ad..8ec6bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.4.2 (Pre-release) + +- Display pīkau cover photos with center positioning. +- Update "Getting the most out of your time" pīkau: + - Name changed to "Getting the most out of pīkau". + - Minor grammar changes. + ## 0.4.1 (Pre-release) - Display pīkau content with iQualify style navigation. From e3db7ec11fc066a6f932749145203e58da1c4c39 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:09:55 +1200 Subject: [PATCH 6/8] Fix invalid YAML file value --- .../pikau-courses/getting-the-most-out-of-pikau/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml index c0d6040..da6e558 100644 --- a/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml +++ b/pikau/content/pikau-courses/getting-the-most-out-of-pikau/metadata.yaml @@ -1,4 +1,4 @@ -name: Intro 1: Getting the most out of pīkau +name: "Intro 1: Getting the most out of pīkau" status: 6 overview: overview.md language: en From 0c8d09ba4a787d7c9ca115c51713ae46ae0811c0 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:17:07 +1200 Subject: [PATCH 7/8] Alter pikau unit header to display course instead of module This matches iQualify website --- templates/pikau/pikauunit_detail.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/pikau/pikauunit_detail.html b/templates/pikau/pikauunit_detail.html index 1905fcb..f5ae13c 100644 --- a/templates/pikau/pikauunit_detail.html +++ b/templates/pikau/pikauunit_detail.html @@ -15,9 +15,11 @@ {% block custom_page_heading %}
- {% if pikau_unit.module_name %} -
{{ pikau_unit.module_name }}
- {% endif %} +
+ + {{ pikau_unit.pikau_course.name }} + +

{{ pikau_unit.name }}

From 27beced51200ee0a73e212fec62f539325ebae41 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:18:13 +1200 Subject: [PATCH 8/8] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ec6bdc..2e9decd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.4.2 (Pre-release) - Display pīkau cover photos with center positioning. +- Alter pīkau content unit header to display course name instead of module name. - Update "Getting the most out of your time" pīkau: - Name changed to "Getting the most out of pīkau". - Minor grammar changes.