From 4b9cd1f8b734e3e174e44219dc612c586268ad2c Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:41:18 +1200 Subject: [PATCH 1/4] Update pikau course content rendering --- static/css/website.css | 4 ++++ templates/pikau/pikaucourse_content.html | 2 +- templates/pikau/pikauunit_detail.html | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/static/css/website.css b/static/css/website.css index 3adb782..31d749a 100644 --- a/static/css/website.css +++ b/static/css/website.css @@ -132,3 +132,7 @@ footer > .container { .form-inline label { margin-right: 0.5rem; } +.no-underline, +.no-underline:hover { + text-decoration: none !important; +} diff --git a/templates/pikau/pikaucourse_content.html b/templates/pikau/pikaucourse_content.html index 3b6344e..db747b2 100644 --- a/templates/pikau/pikaucourse_content.html +++ b/templates/pikau/pikaucourse_content.html @@ -60,7 +60,7 @@

{{ pikau_course.name }}

{% endif %} - {{ unit.name }} + {{ unit.name }} {% endfor %} diff --git a/templates/pikau/pikauunit_detail.html b/templates/pikau/pikauunit_detail.html index f5ae13c..ffd4bbd 100644 --- a/templates/pikau/pikauunit_detail.html +++ b/templates/pikau/pikauunit_detail.html @@ -16,9 +16,9 @@ {% block custom_page_heading %}

{{ pikau_unit.name }} From 26ccf7ab453be1e4ca1516dc09ef5b4a708ca510 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:42:19 +1200 Subject: [PATCH 2/4] Ensure all pikau models can be modified via admin interface --- pikau/admin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pikau/admin.py b/pikau/admin.py index 72a7ed3..65e1b4a 100644 --- a/pikau/admin.py +++ b/pikau/admin.py @@ -2,9 +2,12 @@ from django.contrib import admin from pikau.models import ( + GlossaryTerm, + Goal, Level, Milestone, PikauCourse, + PikauUnit, ProgressOutcome, Tag, Topic, @@ -18,9 +21,12 @@ class PikauCourseAdmin(admin.ModelAdmin): filter_horizontal = ("tags", "progress_outcomes", "prerequisites") -admin.site.register(PikauCourse, PikauCourseAdmin) +admin.site.register(GlossaryTerm) +admin.site.register(Goal) admin.site.register(Level) admin.site.register(Milestone) admin.site.register(ProgressOutcome) +admin.site.register(PikauCourse, PikauCourseAdmin) +admin.site.register(PikauUnit) admin.site.register(Tag) admin.site.register(Topic) From a9700b5243861d400619534c2ba498d755a05e77 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:44:19 +1200 Subject: [PATCH 3/4] Increment version number to 0.4.3 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 8961578..e3c386f 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -1,3 +1,3 @@ """Module for Django system configuration.""" -__version__ = "0.4.2" +__version__ = "0.4.3" From 448546ed96ef04f3a62d0a7ffd80c5d5880ca405 Mon Sep 17 00:00:00 2001 From: Jack Morgan Date: Thu, 24 May 2018 10:45:37 +1200 Subject: [PATCH 4/4] Update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9decd..ee64e09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.4.3 (Pre-release) + +- Update pīkau course content rendering to match iQualify. +- Ensure all pīkau models can be modified via admin interface. + + ## 0.4.2 (Pre-release) - Display pīkau cover photos with center positioning. @@ -11,7 +17,7 @@ ## 0.4.1 (Pre-release) - Display pīkau content with iQualify style navigation. -- Add "Getting the most out of your time" pikau. +- Add "Getting the most out of your time" pīkau. ## 0.4.0 (Pre-release)