Merge pull request #371 from pateljannat/ui-fix

lms/lms/widgets/CourseCard.html

@@ -91,6 +91,8 @@
             <span class="course-instructor">
             {% if ins_len == 1 %}
                 {{ instructors[0].full_name }}
+            {% elif ins_len == 2 %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
             {% else %}
                 {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
                 {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}

lms/lms/widgets/Reviews.html

@@ -4,7 +4,7 @@
   <div class="mb-5">
     <span class="course-home-headings"> {{ _("Reviews") }} </span>
     {% if is_eligible_to_review(course.name, membership) and reviews | length %}
-    <span class="review-link button is-secondary pull-right">
+    <span class="btn btn-secondary btn-sm review-link">
       {{ _("Write a review") }}
     </span>
     {% endif %}

lms/public/css/style.css

@@ -1677,3 +1677,13 @@ li {
         margin-bottom: 1rem;
     }
 }
+
+.indicator-pill::before {
+    width: 0;
+    height: 0;
+    margin-right: 0;
+}
+
+.review-link {
+    float: right
+}

lms/www/batch/learn.html

@@ -92,8 +92,10 @@
         <span class="course-meta">
             {% if ins_len == 1 %}
                 {{ instructors[0].full_name }}
+            {% elif ins_len == 2 %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
             {% else %}
-            {% set suffix = _("other") if ins_len - 1 == 1 else _("others")  %}
+                {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
                 {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
             {% endif %}
         </span>
@@ -122,9 +124,9 @@
         {% set course_link = "<a class='join-batch' data-course=" + course.name | urlencode + " href=''>" + _('here') +  "</a>" %}
             <div class="">
                 <div>
-                    {{ _("This lesson is not available for preview.
+                    {{ _("There is no preview available for this lesson.
                     Please join the course to access it.
-                    Click {0} to join the course.").format(course_link) }}
+                    Click {0} to enroll.").format(course_link) }}
                 </div>
             </div>
         {% endif %}

lms/www/profiles/profile.html

@@ -58,7 +58,7 @@
             {% if frappe.session.user == member.email %}
             <div class="ml-auto mt-1">
                 <a class="btn btn-secondary btn-sm" href="/dashboard"> {{ _("Visit Dashboard") }} </a>
-                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile/{{ member.email }}"> {{ _("Edit Profile") }} </a>
+                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile/{{ member.email }}/edit"> {{ _("Edit Profile") }} </a>
             </div>
             {% endif %}
         </div>