Merge branch 'develop' into lms-fixes-1
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ecc9611..47d2056 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -169,10 +169,6 @@
{'role': 'Student', 'doctype':'Student', 'email_field': 'student_email_id'},
]
-role_home_page = {
- "LMS User": "/lms"
-}
-
has_website_permission = {
"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
"Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
diff --git a/erpnext/public/js/education/lms/components/Breadcrumb.vue b/erpnext/public/js/education/lms/components/Breadcrumb.vue
index e7c0fc3..1b617a3 100644
--- a/erpnext/public/js/education/lms/components/Breadcrumb.vue
+++ b/erpnext/public/js/education/lms/components/Breadcrumb.vue
@@ -1,8 +1,15 @@
<template>
<div>
- <span v-for="(route, index) in routeData">
- <router-link :to="route.route">{{ route.label }}</router-link><span> / </span>
- </span>
+ <nav aria-label="breadcrumb">
+ <ol class="breadcrumb">
+ <li v-for="(route, index) in routeData" class="breadcrumb-item active" aria-current="page">
+ <router-link v-if="index != routeData.length - 1" :to="route.route">
+ {{ route.label }}
+ </router-link>
+ <span v-else>{{ route.label }}</span>
+ </li>
+ </ol>
+ </nav>
</div>
</template>
<script type="text/javascript">
diff --git a/erpnext/public/js/education/lms/components/CourseCard.vue b/erpnext/public/js/education/lms/components/CourseCard.vue
index 223654f..16f8873 100644
--- a/erpnext/public/js/education/lms/components/CourseCard.vue
+++ b/erpnext/public/js/education/lms/components/CourseCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="mt-3 col-md-4 col-sm-12">
+ <div class="py-3 col-md-4 col-sm-12">
<div class="card h-100">
<div class="card-hero-img" v-if="course.hero_image" v-bind:style="{ 'background-image': 'url(' + image + ')' }"></div>
<div v-else class="card-image-wrapper">
diff --git a/erpnext/public/js/education/lms/components/ProgramCard.vue b/erpnext/public/js/education/lms/components/ProgramCard.vue
index 26d3882..20de085 100644
--- a/erpnext/public/js/education/lms/components/ProgramCard.vue
+++ b/erpnext/public/js/education/lms/components/ProgramCard.vue
@@ -1,5 +1,5 @@
<template>
-<div class='mt-3 col-md-4 col-sm-12'>
+<div class='py-3 col-md-4 col-sm-12'>
<div class="card h-100">
<router-link :to="'/Program/' + program.name">
<div class="card-hero-img" v-if="program.hero_image" v-bind:style="{ 'background-image': 'url(' + image + ')' }"></div>
diff --git a/erpnext/public/js/education/lms/components/ProgressCard.vue b/erpnext/public/js/education/lms/components/ProgressCard.vue
index 77fb6ef..66b61f6 100644
--- a/erpnext/public/js/education/lms/components/ProgressCard.vue
+++ b/erpnext/public/js/education/lms/components/ProgressCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class='mt-3 col-md-4 col-sm-12'>
+ <div class='py-3 col-md-4 col-sm-12'>
<div class="card h-100">
<div class='card-body'>
<router-link :to="'/Program/' + programData.name">
diff --git a/erpnext/public/js/education/lms/components/ScoreCard.vue b/erpnext/public/js/education/lms/components/ScoreCard.vue
index 1cf53ef..80b12cb 100644
--- a/erpnext/public/js/education/lms/components/ScoreCard.vue
+++ b/erpnext/public/js/education/lms/components/ScoreCard.vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="quizData" class='mt-3 col-md-4 col-sm-12'>
+ <div v-if="quizData" class='py-3 col-md-4 col-sm-12'>
<div class="card h-100">
<div class='card-body'>
<h5 class='card-title'>{{ quizData.program }}</h5>
diff --git a/erpnext/public/js/education/lms/components/TopicCard.vue b/erpnext/public/js/education/lms/components/TopicCard.vue
index 3e930df..4cb8e85 100644
--- a/erpnext/public/js/education/lms/components/TopicCard.vue
+++ b/erpnext/public/js/education/lms/components/TopicCard.vue
@@ -1,6 +1,6 @@
<template>
- <div class="mt-3 col-md-4 col-sm-12">
+ <div class="py-3 col-md-4 col-sm-12">
<div class="card h-100">
<div class="card-hero-img" v-if="topic.hero_image" v-bind:style="{ 'background-image': 'url(' + image + ')' }"></div>
<div v-else class="card-image-wrapper">