From 4880d130f9a75a3264afb64e175a147f1c58b1ec Mon Sep 17 00:00:00 2001
From: Livia Dobai <livia.dobai@gmail.com>
Date: Thu, 5 Mar 2015 00:17:44 +0100
Subject: [PATCH 1/2] Add the  members on the project

---
 web/templates/pages/project_detail.html | 19 +++++++++++++++++++
 web/views.py                            |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/templates/pages/project_detail.html b/web/templates/pages/project_detail.html
index 02f6248..debe0cd 100644
--- a/web/templates/pages/project_detail.html
+++ b/web/templates/pages/project_detail.html
@@ -37,6 +37,25 @@ <h1><a href="{% url 'project-detail' project_id=project.project_id %}">{{ projec
 			<div class="col-md-6 col-xs-6">
 				<p><strong>Project members:</strong></p>
 				<!-- <p><img src="http://placekitten.com/550/550" alt="" class="img-responsive"></p> -->
+					<div class="row">
+						{% for member in member_list %}
+							<div class="col-md-4 col-xs-4">
+								{% if member.profile_picture %}
+									<img src="{{ MEDIA_URL }}{{ member.profile_picture.url|default_if_none:"" }}" alt="{{ member.user.first_name }}" />
+								{% endif %}
+								<p><a href="{% url 'pages-member-detail' user_id=member.id %}">{{ member.user.first_name }} {{ member.user.last_name }}</a></p>
+							</div>
+							{% if forloop.last %}
+					</div>
+							{% else %}
+								{% if forloop.counter|divisibleby:"3" %}
+					</div>
+					<div class="row">
+								{% endif %}
+							{% endif %}
+
+						{% endfor %}
+					</div>
 			</div>
 		</div>
 		{% if task_list %}
diff --git a/web/views.py b/web/views.py
index 59e2055..ac5d6e2 100644
--- a/web/views.py
+++ b/web/views.py
@@ -98,11 +98,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):

From 37d64ed453bee39256a86d768b500bb8f0556f7c Mon Sep 17 00:00:00 2001
From: Livia Dobai <livia.dobai@gmail.com>
Date: Thu, 5 Mar 2015 16:03:37 +0100
Subject: [PATCH 2/2] add style to the member image, resize the column on small
 screen

---
 static/css/style.css                    | 6 ++++++
 web/templates/pages/project_detail.html | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

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 debe0cd..5d04054 100644
--- a/web/templates/pages/project_detail.html
+++ b/web/templates/pages/project_detail.html
@@ -18,7 +18,7 @@ <h1><a href="{% url 'project-detail' project_id=project.project_id %}">{{ projec
 		</div>
 	<div class='container'>
 		<div class="row">
-			<div class="col-md-6 col-xs-6">
+			<div class="col-md-6 col-sm-6">
 				<p><strong>Description:</strong></p>
 				<p>{{ project.project_description }}</p>
 				<p><strong>Project launch date:</strong> {{ project.date_created|date:"d.m.Y" }}</p>
@@ -34,14 +34,14 @@ <h1><a href="{% url 'project-detail' project_id=project.project_id %}">{{ projec
 					<p><strong>Test site:</strong> <a href="{{ project.website_test }}">{{ project.website_test }}</a></p>
 				{% endif %}
 			</div>
-			<div class="col-md-6 col-xs-6">
+			<div class="col-md-6 col-sm-6">
 				<p><strong>Project members:</strong></p>
 				<!-- <p><img src="http://placekitten.com/550/550" alt="" class="img-responsive"></p> -->
 					<div class="row">
 						{% for member in member_list %}
 							<div class="col-md-4 col-xs-4">
 								{% if member.profile_picture %}
-									<img src="{{ MEDIA_URL }}{{ member.profile_picture.url|default_if_none:"" }}" alt="{{ member.user.first_name }}" />
+									<img class="avatar" src="{{ MEDIA_URL }}{{ member.profile_picture.url|default_if_none:"" }}" alt="{{ member.user.first_name }}" />
 								{% endif %}
 								<p><a href="{% url 'pages-member-detail' user_id=member.id %}">{{ member.user.first_name }} {{ member.user.last_name }}</a></p>
 							</div>