fix: conflicts

community/www/courses/course.html

@@ -11,22 +11,23 @@
   <div class="course-header">
     <div class="course-type">course</div>
     <h1 id="course-title" data-course="{{course.name}}">{{course.title}}</h1>
+    <div class="course-short-intro">{{ course.short_introduction }}</div>
   </div>
 
   <div class="row">
-    <div class="col-lg-9 col-md-12">
+    <div class="col-lg-8 col-md-12">
       <div  class="course-details">
+        {{ CourseVideo(course) }}
+
         {{ CourseDescription(course) }}
         {{ BatchSection(course) }}
         {{ CourseOutline(course) }}
       </div>
     </div>
-
-    <div class="col-lg-3 col-md-12">
+    <div class="col-lg-4 col-md-12">
       <div class="sidebar">
         {{ InstructorsSection(course.get_instructor()) }}
       </div>
-
       <div class="sidebar">
         {{ MentorsSection(course.get_mentors(), course.is_mentor(frappe.session.user), course.name) }}
       </div>
@@ -35,14 +36,7 @@
 </div>
 {% endblock %}
 
-
-{% macro CourseDescription(course) %}
-  <h2>Course Description</h2>
-
-  <div class="course-description">
-    {{ course.short_introduction }}
-  </div>
-
+{% macro CourseVideo(course) %}
   {% if course.video_link %}
   <div class="preview-video">
     <iframe
@@ -57,6 +51,14 @@
   {% endif %}
 {% endmacro %}
 
+{% macro CourseDescription(course) %}
+  <h2>Course Description</h2>
+
+  <div class="course-description">
+    {{ course.short_introduction }}
+  </div>
+{% endmacro %}
+
 {% macro BatchSection(course) %}
   {% if course.is_mentor(frappe.session.user) %}
     {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }}
@@ -76,9 +78,7 @@
 
   {% for m in batch.get_mentors() %}
     <div>
-      {% if m.photo_url %}
-      <img class="profile-photo" src="{{m.photo_url}}">
-      {% endif %}
+      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
       <span class="instructor-title">{{m.full_name}}</span>
     </div>
   {% endfor %}
@@ -86,7 +86,7 @@
   <div class="cta">
     <div class="">
       {% if can_manage %}
-        <button >Manage</button>
+        <a href="/courses/{{course.name}}/{{batch.name}}/about" class="btn btn-secondary">Manage</a>
       {% else %}
         <button class="join-batch" data-batch="{{ batch.name | urlencode }}">Join this Batch</button>
       {% endif %}
@@ -99,7 +99,7 @@
   <h2>Your Batches</h2>
 
   {% if mentor_batches %}
-    <div class="message">
+    <div class="alert alert-secondary">
       You are a mentor for this course. Manage your batches or create a new batch from here.
     </div>
 
@@ -136,6 +136,6 @@
   <h2>Course Outline</h2>
 
   {% for chapter in course.get_chapters() %}
-    {{ widgets.ChapterTeaser(chapter=chapter)}}
+    {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter)}}
   {% endfor %}
 {% endmacro %}