From 1f3806a7bdfc58c855dc9a8ea4c1a6bb0a994cd7 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 6 Jun 2022 11:15:06 +0530 Subject: [PATCH 1/2] fix: replaced some dialogs with alerts --- lms/hooks.py | 1 - lms/lms/md.py | 2 +- lms/lms/web_form/chapter/chapter.js | 5 ++- lms/lms/web_form/lesson/lesson.js | 7 +++-- lms/lms/web_form/profile/profile.json | 6 ++-- lms/lms/widgets/CourseOutline.html | 11 +++---- lms/public/css/style.css | 28 ++++++++--------- lms/public/js/common_functions.js | 17 ++++++----- lms/templates/quiz.html | 6 ++-- lms/www/batch/learn.html | 11 ++++--- lms/www/courses/course.js | 44 ++++++++++++++++----------- lms/www/jobs/job.js | 25 ++++++++------- 12 files changed, 89 insertions(+), 74 deletions(-) diff --git a/lms/hooks.py b/lms/hooks.py index 99d428cf..67affeb8 100644 --- a/lms/hooks.py +++ b/lms/hooks.py @@ -214,7 +214,6 @@ profile_mandatory_fields = [ "bio", "linkedin", "education", - "work_experience", "skill", "preferred_functions", "preferred_industries", diff --git a/lms/lms/md.py b/lms/lms/md.py index b02ed68f..8105c72f 100644 --- a/lms/lms/md.py +++ b/lms/lms/md.py @@ -105,7 +105,7 @@ def sanitize_html(html, macro): any broken tags. This makes sures that all those things are fixed before passing to the etree parser. """ - soup = BeautifulSoup(html, features="lxml") + soup = BeautifulSoup(html, features="html5lib") nodes = soup.body.children classname = "" if macro == "YouTubeVideo": diff --git a/lms/lms/web_form/chapter/chapter.js b/lms/lms/web_form/chapter/chapter.js index 6d710013..da98bb5e 100644 --- a/lms/lms/web_form/chapter/chapter.js +++ b/lms/lms/web_form/chapter/chapter.js @@ -1,6 +1,9 @@ frappe.ready(function() { frappe.web_form.after_save = () => { - frappe.msgprint(__("Chapter has been saved successfully. Go back to the course and add this chapter to the chapters table.")) + frappe.show_alert({ + message:__("Chapter has been saved successfully. Go back to the course and add this chapter to the chapters table."), + indicator:'green' + }, 3); setTimeout(() => { window.location.href = `/courses/${frappe.web_form.doc.course}`; }, 3000); diff --git a/lms/lms/web_form/lesson/lesson.js b/lms/lms/web_form/lesson/lesson.js index ad73a38c..82214a05 100644 --- a/lms/lms/web_form/lesson/lesson.js +++ b/lms/lms/web_form/lesson/lesson.js @@ -49,10 +49,13 @@ const show_upload_modal = () => { }; const show_success_message = () => { - frappe.msgprint(__(`Lesson has been saved successfully. Go back to the chapter and add this lesson to the lessons table.`)); + frappe.show_alert({ + message: __(`Lesson has been saved successfully. Go back to the chapter and add this lesson to the lessons table.`), + indicator:'green' + }, 3); setTimeout(() => { window.location.href = `/courses/${this.course}`; - }, 2000); + }, 3000); }; const add_file_upload_component = () => { diff --git a/lms/lms/web_form/profile/profile.json b/lms/lms/web_form/profile/profile.json index 70dcf10d..a0a78e8d 100644 --- a/lms/lms/web_form/profile/profile.json +++ b/lms/lms/web_form/profile/profile.json @@ -22,7 +22,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2022-02-23 09:32:37.352930", + "modified": "2022-06-06 10:38:37.784113", "modified_by": "Administrator", "module": "LMS", "name": "profile", @@ -83,7 +83,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -244,7 +244,7 @@ "max_value": 0, "options": "Work Experience", "read_only": 0, - "reqd": 1, + "reqd": 0, "show_in_filter": 0 }, { diff --git a/lms/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html index 567b8010..0dd138d5 100644 --- a/lms/lms/widgets/CourseOutline.html +++ b/lms/lms/widgets/CourseOutline.html @@ -29,13 +29,12 @@ {% if membership or lesson.include_in_preview %} - + - {{ lesson.title }} - + {{ lesson.title }} {% if membership %} - + {% endif %} @@ -48,7 +47,7 @@ href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}" data-course="{{ course.name }}"> - +
{{ lesson.title }}
@@ -57,7 +56,7 @@ {% else %}
- +
{{ lesson.title }}
diff --git a/lms/public/css/style.css b/lms/public/css/style.css index 14794237..1a6a62d4 100644 --- a/lms/public/css/style.css +++ b/lms/public/css/style.css @@ -411,20 +411,17 @@ input[type=checkbox] { display: flex; align-items: center; padding: 0.5rem; - color: inherit; + color: var(--gray-900); + font-size: var(--text-base); } .lesson-links:hover { cursor: pointer; text-decoration: none; - color: inherit; + color: var(--gray-900); border-radius: var(--border-radius-md); } -.course-content-parent .lesson-links { - font-size: var(--text-base); -} - .lessons { margin-left: 2rem; } @@ -540,11 +537,6 @@ input[type=checkbox] { flex-direction: column; } -.question-card { - flex-direction: column; - padding: 1.25rem; -} - .question p { margin-bottom: 0; } @@ -574,12 +566,13 @@ input[type=checkbox] { margin-top: 1rem; } -.lesson-content-card { - margin: 3rem 0; +.lesson-content { + padding: 1.5rem; + flex-direction: column; } -.lesson-page { - background-color: #FFFFFF; +.lesson-content-card { + margin: 2rem 0 3rem; } .lesson-content-card .alert-dismissible .close { @@ -607,7 +600,6 @@ input[type=checkbox] { display: flex; justify-content: space-between; align-items: center; - margin: 2rem 0 4rem; } .lesson-pagination-parent { @@ -1450,3 +1442,7 @@ li { .no-preview { color: var(--gray-600); } + +.discussions-parent .empty-state { + background-color: var(--gray-200); +} diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js index 1b5df894..11e03dee 100644 --- a/lms/public/js/common_functions.js +++ b/lms/public/js/common_functions.js @@ -28,13 +28,13 @@ const join_course = (e) => { "callback": (data) => { if (data.message == "OK") { $(".no-preview-modal").modal("hide"); - frappe.msgprint({ - "title": __("Successfully Enrolled"), - "message": __("You are now a student of this course.") - }); + frappe.show_alert({ + message: __("You are now a student of this course."), + indicator:'green' + }, 3); setTimeout(function () { window.location.href = `/courses/${course}/learn/1.1`; - }, 2000); + }, 3000); } } }) @@ -55,10 +55,13 @@ const notify_user = (e) => { }, callback: (data) => { $(".no-preview-modal").modal("hide"); - frappe.msgprint(__("You have opted to be notified for this course. You will receive an email when the course becomes available.")); + frappe.show_alert({ + message: __("You have opted to be notified for this course. You will receive an email when the course becomes available."), + indicator:'green' + }, 3); setTimeout(() => { window.location.reload(); - }, 2000); + }, 3000); } }) }; diff --git a/lms/templates/quiz.html b/lms/templates/quiz.html index 8674f1ce..fcf34e7b 100644 --- a/lms/templates/quiz.html +++ b/lms/templates/quiz.html @@ -1,5 +1,5 @@ {% if attempts_exceeded %} -
+
{{ quiz.title }}
{{ _("You have already exceeded the maximum number of attempts allowed for this quiz.") }}
{{ _("Your latest score is {0}.").format(last_attempt_score) }}
@@ -7,7 +7,7 @@ {% else %}
{{ quiz.title }}
-
+
{{ quiz.title }}
{{ _("There are {0} questions in this quiz.").format(quiz.questions | length) }}{% if quiz.max_attempts %} @@ -70,7 +70,7 @@ -
{{ _("Summary") }}
+
{{ _("Submit") }}
{{ _("Please join the course to submit the Quiz.") }}
{{ _("Try Again") }}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html index d6416f61..40b6b898 100644 --- a/lms/www/batch/learn.html +++ b/lms/www/batch/learn.html @@ -22,9 +22,6 @@
{{ LessonContent(lesson) }} - {% if membership %} - {{ pagination(prev_url, next_url) }} - {% endif %} {{ Discussions() }}
@@ -45,7 +42,7 @@ {% macro LessonContent(lesson) %} {% set instructors = get_instructors(course.name) %} {% set is_instructor = is_instructor(course.name) %} -
+
{ }; const submit_for_review = (e) => { - let course = $(e.currentTarget).data("course"); - frappe.call({ - method: "lms.lms.doctype.lms_course.lms_course.submit_for_review", - args: { - "course": course - }, - callback: (data) => { - if (data.message == "No Chp") { - frappe.msgprint(__(`There are no chapters in this course. - Please add chapters and lessons to your course before you submit it for review.`)); - } else if (data.message == "OK") { - frappe.msgprint(__("Your course has been submitted for review.")) - window.location.reload(); - } - } - }) + let course = $(e.currentTarget).data("course"); + frappe.call({ + method: "lms.lms.doctype.lms_course.lms_course.submit_for_review", + args: { + "course": course + }, + callback: (data) => { + if (data.message == "No Chp") { + frappe.msgprint(__(`There are no chapters in this course. + Please add chapters and lessons to your course before you submit it for review.`)); + } else if (data.message == "OK") { + frappe.show_alert({ + message: __("Your course has been submitted for review."), + indicator:'green' + }, 3); + setTimeout(() => { + window.location.reload(); + }, 3000); + } + } + }); }; const apply_cetificate = (e) => { @@ -199,10 +204,13 @@ const submit_slot = (e) => { }, callback: (data) => { $("#slot-modal").modal("hide"); - frappe.msgprint(__("Your slot has been booked. Prepare well for the evaluations.")); + frappe.show_alert({ + message: __("Your slot has been booked. Prepare well for the evaluations."), + indicator:'green' + }, 3); setTimeout(() => { window.location.reload(); - }, 2000); + }, 3000); } }); }; diff --git a/lms/www/jobs/job.js b/lms/www/jobs/job.js index a191d72c..aa7136ed 100644 --- a/lms/www/jobs/job.js +++ b/lms/www/jobs/job.js @@ -18,15 +18,18 @@ const open_report_dialog = (e) => { }; const report = (e) => { - frappe.call({ - method: "lms.job.doctype.job_opportunity.job_opportunity.report", - args: { - "job": $(e.currentTarget).data("job"), - "reason": $(".report-field").val() - }, - callback: (data) => { - $(".report-modal").modal("hide"); - frappe.msgprint(__("Thanks for informing us about this post. The admin will look into it and take an appropriate action soon.")) - } - }) + frappe.call({ + method: "lms.job.doctype.job_opportunity.job_opportunity.report", + args: { + "job": $(e.currentTarget).data("job"), + "reason": $(".report-field").val() + }, + callback: (data) => { + $(".report-modal").modal("hide"); + frappe.show_alert({ + message: __("Thanks for informing us about this post. The admin will look into it and take an appropriate action soon."), + indicator:'green' + }, 5); + } + }); } From 9916ec132b23fa741dce43db75e4046b0966f1fe Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 6 Jun 2022 20:53:22 +0530 Subject: [PATCH 2/2] fix: revert unnecessary changes --- lms/lms/md.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/lms/md.py b/lms/lms/md.py index 8105c72f..b02ed68f 100644 --- a/lms/lms/md.py +++ b/lms/lms/md.py @@ -105,7 +105,7 @@ def sanitize_html(html, macro): any broken tags. This makes sures that all those things are fixed before passing to the etree parser. """ - soup = BeautifulSoup(html, features="html5lib") + soup = BeautifulSoup(html, features="lxml") nodes = soup.body.children classname = "" if macro == "YouTubeVideo":