diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e92862..d2284ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.4.1 (Pre-release) + +- Display pīkau content with iQualify style navigation. +- Add "Getting the most out of your time" pikau. + ## 0.4.0 (Pre-release) - Add files application for tracking files and their licences. (fixes #34) diff --git a/config/__init__.py b/config/__init__.py index 31e00d6..3ba5830 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -1,3 +1,3 @@ """Module for Django system configuration.""" -__version__ = "0.4.0" +__version__ = "0.4.1" diff --git a/pikau/content/levels.yaml b/pikau/content/levels.yaml index b0c4b1b..0ec540a 100644 --- a/pikau/content/levels.yaml +++ b/pikau/content/levels.yaml @@ -2,3 +2,4 @@ ece: Early Childhood Education primary: Primary School secondary: Secondary School leaders: Curriculum Leaders +all: All diff --git a/pikau/content/pikau-courses.yaml b/pikau/content/pikau-courses.yaml index e7d7562..efef247 100644 --- a/pikau/content/pikau-courses.yaml +++ b/pikau/content/pikau-courses.yaml @@ -1,2 +1,3 @@ courses: - example-pikau-course + - getting-the-most-out-of-your-time 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-your-time/assessment-items.md new file mode 100644 index 0000000..a355538 --- /dev/null +++ b/pikau/content/pikau-courses/getting-the-most-out-of-your-time/assessment-items.md @@ -0,0 +1,17 @@ +# Assessment 1: Open Response + +### Title + +How do you learn? + +### Instructions + +You know how you learn best. Are you like Māui, just want a brief overview and then time to play? You may like to go through this pikau in a different order to how we deliver it. But we do recommend looking at everything as we have made it all as succinct as possible. + +Or are you more like Mahuika, you need to know exactly what is expected of you and how to achieve it. You will probably get the most out of this pīkau by working systematically through it in order. + +**How do you learn best? Are you more like Mahuika or Māui?** + +### Response to user feedback + +Call to action to join ngā kiriahi and participate in the discussion. 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 new file mode 100644 index 0000000..e49892f --- /dev/null +++ b/pikau/content/pikau-courses/getting-the-most-out-of-your-time/introduction-to-pikau.md @@ -0,0 +1,25 @@ +# 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. 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-your-time/metadata.yaml new file mode 100644 index 0000000..b9538e6 --- /dev/null +++ b/pikau/content/pikau-courses/getting-the-most-out-of-your-time/metadata.yaml @@ -0,0 +1,13 @@ +name: Getting the most out of your time +status: 6 +overview: overview.md +language: en +topic: housekeeping +level: all +tags: + - introductory +cover-photo: images/pikau/banner-mahuika-maui.png +content: + - slug: introduction-to-pikau + file: introduction-to-pikau.md +assessment-items: assessment-items.md 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-your-time/overview.md new file mode 100644 index 0000000..77ed0ca --- /dev/null +++ b/pikau/content/pikau-courses/getting-the-most-out-of-your-time/overview.md @@ -0,0 +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. + +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: + +- How to get the most from the time you spend on 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/tags.yaml b/pikau/content/tags.yaml index 1385d6c..c6a2017 100644 --- a/pikau/content/tags.yaml +++ b/pikau/content/tags.yaml @@ -29,3 +29,7 @@ srt-element-7: srt-element-8: name: "Te Whanaunatanga" description: "Resources: PLD, community, relationships, support." + +# Other +introductory: + name: Introductory diff --git a/pikau/content/topics.yaml b/pikau/content/topics.yaml index 53ba714..df5a126 100644 --- a/pikau/content/topics.yaml +++ b/pikau/content/topics.yaml @@ -1,3 +1,4 @@ dddo: Designing and Developing Digital Outcomes ct: Computational Thinking dl: Digital Leaders +housekeeping: Housekeeping diff --git a/pikau/management/commands/_PikauCourseLoader.py b/pikau/management/commands/_PikauCourseLoader.py index 8ee48b0..5e3e31c 100644 --- a/pikau/management/commands/_PikauCourseLoader.py +++ b/pikau/management/commands/_PikauCourseLoader.py @@ -28,30 +28,38 @@ def load(self): for pikau_course_slug in pikau_courses.get("courses", list()): self.base_path = os.path.join(self.original_base_path, "pikau-courses", pikau_course_slug) pikau_course_metadata = self.load_yaml_file("metadata.yaml") - pikau_course_overview = self.convert_md_file( - pikau_course_metadata["overview"], - CONFIG_FILE, - heading_required=False, - remove_title=False, - ).html_string - pikau_course_study_plan = self.convert_md_file( - pikau_course_metadata["study-plan"], - CONFIG_FILE, - heading_required=False, - remove_title=False, - ).html_string - pikau_course_assessment_description = self.convert_md_file( - pikau_course_metadata["assessment-description"], - CONFIG_FILE, - heading_required=False, - remove_title=False, - ).html_string - pikau_course_assessment_items = self.convert_md_file( - pikau_course_metadata["assessment-items"], - CONFIG_FILE, - heading_required=False, - remove_title=False, - ).html_string + pikau_course_overview = pikau_course_metadata.get("overview", "") + if pikau_course_overview: + pikau_course_overview = self.convert_md_file( + pikau_course_metadata["overview"], + CONFIG_FILE, + heading_required=False, + remove_title=False, + ).html_string + pikau_course_study_plan = pikau_course_metadata.get("study-plan", "") + if pikau_course_study_plan: + pikau_course_study_plan = self.convert_md_file( + pikau_course_metadata["study-plan"], + CONFIG_FILE, + heading_required=False, + remove_title=False, + ).html_string + pikau_course_assessment_description = pikau_course_metadata.get("assessment-description", "") + if pikau_course_assessment_description: + pikau_course_assessment_description = self.convert_md_file( + pikau_course_metadata["assessment-description"], + CONFIG_FILE, + heading_required=False, + remove_title=False, + ).html_string + pikau_course_assessment_items = pikau_course_metadata.get("assessment-items", "") + if pikau_course_assessment_items: + pikau_course_assessment_items = self.convert_md_file( + pikau_course_metadata["assessment-items"], + CONFIG_FILE, + heading_required=False, + remove_title=False, + ).html_string defaults = { "name": pikau_course_metadata["name"], @@ -59,7 +67,7 @@ def load(self): "language": pikau_course_metadata["language"], "topic": Topic.objects.get(slug=pikau_course_metadata["topic"]), "level": Level.objects.get(slug=pikau_course_metadata["level"]), - "trailer_video": pikau_course_metadata["trailer-video"], + "trailer_video": pikau_course_metadata.get("trailer-video", ""), "cover_photo": pikau_course_metadata.get("cover-photo", "images/pikau-course-cover.png"), "overview": pikau_course_overview, "readiness_level": pikau_course_metadata.get("readiness-level"), diff --git a/static/css/iqualify.css b/static/css/iqualify.css index 2c80532..cf3a221 100644 --- a/static/css/iqualify.css +++ b/static/css/iqualify.css @@ -138,3 +138,42 @@ div.btn-spacer { .gd-box-purple { background-color: #ff00ff; } +/* Tab navigation */ +#iqualify-tabs .tab-icon { + width: 25px; +} +#iqualify-tabs { + background-color: #a0a5b5; +} +#iqualify-tabs a { + color: black; +} +#iqualify-tabs .nav-link { + border: 0; + border-radius: 0; + border-top: 4px solid #a0a5b5; +} +#iqualify-tabs .nav-item:hover { + background-color: rgba(74, 74, 85, 0.3); +} +#iqualify-tabs .nav-link.active { + background-color: #f9f9f9; + border-color: #6b717f; +} +/* Content image styles */ +.img-wrap-center { + display: block; + text-align: center; +} +figure { + background: radial-gradient(#d2d2d2, #efefef); + border: 1px solid #bdc2d0; +} +figure figcaption { + text-align: left; + font-size: 16px !important; + padding: 20px 15px 50px 15px; + background-color: white; + border-top: 1px dotted #bdc2d0; + border-bottom: 4px solid #bdc2d0; +} diff --git a/static/images/icons/icons8/compass.png b/static/images/icons/icons8/compass.png new file mode 100644 index 0000000..bd7185f Binary files /dev/null and b/static/images/icons/icons8/compass.png differ diff --git a/static/images/icons/icons8/flag.png b/static/images/icons/icons8/flag.png new file mode 100644 index 0000000..5799fbb Binary files /dev/null and b/static/images/icons/icons8/flag.png differ diff --git a/static/images/icons/icons8/shield.png b/static/images/icons/icons8/shield.png new file mode 100644 index 0000000..a33b08f Binary files /dev/null and b/static/images/icons/icons8/shield.png differ diff --git a/static/images/pikau/banner-mahuika-maui.png b/static/images/pikau/banner-mahuika-maui.png new file mode 100644 index 0000000..e00a651 Binary files /dev/null and b/static/images/pikau/banner-mahuika-maui.png differ diff --git a/static/images/pikau/mahuika-face.png b/static/images/pikau/mahuika-face.png new file mode 100644 index 0000000..f59f21a Binary files /dev/null and b/static/images/pikau/mahuika-face.png differ diff --git a/static/images/pikau/maui-face.png b/static/images/pikau/maui-face.png new file mode 100644 index 0000000..331e3ec Binary files /dev/null and b/static/images/pikau/maui-face.png differ diff --git a/templates/pikau/pikaucourse_content.html b/templates/pikau/pikaucourse_content.html index a352a38..3b6344e 100644 --- a/templates/pikau/pikaucourse_content.html +++ b/templates/pikau/pikaucourse_content.html @@ -23,25 +23,53 @@

{{ pikau_course.name }}

Note: These pages aim to display how content will be viewed on iQualify, however this consistency is not guaranteed. Different icons are used for licensing reasons. -

Overview

- {% render_html_field pikau_course.overview %} + +
+
+ {% render_html_field pikau_course.overview %} +
+
+ {% for unit in pikau_course.content.all %} + {% if unit.module_name %} + {% ifchanged unit.module_name %} +
+
+ {{ unit.module_name }} +
+ {% endifchanged %} + {% elif not forloop.first %} +
+ {% endif %} + + ⃝ {{ unit.name }} + + {% endfor %} +
+
+ {% render_html_field pikau_course.assessment_description %} -

Contents

- {% for unit in pikau_course.content.all %} - {% if unit.module_name %} - {% ifchanged unit.module_name %} -
-
- {{ unit.module_name }} -
- {% endifchanged %} - {% elif not forloop.first %} -
- {% endif %} - - ⃝ {{ unit.name }} - - {% endfor %} + {% render_html_field pikau_course.assessment_items %} +
+
{% endblock content %} {% block css %} diff --git a/templates/pikau/pikaucourse_detail.html b/templates/pikau/pikaucourse_detail.html index bd75cc0..b65494f 100644 --- a/templates/pikau/pikaucourse_detail.html +++ b/templates/pikau/pikaucourse_detail.html @@ -21,17 +21,16 @@ {% endwith %} {% endif %}

{{ pikau_course.name }}

- {% if pikau_course.status < 6 and pikau_course.development_folder %} + {% if pikau_course.content %} + + View content + + {% elif pikau_course.status < 6 and pikau_course.development_folder %} View on Google Drive {% endif %} - {% if pikau_course.status >= 6 %} - - View content - - {% endif %} {% endblock custom_page_heading %} @@ -194,14 +193,4 @@

Resources

Study Plan

{% render_html_field pikau_course.study_plan %} {% endif %} - - {% if pikau_course.assessment_description %} -

Assessment Description

- {% render_html_field pikau_course.assessment_description %} - {% endif %} - - {% if pikau_course.assessment_items %} -

Assessment Items

- {% render_html_field pikau_course.assessment_items %} - {% endif %} {% endblock content %} diff --git a/utils/custom_converter_templates/image.html b/utils/custom_converter_templates/image.html index 929efce..ba5b900 100644 --- a/utils/custom_converter_templates/image.html +++ b/utils/custom_converter_templates/image.html @@ -7,11 +7,11 @@ {% else %} src="{{ full_file_path }}" {% endif %} -class="figure-img" +class="figure-img img-fluid" {% if alt %} alt="{{ alt }}"{% endif %} {% if hover_text %} title="{{ hover_text }}"{% endif %}> {% if caption %} -
+
{% if caption_link %} {% endif %} @@ -22,7 +22,7 @@
{% endif %} {% if source_link %} -
+
Source
{% endif %}