several adjustments based on Malin's feedback

views/course.pug

@@ -21,20 +21,17 @@ block content
         +lesson(lesson, course, nextLesson)
       else
         .course
-          .course__content
-            h1.course__title= course.fields.title
-            .course__overview
-              h3.course__overview-title Overview
-              if course.fields.duration
-                .course__overview-item
-                  img.course__overview-icon(src='/images/icon-duration.svg')
-                  .course__overview-value Duration: #{course.fields.duration} min
-              if course.fields.skillLevel
-                .course__overview-item
-                  img.course__overview-icon(src='/images/icon-skill-level.svg')
-                  .course__overview-value Skill level: #{course.fields.skillLevel}
-              .course__overview-cta-wrapper
-                a.course__overview-cta.cta(href=`/courses/${course.fields.slug}/lessons/${course.fields.lessons[0].fields.slug}${queryString}`) Start course
-            .course__description !{helpers.markdown(course.fields.description)}
-          .course__footer
-            a.course__cta.cta(href=`/courses/${course.fields.slug}/lessons/${course.fields.lessons[0].fields.slug}${queryString}`) Start course
+          h1.course__title= course.fields.title
+          .course__overview
+            h3.course__overview-title Overview
+            if course.fields.duration
+              .course__overview-item
+                img.course__overview-icon(src='/images/icon-duration.svg')
+                .course__overview-value Duration: #{course.fields.duration} min
+            if course.fields.skillLevel
+              .course__overview-item
+                img.course__overview-icon(src='/images/icon-skill-level.svg')
+                .course__overview-value Skill level: #{course.fields.skillLevel}
+            .course__overview-cta-wrapper
+              a.course__overview-cta.cta(href=`/courses/${course.fields.slug}/lessons/${course.fields.lessons[0].fields.slug}${queryString}`) Start course
+          .course__description !{helpers.markdown(course.fields.description)}

views/courses.pug

@@ -11,10 +11,10 @@ block content
         .sidebar-menu
           ul.sidebar-menu__list
             li.sidebar-menu__item
-              a.sidebar-menu__link.active(href=`/courses${queryString}`) All courses
+              a.sidebar-menu__link(href=`/courses${queryString}` class=(currentPath.endsWith('/courses') ? 'active' : '')) All courses
             each category in categories
               li.sidebar-menu__item
-                a.sidebar-menu__link(href=`/courses/categories/${category.fields.slug}${queryString}`) #{category.fields.title}
+                a.sidebar-menu__link(href=`/courses/categories/${category.fields.slug}${queryString}` class=(currentPath.endsWith(category.fields.slug) ? 'active' : '')) #{category.fields.title}
     section.layout-sidebar__content
       .courses
         h1= title

views/layout.pug

@@ -24,10 +24,10 @@ html
                 .header__controls
                   form(action="" method="get")
                     .group
-                      label(for='api') API type:
+                      label(for='api') API:
                       select(name='api' onChange='this.form.submit()')
-                        option(value='cda' selected=query.api === 'cda') Delivery API
-                        option(value='cpa' selected=query.api === 'cpa') Preview API
+                        option(value='cda' selected=query.api === 'cda') Content Delivery API
+                        option(value='cpa' selected=query.api === 'cpa') Content Preview API
                     .group
                       label(for='locale') Locale:
                       select(name='locale' onChange='this.form.submit()')

views/mixins/_lesson.pug

@@ -4,26 +4,24 @@ include _lessonModuleImage
 
 mixin lesson(lesson, course, nextLesson)
   .lesson
-    .lesson_content
-      h1.lesson__title #{lesson.fields.title}
-      div.lesson__short-description !{helpers.markdown(lesson.fields.description)}
-      if lesson.fields.image
-        img.lesson__image(src=`${lesson.fields.image.fields.file.url}` alt=`${lesson.fields.image.fields.title}`)
-      each module in lesson.fields.modules
-        if module.sys.contentType
-          case module.sys.contentType.sys.id
-            when 'lessonModuleCodeSnippets'
-              +lessonModuleCodeSnippet(module)
-            when 'lessonModuleCopy'
-              +lessonModuleCopy(module)
-            when 'lessonModuleImage'
-              +lessonModuleImage(module)
-        else
-          h2 ️️⚠️ Invalid lesson module
-          p
-            span Could not determine type of
-            strong  #{module.sys.id}
-    .lesson_footer
-      if nextLesson
-        a.lesson__cta.cta(href=`/courses/${course.fields.slug}/lessons/${nextLesson.fields.slug}${queryString}`) View next lesson
+    h1.lesson__title #{lesson.fields.title}
+    div.lesson__short-description !{helpers.markdown(lesson.fields.description)}
+    if lesson.fields.image
+      img.lesson__image(src=`${lesson.fields.image.fields.file.url}` alt=`${lesson.fields.image.fields.title}`)
+    each module in lesson.fields.modules
+      if module.sys.contentType
+        case module.sys.contentType.sys.id
+          when 'lessonModuleCodeSnippets'
+            +lessonModuleCodeSnippet(module)
+          when 'lessonModuleCopy'
+            +lessonModuleCopy(module)
+          when 'lessonModuleImage'
+            +lessonModuleImage(module)
+      else
+        h2 ️️⚠️ Invalid lesson module
+        p
+          span Could not determine type of
+          strong  #{module.sys.id}
+    if nextLesson
+      a.lesson__cta.cta(href=`/courses/${course.fields.slug}/lessons/${nextLesson.fields.slug}${queryString}`) View next lesson
 

views/mixins/_moduleHighlightedCourse.pug

@@ -12,7 +12,8 @@ mixin moduleHighlightedCourse(module, course)
           .module-higlighted-course__categories
             each category in course.fields.categories
               a.module-higlighted-course__category(href=`/courses/categories/${category.fields.slug}${queryString}`) #{category.fields.title}
-        h2.module-higlighted-course__title= course.fields.title
+        h2.module-higlighted-course__title
+          a(href=`/courses/${course.fields.slug}${queryString}`)= course.fields.title
         .module-higlighted-course__description-wrapper
           p !{helpers.markdown(course.fields.shortDescription)}
         .module-higlighted-course__link-wrapper

views/settings.pug

@@ -28,23 +28,23 @@ block content
         .form-item__help-text The Space ID is a unique identifier for your space.
 
       .form-item
-        label(for="cda") Delivery API key
+        label(for="cda") Content Delivery API - access token
         input(type="text" name="cda" value=settings.cda)
         if 'cda' in errors
           each message in errors.cda
             .form-item__error-message= message
         .form-item__help-text
-          | This key is used to connect to our 
-          a(href='https://www.contentful.com/developers/docs/references/content-delivery-api/' target='_blank' rel='noopener') Delivery API.
+          | View published content using this API. 
+          a(href='https://www.contentful.com/developers/docs/references/content-delivery-api/' target='_blank' rel='noopener') Content Delivery API.
       .form-item
-        label(for="cpa") Preview API key
+        label(for="cpa") Content Preview API - access token
         input(type="text" name="cpa" value=settings.cpa)
         if 'cpa' in errors
           each message in errors.cpa
             .form-item__error-message= message
         .form-item__help-text
-          | This key is used to connect to our 
-          a(href='https://www.contentful.com/developers/docs/references/content-preview-api/' target='_blank' rel='noopener') Preview API.
+          | Preview unpublished content using this API (i.e. content with “Draft” status). 
+          a(href='https://www.contentful.com/developers/docs/references/content-preview-api/' target='_blank' rel='noopener') Content Preview API.
 
       .form-item
         input.cta(type="submit" value="Load settings")