@@ -187,8 +187,8 @@
{% if lesson.name %}
+ {{ _("Create Quiz") }}
{% endif %}
- {{ _("Create a Quiz") }}
@@ -217,32 +217,42 @@
{% macro HelpArticle() %}
-
+
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 1fb8facf..2468b741 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -507,7 +507,7 @@ const show_upload_modal = () => {
new frappe.ui.FileUploader({
folder: "Home/Attachments",
restrictions: {
- allowed_file_types: ['image/*']
+ allowed_file_types: ['image/*', 'video/*']
},
on_success: (file_doc) => {
$(".attachments").append(build_attachment_table(file_doc));
@@ -521,11 +521,19 @@ const show_upload_modal = () => {
const build_attachment_table = (file_doc) => {
+ let video_types = ["mov", "mp4", "mkv"];
+ let video_extension = file_doc.file_url.split(".").pop();
+ let is_video = video_types.indexOf(video_extension) >= 0;
+ let link = is_video ? `{{ Video('${file_doc.file_url}') }}` : ``;
+
return $(`
${file_doc.file_name}
- ${__("Copy Link")}
+
+ ${__("Copy Link")}
+
+
`);
};
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index dd10db86..c7a18944 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -56,209 +56,226 @@
{% macro CourseCardWide(course) %}
-
-
{{ _("Help Article") }}
- {{ _("You can add additional content to the lesson using a special syntax.The table below - mentions all types of dynamic content that you can add to the lessons and the syntax for the - same.") }} + {{ _("You can add additional content to the lesson using a special syntax. The table below mentions + all types of dynamic content that you can add to the lessons and the syntax for the same.") }}
| {{ _("Content Type") }} | -{{ _("Syntax") }} | -|||
|---|---|---|---|---|
| - {{ _("Video") }} - | -- {% raw %} {{ Video("url_of_source") }} {% endraw %} - | +{{ _("Content Type") }} | +{{ _("Syntax") }} | +{{ _("Description") }} |
| {{ _("YouTube Video") }} | - {% raw %} {{ YouTubeVideo("unique_embed_id") }} {% endraw %} + {% raw %} {{ YouTubeVideo("embed_src") }} {% endraw %} + | +
+
+ {{ _("Copy and paste the syntax in the editor. Replace 'embed_src' with the embed source
+ that YouTube provides. To get the source, follow the steps mentioned below.") }}
+
+
|
||
| - {% raw %} {{ Quiz("lms_quiz_name") }} {% endraw %} + {% raw %} {{ Quiz("lms_quiz_id") }} {% endraw %} + | ++ {% set quiz_link = " Quiz List " %} + {{ _("Copy and paste the syntax in the editor. Replace 'lms_quiz_id' with the ID of the Quiz. You can get the ID of the quiz from the {0}.").format(quiz_link) }} |
- {% for tag in get_tags(course.name) %}
-
{{ tag }}
+
-
+ {% for tag in get_tags(course.name) %}
+
- {% endfor %}
+
+ {{ tag }}
+ {% if course.edit_mode %}
+
+
+
+ {% endif %}
+
+ {% endfor %}
{% if course.edit_mode %}
-
-
-
+
{% endif %}
{% if course.title %} {{ course.title }} {% endif %}
+
+ {% if course.short_introduction %} {{ course.short_introduction }} {% endif %}
+
{% if course.edit_mode %}
-
+
+
+
+ {% if course.video_link %}{{ course.video_link }}{% endif %}
+
+
+
+
+
+
+
+ {{ _('If you have a video that provides a teaser or preview of the course, you can add it here.') }}
+
+
+ {{ _("Follow the steps mentioned below for the same.") }}
+
+
+
+ -
+
- + {{ _("Upload the video on youtube.") }} + +
- + {{ _("When you share a youtube video, it shows an option called Embed.") }} + +
- + {{ _("On clicking it, it provides an iframe. Copy the source (src) of the iframe and paste it here.") }} + +
+ {{ course.image }}
+
+
+ {{ _("Attach Image") }}
{% endif %}
-{% if course.title %} {{ course.title }} {% endif %}
-
-{% if course.short_introduction %} {{ course.short_introduction }} {% endif %}
-
-{% if course.edit_mode %}
-
-
{% if course.video_link %}{{ course.video_link }}{% endif %}
-
+ {% if not course.edit_mode %}
+
+
-
-
- {% if course.image %}
- {{ _("Instructors") }}:
+ {% for instructor in get_instructors(course.name) %}
+
+ {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }}
+
+ {{ instructor.full_name }}
+
+
+ {% endfor %}
- {{ course.image }}
-
-
- {% else %}
- {{ _("Attach Image") }}
{% endif %}
-{% endif %}
-{% if not course.edit_mode %}
-
-
-{% endif %}
-
-{% if membership and not course.edit_mode %}
-{% set progress = frappe.utils.cint(membership.progress) %}
-{{ _("Instructors") }}:
- {% for instructor in get_instructors(course.name) %}
-
- {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }}
-
- {{ instructor.full_name }}
-
-
- {% endfor %}
-
-
{{ progress }}% {{ _("Completed") }}
-
-
+ {% if membership and not course.edit_mode %}
+ {% set progress = frappe.utils.cint(membership.progress) %}
+
-{% endif %}
+ {% endif %}
{% endmacro %}
{% macro CourseHeaderOverlay(course) %}
-{% if not course.edit_mode %}
-
+
-{{ progress }}% {{ _("Completed") }}
+
+
+
+ {% if not course.edit_mode %}
+
- {% if course.video_link %}
-
- {% endif %}
-
-
-
-{{ SlotModal(course) }}
+ {{ SlotModal(course) }}
-{% endif %}
+ {% endif %}
{% endmacro %}
{% macro Description(course) %}
- {{ course.title }}
-
- {{ Notes(course) }}
-
-
-
- {{ get_students(course.name) | length }} {{ _("Enrolled") }}
-
-
- {% if get_lessons(course.name) | length %}
-
-
- {{ get_lessons(course.name) | length }} {{ _("Lessons") }}
-
+ {% if course.video_link %}
+
{% endif %}
- {% if course.paid_certificate %}
-
-
-
- {{ format_amount(course.price_certificate, course.currency) }}
-
- {{ _("Get Certified") }}
+
-
+
- {% endif %}
-
- {{ CTASection(course, membership) }}
-
{{ course.title }}
+
+ {{ Notes(course) }}
+
+
+
+ {{ get_students(course.name) | length }} {{ _("Enrolled") }}
+
+
+ {% if get_lessons(course.name) | length %}
+
+
+ {{ get_lessons(course.name) | length }} {{ _("Lessons") }}
+
+ {% endif %}
+
+ {% if course.paid_certificate %}
+
+
+
+ {{ format_amount(course.price_certificate, course.currency) }}
+
+ {{ _("Get Certified") }}
+
+ {% endif %}
+
+ {{ CTASection(course, membership) }}
+
{% if course.description %}{{ frappe.utils.md_to_html(course.description) }}{% endif %}
+ {% if course.description %}{{ frappe.utils.md_to_html(course.description) }}{% endif %}
{% endmacro %}
{% macro Save(course) %}
-{% if course.edit_mode %}
-
-
- {% if course.name %}
-
- {{ _("Back to Course") }}
-
+ {% if course.edit_mode %}
+
-{% endif %}
{% endmacro %}
{% macro CourseCreator(course) %}
-
+
+ {% if course.name %}
+
+ {{ _("Back to Course") }}
+
+ {% endif %}
+
{% endif %}
- {{ _("Course Creators") }}
-
-
- {% set instructors = get_instructors(course.name) %}
- {% for instructor in instructors %}
-
- {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
-
{% endmacro %}
{% macro RelatedCourses(course) %}
-{% if course.related_courses | length %}
-
-
- {% endfor %}
- {{ instructor.full_name }}
- {{ get_authored_courses(instructor.name) | length }} {{ _("Courses Created") }}
+ {{ _("Course Creators") }}
+
+ {% set instructors = get_instructors(course.name) %}
+ {% for instructor in instructors %}
+
-
+ {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
+
+ {% endfor %}
+
+ {{ instructor.full_name }}
+ {{ get_authored_courses(instructor.name) | length }} {{ _("Courses Created") }}
+
-
-
-{% endif%}
+ {% endif %}
{% endmacro %}
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 4dae5798..8281669d 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -327,10 +327,12 @@ const add_tag = (e) => {
const save_course = (e) => {
+ let tags = $('.course-card-pills').map((i, el) => $(el).text().trim()).get();
+ tags = tags.filter(word => word.trim().length > 0);
frappe.call({
method: "lms.lms.doctype.lms_course.lms_course.save_course",
args: {
- "tags": $('.course-card-pills').map((i, el) => $(el).text().trim()).get().join(", "),
+ "tags": tags.join(", "),
"title": $("#title").text(),
"short_introduction": $("#intro").text(),
"video_link": $("#video-link").text(),
@@ -339,7 +341,13 @@ const save_course = (e) => {
"course": $("#title").data("course") ? $("#title").data("course") : ""
},
callback: (data) => {
- window.location.href = `/courses/${data.message}?edit=1`;
+ frappe.show_alert({
+ message: __("Saved"),
+ indicator: "green",
+ });
+ setTimeout(() => {
+ window.location.href = `/courses/${data.message}?edit=1`;
+ }, 1000);
}
});
};
{{ _("Other Courses") }}
-
-
-
-
- {% for crs in course.related_courses %}
- {% if loop.index % 3 == 1 %}
- {% endif %}
- {% endfor %}
-
+ {% if course.related_courses | length %}
+
- {% endif %}
- {{ widgets.CourseCard(course=crs, read_only=False) }}
- {% if loop.index % 3 == 0 or loop.index == course.related_courses | length %}
+
-
+
{{ _("Other Courses") }}
+
+
+
+ {% for crs in course.related_courses %}
+ {% if loop.index % 3 == 1 %}
+ {% endif %}
+ {% endfor %}
+
- {% if course.related_courses | length > 3 %}
-
+ {% endif %}
+
+
+ {% endif %}
+ {{ widgets.CourseCard(course=crs, read_only=False) }}
+ {% if loop.index % 3 == 0 or loop.index == course.related_courses | length %}