From fdb9739d2c8f447d909261e043861a0a61ae95ae Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 20 Apr 2022 09:26:58 -0400 Subject: [PATCH] what? I just pushed --- .../JnJVision/_cards_categories.html.liquid | 174 ++++++++++-------- .../JnJVision/_cards_course.html.liquid | 7 +- .../_cards_featured_course.html.liquid | 6 +- .../_cards_training_event.html.liquid | 2 +- .../JnJVision/_catalog_courses.html.liquid | 56 ++++++ .../JnJVision/_course_details.html.liquid | 2 +- .../_course_progress_and_cta.html.liquid | 4 +- .../JnJVision/_courses_catalog.html.liquid | 16 ++ .../JnJVision/_filter_dropdown.html.liquid | 33 ++++ .../JnJVision/_head.html.liquid | 1 - .../JnJVision/_homepage_events.html.liquid | 2 +- .../JnJVision/catalog.html.liquid | 22 +++ .../JnJVision/homepage.html.liquid | 88 +++++++-- .../JnJVision/styles.css.liquid | 24 +-- 14 files changed, 329 insertions(+), 108 deletions(-) create mode 100644 NP_Custom_Templates/customer_templates/JnJVision/_catalog_courses.html.liquid create mode 100644 NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid create mode 100644 NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid create mode 100644 NP_Custom_Templates/customer_templates/JnJVision/catalog.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid index bb3be4c8..8950ae25 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid @@ -1,101 +1,127 @@ -
-
- -
-
-
+
+
+ +
Podcasts
-
-

- Professional Events -

-
-
+
+

Professional Events

+
+
+
-
-
-
-
+
+ +
Product -
-
-

- Johnson & Johnson Product Education -

-
-
+
+
+

Johnson & Johnson Product Education

+
+
+
-
-
- -
- -
-
-
- Product -
-
-

- Fine-Tuned Podcast Series -

-
-
-
-
-
-
-
- Product -
-
-

- Challenging Cases Video Series -

-
-
-
+
+ +
+ Product +
+
+

Fine-Tuned Podcast Series

+
+
+ +
+ +
+ +
+ Product +
+
+

Challenging Cases Video Series

+
+
+
-
+ \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid index 46039077..75ea258c 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid @@ -54,6 +54,10 @@ the client wants to revert back. My categories boxes are below. {% endcomment %} {{ course.name }}

+ {% capture course_path %}{% route course, id: course.id %}{% endcapture %} + {% if course.has_to_restart? %} + {% include "course_version_outdated_popup", path: course_path %} + {% endif %}
@@ -146,6 +150,7 @@ the client wants to revert back. My categories boxes are below. {% endcomment %} } .course-title-vision { - font-family: "PlusJakartaSans-Regular" !important; + font-family: "PlusJakartaSans-Bold", !important; + font-weight: 700; } diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid index 95201a8a..8d0627a4 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_featured_course.html.liquid @@ -17,7 +17,7 @@ {{ course.name }} -
+
{{ course.short_description }}
@@ -40,7 +40,7 @@ {% t shared.progress, count: course.progress %}
-
+
{% include "course_details" %}
@@ -65,5 +65,5 @@ diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid index c61bcae3..440a9bc8 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid @@ -21,7 +21,7 @@
- {% if training_event.sessions.first.day < 10 %}0{% endif %}{{ training_event.sessions.first.day }} + {% if training_event.sessions.first.day < 10 %}0{% endif %}{{ training_event.sessions.first.day }}
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_catalog_courses.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_catalog_courses.html.liquid new file mode 100644 index 00000000..66bd0a59 --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JnJVision/_catalog_courses.html.liquid @@ -0,0 +1,56 @@ +
+
+
+ {{ course.name }} +
+ +
+
+ {{ course.name }} +
+
+ {% capture course_path %}{% route course, id: course.id %}{% endcapture %} + + {% t shared.view %} + + {% if course.has_to_restart? %} + {% include "course_version_outdated_popup", path: course_path %} + {% endif %} +
+
+
+ + + \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_details.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_course_details.html.liquid index 34b7db4e..c3607eeb 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_course_details.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_course_details.html.liquid @@ -34,7 +34,7 @@ text-shadow: none; float: right; align: center; - color: #cc0033; + color: white; font-weight: 700; font-size: 10px;' } diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid index 7d0508c3..e230184c 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid @@ -1,4 +1,4 @@ -w
+{% comment %}
{% t .header %}
@@ -43,4 +43,4 @@ w
{% t shared.continue %} {% endif %} -{% endif %} \ No newline at end of file +{% endif %}{% endcomment %} \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid new file mode 100644 index 00000000..dc0056a1 --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid @@ -0,0 +1,16 @@ +{% if courses.in_catalog.any? %} +
+ {% for course in courses.in_catalog %} +
+ {% include "catalog_courses" %} +
+ {% endfor %} +
+{% else %} + {% capture message %} + {% t shared.zero_state.courses.catalog, + key: current_school.course_vocabulary + %} +{% endcapture %} +{% include "courses_zero_state", message: message %} +{% endif %} diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid new file mode 100644 index 00000000..e7a954bb --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid @@ -0,0 +1,33 @@ +
+
+ + +
+
+ {% + include "filter_select", + filters: filters, + key: key, + label: label + %} + + +
+
+
+
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid index f68f1be4..8f79cbd4 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid @@ -5,7 +5,6 @@ - diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_events.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_homepage_events.html.liquid index 0322c549..436f28ab 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_events.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/_homepage_events.html.liquid @@ -254,7 +254,7 @@ margin: 40px auto 0; } - .events-event { + .events-event { padding: 50px 60px; display: flex; } diff --git a/NP_Custom_Templates/customer_templates/JnJVision/catalog.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/catalog.html.liquid new file mode 100644 index 00000000..aea42680 --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JnJVision/catalog.html.liquid @@ -0,0 +1,22 @@ +{% include "header" %} +{% include "sub_navigation" %} +
+
+
+
{{ catalog.headline }}
+
{{ catalog.subheadline }}
+
+ {% capture label %}{% t shared.filters.by_category %}{% endcapture %} + + {% if courses.in_catalog.any? %} + {% + include "filter_dropdown", + filters: courses.filters, + key: "category_uuid", + label: label + %} + {% endif %} +
+{% include "courses_catalog" %} +
+{% include "footer" %} \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/homepage.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/homepage.html.liquid index b99d6aa9..9a3fcc6d 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/homepage.html.liquid +++ b/NP_Custom_Templates/customer_templates/JnJVision/homepage.html.liquid @@ -4,11 +4,30 @@ {% include "homepage_hero_carousel" %} {% comment %} {% include "sub_navigation" %} {% endcomment %}