diff --git a/static/css/style.css b/static/css/style.css index b03cdd9..5240d28 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -133,3 +133,9 @@ h4 { margin: 145px 0px 15px 0px; } +.avatar{ + width: 50px; + height: 50px; + margin: 5px; + +} diff --git a/web/templates/pages/project_detail.html b/web/templates/pages/project_detail.html index 02f6248..5d04054 100644 --- a/web/templates/pages/project_detail.html +++ b/web/templates/pages/project_detail.html @@ -18,7 +18,7 @@

{{ projec
-
+ -
+

Project members:

+
+ {% for member in member_list %} +
+ {% if member.profile_picture %} + {{ member.user.first_name }} + {% endif %} +

{{ member.user.first_name }} {{ member.user.last_name }}

+
+ {% if forloop.last %} +
+ {% else %} + {% if forloop.counter|divisibleby:"3" %} +
+
+ {% endif %} + {% endif %} + + {% endfor %} +
{% if task_list %} diff --git a/web/views.py b/web/views.py index 500e786..3e98b65 100644 --- a/web/views.py +++ b/web/views.py @@ -95,11 +95,13 @@ def project_detail(request, project_id): if Project.objects.filter(pk=project_id).exclude(status = 'DELETED').exists(): project = Project.objects.get(pk=project_id) task_list = Task.objects.filter(project_id=project_id).exclude(status = 'DELETED') + member_list = project.project_members.all() else: project = None return render(request, 'pages/project_detail.html', {'project': project, - 'task_list' : task_list}) + 'task_list' : task_list, + 'member_list' : member_list}) @permission_required('api.add_project', login_url='/login/') def project_new(request):