From 7d7f674d9eba78b18fe938315f8a05cd5d2a485e Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 12 Sep 2022 18:17:06 +0530 Subject: [PATCH] fix: empty states --- .../courses_enrolled/courses_enrolled.html | 38 ++- lms/lms/widgets/Reviews.html | 309 +++++++++--------- lms/public/css/style.css | 12 +- lms/templates/courses_created.html | 4 +- lms/templates/courses_under_review.html | 5 +- lms/www/batch/quiz_list.html | 24 +- lms/www/community/index.html | 2 +- lms/www/courses/index.html | 50 +-- lms/www/jobs/index.html | 11 +- 9 files changed, 232 insertions(+), 223 deletions(-) diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html index b165aa70..298a2363 100644 --- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html +++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html @@ -1,29 +1,31 @@ {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %} + {% if enrolled | length %}
- {% for course in enrolled %} - {{ widgets.CourseCard(course=course) }} - {% endfor %} + {% for course in enrolled %} + {{ widgets.CourseCard(course=course) }} + {% endfor %}
+ {% else %} {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %} -
-
-
-
{{ _("You haven't enrolled for any courses") }}
-
{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}
+
+
+
+
{{ _("You haven't enrolled for any courses") }}
+
{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}
+
+ {% set recommended_courses = get_popular_courses() %} +
+ {% for course in recommended_courses %} + {% if course %} + {% set course_details = frappe.get_doc("LMS Course", course.course) %} + {{ widgets.CourseCard(course=course_details) }} + {% endif %} + {% endfor %} +
- {% set recommended_courses = get_popular_courses() %} -
- {% for course in recommended_courses %} - {% if course %} - {% set course_details = frappe.get_doc("LMS Course", course.course) %} - {{ widgets.CourseCard(course=course_details) }} - {% endif %} - {% endfor %} -
-
{% endif %} diff --git a/lms/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html index 29015da1..89904e55 100644 --- a/lms/lms/widgets/Reviews.html +++ b/lms/lms/widgets/Reviews.html @@ -1,166 +1,169 @@ {% if not course.upcoming %}
- {% set reviews = get_reviews(course.name) %} -
- {{ _("Reviews") }} - {% if is_eligible_to_review(course.name, membership) and reviews | length %} - - {{ _("Write a review") }} - - {% endif %} -
- - {% set avg_rating = get_average_rating(course.name) %} - {% if avg_rating %} -
-
-
{{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
-
{{ reviews | length }} {{ _("ratings") }}
-
-
- {% for i in [1, 2, 3, 4, 5] %} - - - - {% endfor %} -
-
-
- {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }} -
-
-
- {% set sorted_reviews = get_sorted_reviews(course.name) %} -
- {% for review in sorted_reviews %} -
-
{{ frappe.utils.cint(review) }} {{ _("stars") }}
-
-
- {{ sorted_reviews[review] }} Complete -
-
-
{{ frappe.utils.cint(sorted_reviews[review]) }}%
-
- {% endfor %} -
-
- {% endif %} - - {% if reviews | length %} -
- {% for review in reviews %} -
-
- -
- {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }} -
- -
-
- - - {{ review.owner_details.full_name }} - - -
frappe.utils.pretty_date(review.creation)
-
- -
- {% for i in [1, 2, 3, 4, 5] %} - - - - {% endfor %} -
-
-
- -
{{ review.review }}
-
- {% if loop.index != reviews | length %} -
- {% endif %} - {% endfor %} -
- - {% else %} -
-
- -
-
-
{{ _("Review the course") }}
-
{{ _("Help us improve our course material.") }}
-
-
- {% if not is_instructor(course.name) %} + {% set reviews = get_reviews(course.name) %} +
+ {{ _("Reviews") }} {% if is_eligible_to_review(course.name, membership) %} - - {{ _("Write a review") }} - - {% elif frappe.session.user == "Guest" %} - {{ _("Login") }} - {% elif not membership %} -
{{ _("Start Learning") }}
+ + {{ _("Write a review") }} + + {% elif not is_instructor(course.name) and frappe.session.user == "Guest" %} + {{ _("Login") }} + {% elif not is_instructor(course.name) and not membership %} +
{{ _("Start Learning") }}
{% endif %} - {% endif %}
-
- {% endif %} + + + {% set avg_rating = get_average_rating(course.name) %} + {% if avg_rating %} +
+
+
+ {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} +
+
{{ reviews | length }} {{ _("ratings") }}
+
+
+ {% for i in [1, 2, 3, 4, 5] %} + + + + {% endfor %} +
+
+
+ {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }} +
+
+ + +
+ {% set sorted_reviews = get_sorted_reviews(course.name) %} +
+ {% for review in sorted_reviews %} +
+
+ {{ frappe.utils.cint(review) }} {{ _("stars") }} +
+
+
+ {{ sorted_reviews[review] }} Complete +
+
+
{{ frappe.utils.cint(sorted_reviews[review]) }}%
+
+ {% endfor %} +
+
+ {% endif %} + + + {% if reviews | length %} +
+ {% for review in reviews %} +
+
+
+ {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }} +
+
+
+ + + {{ review.owner_details.full_name }} + + +
+ {{ frappe.utils.pretty_date(review.creation) }} +
+
+
+ {% for i in [1, 2, 3, 4, 5] %} + + + + {% endfor %} +
+
+
+
{{ review.review }}
+
+ {% if loop.index != reviews | length %} +
+ {% endif %} + {% endfor %} +
+ + + {% else %} +
+ +
+
{{ _("Review the course") }}
+
{{ _("Help us improve our course material.") }}
+
+
+ {% endif %}
-