From 16cb564a6a4dd0a84d652d72a3f95de50e88212b Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 3 Jan 2023 16:48:16 +0530 Subject: [PATCH 1/5] fix: render meta block in portal base pages --- lms/templates/lms_base.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lms/templates/lms_base.html b/lms/templates/lms_base.html index a37775ad..3e535dcf 100644 --- a/lms/templates/lms_base.html +++ b/lms/templates/lms_base.html @@ -1,5 +1,8 @@ {% extends "templates/base.html" %} +{% block meta_block %} + {% include "templates/includes/meta_block.html" %} +{% endblock %} {% block content %} {% include "public/icons/symbol-defs.svg" %} From 37e8c3ab844957ba7a7a19221e8cda1eabac2e5b Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 3 Jan 2023 16:48:52 +0530 Subject: [PATCH 2/5] feat: add meta image field in LMS course --- lms/lms/doctype/lms_course/lms_course.json | 16 ++++++++++++++-- lms/www/courses/course.py | 5 +++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json index f2e4ce4a..5121ef27 100644 --- a/lms/lms/doctype/lms_course/lms_course.json +++ b/lms/lms/doctype/lms_course/lms_course.json @@ -44,7 +44,9 @@ "pricing_section", "paid_certificate", "currency", - "price_certificate" + "price_certificate", + "website_meta_section", + "meta_image" ], "fields": [ { @@ -235,6 +237,16 @@ { "fieldname": "column_break_26", "fieldtype": "Column Break" + }, + { + "fieldname": "website_meta_section", + "fieldtype": "Section Break", + "label": "Website Meta" + }, + { + "fieldname": "meta_image", + "fieldtype": "Attach Image", + "label": "Meta Image" } ], "is_published_field": "published", @@ -261,7 +273,7 @@ } ], "make_attachments_public": 1, - "modified": "2022-09-14 13:26:53.153822", + "modified": "2023-01-03 16:38:35.237691", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py index d9404ed5..488ab30b 100644 --- a/lms/www/courses/course.py +++ b/lms/www/courses/course.py @@ -57,6 +57,7 @@ def set_course_context(context, course_name): "currency", "max_attempts", "duration", + "meta_image" ], as_dict=True, ) @@ -98,8 +99,8 @@ def set_course_context(context, course_name): context.is_user_interested = get_user_interest(context.course.name) context.metatags = { - "title": course.title, - "image": course.image, + "name": course.title, + "image": course.meta_image or course.image, "description": course.short_introduction, "keywords": course.title, } From a0e281fb30ade8622a30ef3818b09e352520b5ca Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 3 Jan 2023 16:52:50 +0530 Subject: [PATCH 3/5] feat(ux): add `View in Website` button in LMS Course --- lms/lms/doctype/lms_course/lms_course.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lms/lms/doctype/lms_course/lms_course.js b/lms/lms/doctype/lms_course/lms_course.js index 2dabc7f7..f0596339 100644 --- a/lms/lms/doctype/lms_course/lms_course.js +++ b/lms/lms/doctype/lms_course/lms_course.js @@ -27,4 +27,7 @@ frappe.ui.form.on("LMS Course", { }; }); }, + refresh: (frm) => { + frm.add_web_link(`/courses/${frm.doc.name}`, "View in Website"); + }, }); From 12b2b0d0ebffa8eee073665821d28ec35aeab5da Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 3 Jan 2023 17:01:00 +0530 Subject: [PATCH 4/5] fix: linter --- lms/www/courses/course.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py index 488ab30b..ec7666bb 100644 --- a/lms/www/courses/course.py +++ b/lms/www/courses/course.py @@ -57,7 +57,7 @@ def set_course_context(context, course_name): "currency", "max_attempts", "duration", - "meta_image" + "meta_image", ], as_dict=True, ) From d28096ede6e35732c3c7a30b7695db312494f37d Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 3 Jan 2023 17:32:49 +0530 Subject: [PATCH 5/5] Revert "feat: add meta image field in LMS course" This reverts commit 37e8c3ab844957ba7a7a19221e8cda1eabac2e5b. --- lms/lms/doctype/lms_course/lms_course.json | 16 ++-------------- lms/www/courses/course.py | 5 ++--- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json index 5121ef27..f2e4ce4a 100644 --- a/lms/lms/doctype/lms_course/lms_course.json +++ b/lms/lms/doctype/lms_course/lms_course.json @@ -44,9 +44,7 @@ "pricing_section", "paid_certificate", "currency", - "price_certificate", - "website_meta_section", - "meta_image" + "price_certificate" ], "fields": [ { @@ -237,16 +235,6 @@ { "fieldname": "column_break_26", "fieldtype": "Column Break" - }, - { - "fieldname": "website_meta_section", - "fieldtype": "Section Break", - "label": "Website Meta" - }, - { - "fieldname": "meta_image", - "fieldtype": "Attach Image", - "label": "Meta Image" } ], "is_published_field": "published", @@ -273,7 +261,7 @@ } ], "make_attachments_public": 1, - "modified": "2023-01-03 16:38:35.237691", + "modified": "2022-09-14 13:26:53.153822", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py index ec7666bb..d9404ed5 100644 --- a/lms/www/courses/course.py +++ b/lms/www/courses/course.py @@ -57,7 +57,6 @@ def set_course_context(context, course_name): "currency", "max_attempts", "duration", - "meta_image", ], as_dict=True, ) @@ -99,8 +98,8 @@ def set_course_context(context, course_name): context.is_user_interested = get_user_interest(context.course.name) context.metatags = { - "name": course.title, - "image": course.meta_image or course.image, + "title": course.title, + "image": course.image, "description": course.short_introduction, "keywords": course.title, }