MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Jannat Patel
2022-02-08 16:34:24 +05:30
parent 57c69a7d6c bf3a496ea3
commit e17637d27b
11 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
school/lms/widgets/CourseCard.html
+2 -1
View File
@@ -39,10 +39,11 @@
{{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
<a class="button-links" href="{{ get_profile_url(course.get_instructor().username) }}">
<span class="course-instructor">
{{ course.get_instructor().full_name }}
{{ instructor.full_name }}
</span>
</a>
</span>
{% endfor %}
<span class="course-student-count">
{% if course.get_students() | length %}
<span class="vertically-center mr-4">
school/lms/widgets/CourseTeaser.html
-19
View File
@@ -1,19 +0,0 @@
<div class="course-teaser">
<div class="course-body">
<h3 class="course-title"><a href="/courses/{{ course.name }}">{{ course.title }}</a></h3>
<div class="course-intro">
{{ course.short_introduction or "" }}
</div>
</div>
<div class="course-footer">
{% set batch = course.get_student_batch(frappe.session.user) %}
{% if batch %}
<a class="btn btn-secondary pull-right" href="/courses/{{course.name}}/{{batch.name}}/learn">Resume Course</a>
{% endif %}
<div class="course-author">
{% with author = course.get_instructor() %}
{{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="{{get_profile_url(author.username)}}">{{ author.full_name }}</a>
{% endwith %}
</div>
</div>
</div>