From 687f7f7f7b7716572d5277110794d1c374e659c2 Mon Sep 17 00:00:00 2001
From: pateljannat <pateljannat2308@gmail.com>
Date: Thu, 27 May 2021 11:25:05 +0530
Subject: [PATCH] fix: minor home page issues

---
 community/lms/widgets/RenderBatch.html | 29 ++++++++++++++++++++++
 community/www/batch/home.html          | 27 +++-----------------
 community/www/courses/course.html      | 34 ++------------------------
 3 files changed, 35 insertions(+), 55 deletions(-)
 create mode 100644 community/lms/widgets/RenderBatch.html

diff --git a/community/lms/widgets/RenderBatch.html b/community/lms/widgets/RenderBatch.html
new file mode 100644
index 00000000..60e77784
--- /dev/null
+++ b/community/lms/widgets/RenderBatch.html
@@ -0,0 +1,29 @@
+<div class="batch">
+  <div class="batch-details">
+    <div>Session every {{batch.sessions_on}}</div>
+    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
+      {{frappe.utils.format_time(batch.end_time, "short")}}
+    </div>
+    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
+    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
+
+    {% for m in batch.get_mentors() %}
+    <div>
+      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
+      <span class="instructor-title">{{m.full_name}}</span>
+    </div>
+    {% endfor %}
+  </div>
+  {% if can_manage or can_join %}
+  <div class="cta">
+    <div class="">
+      {% if can_manage %}
+      <a href="/courses/{{course.name}}/{{batch.name}}/home" class="btn btn-primary">Manage</a>
+      {% elif can_join %}
+      <button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
+        data-course="{{ course.name | urlencode }}">Join this Batch</button>
+      {% endif %}
+    </div>
+  </div>
+  {% endif %}
+</div>
diff --git a/community/www/batch/home.html b/community/www/batch/home.html
index 3b98e3fb..4198f691 100644
--- a/community/www/batch/home.html
+++ b/community/www/batch/home.html
@@ -14,33 +14,14 @@
   <div class="course-details">
     {{ widgets.CourseOutline(course=course, batch=batch, show_link=True) }}
   </div>
-  <div class="col-lg-4 col-md-12">
+  <div class="w-25">
     <h2>Batch Schedule</h2>
-    {{ BatchDetails(batch) }}
+    {{ widgets.RenderBatch(batch=batch) }}
   </div>
+  {% if batch.description %}
   <h2>Batch Details</h2>
   {{ frappe.utils.md_to_html(batch.description) }}
-
+  {% endif %}
 
 </div>
 {% endblock %}
-
-{% macro BatchDetails(batch) %}
-<div class="batch">
-  <div class="batch-details">
-    <div>Session every {{batch.sessions_on}}</div>
-    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
-      {{frappe.utils.format_time(batch.end_time, "short")}}
-    </div>
-    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
-    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
-
-    {% for m in batch.get_mentors() %}
-    <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
-      <span class="instructor-title">{{m.full_name}}</span>
-    </div>
-    {% endfor %}
-  </div>
-</div>
-{% endmacro %}
diff --git a/community/www/courses/course.html b/community/www/courses/course.html
index 21c12831..ce8d3c90 100644
--- a/community/www/courses/course.html
+++ b/community/www/courses/course.html
@@ -64,36 +64,6 @@
 {% endif %}
 {% endmacro %}
 
-{% macro RenderBatch(batch, can_manage=False) %}
-<div class="batch">
-  <div class="batch-details">
-    <div>Session every {{batch.sessions_on}}</div>
-    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
-      {{frappe.utils.format_time(batch.end_time, "short")}}
-    </div>
-    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
-    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
-
-    {% for m in batch.get_mentors() %}
-    <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
-      <span class="instructor-title">{{m.full_name}}</span>
-    </div>
-    {% endfor %}
-  </div>
-  <div class="cta">
-    <div class="">
-      {% if can_manage %}
-      <a href="/courses/{{course.name}}/{{batch.name}}/home" class="btn btn-primary">Manage</a>
-      {% else %}
-      <button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
-        data-course="{{ course.name | urlencode }}">Join this Batch</button>
-      {% endif %}
-    </div>
-  </div>
-</div>
-{% endmacro %}
-
 {% macro BatchSectionForMentors(course, mentor_batches) %}
 <h2>Your Batches</h2>
 
@@ -105,7 +75,7 @@
 <div class="row">
   {% for batch in mentor_batches %}
   <div class="col-lg-4 col-md-6">
-    {{ RenderBatch(batch, can_manage=True) }}
+    {{ widgets.RenderBatch(batch=batch, can_manage=True) }}
   </div>
   {% endfor %}
 </div>
@@ -127,7 +97,7 @@
 <div class="row">
   {% for batch in upcoming_batches %}
   <div class="col-lg-4 col-md-6">
-    {{ RenderBatch(batch, can_manage=False) }}
+    {{ widgets.RenderBatch(batch=batch, can_join=True) }}
   </div>
   {% endfor %}
 </div>