Merge branch 'release/0.4.3'

uccser · May 23, 2018 · 6ba0f69 · 6ba0f69
2 parents a68d8b7 + 448546e
commit 6ba0f69
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git 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)
 

diff --git 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"
diff --git 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)
diff --git 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
@@ -60,7 +60,7 @@ <h1 class="text-white text-center">{{ pikau_course.name }}</h1>
           <div class="btn-spacer"></div>
         {% endif %}
         <a href="{% url 'pikau:pikau_unit' pikau_course.slug unit.slug %}" class="btn btn-light btn-block btn-pikau-unit">
-          <span class="mr-5 text-muted">&#8413;</span> {{ unit.name }}
+          <span class="ml-3 mr-5 text-muted">&#8413;</span> {{ unit.name }}
         </a>
       {% endfor %}
     </div>

diff --git a/templates/pikau/pikauunit_detail.html b/templates/pikau/pikauunit_detail.html
@@ -16,9 +16,9 @@
 {% 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 %}>
     <div class="mb-3">
-      <span class="border-bottom pb-2">
+      <a class="border-bottom pb-2 text-white no-underline" href="{% url 'pikau:pikau_content' pikau_unit.pikau_course.slug  %}">
         {{ pikau_unit.pikau_course.name }}
-      </span>
+      </a>
     </div>
     <h1>
       {{ pikau_unit.name }}