From b3a9274cd3e5533c17725fe8ec026848fe2e5b6e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 30 Aug 2022 12:50:26 +0530
Subject: [PATCH] fix: minor UI

---
 .../courses_enrolled/courses_enrolled.html    |  4 +-
 lms/public/js/common_functions.js             |  2 +-
 lms/www/batch/join.html                       | 40 +++++++++----------
 lms/www/batch/learn.html                      | 35 +++++++++-------
 lms/www/dashboard/index.html                  |  5 ++-
 5 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index f254a3ef..b165aa70 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,14 +1,16 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
+
 {% if enrolled | length %}
 <div class="cards-parent">
   {% for course in enrolled %}
   {{ widgets.CourseCard(course=course) }}
   {% endfor %}
 </div>
+
 {% else %}
 {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
 <div class="empty-state">
-  <div class="empty-state-text">
+  <div class="empty-state-text text-left">
     <div class="text-center">
       <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
       <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js
index d09baca3..17ace20d 100644
--- a/lms/public/js/common_functions.js
+++ b/lms/public/js/common_functions.js
@@ -67,7 +67,7 @@ const join_course = (e) => {
                 }, 3);
                 setTimeout(function () {
                     window.location.href = `/courses/${course}/learn/1.1`;
-                }, 3000);
+                }, 1000);
             }
         }
     })
diff --git a/lms/www/batch/join.html b/lms/www/batch/join.html
index ce46d291..824cf13d 100644
--- a/lms/www/batch/join.html
+++ b/lms/www/batch/join.html
@@ -48,25 +48,25 @@
 <script>
 frappe.ready(() => {
     $("#confirm").click((e) => {
-      frappe.call({
-        "method": "lms.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
-        "args": {
-          "batch": {{ batch.name }},
-          "course": {{ batch.course }}
-        },
-        "callback": (data) => {
-          if (data.message == "OK") {
-            frappe.msgprint({
-              message: __("You are now a member of this batch!"),
-              clear: true
-            });
-            setTimeout(function () {
-              window.location.href = "/courses/{{ batch.course }}/home";
-            }, 2000);
-          }
-        }
-      })
-    })
-  })
+        frappe.call({
+            "method": "lms.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
+            "args": {
+                "batch": {{ batch.name }},
+                "course": {{ batch.course }}
+            },
+            "callback": (data) => {
+            if (data.message == "OK") {
+                frappe.msgprint({
+                    message: __("You are now a member of this batch!"),
+                    clear: true
+                });
+                setTimeout(function () {
+                    window.location.href = "/courses/{{ batch.course }}/home";
+                }, 1000);
+            }
+            }
+        });
+    });
+});
 </script>
 {% endblock %}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index b364ca79..c3fb460a 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -67,7 +67,7 @@
             data-index="{{ lesson_index }}" data-course="{{ course.name }}" data-chapter="{{ chapter }}"
             {% if lesson.name %} data-lesson="{{ lesson.name }}" {% endif %}
             >{% if lesson.title %}{{ lesson.title }}{% endif %}</div>
-        <span class="lesson-progress {{ hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
+        <span class="indicator-pill green {{ hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
 
         <!-- Edit Button -->
         {% if is_instructor and not lesson.edit_mode %}
@@ -119,9 +119,13 @@
             {% endif %}
 
         {% else %}
+        {% set course_link = "<a class='join-batch' data-course=" + course.name | urlencode + " href=''>" + _('here') +  "</a>" %}
             <div class="">
-                <div class="btn btn-primary pull-right join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
-                <div class=""> {{ _("This lesson is not available for preview. Please join the course to access it.") }} </div>
+                <div>
+                    {{ _("This lesson is not available for preview.
+                    Please join the course to access it.
+                    Click {0} to join the course.").format(course_link) }}
+                </div>
             </div>
         {% endif %}
     </div>
@@ -140,14 +144,14 @@
     <div>
         {% if prev_url %}
         <a class="btn btn-secondary dark-links prev" href="{{ prev_url }}">
-            <img class="mr-2" src="/assets/lms/icons/left-arrow.svg">
-            {{ _("Prev") }}
+            {{ _("Previous") }}
         </a>
         {% endif %}
     </div>
 
-    {% if not is_mentor(course.name, frappe.session.user) and membership %}
     {% set progress = get_progress(course.name, lesson.name) %}
+
+    {% if not is_mentor(course.name, frappe.session.user) and membership %}
     <div class="custom-checkbox {% if progress == 'Complete' %} hide {% endif %}">
         <label class="quiz-label">
             <input class="mark-progress" type="checkbox" checked>
@@ -155,18 +159,19 @@
             <span class="small">{{ _("Mark as complete on moving to the next lesson") }}</span>
         </label>
     </div>
-
-    <div class="btn btn-default mark-progress {{ progress }} {% if progress == 'Incomplete' or progress == None %} hide {% endif %}"
-        data-progress="Incomplete">
-        {{ _("Mark as Incomplete") }}
-    </div>
     {% endif %}
 
     <div>
-        <a class="btn btn-primary next {% if not next_url and (membership.progress|int == 100  or is_instructor)  %} hide {% endif %}"
-        {% if next_url %} data-href="{{ next_url }}" {% endif %} href="">
-        {% if next_url %} {{ _("Next") }} {% else %} {{ _("Mark as Complete") }} {% endif %}
-        <img class="ml-2" src="/assets/lms/icons/side-arrow-white.svg">
+        {% if not is_mentor(course.name, frappe.session.user) and membership %}
+        <div class="btn btn-default mark-progress {{ progress }} {% if progress == 'Incomplete' or progress == None %} hide {% endif %}"
+            data-progress="Incomplete">
+            {{ _("Mark as Incomplete") }}
+        </div>
+        {% endif %}
+
+        <a class="btn btn-primary next ml-2 {% if not next_url and (membership.progress|int == 100  or is_instructor)  %} hide {% endif %}"
+            {% if next_url %} data-href="{{ next_url }}" {% endif %} href="">
+            {% if next_url %} {{ _("Next") }} {% else %} {{ _("Mark as Complete") }} {% endif %}
         </a>
     </div>
 
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 1f6e5855..a24a2977 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -1,5 +1,6 @@
 {% extends "templates/base.html" %}
-{% block title %}{{ _("Dashboard")}}
+{% block title %}
+{{ _("Dashboard")}}
 {% endblock %}
 
 
@@ -20,6 +21,7 @@
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
             </li>
+
             {% if show_creators_section %}
             <li class="nav-item">
                 <a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}
@@ -34,6 +36,7 @@
             <div class="tab-pane active" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
                 {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
             </div>
+
             {% if show_creators_section %}
             <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
                 {% include "lms/templates/courses_created.html" %}