Merge branch 'develop' of https://github.com/frappe/lms into profile

frontend/index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" href="/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Frappe UI App</title>
+		<title>Frappe Learning</title>
 		<meta name="title" content="{{ meta.title }}" />
 		<meta name="image" content="{{ meta.image }}" />
 		<meta name="description" content="{{ meta.description }}" />
@@ -30,7 +30,7 @@
 					Seo checks if a page has more than 300 words. So, here are some more words to make it more than 300 words.
 					Page descriptions are the HTML meta tags that provide a brief summary of a web page.
 					Search engines use meta descriptions to help identify the page's topic - they don't use them to rank the page, but they do use them to determine whether or not to display the page in search results.
-					Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on. 
+					Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on.
 					They're also important because they can help improve your click-through rate (CTR) from search results.
 					A good meta description can entice people to click on your page instead of someone else's.
 				</p>

frontend/src/components/LessonPlugins.vue

@@ -3,12 +3,21 @@
 		{{ __('Components') }}
 	</div>
 	<div class="mt-5">
-		<div class="">
+		<Tooltip
-			<div class="text-xs text-gray-600 mb-1">
+			:text="
-				{{ __('Select an Editor') }}
+				__(
+					'Content such as quiz, video and image will be added in the editor you select.'
+				)
+			"
+			placement="bottom"
+		>
+			<div class="">
+				<div class="text-xs text-gray-600 mb-1">
+					{{ __('Select an Editor') }}
+				</div>
+				<Select v-model="currentEditor" :options="getEditorOptions()" />
 			</div>
-			<Select v-model="currentEditor" :options="getEditorOptions()" />
+		</Tooltip>
-		</div>
 		<div class="flex mt-4">
 			<Link
 				v-model="quiz"
@@ -63,7 +72,7 @@
 </template>
 <script setup>
 import Link from '@/components/Controls/Link.vue'
-import { FileUploader, Button, Select } from 'frappe-ui'
+import { FileUploader, Button, Select, Tooltip } from 'frappe-ui'
 import { Plus, FileText } from 'lucide-vue-next'
 import { ref, watch } from 'vue'
 

frontend/src/pages/Lesson.vue

@@ -245,6 +245,8 @@ const lesson = createResource({
 })
 
 const renderEditor = (holder, content) => {
+	// empty the holder
+	document.getElementById(holder).innerHTML = ''
 	return new EditorJS({
 		holder: holder,
 		tools: getEditorTools(),

lms/job/doctype/lms_job_application/lms_job_application.py

@@ -14,7 +14,7 @@ class LMSJobApplication(Document):
 		outgoing_email_account = frappe.get_cached_value(
 			"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 		)
-		if outgoing_email_account:
+		if outgoing_email_account or frappe.conf.get("mail_login"):
 			self.send_email_to_employer()
 
 	def validate_duplicate(self):

lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py

@@ -18,7 +18,7 @@ class LMSAssignmentSubmission(Document):
 			outgoing_email_account = frappe.get_cached_value(
 				"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 			)
-			if outgoing_email_account:
+			if outgoing_email_account or frappe.conf.get("mail_login"):
 				self.send_mail()
 
 	def validate_duplicates(self):

lms/lms/doctype/lms_batch/lms_batch.py

@@ -73,7 +73,9 @@ class LMSBatch(Document):
 			outgoing_email_account = frappe.get_cached_value(
 				"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 			)
-			if not student.confirmation_email_sent and outgoing_email_account:
+			if not student.confirmation_email_sent and (
+				outgoing_email_account or frappe.conf.get("mail_login")
+			):
 				self.send_mail(student)
 				student.confirmation_email_sent = 1
 

lms/lms/doctype/lms_certificate/lms_certificate.py

@@ -18,7 +18,7 @@ class LMSCertificate(Document):
 			outgoing_email_account = frappe.get_cached_value(
 				"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 			)
-			if outgoing_email_account:
+			if outgoing_email_account or frappe.conf.get("mail_login"):
 				self.send_mail()
 
 	def send_mail(self):