From 6200b6a4b09956cd2894965e25d81e55f74088ce Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 10 Feb 2022 12:59:31 +0530 Subject: [PATCH] fix: suffix message for course card instructor --- school/lms/widgets/CourseCard.html | 10 ++++++---- school/public/css/style.css | 4 +++- school/public/icons/rating.svg | 4 ++-- school/public/icons/user.svg | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/school/lms/widgets/CourseCard.html b/school/lms/widgets/CourseCard.html index 1b574c7b..d18711f8 100644 --- a/school/lms/widgets/CourseCard.html +++ b/school/lms/widgets/CourseCard.html @@ -37,22 +37,24 @@
{% set instructors = get_instructors(course.name) %} + {% set ins_len = instructors | length %} {% for instructor in instructors %} - {% if instructors | length > 1 and loop.index == 1 %} + {% if ins_len > 1 and loop.index == 1 %}
{% endif %} {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }} - {% if instructors | length > 1 and loop.index == instructors | length %} + {% if ins_len > 1 and loop.index == ins_len %}
{% endif %} {% endfor %} - {% if instructors | length == 1 %} + {% if ins_len == 1 %} {{ instructors[0].full_name }} {% else %} - {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors | length - 1 }} others + {% set suffix = "other" if ins_len - 1 == 1 else "others" %} + {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }} {% endif %} diff --git a/school/public/css/style.css b/school/public/css/style.css index b12530b2..c362b250 100644 --- a/school/public/css/style.css +++ b/school/public/css/style.css @@ -9,7 +9,7 @@ --text-2xl: 20px; --text-3xl: 22px; --text-4xl: 44px; - --navbar-shadow: 0px 1px 8px rgba(0, 0, 0, 0.08) + --navbar-shadow: 0px 1px 8px rgba(0, 0, 0, 0.08); --gray-750: #505A62; } @@ -107,6 +107,7 @@ input[type=checkbox] { .course-card-meta { margin: 0.75rem 0 0.5rem; font-size: 14px; + color: var(--gray-600); } .course-card-meta-2 { @@ -157,6 +158,7 @@ input[type=checkbox] { .course-instructor { margin-left: 0.625rem; font-size: 0.875rem; + color: var(--gray-750); } .course-student-count { diff --git a/school/public/icons/rating.svg b/school/public/icons/rating.svg index dcbe9644..75c52d22 100644 --- a/school/public/icons/rating.svg +++ b/school/public/icons/rating.svg @@ -1,3 +1,3 @@ - - + + diff --git a/school/public/icons/user.svg b/school/public/icons/user.svg index 66b19fb9..4e56156c 100644 --- a/school/public/icons/user.svg +++ b/school/public/icons/user.svg @@ -1,4 +1,4 @@ - - - + + +