eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/frappe/school into jobs-improvement

Browse Source
This commit is contained in:
Jannat Patel
2022-01-11 19:30:53 +05:30
parent 19f5251736 20eb0c4d64
commit 2fe5a6b248
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
school/lms/widgets/MemberCard.html
View File

@@ -1,7 +1,6 @@
<div class="common-card-style member-card {{dimension_class}} "> <div class="common-card-style member-card">
{% set avatar_class = "avatar-xl" if not dimension_class else "avatar-large"%}
{{ widgets.Avatar(member=member, avatar_class=avatar_class) }} {{ widgets.Avatar(member=member, avatar_class=avatar_class) }}
<div class="small-title member-card-title"> <div class="small-title member-card-title {% if show_course_count %} font-weight-bold {% endif %}">
{{ member.full_name }} {{ member.full_name }}
</div> </div>
{% set course_count = member.get_authored_courses() | length %} {% set course_count = member.get_authored_courses() | length %}

2
school/overrides/user.py
View File

@@ -280,7 +280,7 @@ def get_user_details(users):
user_details = [] user_details = []
for user in users: for user in users:
details = frappe.get_doc("User", user) details = frappe.get_doc("User", user)
user_details.append(Widgets().MemberCard(member=details)) user_details.append(Widgets().MemberCard(member=details, avatar_class="avatar-large"))
return user_details return user_details

8
school/public/css/style.css
View File

@@ -804,10 +804,10 @@ input[type=checkbox] {
.member-parent { .member-parent {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-moz-column-gap: 32px; -moz-column-gap: 1rem;
column-gap: 32px; column-gap: 1rem;
row-gap: 32px; row-gap: 1rem;
} }
@media (max-width: 600px) { @media (max-width: 600px) {

4
school/www/cohorts/subgroup.html
View File

@@ -56,7 +56,7 @@
{% if mentors %} {% if mentors %}
<div class="member-parent"> <div class="member-parent">
{% for m in mentors %} {% for m in mentors %}
{{ widgets.MemberCard(member=m, show_course_count=False, dimension_class="") }} {{ widgets.MemberCard(member=m, show_course_count=False) }}
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
@@ -70,7 +70,7 @@
{% if students %} {% if students %}
<div class="member-parent"> <div class="member-parent">
{% for student in students %} {% for student in students %}
{{ widgets.MemberCard(member=student, show_course_count=False, dimension_class="") }} {{ widgets.MemberCard(member=student, show_course_count=False) }}
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}

2
school/www/community/index.html
View File

@@ -18,7 +18,7 @@
<div class="member-parent"> <div class="member-parent">
{% for user in user_details %} {% for user in user_details %}
{{ widgets.MemberCard(member=user, show_course_count=False) }} {{ widgets.MemberCard(member=user, show_course_count=False, avatar_class="avatar-large") }}
{% endfor %} {% endfor %}
</div> </div>
{% if user_count > user_details | length %} {% if user_count > user_details | length %}

4
school/www/courses/course.html
View File

@@ -129,7 +129,7 @@
<div class="course-home-headings"> <div class="course-home-headings">
Creator Creator
</div> </div>
{{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }} {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, avatar_class="avatar-large") }}
</div> </div>
{% endmacro %} {% endmacro %}
@@ -218,7 +218,7 @@
</div> </div>
<div class="member-parent"> <div class="member-parent">
{% for mentor in course.get_mentors() %} {% for mentor in course.get_mentors() %}
{{ widgets.MemberCard(member=mentor, show_course_count=False, dimension_class="") }} {{ widgets.MemberCard(member=mentor, show_course_count=False) }}
{% endfor %} {% endfor %}
</div> </div>
<div class="view-all-mentors"> <div class="view-all-mentors">