Merge branch 'master' into add-fixed-button

Author: zihanKuang

assets/scss/_styles_project.scss

@@ -221,7 +221,7 @@ a:not([href]):not([class]):hover {
   a {
     &:hover {
       color: dark;
-      text-decoration: none;
+      text-decoration: underline;
     }
 
     &.active:not(.tree-root) {

layouts/partials/common-curricula-properties.html

@@ -7,7 +7,7 @@
 
 
 
-"title": {{ partial "title.html" $page | jsonify }},
+"title": {{ $page.Title | jsonify }},
 "slug": {{ or $page.Slug $page.File.ContentBaseName | jsonify }},
 "id": {{ $id | jsonify }},
 "level": {{ $page.Params.level | jsonify }},

layouts/partials/learning-path.json.html

@@ -6,6 +6,10 @@
 {{- $banner_url := partial "banner-url.html" (dict "uuid" $uuid "banner" .Params.Banner) -}}
 {{- $id := partial "id.html" . -}}
 
+
+{{- $urlParts := split (trim .RelPermalink "/") "/" -}}
+{{- $slug := index $urlParts (sub (len $urlParts) 1) -}}
+
 {{/* 
   This file is used to generate the JSON representation of a learning path.
   It includes metadata such as title, description, banner, and courses.
@@ -14,7 +18,7 @@
 {
   "id": {{ $id | jsonify }},
   "level": {{ (trim  $level " \n\r\t") | jsonify }},
-  "slug": {{ or .Slug .File.ContentBaseName | jsonify }},
+  "slug": {{ $slug | jsonify }},
   "org_id": {{ $uuid | jsonify }},
   "type": {{ .Params.Type | jsonify }},
   "visibility": {{ or .Params.Visibility "public" | jsonify }},

layouts/partials/test/title.html

@@ -255,15 +255,15 @@
     }
 </style>
 
-{{ $title := partial "test/title.html" . }}
+{{ $title := .Title }}
 
 <div class="container">
     <div class="header">
             <div id="go-back">
         <i class="fas fa-arrow-left"></i>
     </div>
         <h1>{{ $title }}</h1>
-        <p>{{ .Content | default "Please answer the questions below to complete the quiz." }}</p>
+        <p>{{ .Content | default "Please answer the questions below to complete the test." }}</p>
     </div>
 
     <div class="form-container">

layouts/partials/title.html

@@ -6,10 +6,10 @@
 
 {
   "id": {{ partial "id.html" . | jsonify }},
-  "title": {{ partial "test/title.html" . | jsonify }},
+  "title": {{ .Title | jsonify }},
   "org_id": {{ $orgId | jsonify }},
   "final": {{ partial "test/is-final.html" .  | jsonify }},
-  "description": {{ .Content | plainify | jsonify }},
+  "description": {{ .Content | safeHTML | jsonify }},
   "slug": {{ .Slug | jsonify }},
   "relPermalink": {{ .RelPermalink | jsonify }},
   "permalink": {{ .Permalink | jsonify }},