Luminate templates mostly. Cin7 too.

This commit is contained in:
Norm Rasmussen
2024-06-03 17:27:33 -04:00
parent 1c28a57244
commit 2f75b0779a
8 changed files with 72 additions and 30 deletions

View File

@ -20,11 +20,11 @@
<script>
document.addEventListener("DOMContentLoaded", () => {
let link = document.getElementById('courses-category');
if (window.location.pathname == '/app/courses-category') {
link.classList.add("np-sub-navigation-content-item-active");
} else {
link.classList.remove("np-sub-navigation-content-item-active");
}
});
</script>
</script>

View File

@ -8,7 +8,10 @@
class="learning-path-card-image"
/>
{% if course.ribbon %}
<div class="np-card-ribbon" {% if course.ribbon == "Omni" %} style="background: #0026b2;"{% endif %}>
<div class="np-card-ribbon" {% if course.ribbon == "Omni" %} style="background: #0026b2;"
{% elsif course.ribbon == "Core"%} style="background: #05CBBF"
{% else %} style="background: #213343"
{% endif %}>
{{ course.ribbon }}
</div>
{% endif %}

View File

@ -9,5 +9,5 @@
<option class="second-login-role-option" value="EVV Agency Admin/Manager">Agency Admin/Manager</option>
<option class="second-login-role-option" value="EVV Agency Staff">Agency Staff</option>
<option class="second-login-role-option" value="Alt-EVV User (Aggregator)">Alt-EVV User (Aggregator)</option>
<option class="second-login-role-option" value="Caregiver">Caregiver</option>
{% comment %} <option class="second-login-role-option" value="Caregiver">Caregiver</option> {% endcomment %}
</select>

View File

@ -28,33 +28,54 @@
<div class="course-length">{{course.properties.course_length}}</div>
{% endif %}
</div>
{% else %}
<div></div>
{% endif %}
<div class="np-card-content-footer">
<div class="np-card-content-footer">
<div class="np-card-content-progress np-button-color">
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Completo
{% elsif course.progress == 100 %}
{{course.progress }}% Completo
{% else %}
No empezado
{% endif %}
{% if current_person.properties.language == "en" %}
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Complete
{% elsif course.progress == 100 %}
{{course.progress }}% Complete
{% else %}
Not Started
{% endif %}
{% elsif current_person.properties.language == "es" %}
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Completo
{% elsif course.progress == 100 %}
{{course.progress }}% Completo
{% else %}
No empezado
{% endif %}
{% endif %}
</div>
{% capture course_path %}{% route course, id: course.id %}{% endcapture %}
{% if course.has_to_restart? %}
{% include "course_version_outdated_popup", path: course_path %}
{% endif %}
<a class="np-button np-button-wide" href="{{ course_path }}">
{% if course.progress > 0 and course.progress < 100 %}
Continue
{% elsif course.progress == 100 %}
Retake
{% else %}
View
{% endif %}
{% if current_person.properties.language == "en" %}
{% if course.progress > 0 and course.progress < 100 %}
Continue
{% elsif course.progress == 100 %}
Retake
{% else %}
View
{% endif %}
{% elsif current_person.properties.language == "es" %}
{% if course.progress > 0 and course.progress < 100 %}
Continuar
{% elsif course.progress == 100 %}
Repetir
{% else %}
Vista
{% endif %}
{% endif %}
</a>
</div>
</div>

View File

@ -24,13 +24,23 @@
</div>
<div class="np-card-content-footer">
<div class="np-card-content-progress np-button-color">
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Completo
{% elsif course.progress == 100 %}
{{course.progress }}% Completo
{% else %}
No empezado
{% endif %}
{% if current_person.properties.language == "es" %}
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Completo
{% elsif course.progress == 100 %}
{{course.progress }}% Completo
{% else %}
No empezado
{% endif %}
{% elsif current_person.properties.language == "en" %}
{% if course.progress > 0 and course.progress < 100 %}
{{course.progress }}% Complete
{% elsif course.progress == 100 %}
{{course.progress }}% Complete
{% else %}
Not Started
{% endif %}
{% endif %}
</div>
<div class="np-card-progress-bar-container">
<div style="width: {{ course.progress }}%" class="np-button-background-color np-card-progress-bar">

View File

@ -4,12 +4,14 @@
<main class="np-main np-dashboard np-subpage-container np-max-width">
<div class="row np-flex-center">
<div class="col-xs-12 col-sm-8">
{% comment %}
{% if features.learning_paths? %}
<div class="Learning Paths np-dashboard-resources-title">
{% t shared.learning_paths %}
</div>
{% include "learning_paths_index", items: learning_paths.enrolled %}
{% endif %}
{% endcomment %}
<div class="Courses np-dashboard-resources-title">
{% t shared.course_vocabulary.plural, key: current_school.course_vocabulary %}
</div>

View File

@ -113,6 +113,7 @@
{% include "homepage_featured", items: catalog_courses %}
{% comment %}
<div class="np-max-width np-homepage-row-wrapper">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12" style="display:flex; flex-direction:column;">
@ -151,7 +152,7 @@
{% endif %}
</div>
{% endcomment %}
</div>
</div>
{% comment %} {% if features.training_events? %}
@ -178,7 +179,7 @@
{% include "homepage_ongoing_training", items: catalog_courses %}
{% include "homepage_topics" %}
{% comment %} {% include "homepage_topics" %} {% endcomment %}
<button
type="button"
class="popup-trigger"

View File

@ -327,3 +327,8 @@ message](https://northpasshq.slack.com/archives/C04RER4PH09/p1709147957374999?th
- [ ] Anthology - Intro Jessica (CAM) for Spanish Academy
- [X] DoorDash - Intro Barb for PS CSQL.
## 06-03-2024
- [ ] Cin7 - Catalog Filters showing both Core and Omni despite learner only in one group
- [ ] Cin7 - Badges still duplicating