Merge branch 'release/0.4.2'

uccser · May 23, 2018 · a68d8b7 · a68d8b7
2 parents 38c4b23 + 27beced
commit a68d8b7
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 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.
+
 ## 0.4.1 (Pre-release)
 
 - Display pīkau content with iQualify style navigation.

diff --git 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"
diff --git 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/...most-out-of-your-time/assessment-items.md → ...the-most-out-of-pikau/assessment-items.md b/...most-out-of-your-time/assessment-items.md → ...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
@@ -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/...g-the-most-out-of-your-time/metadata.yaml → ...tting-the-most-out-of-pikau/metadata.yaml b/...g-the-most-out-of-your-time/metadata.yaml → ...tting-the-most-out-of-pikau/metadata.yaml
@@ -1,4 +1,4 @@
-name: Getting the most out of your time
+name: "Intro 1: Getting the most out of pīkau"
 status: 6
 overview: overview.md
 language: en

diff --git a/...ing-the-most-out-of-your-time/overview.md → ...getting-the-most-out-of-pikau/overview.md b/...ing-the-most-out-of-your-time/overview.md → ...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/...ontent/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md b/...ontent/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md
diff --git 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;

diff --git a/templates/pikau/pikauunit_detail.html b/templates/pikau/pikauunit_detail.html
@@ -15,9 +15,11 @@
 
 {% block custom_page_heading %}
   <div class="jumbotron bg-size-cover text-white"{% if pikau_unit.pikau_course.cover_photo %} style="background-image:url({% static pikau_unit.pikau_course.cover_photo %});"{% endif %}>
-    {% if pikau_unit.module_name %}
-      <div>{{ pikau_unit.module_name }}</div>
-    {% endif %}
+    <div class="mb-3">
+      <span class="border-bottom pb-2">
+        {{ pikau_unit.pikau_course.name }}
+      </span>
+    </div>
     <h1>
       {{ pikau_unit.name }}
     </h1>