chore: resolved conflicts

lms/lms/widgets/CourseCard.html

@@ -58,19 +58,12 @@
                 {{ frappe.utils.flt(course.avg_rating, frappe.get_system_settings("float_precision") or 3) }}
             </div>
             {% endif %}
-
-            {% if course.paid_certificate %}
-            <div class="vertically-center">
-                <svg class="icon icon-md">
-                    <use href="#icon-badge"></use>
-                </svg>
-                <span class="certificate-price" data-price="{{ course.price_certificate }}">
-                    {{ format_amount(course.price_certificate, course.currency) }}
-                </span>
-            </div>
-            {% endif %}
         </div>
-        <div class="course-card-title">{{ course.title }}</div>
+
+        <div class="course-card-title">
+            {{ course.title }}
+        </div>
+
         <div class="short-introduction">
             {{ course.short_introduction }}
         </div>
@@ -86,7 +79,8 @@
         {% endif %}
 
         <div class="course-card-footer">
-            <span class="">
+
+            <div class="course-card-instructors">
                 {% set instructors = get_instructors(course.name) %}
                 {% set ins_len = instructors | length %}
                 {% for instructor in instructors %}
@@ -111,7 +105,15 @@
                     {% endif %}
                     </span>
                 </a>
-            </span>
+            </div>
+
+            <div class="course-price">
+                {% if course.paid_course %}
+                    {{ frappe.utils.fmt_money(course.course_price, 0, course.currency) }}
+                {% else %}
+                    {{ _("Free") }}
+                {% endif %}
+            </div>
         </div>
 
         {% if read_only %}

lms/lms/widgets/NoPreviewModal.html

@@ -30,7 +30,7 @@
                     {{ _("Notify me when available") }}
                 </button>
                 {% elif show_start_learing_cta(course, membership) %}
-                <button class="btn btn-primary btn-sm join-batch pull-right" data-course="{{ course.name | urlencode}}">
+                <button class="btn btn-primary btn-sm enroll-in-course pull-right" data-course="{{ course.name | urlencode}}">
                     {{ _("Start Learning") }}
                 </button>
                 {% endif %}