Skip to content

Add to the project detail page a list of members on the project #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mojcas merged 4 commits into from
Mar 5, 2015
Merged

Add to the project detail page a list of members on the project #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4880d13
Add the members on the project
livike Mar 4, 2015
f2570b2
Merge remote-tracking branch 'upstream/master' into membersonproject
livike Mar 4, 2015
931ae7d
Merge remote-tracking branch 'upstream/master' into membersonproject
livike Mar 5, 2015
37d64ed
add style to the member image, resize the column on small screen
livike Mar 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,9 @@ h4 {
margin: 145px 0px 15px 0px;
}

.avatar{
width: 50px;
height: 50px;
margin: 5px;

}
23 changes: 21 additions & 2 deletions web/templates/pages/project_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -34,9 +34,28 @@ <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 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>
{% if forloop.last %}
</div>
{% else %}
{% if forloop.counter|divisibleby:"3" %}
</div>
<div class="row">
{% endif %}
{% endif %}

{% endfor %}
</div>
</div>
</div>
{% if task_list %}
Expand Down
4 changes: 3 additions & 1 deletion web/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down