From 23e2611725ef7626166f0a7449854f7535ea8d53 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 7 Mar 2022 12:52:09 +0530
Subject: [PATCH 1/2] feat: discussions redesign

---
 school/lms/md.py            |  2 +-
 school/www/batch/learn.html | 43 ++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/school/lms/md.py b/school/lms/md.py
index 5acb6322..ce410d81 100644
--- a/school/lms/md.py
+++ b/school/lms/md.py
@@ -99,7 +99,7 @@ class MacroInlineProcessor(InlineProcessor):
         return e, m.start(0), m.end(0)
 
 def sanitize_html(html, macro):
-    """Sanotize the html using BeautifulSoup.
+    """Sanitize the html using BeautifulSoup.
 
     The markdown processor request the correct markup and crashes on
     any broken tags. This makes sures that all those things are fixed
diff --git a/school/www/batch/learn.html b/school/www/batch/learn.html
index 34a5bd52..0e07aa39 100644
--- a/school/www/batch/learn.html
+++ b/school/www/batch/learn.html
@@ -25,9 +25,9 @@
         {% if membership %}
         {{ pagination(prev_url, next_url) }}
         {% endif %}
+        {{ Discussions() }}
       </div>
     </div>
-    {{ Discussions() }}
   </div>
 </div>
 {% endblock %}
@@ -41,7 +41,7 @@
     {% if membership %} is-member {% endif %}
     {% if membership or is_instructor %} eligible-for-submission {% endif %}" data-lesson="{{ lesson.name }}"
       data-course="{{ course.name }}">{{ lesson.title }}</div>
-    <span class="lesson-progress {{hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">COMPLETED</span>
+    <span class="lesson-progress {{hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
   </div>
 
   <div class="d-flex align-items-center">
@@ -62,7 +62,7 @@
       {% if ins_len == 1 %}
         {{ instructors[0].full_name }}
       {% else %}
-        {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
+        {% set suffix = _("other") if ins_len - 1 == 1 else _("others")  %}
         {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
       {% endif %}
       </span>
@@ -70,22 +70,21 @@
     <div class="ml-3 course-meta"> {{ frappe.utils.format_date(lesson.creation, "medium") }} </div>
   </div>
 
-
   <div class="markdown-source lesson-content-card">
-  {% if membership or lesson.include_in_preview or is_instructor %}
-  {% if is_instructor and not lesson.include_in_preview %}
-    <div class="small alert alert-secondary alert-dismissible mt-4 mb-4">
-      This lesson is not available for preview. As you are the Instructor of the course only you can see it.
-      <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-    </div>
-  {% endif %}
-    {{ render_html(lesson.body) }}
-  {% else %}
-    <div class="">
-      <a class="button is-primary pull-right" href="/courses/{{ course.name }}"> Start Learning </a>
-      <div class="">This lesson is not available for preview. Please join the course to access it.</div>
-    </div>
-  {% endif %}
+    {% if membership or lesson.include_in_preview or is_instructor %}
+    {% if is_instructor and not lesson.include_in_preview %}
+      <div class="small alert alert-secondary alert-dismissible mt-4 mb-4">
+        {{ _("This lesson is not available for preview. As you are the Instructor of the course only you can see it.") }}
+        <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+      </div>
+    {% endif %}
+      {{ render_html(lesson.body) }}
+    {% else %}
+      <div class="">
+        <a class="button is-primary pull-right" href="/courses/{{ course.name }}"> {{ _("Start Learning") }} </a>
+        <div class=""> {{ _("This lesson is not available for preview. Please join the course to access it.") }} </div>
+      </div>
+    {% endif %}
   </div>
 
 </div>
@@ -98,7 +97,7 @@
     {% if prev_url %}
     <a class="button is-secondary dark-links prev" href="{{ prev_url }}">
       <img class="mr-2" src="/assets/school/icons/left-arrow.svg">
-      Prev
+      {{ _("Prev") }}
     </a>
     {% endif %}
   </div>
@@ -116,7 +115,7 @@
 
   <div class="button is-secondary mark-progress {{ progress }} {% if progress == 'Incomplete' or progress == None %} hide {% endif %}"
     data-progress="Incomplete">
-    Mark as Incomplete
+    {{ _("Mark as Incomplete") }}
   </div>
 
   {% endif %}
@@ -124,12 +123,12 @@
   <div>
     <a class="button is-primary next {% if membership.progress|int == 100 and not next_url %} hide {% endif %}"
       {% if next_url %} data-href="{{ next_url }}" {% endif %} href="">
-      {% if next_url %} Next {% else %} Mark as Complete {% endif %}
+      {% if next_url %} {{ _("Next") }} {% else %} {{ _("Mark as Complete") }} {% endif %}
       <img class="ml-2" src="/assets/school/icons/side-arrow-white.svg">
     </a>
     {% if course.enable_certification %}
     <div class="button is-primary {% if membership.progress|int != 100 or next_url %} hide {% endif %}" id="certification">
-      Get Certificate
+      {{ _("Get Certificate") }}
     </div>
     {% endif %}
   </div>

From 0523f701c2d255cb6b68b85dcce8b9307cbf83af Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 31 Mar 2022 18:03:11 +0530
Subject: [PATCH 2/2] fix: profile page fixes

---
 lms/public/css/style.css      | 3 +--
 lms/www/profiles/profile.html | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 946bbca9..f56cd446 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -677,7 +677,7 @@ input[type=checkbox] {
   font-size: var(--text-sm);
   display: flex;
   flex-direction: column;
-  margin-bottom: 4rem;
+  margin-bottom: 3rem;
   padding-left: 200px;
   padding-right: 1rem;
   box-shadow: var(--shadow-sm);
@@ -1359,7 +1359,6 @@ pre {
 
 .profile-page-body {
   background-color: var(--gray-50);
-  padding: 2.5rem 0;
 }
 
 .profile-column-grid {
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 97d96288..7038e7c8 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -19,7 +19,6 @@
     </div>
   </div>
   <div class="container">
-    {{ CoursesEnrolled(member, read_only) }}
     {{ CoursesCreated(member, read_only) }}
     {{ CoursesMentored(member, read_only) }}
     {{ ProfileTabs(profile_tabs) }}