Merge pull request #309 from pateljannat/privacy-policy-during-signup

school/www/courses/course.html

@@ -121,14 +121,14 @@
   {% endif %}
 
   <div class="course-overlay-content">
+    <div class="course-home-headings"> {{ course.title }} </div>
 
     <div id="interest-alert" class="{% if not is_user_interested %} hide {% endif %}">
       You have opted to be notified for this course. You will receive an email when the course becomes available.
     </div>
 
-    <div class="course-home-headings"> {{ course.title }} </div>
     {% if get_lessons(course.name) | length %}
-    <div class="mt-3">
+    <div class="mt-3 mb-4">
       <img class="mr-3" src="/assets/school/icons/book.svg">
       {{ get_lessons(course.name) | length }} {{ _("Lessons") }}
     </div>

school/www/profiles/profile.html

@@ -209,7 +209,7 @@
 {% endmacro %}
 
 {% macro Contact(member) %}
-{% if show_contacts_section %}
+{% if member.linkedin or member.medium or member.github %}
 <div class="education-details">
   <div class="common-card-style profile-card">
     <div class="course-home-headings"> {{ _("Contact") }} </div>
@@ -232,6 +232,7 @@
       <img src="/assets/school/icons/github.svg"> {{ member.github.split("/")[-1] }}
     </a>
     {% endif %}
+
     </div>
   </div>
 </div>

school/www/profiles/profile.py

@@ -17,17 +17,8 @@ def get_context(context):
     except:
         context.template = "www/404.html"
         return
-    context.hide_primary_contact = frappe.db.get_single_value("LMS Settings", "hide_primary_contact")
-    context.show_contacts_section = show_contacts_section(context.member, context.hide_primary_contact)
     context.profile_tabs = get_profile_tabs(context.member)
 
-def show_contacts_section(member, hide_primary_contact):
-    if member.github or member.linkedin or member.medium:
-        return True
-    if hide_primary_contact or member.hide_private:
-        return False
-    return True
-
 def get_profile_tabs(user):
     """Returns the enabled ProfileTab objects.