fix: conflicts

school/lms/web_template/course_cards/course_cards.html

@@ -6,4 +6,10 @@
     {{ widgets.CourseCard(course=course, read_only=False) }}
     {% endfor %}
   </div>
+  <a class="button-links d-flex justify-content-center mt-10 intercative-link" style="color: var(--gray-800);" href="/courses">
+    <div>
+      Explore More
+    </div>
+    <img src="/assets/school/icons/arrow.svg" class="ml-2"/>
+  </a>
 </div>

school/lms/web_template/courses_enrolled/courses_enrolled.html

@@ -16,7 +16,7 @@
   {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
   <div class="empty-state">
     <div class="course-home-headings text-center mb-0" style="color: inherit;">You haven't enrolled for any courses</div>
-    <p class="text-center mb-8">Here are a few courses we recommend for you to get started with {{ site_name }}</p>
+    <p class="small text-center mb-8">Here are a few courses we recommend for you to get started with {{ site_name }}</p>
     {% set recommended_courses = [course1, course2, course3] %}
     <div class="cards-parent">
     {% for recommended_course in recommended_courses %}

school/lms/widgets/CourseCard.html

@@ -77,36 +77,36 @@
 
   {% if certificate %}
   <div class="view-course-link is-default">
-    _("Get Certificate") <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
+    {{ _("Get Certificate") }}
   </div>
   <a class="stretched-link" href="/courses/{{ course.name }}/{{ certificate }}"></a>
 
   {% elif course.enable_certification and progress == 100 %}
   <div class="view-course-link is-default" id="certification" data-course="{{ course.name }}">
-    {{ _("Get Certificate") }} <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
+    {{ _("Get Certificate") }}
   </div>
 
   {% elif progress == 100 %}
   <div class="view-course-link is-default">
-    {{ _("Course Completed") }} <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
+    {{ _("Course Completed") }}
   </div>
   <a class="stretched-link" href="/courses/{{ course.name }}"></a>
 
   {% elif course.upcoming %}
   <div class="view-course-link is-secondary border">
-    {{ _("Upcoming Course") }} <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
+    {{ _("Upcoming Course") }}
   </div>
   <a class="stretched-link" href="/courses/{{ course.name }}"></a>
 
   {% elif membership %}
   <div class="view-course-link is-primary">
-    {{ _("Continue Course") }} <img class="ml-1" src="/assets/school/icons/white-arrow.svg" />
+    {{ _("Continue Course") }}
   </div>
   <a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
 
   {% else %}
   <div class="view-course-link is-default">
-    {{ _("View Course") }} <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
+    {{ _("View Course") }}
   </div>
   <a class="stretched-link" href="/courses/{{ course.name }}"></a>
 

school/lms/widgets/Reviews.html

@@ -37,18 +37,19 @@
   </div>
 
   {% else %}
-  <div class="common-card-style thread-card">
-    <div class="w-25 text-center" style="margin: 0 auto;">
-      <span class="font-weight-bold"> No Reviews </span>
-      <div class="small">
-        There are no reviews for this course.
-      </div>
-      {% if course.is_eligible_to_review(membership) %}
+  <div class="empty-state text-center">
+    <img class="icon icon-xl" src="/assets/frappe/icons/timeless/message.svg">
+    <div class="course-home-headings mt-4 mb-0" style="color: inherit;"> {{ _("Review the course") }} </div>
+    <div class="small mb-6"> {{ _("Help us improve our course material.") }} </div>
+    {% if course.is_eligible_to_review(membership) %}
       <span class="review-link button is-secondary ml-auto mr-auto mt-3">
         Write a review
       </span>
-      {% endif %}
-    </div>
+    {% elif frappe.session.user == "Guest" %}
+    <a class="button is-secondary dark-links ml-auto mr-auto mt-3" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
+    {% elif not membership %}
+    <div class="button is-secondary join-batch ml-auto mr-auto mt-3" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
+    {% endif %}
   </div>
   {% endif %}
 </div>