chore: resolved conflicts

This commit is contained in:
Jannat Patel
2023-08-17 21:25:52 +05:30
29 changed files with 623 additions and 330 deletions

View File

@@ -2,12 +2,12 @@
<span class="btn btn-secondary btn-sm review-link">
{{ _("Write a review") }}
</span>
{% elif not is_instructor(course.name) and frappe.session.user == "Guest" %}
{% elif not is_instructor and frappe.session.user == "Guest" %}
<a class="btn btn-secondary btn-sm" href="/login?redirect-to=/courses/{{ course.name }}">
{{ _("Write a review") }}
</a>
{% elif show_start_learing_cta(course, membership) %}
<div class="btn btn-secondary btn-sm join-batch" data-course="{{ course.name | urlencode }}">
<div class="btn btn-secondary btn-sm enroll-in-course" data-course="{{ course.name | urlencode }}">
{{ _("Start Learning") }}
</div>
{% endif %}